From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#22107: 25.1; Wrong docstring for this-single-command-keys Date: Tue, 08 Dec 2015 18:59:41 +0200 Message-ID: <838u54dgg2.fsf@gnu.org> References: <87h9jt3o66.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1449594213 9747 80.91.229.3 (8 Dec 2015 17:03:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Dec 2015 17:03:33 +0000 (UTC) Cc: monnier@iro.umontreal.ca, 22107@debbugs.gnu.org To: bruce.connor.am@gmail.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Dec 08 18:03:21 2015 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 1a6LfX-0008Ko-W6 for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Dec 2015 18:03:16 +0100 Original-Received: from localhost ([::1]:60888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6LfX-00039T-90 for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Dec 2015 12:03:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6LfN-00031Z-Mz for bug-gnu-emacs@gnu.org; Tue, 08 Dec 2015 12:03:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6LfK-0007ei-B7 for bug-gnu-emacs@gnu.org; Tue, 08 Dec 2015 12:03:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6LfK-0007e4-8n for bug-gnu-emacs@gnu.org; Tue, 08 Dec 2015 12:03:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1a6LfJ-0007uH-SQ for bug-gnu-emacs@gnu.org; Tue, 08 Dec 2015 12:03:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 08 Dec 2015 17:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22107 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22107-submit@debbugs.gnu.org id=B22107.144959413130323 (code B ref 22107); Tue, 08 Dec 2015 17:03:01 +0000 Original-Received: (at 22107) by debbugs.gnu.org; 8 Dec 2015 17:02:11 +0000 Original-Received: from localhost ([127.0.0.1]:43432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a6LeU-0007t1-TG for submit@debbugs.gnu.org; Tue, 08 Dec 2015 12:02:11 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:59501) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a6LeA-0007sB-S1 for 22107@debbugs.gnu.org; Tue, 08 Dec 2015 12:02:09 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NZ100C00TO48600@a-mtaout20.012.net.il> for 22107@debbugs.gnu.org; Tue, 08 Dec 2015 18:59:47 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NZ100BNATVISCA0@a-mtaout20.012.net.il>; Tue, 08 Dec 2015 18:59:43 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il 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: 208.118.235.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:109768 Archived-At: > Date: Tue, 8 Dec 2015 12:01:29 +0000 > From: Artur Malabarba > Cc: 22107@debbugs.gnu.org > > 2015-12-08 1:20 GMT+00:00 Glenn Morris : > > > > Without any testing, going to guess this was caused by 5dc644a6b01e. > > Yes, I've just compiled and verified the commit "Generalize the > prefix-command machinery of C-u" is the cause. > Stefan, do you know what the problem might be? I'm not Stefan, so I cannot say that I understand what I'm doing, but the simple patch below seems to restore the old behavior. Stefan, any objections or gotchas? diff --git a/src/keyboard.c b/src/keyboard.c index 02bc7d2..e378b89 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1486,8 +1486,11 @@ command_loop_1 (void) if (!CONSP (last_command_event)) kset_last_repeatable_command (current_kboard, Vreal_this_command); - this_command_key_count = 0; - this_single_command_key_start = 0; + if (NILP (KVAR (current_kboard, Vprefix_arg))) + { + this_command_key_count = 0; + this_single_command_key_start = 0; + } if (current_kboard->immediate_echo && !NILP (call0 (Qinternal_echo_keystrokes_prefix)))