ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	lisp/org.el
This commit is contained in:
Bastien Guerry 2014-06-20 08:44:06 +02:00
parent f336de2f82 4b0557bdd8
commit ce2359eb80
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org.el
View File

@ -5519,8 +5519,7 @@ 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)
@ -5574,9 +5573,6 @@ The following commands are available:
(abbrev-table-put org-mode-abbrev-table (abbrev-table-put org-mode-abbrev-table
:parents (list text-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 () (defun org-find-invisible-foreground ()
(let ((candidates (remove (let ((candidates (remove
"unspecified-bg" "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)) (while (and (ignore-errors (progn (org-up-heading-all 1) t))
(not (bobp))) (not (bobp)))
(org-flag-heading nil) (org-flag-heading nil)
(when siblings-p (org-show-siblings))))) (when siblings-p (org-show-siblings)))))))
(unless (eq key 'agenda) (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.")
@ -24339,8 +24334,7 @@ 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."