diff options
author | Bastien Guerry <bzg@altern.org> | 2013-02-27 14:49:46 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-02-27 14:49:46 +0100 |
commit | 692f053d8067e2314826cfcd3cf4ded7362a8dce (patch) | |
tree | 2ca11119d3237b93d479ab45fc07a3f8708dd552 | |
parent | c8c991e049400ce943f3e0cbdfcacbf8e40938d7 (diff) | |
parent | c8c26c8e1968a4b341ae05046f33374ae5b08723 (diff) | |
download | org-mode-692f053d8067e2314826cfcd3cf4ded7362a8dce.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el index 466c8bc..8d216be 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5266,7 +5266,8 @@ The following commands are available: (org-add-hook 'isearch-mode-end-hook 'org-isearch-end 'append 'local) ;; Emacs 22 deals with this through a special variable (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 (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) +(defsubst org-fix-ellipsis-at-bol () + (save-excursion (goto-char (window-start)) (recenter 0))) (defun org-find-invisible-foreground () (let ((candidates (remove @@ -13270,7 +13273,7 @@ How much context is shown depends upon the variables (not (bobp))) (org-flag-heading nil) (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 "Hook run before revealing a location.") @@ -22972,7 +22975,8 @@ Show the heading too, if it is currently invisible." isearch-mode-end-hook-quit) ;; Only when the isearch was not quitted. (org-add-hook 'post-command-hook 'org-isearch-post-command - 'append 'local))))) + 'append 'local))) + (org-fix-ellipsis-at-bol))) (defun org-isearch-post-command () "Remove self from hook, and show context." |