From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Luc Teirlinck Newsgroups: gmane.emacs.devel Subject: Re: Another bug with the macro counter Date: Fri, 29 Oct 2004 22:27:32 -0500 (CDT) Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: <200410300327.i9U3RWW02355@raven.dms.auburn.edu> References: <200410210107.i9L176B10842@raven.dms.auburn.edu> <200410300238.i9U2cOD02290@raven.dms.auburn.edu> NNTP-Posting-Host: deer.gmane.org X-Trace: sea.gmane.org 1099107062 11803 80.91.229.6 (30 Oct 2004 03:31:02 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 30 Oct 2004 03:31:02 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 30 05:30:53 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CNjx7-0002cP-00 for ; Sat, 30 Oct 2004 05:30:53 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CNk4z-0005wp-VK for ged-emacs-devel@m.gmane.org; Fri, 29 Oct 2004 23:39:02 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CNk4s-0005wh-Bw for emacs-devel@gnu.org; Fri, 29 Oct 2004 23:38:54 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CNk4r-0005wV-UK for emacs-devel@gnu.org; Fri, 29 Oct 2004 23:38:54 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CNk4r-0005wS-SH for emacs-devel@gnu.org; Fri, 29 Oct 2004 23:38:53 -0400 Original-Received: from [131.204.53.104] (helo=manatee.dms.auburn.edu) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CNju1-0006aV-Ps for emacs-devel@gnu.org; Fri, 29 Oct 2004 23:27:42 -0400 Original-Received: from raven.dms.auburn.edu (raven.dms.auburn.edu [131.204.53.29]) by manatee.dms.auburn.edu (8.12.10/8.12.10) with ESMTP id i9U3ReFu026608; Fri, 29 Oct 2004 22:27:41 -0500 (CDT) Original-Received: (from teirllm@localhost) by raven.dms.auburn.edu (8.11.7p1+Sun/8.11.7) id i9U3RWW02355; Fri, 29 Oct 2004 22:27:32 -0500 (CDT) X-Authentication-Warning: raven.dms.auburn.edu: teirllm set sender to teirllm@dms.auburn.edu using -f Original-To: teirllm@dms.auburn.edu In-reply-to: <200410300238.i9U2cOD02290@raven.dms.auburn.edu> (message from Luc Teirlinck on Fri, 29 Oct 2004 21:38:24 -0500 (CDT)) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:29161 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:29161 The following is a corrected version of my patch to simple.el: ===File ~/simple-new-diff=================================== *** simple.el 25 Oct 2004 07:40:49 -0500 1.664 --- simple.el 29 Oct 2004 22:13:27 -0500 *************** *** 865,873 **** (if (and (integerp value) (or (not (memq this-command '(eval-last-sexp eval-print-last-sexp))) (eq this-command last-command) ! (and (boundp 'edebug-active) edebug-active))) (let ((char-string ! (if (or (and (boundp 'edebug-active) edebug-active) (memq this-command '(eval-last-sexp eval-print-last-sexp))) (prin1-char value)))) (if char-string --- 865,874 ---- (if (and (integerp value) (or (not (memq this-command '(eval-last-sexp eval-print-last-sexp))) (eq this-command last-command) ! (and (boundp 'edebug-active) (with-no-warnings edebug-active)))) (let ((char-string ! (if (or (and (boundp 'edebug-active) ! (with-no-warnings edebug-active)) (memq this-command '(eval-last-sexp eval-print-last-sexp))) (prin1-char value)))) (if char-string *************** *** 3916,3921 **** --- 3917,3928 ---- At top-level, as an editor command, this simply beeps." (interactive) (deactivate-mark) + (or (not (featurep 'kmacro)) + (with-no-warnings appending-to-kbd-macro) + ;; never exits the or. + (with-no-warnings (setq appending-to-kbd-macro nil)) + (kmacro-ring-empty-p) + (kmacro-pop-ring)) (setq defining-kbd-macro nil) (signal 'quit nil)) ============================================================