Mercurial > emacs
changeset 28324:979a905864ab
(lisp-eval-defun): Make arglist compatible with inf-lisp version.
(eval-defun-1): Fix custom-declare-variable case.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Sun, 26 Mar 2000 16:36:17 +0000 |
| parents | c58dc3f08133 |
| children | 6baee0eab769 |
| files | lisp/emacs-lisp/lisp-mode.el |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/lisp-mode.el Sun Mar 26 16:27:11 2000 +0000 +++ b/lisp/emacs-lisp/lisp-mode.el Sun Mar 26 16:36:17 2000 +0000 @@ -278,8 +278,8 @@ (set-syntax-table lisp-mode-syntax-table) (run-hooks 'lisp-mode-hook)) -;; This will do unless shell.el is loaded. -(defun lisp-eval-defun nil +;; This will do unless inf-lisp.el is loaded. +(defun lisp-eval-defun (&optional and-go) "Send the current defun to the Lisp process made by \\[run-lisp]." (interactive) (error "Process lisp does not exist")) @@ -395,11 +395,12 @@ (cdr-safe (cdr-safe form))) ;; Force variable to be bound. (cons 'defconst (cdr form))) - ;; `defcustom' is now macroexpanded to `custom-declare-variable'. + ;; `defcustom' is now macroexpanded to + ;; `custom-declare-variable' with a quoted value arg. ((and (eq (car form) 'custom-declare-variable) (default-boundp (eval (nth 1 form)))) ;; Force variable to be bound. - (set-default (eval (nth 1 form)) (eval (nth 2 form))) + (set-default (eval (nth 1 form)) (eval (nth 1 (nth 2 form)))) form) ((eq (car form) 'progn) (cons 'progn (mapcar 'eval-defun-1 (cdr form))))