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

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2013-02-27 14:49:46 +01:00
parent c8c991e049 c8c26c8e19
commit 692f053d80
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/org.el
View file

@ -5266,7 +5266,8 @@ The following commands are available:
(org-add-hook 'isearch-mode-end-hook 'org-isearch-end 'append 'local) (org-add-hook 'isearch-mode-end-hook 'org-isearch-end 'append 'local)
;; Emacs 22 deals with this through a special variable ;; Emacs 22 deals with this through a special variable
(org-set-local 'outline-isearch-open-invisible-function (org-set-local 'outline-isearch-open-invisible-function
(lambda (&rest ignore) (org-show-context 'isearch)))) (lambda (&rest ignore) (org-show-context 'isearch)))
(org-add-hook 'isearch-mode-end-hook 'org-fix-ellipsis-at-bol 'append 'local))
;; Setup the pcomplete hooks ;; Setup the pcomplete hooks
(set (make-local-variable 'pcomplete-command-completion-function) (set (make-local-variable 'pcomplete-command-completion-function)
@ -5313,6 +5314,8 @@ The following commands are available:
(put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify) (put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify)
(defsubst org-fix-ellipsis-at-bol ()
(save-excursion (goto-char (window-start)) (recenter 0)))
(defun org-find-invisible-foreground () (defun org-find-invisible-foreground ()
(let ((candidates (remove (let ((candidates (remove
@ -13270,7 +13273,7 @@ How much context is shown depends upon the variables
(not (bobp))) (not (bobp)))
(org-flag-heading nil) (org-flag-heading nil)
(when siblings-p (org-show-siblings))))) (when siblings-p (org-show-siblings)))))
(save-excursion (goto-char (window-start)) (recenter 0)))) (org-fix-ellipsis-at-bol)))
(defvar org-reveal-start-hook nil (defvar org-reveal-start-hook nil
"Hook run before revealing a location.") "Hook run before revealing a location.")
@ -22972,7 +22975,8 @@ Show the heading too, if it is currently invisible."
isearch-mode-end-hook-quit) isearch-mode-end-hook-quit)
;; Only when the isearch was not quitted. ;; Only when the isearch was not quitted.
(org-add-hook 'post-command-hook 'org-isearch-post-command (org-add-hook 'post-command-hook 'org-isearch-post-command
'append 'local))))) 'append 'local)))
(org-fix-ellipsis-at-bol)))
(defun org-isearch-post-command () (defun org-isearch-post-command ()
"Remove self from hook, and show context." "Remove self from hook, and show context."