summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2011-07-21 16:53:50 +0200
committerNicolas Goaziou <n.goaziou@gmail.com>2011-07-21 16:53:50 +0200
commit4fd9989b588a0659791b66c59cef79cb18218085 (patch)
tree681801447aad91bde57a872a87c1fdbc531bac01
parent5b39df0523c8aa2e7166d917b419dc141c027564 (diff)
downloadorg-mode-4fd9989b588a0659791b66c59cef79cb18218085.tar.gz
Fix archiving bug introduced by last commit
* lisp/org.el (org-kill-is-subtree-p): matched string needs to start at bol.
-rw-r--r--lisp/org.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index ac60e4e..611672b 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7607,6 +7607,7 @@ which is OK for `org-paste-subtree'.
If optional TXT is given, check this string instead of the current kill."
(let* ((kill (or txt (and kill-ring (current-kill 0)) ""))
(re (org-get-limited-outline-regexp))
+ (^re (concat "^" re))
(start-level (and kill
(string-match
(concat "\\`\\([ \t\n\r]*?\n\\)?\\(" re "\\)")
@@ -7617,7 +7618,7 @@ If optional TXT is given, check this string instead of the current kill."
(progn
nil) ;; does not even start with a heading
(catch 'exit
- (while (setq start (string-match re kill (1+ start)))
+ (while (setq start (string-match ^re kill (1+ start)))
(when (< (- (match-end 0) (match-beginning 0) 1) start-level)
(throw 'exit nil)))
t))))