mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

* startup.el (command-line): Remove support for font-lock-face-attributes.

Browse source
This commit is contained in:
Chong Yidong 2012-04-11 13:43:47 +08:00
parent ab7ce8c155
commit af23e2e5ec
2 changed files with 5 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-11 Chong Yidong <cyd@gnu.org>
* startup.el (command-line): Remove support for long-obsolete
variable font-lock-face-attributes.
2012-04-11 Glenn Morris <rgm@gnu.org> 2012-04-11 Glenn Morris <rgm@gnu.org>
* vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug. * vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug.

32
lisp/startup.el
View file

@ -1169,38 +1169,6 @@ the `--debug-init' option to view a complete error backtrace."
(or mail-host-address (or mail-host-address
(system-name)))))) (system-name))))))
;; Originally face attributes were specified via
;; `font-lock-face-attributes'. Users then changed the default
;; face attributes by setting that variable. However, we try and
;; be back-compatible and respect its value if set except for
;; faces where M-x customize has been used to save changes for the
;; face.
(when (boundp 'font-lock-face-attributes)
(let ((face-attributes font-lock-face-attributes))
(while face-attributes
(let* ((face-attribute (pop face-attributes))
(face (car face-attribute)))
;; Rustle up a `defface' SPEC from a
;; `font-lock-face-attributes' entry.
(unless (get face 'saved-face)
(let ((foreground (nth 1 face-attribute))
(background (nth 2 face-attribute))
(bold-p (nth 3 face-attribute))
(italic-p (nth 4 face-attribute))
(underline-p (nth 5 face-attribute))
face-spec)
(when foreground
(setq face-spec (cons ':foreground (cons foreground face-spec))))
(when background
(setq face-spec (cons ':background (cons background face-spec))))
(when bold-p
(setq face-spec (append '(:weight bold) face-spec)))
(when italic-p
(setq face-spec (append '(:slant italic) face-spec)))
(when underline-p
(setq face-spec (append '(:underline t) face-spec)))
(face-spec-set face (list (list t face-spec)) nil)))))))
;; If parameter have been changed in the init file which influence ;; If parameter have been changed in the init file which influence
;; face realization, clear the face cache so that new faces will ;; face realization, clear the face cache so that new faces will
;; be realized. ;; be realized.