[Emacs-diffs] /srv/bzr/emacs/trunk r107864: * startup.el (command-line): Remove support for font-lock-face-attributes.

[Chong Yidong]

------------------------------------------------------------
revno: 107864
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2012-04-11 13:43:47 +0800
message:
  * startup.el (command-line): Remove support for font-lock-face-attributes.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-11 03:24:26 +0000
+++ b/lisp/ChangeLog    2012-04-11 05:43:47 +0000
@@ -1,3 +1,8 @@
+2012-04-11  Chong Yidong  <address@hidden>
+
+       * startup.el (command-line): Remove support for long-obsolete
+       variable font-lock-face-attributes.
+
 2012-04-11  Glenn Morris  <address@hidden>
 
        * vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug.

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2012-04-09 06:58:41 +0000
+++ b/lisp/startup.el   2012-04-11 05:43:47 +0000
@@ -1169,38 +1169,6 @@
                                            (or mail-host-address
                                                (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
     ;; face realization, clear the face cache so that new faces will
     ;; be realized.