summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-16 12:07:37 +0100
committerBastien Guerry <bzg@altern.org>2014-01-16 12:07:37 +0100
commit81dad90342d93392f0c2cd33986dd192086969f2 (patch)
treed9a3c408ff0c5738d1d624e77553f6bc2842db7a
parent3fafad7eecb23e9041c3120e0a75430d780f81ad (diff)
parentd16477913df4c91055239cf832c3da57152e751c (diff)
downloadorg-mode-81dad90342d93392f0c2cd33986dd192086969f2.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index fe5d26b..66a2125 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14650,7 +14650,7 @@ the column by ignoring invisible text."
(goto-char (match-beginning 0))
(setq c0 (current-column)
;; compute offset for the case of org-indent-mode active
- di (if org-indent-mode
+ di (if (org-bound-and-true-p org-indent-mode)
(* (1- org-indent-indentation-per-level) (1- level))
0)
p0 (if (equal (char-before) ?*) (1+ (point)) (point))