[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el [lexbind] |
Date: |
Tue, 06 Jul 2004 07:09:26 -0400 |
Index: emacs/lisp/emacs-lisp/lisp-mode.el
diff -c emacs/lisp/emacs-lisp/lisp-mode.el:1.134.4.8
emacs/lisp/emacs-lisp/lisp-mode.el:1.134.4.9
*** emacs/lisp/emacs-lisp/lisp-mode.el:1.134.4.8 Tue Jul 6 09:31:50 2004
--- emacs/lisp/emacs-lisp/lisp-mode.el Tue Jul 6 10:00:21 2004
***************
*** 578,585 ****
value)))
(defun eval-defun-1 (form)
! "Change defvar into defconst within FORM.
! Likewise for other constructs as necessary."
;; The code in edebug-defun should be consistent with this, but not
;; the same, since this gets a macroexpended form.
(cond ((not (listp form))
--- 578,586 ----
value)))
(defun eval-defun-1 (form)
! "Treat some expressions specially.
! Reset the `defvar' and `defcustom' variables to the initial value.
! Reinitialize the face according to the `defface' specification."
;; The code in edebug-defun should be consistent with this, but not
;; the same, since this gets a macroexpended form.
(cond ((not (listp form))
***************
*** 597,602 ****
--- 598,610 ----
;; Force variable to be bound.
(set-default (eval (nth 1 form)) (eval (nth 1 (nth 2 form))))
form)
+ ;; `defface' is macroexpanded to `custom-declare-face'.
+ ((eq (car form) 'custom-declare-face)
+ ;; Reset the face.
+ (put (eval (nth 1 form)) 'face-defface-spec nil)
+ (setq face-new-frame-defaults
+ (assq-delete-all (eval (nth 1 form)) face-new-frame-defaults))
+ form)
((eq (car form) 'progn)
(cons 'progn (mapcar 'eval-defun-1 (cdr form))))
(t form)))
***************
*** 632,638 ****
(setq beg (point))
(setq form (read (current-buffer)))
(setq end (point)))
! ;; Alter the form if necessary, changing defvar into defconst, etc.
(setq form (eval-defun-1 (macroexpand form)))
(list beg end standard-output
`(lambda (ignore)
--- 640,646 ----
(setq beg (point))
(setq form (read (current-buffer)))
(setq end (point)))
! ;; Alter the form if necessary.
(setq form (eval-defun-1 (macroexpand form)))
(list beg end standard-output
`(lambda (ignore)
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el [lexbind],
Miles Bader <=