From: Chong Yidong <cyd@gnu.org>
Date: Wed, 11 Apr 2012 05:43:47 +0000 (+0800)
Subject: * startup.el (command-line): Remove support for font-lock-face-attributes.
X-Git-Tag: emacs-24.2.90~471^2~364^2~37
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af23e2e5ecc6855a431f9d03f8732dc26579ff88;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75ea616e0b5..205d6d0be99 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 
 	* vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug.
diff --git a/lisp/startup.el b/lisp/startup.el
index 518b53ccdf1..b5dae92517a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1169,38 +1169,6 @@ the `--debug-init' option to view a complete error backtrace."
 					    (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.