[Emacs-diffs] /srv/bzr/emacs/trunk r109499: * emacs-lisp/lisp-mode.el (eval-defun-1): Handle standard value of

[Andreas Schwab]

------------------------------------------------------------
revno: 109499
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2012-08-07 23:52:54 +0200
message:
  * emacs-lisp/lisp-mode.el (eval-defun-1): Handle standard value of
  a defcustom that is quoted with backquote.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-07 16:12:20 +0000
+++ b/lisp/ChangeLog    2012-08-07 21:52:54 +0000
@@ -1,5 +1,8 @@
 2012-08-07  Andreas Schwab  <address@hidden>
 
+       * 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.

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2012-08-05 14:14:54 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2012-08-07 21:52:54 +0000
@@ -776,7 +776,9 @@
              (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)