summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-09-03 11:19:14 +0200
committerBastien Guerry <bzg@altern.org>2012-09-03 11:19:14 +0200
commit7efb9cb7ed4782c572a1a630b5b8cb7efa09b553 (patch)
tree919d7b6cabcc2fd0e861272e402dff1f5f79e0bc
parent87208bdecd53ecaedf1a993855c2f1a9038b77f9 (diff)
parent8d599a4eb23f5ca60162965d5e78d8ad7afff0be (diff)
downloadorg-mode-7efb9cb7ed4782c572a1a630b5b8cb7efa09b553.tar.gz
Merge branch 'maint' of orgmode.org:org-mode into maint
-rw-r--r--lisp/org.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 162179a..d1698e1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -21061,7 +21061,8 @@ meant to be filled."
(make-string (org-list-item-body-column
(org-element-property :begin parent))
? ))
- ((looking-at "[ \t]+") (match-string 0))
+ ((save-excursion (beginning-of-line) (looking-at "[ \t]+"))
+ (match-string 0))
(t ""))))
(comment-block
;; Only fill contents if P is within block boundaries.
@@ -21073,7 +21074,9 @@ meant to be filled."
(skip-chars-backward " \r\t\n")
(line-beginning-position))))
(when (and (>= p cbeg) (< p cend))
- (if (looking-at "[ \t]+") (match-string 0) ""))))))))))
+ (if (save-excursion (beginning-of-line) (looking-at "[ \t]+"))
+ (match-string 0)
+ ""))))))))))
(declare-function message-goto-body "message" ())
(defvar message-cite-prefix-regexp) ; From message.el