aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-08-07 08:55:12 +0000
committerGerd Moellmann2001-08-07 08:55:12 +0000
commit1155d48351e6badb1bf27658ccbda38d5f5d6fd6 (patch)
treed6fca307ea19a904194dc1c155ab90ee72fc7d45
parent69ebef1d59bfed74c0d1fb68fd9a3a7c73aa03fc (diff)
downloademacs-1155d48351e6badb1bf27658ccbda38d5f5d6fd6.tar.gz
emacs-1155d48351e6badb1bf27658ccbda38d5f5d6fd6.zip
(image-type-regexps): For JPEG files, use a regexp
derived from the JPEG spec.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/image.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d99f230388..9a29f22ea5b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-08-07 Gerd Moellmann <gerd@gnu.org> 12001-08-07 Gerd Moellmann <gerd@gnu.org>
2 2
3 * image.el (image-type-regexps): For JPEG files, use a regexp
4 derived from the JPEG spec.
5
3 * image.el (image-type-regexps): Use `\`' instead of `^' in 6 * image.el (image-type-regexps): Use `\`' instead of `^' in
4 most regular expressions. 7 most regular expressions.
5 8
diff --git a/lisp/image.el b/lisp/image.el
index 14b9da5cf07..e0d19f5b776 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -34,7 +34,8 @@
34 '(("\\`/\\*.*XPM.\\*/" . xpm) 34 '(("\\`/\\*.*XPM.\\*/" . xpm)
35 ("\\`P[1-6]" . pbm) 35 ("\\`P[1-6]" . pbm)
36 ("\\`GIF8" . gif) 36 ("\\`GIF8" . gif)
37 ("JFIF" . jpeg) 37 ;; The following is from JPEG File Interchange Format, Version 1.02.
38 ("\\`\xff\xd8\xff\xe0..JFIF\0" . jpeg)
38 ("\\`\211PNG\r\n" . png) 39 ("\\`\211PNG\r\n" . png)
39 ("\\`#define" . xbm) 40 ("\\`#define" . xbm)
40 ("\\`\\(MM\0\\*\\)\\|\\(II\\*\0\\)" . tiff) 41 ("\\`\\(MM\0\\*\\)\\|\\(II\\*\0\\)" . tiff)