aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-09-14 08:10:15 +0000
committerGlenn Morris2007-09-14 08:10:15 +0000
commit34acda03c2ae306db56217f8259180381eee4d49 (patch)
tree6b994438b9c6fcf89dd04442b830ca24b97f5897
parentaca946f32ebf58fcb676940f041d49b0506cde5d (diff)
downloademacs-34acda03c2ae306db56217f8259180381eee4d49.tar.gz
emacs-34acda03c2ae306db56217f8259180381eee4d49.zip
(fancy-startup-text, fancy-about-text): Fix face quoting.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/startup.el14
2 files changed, 10 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 384d2da4a8d..54aba3bf7c3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12007-09-14 Glenn Morris <rgm@gnu.org> 12007-09-14 Glenn Morris <rgm@gnu.org>
2 2
3 * startup.el (fancy-startup-text, fancy-about-text): Fix face
4 quoting.
5
3 * calendar/cal-hebrew.el, calendar/cal-menu.el 6 * calendar/cal-hebrew.el, calendar/cal-menu.el
4 * calendar/calendar.el, calendar/diary-lib.el 7 * calendar/calendar.el, calendar/diary-lib.el
5 * calendar/holidays.el: Rename all instances of 8 * calendar/holidays.el: Rename all instances of
diff --git a/lisp/startup.el b/lisp/startup.el
index d1cf365b4da..052f33fd175 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1142,7 +1142,7 @@ regardless of the value of this variable."
1142;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1142;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1143 1143
1144(defvar fancy-startup-text 1144(defvar fancy-startup-text
1145 '((:face '(variable-pitch :foreground "red") 1145 '((:face (variable-pitch :foreground "red")
1146 "Welcome to " 1146 "Welcome to "
1147 :link ("GNU Emacs" (lambda (button) (browse-url "http://www.gnu.org/software/emacs/"))) 1147 :link ("GNU Emacs" (lambda (button) (browse-url "http://www.gnu.org/software/emacs/")))
1148 ", one component of the " 1148 ", one component of the "
@@ -1152,9 +1152,9 @@ regardless of the value of this variable."
1152 '("GNU/Linux" (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))) 1152 '("GNU/Linux" (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")))
1153 '("GNU" (lambda (button) (describe-project))))) 1153 '("GNU" (lambda (button) (describe-project)))))
1154 " operating system.\n" 1154 " operating system.\n"
1155 :face 'variable-pitch "To quit a partially entered command, type " 1155 :face variable-pitch "To quit a partially entered command, type "
1156 :face 'default "Control-g" 1156 :face default "Control-g"
1157 :face 'variable-pitch ".\n\n" 1157 :face variable-pitch ".\n\n"
1158 :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial))) 1158 :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial)))
1159 "\tLearn basic keystroke commands" 1159 "\tLearn basic keystroke commands"
1160 (lambda () 1160 (lambda ()
@@ -1195,7 +1195,7 @@ Each element in the list should be a list of strings or pairs
1195`:face FACE', like `fancy-splash-insert' accepts them.") 1195`:face FACE', like `fancy-splash-insert' accepts them.")
1196 1196
1197(defvar fancy-about-text 1197(defvar fancy-about-text
1198 '((:face '(variable-pitch :foreground "red") 1198 '((:face (variable-pitch :foreground "red")
1199 "This is " 1199 "This is "
1200 :link ("GNU Emacs" (lambda (button) (browse-url "http://www.gnu.org/software/emacs/"))) 1200 :link ("GNU Emacs" (lambda (button) (browse-url "http://www.gnu.org/software/emacs/")))
1201 ", one component of the " 1201 ", one component of the "
@@ -1205,14 +1205,14 @@ Each element in the list should be a list of strings or pairs
1205 '("GNU/Linux" (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))) 1205 '("GNU/Linux" (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")))
1206 '("GNU" (lambda (button) (describe-project))))) 1206 '("GNU" (lambda (button) (describe-project)))))
1207 " operating system.\n" 1207 " operating system.\n"
1208 :face (lambda () 1208 :face (lambda ()
1209 (list 'variable-pitch :foreground 1209 (list 'variable-pitch :foreground
1210 (if (eq (frame-parameter nil 'background-mode) 'dark) 1210 (if (eq (frame-parameter nil 'background-mode) 'dark)
1211 "cyan" "darkblue"))) 1211 "cyan" "darkblue")))
1212 "\n" 1212 "\n"
1213 (lambda () (emacs-version)) 1213 (lambda () (emacs-version))
1214 "\n" 1214 "\n"
1215 :face '(variable-pitch :height 0.5) 1215 :face (variable-pitch :height 0.5)
1216 (lambda () emacs-copyright) 1216 (lambda () emacs-copyright)
1217 "\n\n" 1217 "\n\n"
1218 :face variable-pitch 1218 :face variable-pitch