Mercurial > hg > xemacs-beta
changeset 4365:c9ab656691c0
Automated merge with ssh://aidan-guest@hg.debian.org//hg/xemacs/xemacs
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 27 Dec 2007 13:22:26 +0100 |
| parents | d74913294e87 (diff) f5693b5f7f2d (current diff) |
| children | 7b628daa39d4 69e6352406f0 |
| files | lisp/ChangeLog |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 27 08:16:15 2007 +0100 +++ b/lisp/ChangeLog Thu Dec 27 13:22:26 2007 +0100 @@ -1,3 +1,11 @@ +2007-12-25 Aidan Kehoe <kehoea@parhasard.net> + + * glyphs.el (init-glyphs): + Revert part of Didier's 2007-10-15 commit, which broke + #'make-image-specifier with string arguments, and more noticeably + truncation-glyph, continuation-glyph, octal-escape-glyph, + control-arrow-glyph. + 2007-12-23 Mike Sperber <mike@xemacs.org> * font.el (xft-font-create-object): Use
--- a/lisp/glyphs.el Thu Dec 27 08:16:15 2007 +0100 +++ b/lisp/glyphs.el Thu Dec 27 13:22:26 2007 +0100 @@ -1185,8 +1185,7 @@ [jpeg :data nil] 2))) ,@(if (featurep 'png) '(("\\.png\\'" [png :file nil] 2))) ,@(if (featurep 'png) '(("\\`\211PNG" [png :data nil] 2))) - ;; No, I don't think we want to inline images... -- dvl - ;; ("" [string :data nil] 2) + ("" [string :data nil] 2) ("" [nothing])))) ;; #### this should really be formatted-string, not string but we ;; don't have it implemented yet @@ -1210,8 +1209,7 @@ ("\\`\377\330\377\340\000\020JFIF" [string :data "[jpeg]"]) ("\\.png\\'" [string :data nil] 2) ("\\`\211PNG" [string :data "[png]"]) - ;; No, I don't think we want to inline images... -- dvl - ;;("" [string :data nil] 2) + ("" [string :data nil] 2) ;; this last one is here for pointers and icons and such -- ;; strings are not allowed so they will be ignored. ("" [nothing])))