aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann2001-08-21 08:12:16 +0000
committerGerd Moellmann2001-08-21 08:12:16 +0000
commit6ea3db8a109343832a5da4458bb5259481c3058e (patch)
treeff37d6c103e60a48c21189a6ea2e8277e8056eff /lisp
parent37618c60af47be61986fd0ad77981833fb9d6187 (diff)
downloademacs-6ea3db8a109343832a5da4458bb5259481c3058e.tar.gz
emacs-6ea3db8a109343832a5da4458bb5259481c3058e.zip
(image-type-regexps): Make sure that the TIFF
pattern is only matched at the beginning of a string. From Markus Rost <rost@math.ohio-state.edu>.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/image.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 984ef8384c7..40eef086a4e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12001-08-21 Gerd Moellmann <gerd@gnu.org> 12001-08-21 Gerd Moellmann <gerd@gnu.org>
2 2
3 * image.el (image-type-regexps): Make sure that the TIFF
4 pattern is only matched at the beginning of a string.
5 From Markus Rost <rost@math.ohio-state.edu>.
6
3 * international/swedish.el: Pre-Mule file removed. From: Jonas 7 * international/swedish.el: Pre-Mule file removed. From: Jonas
4 Oberg <jonas@gnu.org>. 8 Oberg <jonas@gnu.org>.
5 9
diff --git a/lisp/image.el b/lisp/image.el
index f7ab77379dc..e4c2387d78e 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -36,7 +36,7 @@
36 ("\\`GIF8" . gif) 36 ("\\`GIF8" . gif)
37 ("\\`\211PNG\r\n" . png) 37 ("\\`\211PNG\r\n" . png)
38 ("\\`[\t\n\r ]*#define" . xbm) 38 ("\\`[\t\n\r ]*#define" . xbm)
39 ("\\`\\(MM\0\\*\\)\\|\\(II\\*\0\\)" . tiff) 39 ("\\`\\(MM\0\\*\\|II\\*\0\\)" . tiff)
40 ("\\`[\t\n\r ]*%!PS" . postscript) 40 ("\\`[\t\n\r ]*%!PS" . postscript)
41 ("\\`\xff\xd8" . (image-jpeg-p . jpeg))) 41 ("\\`\xff\xd8" . (image-jpeg-p . jpeg)))
42 "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types. 42 "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types.