From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kyle Meyer Subject: [RFC/PATCH] org-goto: Update for isearch changes Date: Sun, 02 Nov 2014 16:31:39 -0500 Message-ID: <87d295uw5g.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xl2kU-0002R3-P3 for emacs-orgmode@gnu.org; Sun, 02 Nov 2014 16:31:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xl2kP-00008d-SB for emacs-orgmode@gnu.org; Sun, 02 Nov 2014 16:31:46 -0500 Received: from mail-qa0-f51.google.com ([209.85.216.51]:59683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xl2kP-00008V-PE for emacs-orgmode@gnu.org; Sun, 02 Nov 2014 16:31:41 -0500 Received: by mail-qa0-f51.google.com with SMTP id f12so7375939qad.38 for ; Sun, 02 Nov 2014 13:31:41 -0800 (PST) Received: from localhost (nat-130-132-173-5.central.yale.edu. [130.132.173.5]) by mx.google.com with ESMTPSA id q4sm6933842qas.16.2014.11.02.13.31.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Nov 2014 13:31:40 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org-mode --=-=-= Content-Type: text/plain Hello, As of Emacs 24.4, isearch no longer has the function isearch-other-control-char, which is bound in org-goto-local-auto-isearch-map. I've attached a patch that seems to produce the correct behavior with Emacs 24.4. However, I haven't used this interface enough in the past (I have org-goto-interface set to 'outline-path-completion') to be confident that the patch keeps the intended behavior. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-org-goto-Update-for-isearch-changes.patch >From 84b00057fe853649b33ecaff15890c98541af68b 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-go 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. [1] bzr revision 114586, git commit aa04ac2c6, http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15200 --- lisp/org.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 1b17d2c..cfb7ed9 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -7523,8 +7523,13 @@ (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) +(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 --=-=-= Content-Type: text/plain -- Kyle --=-=-=--