Mercurial > hg > xemacs-beta

comparison lisp/glyphs.el @ 4363:6a17ac5da3c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4356:cc293ef846d2 4363:6a17ac5da3c4
1183 ;; the following. I have no idea if this is standard. 1183 ;; the following. I have no idea if this is standard.
1184 ,@(if (featurep 'jpeg) '(("\\`\377\330\377\340\000\020JFIF" 1184 ,@(if (featurep 'jpeg) '(("\\`\377\330\377\340\000\020JFIF"
1185 [jpeg :data nil] 2))) 1185 [jpeg :data nil] 2)))
1186 ,@(if (featurep 'png) '(("\\.png\\'" [png :file nil] 2))) 1186 ,@(if (featurep 'png) '(("\\.png\\'" [png :file nil] 2)))
1187 ,@(if (featurep 'png) '(("\\`\211PNG" [png :data nil] 2))) 1187 ,@(if (featurep 'png) '(("\\`\211PNG" [png :data nil] 2)))
1188 ;; No, I don't think we want to inline images... -- dvl 1188 ("" [string :data nil] 2)
1189 ;; ("" [string :data nil] 2)
1190 ("" [nothing])))) 1189 ("" [nothing]))))
1191 ;; #### this should really be formatted-string, not string but we 1190 ;; #### this should really be formatted-string, not string but we
1192 ;; don't have it implemented yet 1191 ;; don't have it implemented yet
1193 (if (featurep 'tty) 1192 (if (featurep 'tty)
1194 (progn 1193 (progn
1208 ;; all of the JFIF-format JPEG's that I've seen begin with 1207 ;; all of the JFIF-format JPEG's that I've seen begin with
1209 ;; the following. I have no idea if this is standard. 1208 ;; the following. I have no idea if this is standard.
1210 ("\\`\377\330\377\340\000\020JFIF" [string :data "[jpeg]"]) 1209 ("\\`\377\330\377\340\000\020JFIF" [string :data "[jpeg]"])
1211 ("\\.png\\'" [string :data nil] 2) 1210 ("\\.png\\'" [string :data nil] 2)
1212 ("\\`\211PNG" [string :data "[png]"]) 1211 ("\\`\211PNG" [string :data "[png]"])
1213 ;; No, I don't think we want to inline images... -- dvl 1212 ("" [string :data nil] 2)
1214 ;;("" [string :data nil] 2)
1215 ;; this last one is here for pointers and icons and such -- 1213 ;; this last one is here for pointers and icons and such --
1216 ;; strings are not allowed so they will be ignored. 1214 ;; strings are not allowed so they will be ignored.
1217 ("" [nothing]))) 1215 ("" [nothing])))
1218 1216
1219 ;; finish initializing truncation glyph -- created internally 1217 ;; finish initializing truncation glyph -- created internally