summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-06-20 06:44:06 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-06-20 06:44:06 (GMT)
commitce2359eb80fc4a7c0398d34a4d7f7a9038e7c9f9 (patch)
treec7ba32116fffada5d844b344d66f8dbfbf752364
parentf336de2f822a882872c737d985c1d8f25b83358f (diff)
parent4b0557bdd807dbdc49e59d9f172092957f2e6074 (diff)
downloadorg-mode-ce2359eb80fc4a7c0398d34a4d7f7a9038e7c9f9.zip
org-mode-ce2359eb80fc4a7c0398d34a4d7f7a9038e7c9f9.tar.gz
Merge branch 'maint'
Conflicts: lisp/org.el
-rw-r--r--lisp/org.el12
1 files changed, 3 insertions, 9 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 97cb5b3..784b706 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5519,8 +5519,7 @@ 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)))
- (org-add-hook 'isearch-mode-end-hook 'org-fix-ellipsis-at-bol 'append 'local))
+ (lambda (&rest ignore) (org-show-context 'isearch))))
;; Setup the pcomplete hooks
(set (make-local-variable 'pcomplete-command-completion-function)
@@ -5574,9 +5573,6 @@ The following commands are available:
(abbrev-table-put org-mode-abbrev-table
:parents (list text-mode-abbrev-table)))
-(defsubst org-fix-ellipsis-at-bol ()
- (save-excursion (set-window-start (selected-window) (window-start))))
-
(defun org-find-invisible-foreground ()
(let ((candidates (remove
"unspecified-bg"
@@ -13893,8 +13889,7 @@ How much context is shown depends upon the variables
(while (and (ignore-errors (progn (org-up-heading-all 1) t))
(not (bobp)))
(org-flag-heading nil)
- (when siblings-p (org-show-siblings)))))
- (unless (eq key 'agenda) (org-fix-ellipsis-at-bol))))
+ (when siblings-p (org-show-siblings)))))))
(defvar org-reveal-start-hook nil
"Hook run before revealing a location.")
@@ -24339,8 +24334,7 @@ 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)))
- (org-fix-ellipsis-at-bol)))
+ 'append 'local)))))
(defun org-isearch-post-command ()
"Remove self from hook, and show context."