# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1198758065 -3600
# Node ID d74913294e8794f2d973faf8af11028702444873
# Parent  6a17ac5da3c4d311bec3618f02b531b0a0467e4b# Parent  b545430be2eb1d007008624cb1bce9d4eea9efff
Automated merge with file:/Sources/xemacs-21.5-checked-out

diff -r b545430be2eb -r d74913294e87 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 26 22:21:45 2007 +0100
+++ b/lisp/ChangeLog	Thu Dec 27 13:21:05 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-22  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	Factor out lists of operators specially treated by `make-autoload'.
diff -r b545430be2eb -r d74913294e87 lisp/glyphs.el
--- a/lisp/glyphs.el	Wed Dec 26 22:21:45 2007 +0100
+++ b/lisp/glyphs.el	Thu Dec 27 13:21:05 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])))