From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#16035: 24.3.50; Custom isearch broken on trunk (e.g. change-log-mode) Date: Mon, 16 Dec 2013 22:32:40 +0200 Organization: JURTA Message-ID: <8761qoa653.fsf@mail.jurta.org> References: <87vbz5zcxv.fsf@mail.jurta.org> <87mwkgay9s.fsf@mail.jurta.org> <877gbi94p9.fsf@mail.jurta.org> <87y53s9rfq.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387226116 13755 80.91.229.3 (16 Dec 2013 20:35:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 16 Dec 2013 20:35:16 +0000 (UTC) Cc: 16035@debbugs.gnu.org To: Anders Lindgren Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 16 21:35:21 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Vsesr-0008Iw-Lu for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Dec 2013 21:35:21 +0100 Original-Received: from localhost ([::1]:58036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vsesr-0000YO-7u for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Dec 2013 15:35:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vsesh-0000X4-IK for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 15:35:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsesZ-0006O6-Ak for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 15:35:11 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:40472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsesZ-0006Mw-5g for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 15:35:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VsesX-0002cl-T4 for bug-gnu-emacs@gnu.org; Mon, 16 Dec 2013 15:35:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Dec 2013 20:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16035 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 16035-submit@debbugs.gnu.org id=B16035.138722605710026 (code B ref 16035); Mon, 16 Dec 2013 20:35:01 +0000 Original-Received: (at 16035) by debbugs.gnu.org; 16 Dec 2013 20:34:17 +0000 Original-Received: from localhost ([127.0.0.1]:54491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Vsero-0002be-W6 for submit@debbugs.gnu.org; Mon, 16 Dec 2013 15:34:17 -0500 Original-Received: from [69.163.184.122] (port=58315 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Vserk-0002bI-Rm for 16035@debbugs.gnu.org; Mon, 16 Dec 2013 15:34:13 -0500 Original-Received: from localhost.jurta.org (ps18281.dreamhostps.com [69.163.184.122]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 651F734CB01680; Mon, 16 Dec 2013 12:34:11 -0800 (PST) In-Reply-To: (Anders Lindgren's message of "Mon, 16 Dec 2013 09:13:42 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:82089 Archived-At: > I just found another (minor) detail problem regarding the new isearch > system. > > I sometimes use ESCAPE as the meta key. However, to exit an isearch search, > pressing the real meta key (Cmd, on my mac) and < work as intended. > However, the sequence ESCAPE < does not. Emacs simply responds that > " < is undefined". Hopefully, the following patch fixes this in a correct way. At least, it works in all tests that I tried: C-s ESC < - exits isearch and goes to the top C-s ESC c - doesn't exit isearch and toggles case-sensitivity C-s ESC ESC ESC - cancels isearch === modified file 'lisp/isearch.el' --- lisp/isearch.el 2013-12-06 00:55:20 +0000 +++ lisp/isearch.el 2013-12-16 20:28:12 +0000 @@ -435,8 +435,7 @@ (defvar isearch-mode-map ;; would be simpler to disable the global keymap, and/or have a ;; default local key binding for any key not otherwise bound. (let ((meta-map (make-sparse-keymap))) - (define-key map (char-to-string meta-prefix-char) meta-map) - (define-key map [escape] meta-map)) + (define-key map (char-to-string meta-prefix-char) meta-map)) ;; Several non-printing chars change the searching behavior. (define-key map "\C-s" 'isearch-repeat-forward) @@ -453,7 +452,6 @@ (defvar isearch-mode-map (or (= ?\e meta-prefix-char) (error "Inconsistency in isearch.el")) (define-key map "\e\e\e" 'isearch-cancel) - (define-key map [escape escape escape] 'isearch-cancel) (define-key map "\C-q" 'isearch-quote-char)