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)

123
lisp/org-indent.el
View File

@ -159,69 +159,68 @@ 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)) ((and org-indent-mode
((and org-indent-mode (not (org-version-check "23.1.50" "Org Indent mode" :predicate)))
(not (org-version-check "23.1.50" "Org Indent mode" :predicate))) (message "org-indent-mode can crash Emacs 23.1 - refusing to turn it on!")
(message "org-indent-mode can crash Emacs 23.1 - refusing to turn it on!") (ding)
(ding) (sit-for 1)
(sit-for 1) (setq org-indent-mode nil))
(setq org-indent-mode nil)) (org-indent-mode
(org-indent-mode ;; mode was turned on.
;; mode was turned on. (org-set-local 'indent-tabs-mode nil)
(org-set-local 'indent-tabs-mode nil) (or org-indent-strings (org-indent-initialize))
(or org-indent-strings (org-indent-initialize)) (org-set-local 'org-indent-initial-marker (copy-marker 1))
(org-set-local 'org-indent-initial-marker (copy-marker 1)) (when org-indent-mode-turns-off-org-adapt-indentation
(when org-indent-mode-turns-off-org-adapt-indentation (org-set-local 'org-adapt-indentation nil))
(org-set-local 'org-adapt-indentation nil)) (when org-indent-mode-turns-on-hiding-stars
(when org-indent-mode-turns-on-hiding-stars (org-set-local 'org-hide-leading-stars-before-indent-mode
(org-set-local 'org-hide-leading-stars-before-indent-mode org-hide-leading-stars)
org-hide-leading-stars) (org-set-local 'org-hide-leading-stars t))
(org-set-local 'org-hide-leading-stars t)) (make-local-variable 'filter-buffer-substring-functions)
(make-local-variable 'filter-buffer-substring-functions) (add-hook 'filter-buffer-substring-functions
(add-hook 'filter-buffer-substring-functions (lambda (fun start end delete)
(lambda (fun start end delete) (org-indent-remove-properties-from-string
(org-indent-remove-properties-from-string (funcall fun start end delete))))
(funcall fun start end delete)))) (org-add-hook 'after-change-functions 'org-indent-refresh-maybe nil 'local)
(org-add-hook 'after-change-functions 'org-indent-refresh-maybe nil 'local) (org-add-hook 'before-change-functions
(org-add-hook 'before-change-functions 'org-indent-notify-modified-headline nil 'local)
'org-indent-notify-modified-headline nil 'local) (and font-lock-mode (org-restart-font-lock))
(and font-lock-mode (org-restart-font-lock)) (org-indent-remove-properties (point-min) (point-max))
(org-indent-remove-properties (point-min) (point-max)) ;; Submit current buffer to initialize agent. If it's the first
;; Submit current buffer to initialize agent. If it's the first ;; buffer submitted, also start the agent. Current buffer is
;; buffer submitted, also start the agent. Current buffer is ;; pushed in both cases to avoid a race condition.
;; pushed in both cases to avoid a race condition. (if org-indent-agentized-buffers
(if org-indent-agentized-buffers (push (current-buffer) org-indent-agentized-buffers)
(push (current-buffer) org-indent-agentized-buffers) (push (current-buffer) org-indent-agentized-buffers)
(push (current-buffer) org-indent-agentized-buffers) (setq org-indent-agent-timer
(setq org-indent-agent-timer (run-with-idle-timer 0.2 t #'org-indent-initialize-agent))))
(run-with-idle-timer 0.2 t #'org-indent-initialize-agent)))) (t
(t ;; mode was turned off (or we refused to turn it on)
;; mode was turned off (or we refused to turn it on) (kill-local-variable 'org-adapt-indentation)
(kill-local-variable 'org-adapt-indentation) (setq org-indent-agentized-buffers
(setq org-indent-agentized-buffers (delq (current-buffer) org-indent-agentized-buffers))
(delq (current-buffer) org-indent-agentized-buffers)) (when (markerp org-indent-initial-marker)
(when (markerp org-indent-initial-marker) (set-marker org-indent-initial-marker nil))
(set-marker org-indent-initial-marker nil)) (when (boundp 'org-hide-leading-stars-before-indent-mode)
(when (boundp 'org-hide-leading-stars-before-indent-mode) (org-set-local 'org-hide-leading-stars
(org-set-local 'org-hide-leading-stars org-hide-leading-stars-before-indent-mode))
org-hide-leading-stars-before-indent-mode)) (remove-hook 'filter-buffer-substring-functions
(remove-hook 'filter-buffer-substring-functions (lambda (fun start end delete)
(lambda (fun start end delete) (org-indent-remove-properties-from-string
(org-indent-remove-properties-from-string (funcall fun start end delete))))
(funcall fun start end delete)))) (remove-hook 'after-change-functions 'org-indent-refresh-maybe 'local)
(remove-hook 'after-change-functions 'org-indent-refresh-maybe 'local) (remove-hook 'before-change-functions
(remove-hook 'before-change-functions 'org-indent-notify-modified-headline 'local)
'org-indent-notify-modified-headline 'local) (org-with-wide-buffer
(org-with-wide-buffer (org-indent-remove-properties (point-min) (point-max)))
(org-indent-remove-properties (point-min) (point-max))) (and font-lock-mode (org-restart-font-lock))
(and font-lock-mode (org-restart-font-lock)) (redraw-display))))
(redraw-display))))
(defun org-indent-indent-buffer () (defun org-indent-indent-buffer ()
"Add indentation properties to the accessible part of the buffer." "Add indentation properties to the accessible part of the buffer."

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