[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
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el |
Date: |
Thu, 10 Jun 2004 00:17:33 -0400 |
Index: emacs/lisp/emacs-lisp/lisp-mode.el
diff -c emacs/lisp/emacs-lisp/lisp-mode.el:1.159
emacs/lisp/emacs-lisp/lisp-mode.el:1.160
*** emacs/lisp/emacs-lisp/lisp-mode.el:1.159 Sat May 29 15:33:30 2004
--- emacs/lisp/emacs-lisp/lisp-mode.el Thu Jun 10 04:16:05 2004
***************
*** 570,577 ****
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))
--- 570,578 ----
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))
***************
*** 589,594 ****
--- 590,602 ----
;; 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)))
***************
*** 624,630 ****
(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)
--- 632,638 ----
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/lisp-mode.el,
Juri Linkov <=