Mercurial > hg > xemacs-beta
diff lisp/glyphs.el @ 4363:6a17ac5da3c4
Accept strings as glyph instantiators, fix control-arrow-glyph, etc.
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.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 25 Dec 2007 14:19:45 +0100 |
| parents | 9b4442ac18c7 |
| children | 7191a7b120f1 |
line wrap: on
line diff
--- a/lisp/glyphs.el Mon Dec 24 14:00:51 2007 +0100 +++ b/lisp/glyphs.el Tue Dec 25 14:19:45 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])))