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#15568: Lookup this-command-keys without a prefix argument Date: Sat, 12 Oct 2013 02:49:50 +0300 Organization: JURTA Message-ID: <87y55zl57s.fsf@mail.jurta.org> References: <8761t7l57d.fsf@mail.jurta.org> <87hacq6lsy.fsf@mail.jurta.org> <871u3sy7io.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1381536975 19761 80.91.229.3 (12 Oct 2013 00:16:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Oct 2013 00:16:15 +0000 (UTC) Cc: 15568@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Oct 12 02:16:18 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 1VUmsU-0001pN-AK for geb-bug-gnu-emacs@m.gmane.org; Sat, 12 Oct 2013 02:16:18 +0200 Original-Received: from localhost ([::1]:56638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUmsT-00025m-MU for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Oct 2013 20:16:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUmsK-00024e-DH for bug-gnu-emacs@gnu.org; Fri, 11 Oct 2013 20:16:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUmsE-0000Uy-Cm for bug-gnu-emacs@gnu.org; Fri, 11 Oct 2013 20:16:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUmsE-0000Uu-9f for bug-gnu-emacs@gnu.org; Fri, 11 Oct 2013 20:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VUmsD-0005gW-V8 for bug-gnu-emacs@gnu.org; Fri, 11 Oct 2013 20:16:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 12 Oct 2013 00:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15568 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 15568-submit@debbugs.gnu.org id=B15568.138153691121788 (code B ref 15568); Sat, 12 Oct 2013 00:16:01 +0000 Original-Received: (at 15568) by debbugs.gnu.org; 12 Oct 2013 00:15:11 +0000 Original-Received: from localhost ([127.0.0.1]:43764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VUmrP-0005fL-02 for submit@debbugs.gnu.org; Fri, 11 Oct 2013 20:15:11 -0400 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:56273 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VUmrM-0005fC-5Z for 15568@debbugs.gnu.org; Fri, 11 Oct 2013 20:15:09 -0400 Original-Received: from localhost.jurta.org (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 192E8258B9E935; Fri, 11 Oct 2013 17:15:05 -0700 (PDT) In-Reply-To: (Stefan Monnier's message of "Fri, 11 Oct 2013 08:50:54 -0400") 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:79204 Archived-At: > Here's an idea: check if (eq overriding-terminal-local-map isearch-mode-map) I tried this approach and it passes my tests: === modified file 'lisp/isearch.el' --- lisp/isearch.el 2013-10-09 23:52:46 +0000 +++ lisp/isearch.el 2013-10-11 23:49:42 +0000 @@ -2240,10 +2240,12 @@ (defun isearch-pre-command-hook () (setq this-command 'isearch-edit-string)) ;; Handle a scrolling function or prefix argument. ((or (and isearch-allow-prefix - (memq this-command '(universal-argument - universal-argument-more - universal-argument-minus - digit-argument negative-argument))) + (or (memq this-command '(universal-argument + digit-argument + negative-argument)) + ;; Check if a prefix arg added a nested map. + (and overriding-terminal-local-map + (not (eq overriding-terminal-local-map isearch-mode-map))))) (and isearch-allow-scroll (or (eq (get this-command 'isearch-scroll) t) (eq (get this-command 'scroll-command) t))))