Merge branch 'maint'

2013-03-01 18:58:05 +01:00 · 2013-03-01 18:58:05 +01:00 · 94e501cab8
parent 3b4a0b21c8 7afbf870f2
commit 94e501cab8
1 changed files with 2 additions and 0 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -5184,6 +5184,8 @@ The following commands are available:
  (org-set-local 'outline-regexp org-outline-regexp)
  (org-set-local 'outline-level 'org-outline-level)
  (setq bidi-paragraph-direction 'left-to-right)
+  ;; FIXME Circumvent a bug in outline.el (Emacs <24.4)
+  (set (make-local-variable 'paragraph-start) "\\|[ \t]*$\\|\\*+ ")
  (when (and org-ellipsis
             (fboundp 'set-display-table-slot) (boundp 'buffer-display-table)
 	     (fboundp 'make-glyph-code))