diff options
author | Bastien Guerry <bzg@altern.org> | 2013-04-18 10:29:00 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-04-18 10:29:00 +0200 |
commit | 4231cb4b129ece52526d415e0c900c7d16bf4181 (patch) | |
tree | 14ea37d10dbbdc20a41951d52733aa5d5d5ba9a7 | |
parent | 217d14ecc28a7e2d6e71193b253d8336625942a6 (diff) | |
download | org-mode-4231cb4b129ece52526d415e0c900c7d16bf4181.tar.gz |
Use `org-add-hook' in some places and merge Emacs revno r112320
* ox.el (org-export-stack-mode)
* org-crypt.el (org-crypt-check-auto-save)
(org-crypt-use-before-save-magic): Use `org-add-hook' when the
hooks are local hooks.
* org-indent.el (org-indent-mode)
* org-agenda.el (org-agenda-mode): Use `org-add-hook' and
merge upstream change from Emacs revno r112320.
-rw-r--r-- | lisp/org-agenda.el | 8 | ||||
-rw-r--r-- | lisp/org-crypt.el | 12 | ||||
-rw-r--r-- | lisp/org-indent.el | 10 | ||||
-rw-r--r-- | lisp/ox.el | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 607269d..631c6d0 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2148,10 +2148,10 @@ The following commands are available: (org-add-hook 'post-command-hook 'org-agenda-update-agenda-type nil 'local) (org-add-hook 'pre-command-hook 'org-unhighlight nil 'local) ;; Make sure properties are removed when copying text - (make-local-variable 'filter-buffer-substring-functions) - (add-hook 'filter-buffer-substring-functions - (lambda (fun start end delete) - (substring-no-properties (funcall fun start end delete)))) + (org-add-hook 'filter-buffer-substring-functions + (lambda (fun start end delete) + (substring-no-properties (funcall fun start end delete))) + nil t) (unless org-agenda-keep-modes (setq org-agenda-follow-mode org-agenda-start-with-follow-mode org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 2dfc4ad..b02a7ce 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -139,11 +139,11 @@ See `org-crypt-disable-auto-save'." (message "org-decrypt: Decrypting entry with auto-save-mode enabled. This may cause leakage.")) ((eq org-crypt-disable-auto-save 'encrypt) (message "org-decrypt: Enabling re-encryption on auto-save.") - (add-hook 'auto-save-hook - (lambda () - (message "org-crypt: Re-encrypting all decrypted entries due to auto-save.") - (org-encrypt-entries)) - nil t)) + (org-add-hook 'auto-save-hook + (lambda () + (message "org-crypt: Re-encrypting all decrypted entries due to auto-save.") + (org-encrypt-entries)) + nil t)) (t nil)))) (defun org-crypt-key-for-heading () @@ -264,7 +264,7 @@ See `org-crypt-disable-auto-save'." "Add a hook to automatically encrypt entries before a file is saved to disk." (add-hook 'org-mode-hook - (lambda () (add-hook 'before-save-hook 'org-encrypt-entries nil t)))) + (lambda () (org-add-hook 'before-save-hook 'org-encrypt-entries nil t)))) (add-hook 'org-reveal-start-hook 'org-decrypt-entry) diff --git a/lisp/org-indent.el b/lisp/org-indent.el index 5221e44..44311e3 100644 --- a/lisp/org-indent.el +++ b/lisp/org-indent.el @@ -182,11 +182,11 @@ during idle time." (org-set-local 'org-hide-leading-stars-before-indent-mode org-hide-leading-stars) (org-set-local 'org-hide-leading-stars t)) - (make-local-variable 'filter-buffer-substring-functions) - (add-hook 'filter-buffer-substring-functions - (lambda (fun start end delete) - (org-indent-remove-properties-from-string - (funcall fun start end delete)))) + (org-add-hook 'filter-buffer-substring-functions + (lambda (fun start end delete) + (org-indent-remove-properties-from-string + (funcall fun start end delete))) + nil t) (org-add-hook 'after-change-functions 'org-indent-refresh-maybe nil 'local) (org-add-hook 'before-change-functions 'org-indent-notify-modified-headline nil 'local) @@ -5557,7 +5557,7 @@ files or buffers, only the display. header-line-format '(:eval (format " %-12s | %6s | %s" "Back-End" "Age" "Source"))) - (add-hook 'post-command-hook 'org-export-stack-refresh nil t) + (org-add-hook 'post-command-hook 'org-export-stack-refresh nil t) (set (make-local-variable 'revert-buffer-function) 'org-export-stack-refresh)) |