* emacs-lisp/lisp-mode.el (eval-defun-1): Handle standard value of

a defcustom that is quoted with backquote.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ef05337ccb0aaa906336e97c115f698ea388e57..7a220293eac7000feabbb2f3e627293ea73eedf1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-08-07  Andreas Schwab  <schwab@linux-m68k.org>
 
+       * emacs-lisp/lisp-mode.el (eval-defun-1): Handle standard value of
+       a defcustom that is quoted with backquote.
+
        * calc/calc-prog.el (math-do-defmath): Use backquote forms.  Fix
        handling of interactive spec when the body uses return.
        (math-do-arg-check, math-define-function-body): Use backquote forms.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 7e9dd9e6cfedc6d8cb7ad04fccc678606297c1fe..99677551a47539311f1d1242ff0537854d86f5da 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -776,7 +776,9 @@ Reinitialize the face according to the `defface' specification."
              (default-boundp (eval (nth 1 form) lexical-binding)))
         ;; Force variable to be bound.
         (set-default (eval (nth 1 form) lexical-binding)
-                      (eval (nth 1 (nth 2 form)) lexical-binding))
+                     ;; The value may be quoted with quote or backquote.
+                     (eval (eval (nth 2 form) lexical-binding)
+                           lexical-binding))
         form)
        ;; `defface' is macroexpanded to `custom-declare-face'.
        ((eq (car form) 'custom-declare-face)