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

Merge branch 'maint' 

Conflicts:
	contrib/lisp/org-e-odt.el
This commit is contained in:
Bastien Guerry 2013-01-30 12:11:10 +01:00
parent e54dce3b8c e91a5dd33f
commit 2d18609f4a
4 changed files with 64 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/lisp/org-e-odt.el
View File

@ -4014,6 +4014,7 @@ contextual information."
;; Delete temporary directory and also other embedded ;; Delete temporary directory and also other embedded
;; files that get copied there. ;; files that get copied there.
(delete-directory org-e-odt-zip-dir t))))) (delete-directory org-e-odt-zip-dir t)))))
(condition-case err
(condition-case err (condition-case err
(progn (progn
(unless (executable-find "zip") (unless (executable-find "zip")

2
lisp/org-bibtex.el
View File

@ -708,7 +708,7 @@ This function relies `org-search-view' to locate results."
(org-agenda-search-view-always-boolean t)) (org-agenda-search-view-always-boolean t))
(org-search-view nil (org-search-view nil
(format "%s +{:%s%s:}" (format "%s +{:%s%s:}"
string org-bibtex-prefix string (or org-bibtex-prefix "")
org-bibtex-type-property-name)))) org-bibtex-type-property-name))))
(provide 'org-bibtex) (provide 'org-bibtex)

5
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."
nil " Ind" nil
(cond (cond
((org-bound-and-true-p org-inhibit-startup)
(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

@ -5078,6 +5078,7 @@ The following commands are available:
(modify-syntax-entry ?@ "w") (modify-syntax-entry ?@ "w")
(modify-syntax-entry ?\" "\"") (modify-syntax-entry ?\" "\"")
(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
@ -5161,9 +5162,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