From 2d560370d1626544265d2c21559a0f138ef39ec9 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 2 Nov 2014 01:32:43 -0400 Subject: [PATCH] org-goto: Update for isearch changes * lisp/org.el (org-goto): Update for isearch changes that removed isearch-other-control-char. isearch-other-control-char has been removed from isearch.el [1]. The default interface for org-goto uses isearch-other-control-char to pass certain key presses from org-goto-local-auto-isearch-map to org-goto-map. Specifically, 'C-i' calls org-cycle and 'C-m' calls org-goto-ret. With the current isearch, the keys that should be passed to org-goto-map can be set to nil. In addition to 'C-i' and 'C-m', RET must also be set to nil because isearch-mode-map sets both 'C-m' and RET. [1] bzr revision 114586, git commit aa04ac2c6, http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15200 --- lisp/org.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 5b365b0..a70275c 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -7523,8 +7523,14 @@ (defun org-get-location (buf help) (defvar org-goto-local-auto-isearch-map (make-sparse-keymap)) (set-keymap-parent org-goto-local-auto-isearch-map isearch-mode-map) -(define-key org-goto-local-auto-isearch-map "\C-i" 'isearch-other-control-char) -(define-key org-goto-local-auto-isearch-map "\C-m" 'isearch-other-control-char) +;; `isearch-other-control-char' was removed in Emacs 24.4. +(if (boundp 'isearch-other-control-char) + (progn + (define-key org-goto-local-auto-isearch-map "\C-i" 'isearch-other-control-char) + (define-key org-goto-local-auto-isearch-map "\C-m" 'isearch-other-control-char)) + (define-key org-goto-local-auto-isearch-map "\C-i" nil) + (define-key org-goto-local-auto-isearch-map "\C-m" nil) + (define-key org-goto-local-auto-isearch-map [return] nil)) (defun org-goto-local-search-headings (string bound noerror) "Search and make sure that any matches are in headlines." -- 2.1.3