Merge branch 'maint'

2014-01-16 12:07:37 +01:00 · 2014-01-16 12:07:37 +01:00 · 81dad90342
parent 3fafad7eec d16477913d
commit 81dad90342
1 changed files with 1 additions and 1 deletions
--- 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))