Re: Another bug with the macro counter

[Luc Teirlinck]

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))
  
============================================================