Fix C-M-x on defcustoms

Fix C-M-x on defcustoms

[Jambunathan K]

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]


1. M-x find-library RET vc-dir.el
2. C-s defcustom
3. C-M-x.  Note the following backtrace.

,----
| Debugger entered--Lisp error: (invalid-function (\, (lambda nil nil)))
|   (\, (lambda nil nil))()
|   funcall((\, (lambda nil nil)))
|   eval((funcall (function (\, (lambda nil nil)))) t)
|   eval-defun-1((custom-declare-variable (quote vc-dir-mode-hook) (\` (funcall (function (\, (lambda nil nil))))) "Normal hook run by `vc-dir-mode'.\nSee `run-hooks'." :type (quote hook) :group (quote vc)))
|   eval-defun-2()
|   eval-defun(nil)
|   call-interactively(eval-defun nil nil)
`----

It looks to me that it is an issue of orphaned "comma".

4. I am attaching a fix.

Hopefully it is OK.

ps: My next commit will come with all the ceremony.  Until then ...
-- 

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix-commit-108110.diff --]
[-- Type: text/x-diff, Size: 463 bytes --]

=== modified file 'lisp/custom.el'
--- lisp/custom.el	2012-06-27 07:10:27 +0000
+++ lisp/custom.el	2012-08-07 19:45:37 +0000
@@ -337,7 +337,7 @@
          ;; expression is checked by the byte-compiler, and that
          ;; lexical-binding is obeyed, so quote the expression with
          ;; `lambda' rather than with `quote'.
-         ``(funcall #',(lambda () ,standard))
+	 `(list 'funcall (lambda () ,standard))
        `',standard)
     ,doc
     ,@args))

Re: Fix C-M-x on defcustoms

[Andreas Schwab]

Jambunathan K <kjambunathan@gmail.com> writes:

> 1. M-x find-library RET vc-dir.el
> 2. C-s defcustom
> 3. C-M-x.  Note the following backtrace.
>
> ,----
> | Debugger entered--Lisp error: (invalid-function (\, (lambda nil nil)))
> |   (\, (lambda nil nil))()
> |   funcall((\, (lambda nil nil)))
> |   eval((funcall (function (\, (lambda nil nil)))) t)
> |   eval-defun-1((custom-declare-variable (quote vc-dir-mode-hook) (\` (funcall (function (\, (lambda nil nil))))) "Normal hook run by `vc-dir-mode'.\nSee `run-hooks'." :type (quote hook) :group (quote vc)))
> |   eval-defun-2()
> |   eval-defun(nil)
> |   call-interactively(eval-defun nil nil)
> `----
>
> It looks to me that it is an issue of orphaned "comma".

Yes, but the real issue is eval-defun-1 stripping off the backquote.  I
have checked in a fix.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Fix C-M-x on defcustoms

[Stefan Monnier]

>>>>> "Jambunathan" == Jambunathan K <kjambunathan@gmail.com> writes:

> 1. M-x find-library RET vc-dir.el
> 2. C-s defcustom
> 3. C-M-x.  Note the following backtrace.

> ,----
> | Debugger entered--Lisp error: (invalid-function (\, (lambda nil nil)))
> |   (\, (lambda nil nil))()
> |   funcall((\, (lambda nil nil)))
> |   eval((funcall (function (\, (lambda nil nil)))) t)
> |   eval-defun-1((custom-declare-variable (quote vc-dir-mode-hook) (\`
> | (funcall (function (\, (lambda nil nil))))) "Normal hook run by
> | vc-dir-mode'.\nSee `run-hooks'." :type (quote hook) :group (quote vc)))
> |   eval-defun-2()
> |   eval-defun(nil)
> |   call-interactively(eval-defun nil nil)
> `----

> It looks to me that it is an issue of orphaned "comma".

No, it was just a bug in eval-defun-1 which assumed that the second arg
to custom-declare-variable is always a quoted constant expression,
whereas it can really be any expression returning an expression.

Andreas beat me to the fix,


        Stefan