summaryrefslogtreecommitdiff
path: root/lisp/org-capture.el
diff options
context:
space:
mode:
authorSebastien Delafond <seb@debian.org>2014-06-21 11:08:09 +0200
committerSébastien Delafond <sdelafond@gmail.com>2014-07-13 13:35:35 +0200
commit0a60a1ae5b73c4569a4bdfdd56a3eeb3fbc0b3dc (patch)
tree0e277c1c07e8d47b85bbc3c996febb70da50dfde /lisp/org-capture.el
parent2d3359e41007641d7a8e5b088d9286aef64d99e7 (diff)
parent361fd4da7cfa870165cb1ec175cdbea55ca40e7e (diff)
Imported Debian patch 8.2.7a-1
Diffstat (limited to 'lisp/org-capture.el')
-rw-r--r--lisp/org-capture.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 0433306..d8617d1 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1587,7 +1587,7 @@ The template may still contain \"%?\" for cursor positioning."
(insert template)
(goto-char (point-min))
(org-capture-steal-local-variables buffer)
- (setq buffer-file-name nil)
+ (setq buffer-file-name nil mark-active nil)
;; %[] Insert contents of a file.
(goto-char (point-min))
@@ -1674,7 +1674,9 @@ The template may still contain \"%?\" for cursor positioning."
(or (equal (char-before) ?:) (insert ":"))
(insert ins)
(or (equal (char-after) ?:) (insert ":"))
- (and (org-at-heading-p) (org-set-tags nil 'align)))))
+ (and (org-at-heading-p)
+ (let ((org-ignore-region t))
+ (org-set-tags nil 'align))))))
((equal char "C")
(cond ((= (length clipboards) 1) (insert (car clipboards)))
((> (length clipboards) 1)