* lisp/emacs-lisp/edebug.el (edebug-outside-unread-command-events):

Fix last change.
(edebug-update-eval-list): Use `push'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0bbd7558bc3cb2d0efe3bcc4ae8d21fcd32f312..89cc2106ba06fc6a933f735680fc5b10d316ab49 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-09-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/edebug.el (edebug-outside-unread-command-events):
+       Fix last change.
+       (edebug-update-eval-list): Use `push'.
+
        * emacs-lisp/edebug.el: Use lexical-binding.
        Remove the "edebug-" prefix from non-dynamically-scoped variables.
        Mark unused args with underscore.

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 42260d12a82c0f1ed09fab5fb203d546ac15602d..8f0f24ad092331f6654616884f07998a9a8c6c27 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2480,6 +2480,7 @@ MSG is printed after `::::} '."
 ;; Emacs 19 adds an arg to mark and mark-marker.
 (defalias 'edebug-mark-marker 'mark-marker)
 
+(defvar edebug-outside-unread-command-events)
 
 (defun edebug--display (value offset-index arg-mode)
   (unless (marker-position edebug-def-mark)
@@ -2763,7 +2764,6 @@ MSG is printed after `::::} '."
 
 ;; Emacs 19.
 (defvar edebug-outside-last-command-event)
-(defvar edebug-outside-unread-command-events)
 (defvar edebug-outside-last-input-event)
 (defvar edebug-outside-last-event-frame)
 (defvar edebug-outside-last-nonmenu-event)
@@ -3906,10 +3906,9 @@ Options:
     ))
 
 (defun edebug-create-eval-buffer ()
-  (if (not (and edebug-eval-buffer (buffer-name edebug-eval-buffer)))
-      (progn
-       (set-buffer (setq edebug-eval-buffer (get-buffer-create "*edebug*")))
-       (edebug-eval-mode))))
+  (unless (and edebug-eval-buffer (buffer-name edebug-eval-buffer))
+    (set-buffer (setq edebug-eval-buffer (get-buffer-create "*edebug*")))
+    (edebug-eval-mode)))
 
 ;; Should generalize this to be callable outside of edebug
 ;; with calls in user functions, e.g. (edebug-eval-display)
@@ -3947,7 +3946,7 @@ May only be called from within `edebug--recursive-edit'."
     (if (not (eobp))
        (progn
          (forward-sexp 1)
-         (setq new-list (cons (edebug-last-sexp) new-list))))
+         (push (edebug-last-sexp) new-list)))
 
     (while (re-search-forward "^;" nil t)
       (forward-line 1)
@@ -3956,7 +3955,7 @@ May only be called from within `edebug--recursive-edit'."
               (not (eobp)))
          (progn
            (forward-sexp 1)
-           (setq new-list (cons (edebug-last-sexp) new-list)))))
+           (push (edebug-last-sexp) new-list))))
 
     (setq edebug-eval-list (nreverse new-list))
     (edebug-eval-redisplay)