changeset: 4676:e3feb329bda9 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sun Aug 16 14:58:57 2009 +0100 files: lisp/ChangeLog lisp/faces.el description: Make the initialisation of xpm-color-symbols a bit more reasonable. 2009-08-16 Aidan Kehoe <kehoea(a)parhasard.net&gt; * faces.el (xpm-color-symbols): Call (featurep 'x) when faces.elc is dumped, not repeatedly (myriad times) at image instantiation time. diff -r 9a1a59b4b75d -r e3feb329bda9 lisp/ChangeLog --- a/lisp/ChangeLog Fri Aug 14 19:14:51 2009 +0100 +++ b/lisp/ChangeLog Sun Aug 16 14:58:57 2009 +0100 ＠＠ -1,3 +1,9 ＠＠ +2009-08-16 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * faces.el (xpm-color-symbols): + Call (featurep 'x) when faces.elc is dumped, not repeatedly + (myriad times) at image instantiation time. + 2009-08-14 Aidan Kehoe <kehoea(a)parhasard.net&gt; * minibuf.el (read-from-minibuffer): diff -r 9a1a59b4b75d -r e3feb329bda9 lisp/faces.el --- a/lisp/faces.el Fri Aug 14 19:14:51 2009 +0100 +++ b/lisp/faces.el Sun Aug 16 14:58:57 2009 +0100 ＠＠ -2068,24 +2068,20 ＠＠ (list '("foreground" (face-foreground 'default)) '("background" (face-background 'default)) - '("backgroundToolBarColor" - (or - (and - (featurep 'x) - (x-get-resource "backgroundToolBarColor" - "BackgroundToolBarColor" 'string - nil nil 'warn)) - - (face-background 'toolbar))) - '("foregroundToolBarColor" - (or - (and - (featurep 'x) - (x-get-resource "foregroundToolBarColor" - "ForegroundToolBarColor" 'string - nil nil 'warn)) - (face-foreground 'toolbar))) - ))) + `("backgroundToolBarColor" + ,(if (featurep 'x) + '(or (x-get-resource "backgroundToolBarColor" + "BackgroundToolBarColor" 'string + nil nil 'warn) + (face-background 'toolbar)) + '(face-background 'toolbar))) + `("foregroundToolBarColor" + ,(if (featurep 'x) + '(or (x-get-resource "foregroundToolBarColor" + "ForegroundToolBarColor" 'string + nil nil 'warn) + (face-foreground 'toolbar)) + '(face-foreground 'toolbar)))))) (when (featurep 'tty) (set-face-highlight-p 'bold t 'global '(default tty)) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches