changeset: 4586:ce1f49c863bdc7c1806d7c72986cf2387d9ed224 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Tue Dec 30 19:04:00 2008 +0000 files: lisp/ChangeLog lisp/dumped-lisp.el lisp/glyphs.el description: Improve glyph image format handling on Carbon. lisp/ChangeLog addition: 2008-12-30 Aidan Kehoe <kehoea(a)parhasard.net&gt; * glyphs.el (init-glyphs): When setting the xemacs-logo and frame-icon-glyph glyph images, use 'win, not 'x for TAG-SET. This makes it work on Carbon (&c.) too. * carbon-glyphs.el: Remove, use the code on the model of the other platforms in glyphs.el instead. * dumped-lisp.el (preloaded-file-list): Remove carbon-glyphs. diff -r 8cffd51dbd8f531d5a15d2f4b4e32ee2d6957d89 -r ce1f49c863bdc7c1806d7c72986cf2387d9ed224 lisp/ChangeLog --- a/lisp/ChangeLog Tue Dec 30 18:47:13 2008 +0000 +++ b/lisp/ChangeLog Tue Dec 30 19:04:00 2008 +0000 ＠＠ -1,3 +1,13 ＠＠ 2008-12-30 Aidan Kehoe <kehoea＠parhasa +2008-12-30 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * glyphs.el (init-glyphs): + When setting the xemacs-logo and frame-icon-glyph glyph images, + use 'win, not 'x for TAG-SET. This makes it work on Carbon (&c.) + too. + * carbon-glyphs.el: Remove, use the code on the model of the other + platforms in glyphs.el instead. + * dumped-lisp.el (preloaded-file-list): Remove carbon-glyphs. + 2008-12-30 Aidan Kehoe <kehoea(a)parhasard.net&gt; * make-docfile.el: diff -r 8cffd51dbd8f531d5a15d2f4b4e32ee2d6957d89 -r ce1f49c863bdc7c1806d7c72986cf2387d9ed224 lisp/dumped-lisp.el --- a/lisp/dumped-lisp.el Tue Dec 30 18:47:13 2008 +0000 +++ b/lisp/dumped-lisp.el Tue Dec 30 19:04:00 2008 +0000 ＠＠ -273,8 +273,7 ＠＠ in dumped-lisp.el and is not itself list (when (featurep 'tty) "tty-init") ;; preload the Carbon code. (when (featurep 'carbon) - '("carbon-glyphs" - "carbon-toolbar" + '("carbon-toolbar" "carbon-init")) ;;; Formerly in tooltalk/tooltalk-load.el ;; Moved to tooltalk package diff -r 8cffd51dbd8f531d5a15d2f4b4e32ee2d6957d89 -r ce1f49c863bdc7c1806d7c72986cf2387d9ed224 lisp/glyphs.el --- a/lisp/glyphs.el Tue Dec 30 18:47:13 2008 +0000 +++ b/lisp/glyphs.el Tue Dec 30 19:04:00 2008 +0000 ＠＠ -1266,15 +1266,15 ＠＠ If unspecified in a particular domain, ` (if emacs-beta-version "xemacs-beta.xpm" "xemacs.xpm")) - 'global 'x)) + 'global 'win)) (cond ((featurep 'xpm) (set-glyph-image frame-icon-glyph (concat "../etc/" "xemacs-icon.xpm") - 'global 'x)) + 'global 'win)) ((featurep 'x) (set-glyph-image frame-icon-glyph (concat "../etc/" "xemacs-icon2.xbm") - 'global 'x))) + 'global 'win))) (if (featurep 'tty) (set-glyph-image xemacs-logo _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches