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#4117: 23.1; isearch + isearch-allow-scroll loses shift Date: Tue, 18 Aug 2009 00:18:17 +0300 Organization: JURTA Message-ID: <87ws52xhpi.fsf@mail.jurta.org> References: <19073.19554.183166.905858@winooski.ccs.neu.edu> <87bpmkhcdb.fsf@mail.jurta.org> <19075.22351.611859.436166@winooski.ccs.neu.edu> <873a7sy73p.fsf@mail.jurta.org> <19079.19475.169507.668553@winooski.ccs.neu.edu> <8763cn1bne.fsf@mail.jurta.org> Reply-To: Juri Linkov , 4117@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1250797685 25760 80.91.229.12 (20 Aug 2009 19:48:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Aug 2009 19:48:05 +0000 (UTC) Cc: Eli Barzilay , 4117@emacsbugs.donarmstrong.com To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Aug 20 21:47:58 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MeDc5-0001gU-Hf for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 Aug 2009 21:47:57 +0200 Original-Received: from localhost ([127.0.0.1]:32787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeDc5-00028e-0c for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 Aug 2009 15:47:57 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MeDbn-0001vl-5S for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2009 15:47:39 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MeDbi-0001ph-AR for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2009 15:47:38 -0400 Original-Received: from [199.232.76.173] (port=33856 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeDbi-0001pO-0f for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2009 15:47:34 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:46144) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MeDbh-0002Se-Gx for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2009 15:47:33 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7KJkpLT004437; Thu, 20 Aug 2009 12:47:31 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n7KJcNWa002348; Thu, 20 Aug 2009 12:38:23 -0700 Resent-Date: Thu, 20 Aug 2009 12:38:23 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Juri Linkov Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Thu, 20 Aug 2009 19:38:21 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 4117 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 4117-submit@emacsbugs.donarmstrong.com id=B4117.12505445005578 (code B ref 4117); Thu, 20 Aug 2009 19:38:21 +0000 Original-Received: (at 4117) by emacsbugs.donarmstrong.com; 17 Aug 2009 21:28:20 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mx2.starman.ee (smtp-out2.starman.ee [85.253.0.4]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7HLSIFU005571 for <4117@emacsbugs.donarmstrong.com>; Mon, 17 Aug 2009 14:28:20 -0700 X-Virus-Scanned: by Amavisd-New at mx2.starman.ee Original-Received: from mail.starman.ee (82.131.53.255.cable.starman.ee [82.131.53.255]) by mx2.starman.ee (Postfix) with ESMTP id 77D063F4079; Tue, 18 Aug 2009 00:28:08 +0300 (EEST) In-Reply-To: (Stefan Monnier's message of "Mon, 17 Aug 2009 11:07:36 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (x86_64-pc-linux-gnu) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Thu, 20 Aug 2009 15:47:38 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:30319 Archived-At: > If this works, it's good, but it shouldn't be installed as is: this has > no business being in isearch.el since other packages may need to do > the same. Please try to abstract some useful function that we can put > in subr.el and then use here in isearch.el. Actually the solution is much simpler. I just noticed that `read-key-sequence' already has the necessary argument `dont-downcase-last': The third (optional) arg dont-downcase-last, if non-nil, means do not convert the last event to lower case. (Normally any upper case event is converted to lower case if the original event is undefined and the lower case equivalent is defined.) A non-nil value is appropriate for reading a key sequence to be defined. So the fix is simple: Index: lisp/isearch.el =================================================================== RCS file: /sources/emacs/emacs/lisp/isearch.el,v retrieving revision 1.345 diff -u -r1.345 isearch.el --- lisp/isearch.el 14 Feb 2009 09:04:46 -0000 1.345 +++ lisp/isearch.el 17 Aug 2009 21:17:57 -0000 @@ -1805,7 +1810,7 @@ Return the key sequence as a string/vector." (isearch-unread-key-sequence keylist) (let (overriding-terminal-local-map) - (read-key-sequence nil))) ; This will go through function-key-map, if nec. + (read-key-sequence nil nil t))) ; This will go through function-key-map, if nec. (defun isearch-lookup-scroll-key (key-seq) "If KEY-SEQ is bound to a scrolling command, return it as a symbol. -- Juri Linkov http://www.jurta.org/emacs/