Mercurial > emacs
changeset 108300:9fb2b015a2b4
cus-start.el (all): Add native condition for tool-bar-* symbols.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 07 May 2010 16:52:25 +0300 |
| parents | a5fcd78ad3eb |
| children | 68fc9037b502 |
| files | lisp/ChangeLog lisp/cus-start.el |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri May 07 16:51:16 2010 +0300 +++ b/lisp/ChangeLog Fri May 07 16:52:25 2010 +0300 @@ -1,3 +1,7 @@ +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + * cus-start.el (all): Add native condition for tool-bar-* symbols. + 2010-05-07 Christian von Roques <roques@mti.ag> (tiny change) * lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
--- a/lisp/cus-start.el Fri May 07 16:51:16 2010 +0300 +++ b/lisp/cus-start.el Fri May 07 16:52:25 2010 +0300 @@ -408,6 +408,10 @@ (fboundp 'define-fringe-bitmap)) ((equal "font-use-system-font" (symbol-name symbol)) (featurep 'system-font-setting)) + ;; Conditioned on x-create-frame, because that's + ;; the condition for loadup.el to preload tool-bar.el. + ((string-match "tool-bar-" (symbol-name symbol)) + (fboundp 'x-create-frame)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here!