From: Juri Linkov <juri@jurta.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 15568@debbugs.gnu.org
Subject: bug#15568: Lookup this-command-keys without a prefix argument
Date: Sat, 12 Oct 2013 02:49:50 +0300 [thread overview]
Message-ID: <87y55zl57s.fsf@mail.jurta.org> (raw)
In-Reply-To: <jwvli20ug41.fsf-monnier+emacsbugs@gnu.org> (Stefan Monnier's message of "Fri, 11 Oct 2013 08:50:54 -0400")
> 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))))
prev parent reply other threads:[~2013-10-11 23:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-08 23:21 bug#15568: Lookup this-command-keys without a prefix argument Juri Linkov
2013-10-09 18:14 ` Stefan Monnier
2013-10-09 23:57 ` Juri Linkov
2013-10-10 1:02 ` Stefan Monnier
2013-10-10 23:58 ` Juri Linkov
2013-10-11 2:30 ` Stefan Monnier
2013-10-11 12:50 ` Stefan Monnier
2013-10-11 23:49 ` Juri Linkov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y55zl57s.fsf@mail.jurta.org \
--to=juri@jurta.org \
--cc=15568@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).