tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

org.el: Always honor `org-startup-indented', even when `org-inhibit-startup' is non-nil 

* org.el (org-mode): Always honor `org-startup-indented', even
when `org-inhibit-startup' is non-nil.

* org-indent.el (org-indent-mode): Don't check
`org-inhibit-startup'.

Thanks to Carsten for suggesting this.
This commit is contained in:
Bastien Guerry 2013-01-30 11:18:24 +01:00
parent 35f944aaf0
commit 6d06bcfcbc
2 changed files with 62 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org-indent.el
View File

@ -159,10 +159,9 @@ properties, after each buffer modification, on the modified zone.
The process is synchronous. Though, initial indentation of The process is synchronous. Though, initial indentation of
buffer, which can take a few seconds on large buffers, is done buffer, which can take a few seconds on large buffers, is done
during idle time." nil " Ind" nil during idle time."
(cond nil " Ind" nil
((org-bound-and-true-p org-inhibit-startup) (cond
(setq org-indent-mode nil))
((and org-indent-mode (featurep 'xemacs)) ((and org-indent-mode (featurep 'xemacs))
(message "org-indent-mode does not work in XEmacs - refusing to turn it on") (message "org-indent-mode does not work in XEmacs - refusing to turn it on")
(setq org-indent-mode nil)) (setq org-indent-mode nil))

4
lisp/org.el
View File

@ -4915,6 +4915,7 @@ The following commands are available:
(org-set-local 'calc-embedded-open-mode "# ") (org-set-local 'calc-embedded-open-mode "# ")
(modify-syntax-entry ?@ "w") (modify-syntax-entry ?@ "w")
(if org-startup-truncated (setq truncate-lines t)) (if org-startup-truncated (setq truncate-lines t))
(when org-startup-indented (require 'org-indent) (org-indent-mode 1))
(org-set-local 'font-lock-unfontify-region-function (org-set-local 'font-lock-unfontify-region-function
'org-unfontify-region) 'org-unfontify-region)
;; Activate before-change-function ;; Activate before-change-function
@ -4996,9 +4997,6 @@ The following commands are available:
(set-buffer-modified-p bmp))) (set-buffer-modified-p bmp)))
(when org-startup-with-inline-images (when org-startup-with-inline-images
(org-display-inline-images)) (org-display-inline-images))
(when org-startup-indented
(require 'org-indent)
(org-indent-mode 1))
(unless org-inhibit-startup-visibility-stuff (unless org-inhibit-startup-visibility-stuff
(org-set-startup-visibility))) (org-set-startup-visibility)))
;; Try to set org-hide correctly ;; Try to set org-hide correctly