[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/01/02 02:20:42

Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -b -r1.471 -r1.472
--- lisp/startup.el     28 Dec 2007 22:26:08 -0000      1.471
+++ lisp/startup.el     2 Jan 2008 02:20:40 -0000       1.472
@@ -1156,7 +1156,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defvar fancy-startup-text
-  '((:face (variable-pitch :foreground "red")
+  '((:face (variable-pitch (:foreground "red"))
      "Welcome to "
      :link ("GNU Emacs"
            (lambda (button) (browse-url "http://www.gnu.org/software/emacs/";))
@@ -1202,7 +1202,7 @@
      "\tView the Emacs manual using Info\n"
      :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
      "\tGNU Emacs comes with "
-     :face (variable-pitch :slant oblique)
+     :face (variable-pitch (:slant oblique))
      "ABSOLUTELY NO WARRANTY\n"
      :face variable-pitch
      :link ("Copying Conditions" (lambda (button) (describe-copying)))
@@ -1215,7 +1215,7 @@
 `:face FACE', like `fancy-splash-insert' accepts them.")
 
 (defvar fancy-about-text
-  '((:face (variable-pitch :foreground "red")
+  '((:face (variable-pitch (:foreground "red"))
      "This is "
      :link ("GNU Emacs"
            (lambda (button) (browse-url "http://www.gnu.org/software/emacs/";))
@@ -1231,13 +1231,14 @@
           "Display info on the GNU project.")))
      " operating system.\n"
      :face (lambda ()
-            (list 'variable-pitch :foreground
+            (list 'variable-pitch
+                  (list :foreground
                   (if (eq (frame-parameter nil 'background-mode) 'dark)
-                      "cyan" "darkblue")))
+                            "cyan" "darkblue"))))
      "\n"
      (lambda () (emacs-version))
      "\n"
-     :face (variable-pitch :height 0.5)
+     :face (variable-pitch (:height 0.5))
      (lambda () emacs-copyright)
      "\n\n"
      :face variable-pitch
@@ -1256,7 +1257,7 @@
      "\tWhy we developed GNU Emacs, and the GNU operating system\n"
      :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
      "\tGNU Emacs comes with "
-     :face (variable-pitch :slant oblique)
+     :face (variable-pitch (:slant oblique))
      "ABSOLUTELY NO WARRANTY\n"
      :face variable-pitch
      :link ("Copying Conditions" (lambda (button) (describe-copying)))
@@ -1410,11 +1411,11 @@
               (lambda (button) (customize-group 'initialization))
               "Change initialization settings including this screen")
        "\n"))
-    (fancy-splash-insert :face `(variable-pitch :foreground ,fg)
+    (fancy-splash-insert :face `(variable-pitch (:foreground ,fg))
                         "\nThis is "
                         (emacs-version)
                         "\n"
-                        :face '(variable-pitch :height 0.5)
+                        :face '(variable-pitch (:height 0.5))
                         emacs-copyright
                         "\n")
     (and auto-save-list-file-prefix
@@ -1430,12 +1431,12 @@
                  (regexp-quote (file-name-nondirectory
                                 auto-save-list-file-prefix)))
          t)
-        (fancy-splash-insert :face '(variable-pitch :foreground "red")
+        (fancy-splash-insert :face '(variable-pitch (:foreground "red"))
                              "\nIf an Emacs session crashed recently, "
                              "type "
                              :face '(fixed-pitch :foreground "red")
                              "Meta-x recover-session RET"
-                             :face '(variable-pitch :foreground "red")
+                             :face '(variable-pitch (:foreground "red"))
                              "\nto recover"
                              " the files you were editing."))
 
@@ -1470,7 +1471,7 @@
                       (overlay-put button 'checked t)
                       (overlay-put button 'display (overlay-get button 
:on-glyph))
                       (setq startup-screen-inhibit-startup-screen t)))))
-       (fancy-splash-insert :face '(variable-pitch :height 0.9)
+       (fancy-splash-insert :face '(variable-pitch (:height 0.9))
                             " Never show it again.")))))
 
 (defun exit-splash-screen ()