merge trunk

[gnu-emacs] / lisp / emacs-lisp / edebug.el

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 4ecd244ebf2ba19d3b40d5a3e60740b90d308442..867f079ce5f609459eb8094348cd9109fe1b9d0c 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3814,11 +3814,11 @@ Options:
         (remove-hook 'kill-buffer-hook 'edebug-kill-buffer t))
     (pcase-dolist (`(,var . ,val) '((buffer-read-only . t)))
       (push
-       (if (local-variable-p var) var (cons var (symbol-value var)))
+       (if (local-variable-p var) (cons var (symbol-value var)) var)
        edebug--mode-saved-vars)
       (set (make-local-variable var) val))
     ;; Append `edebug-kill-buffer' to the hook to avoid interfering with
-    ;; other entries that are ungarded against deleted buffer.
+    ;; other entries that are unguarded against deleted buffer.
     (add-hook 'kill-buffer-hook 'edebug-kill-buffer t t)))
 
 (defun edebug-kill-buffer ()