1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 2a2c88a9a17..9b59c672ead 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -277,7 +277,8 @@ With argument, insert value in current buffer after the defun."
                 (end-of-defun)
                 (beginning-of-defun)
                 (read (current-buffer)))))
-    (if (eq (car form) 'defvar)
+    (if (and (eq (car form) 'defvar)
+             (cdr-safe (cdr-safe form)))
         (setq form (cons 'defconst (cdr form))))
     (prin1 (eval form))))