[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/image.el,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/image.el,v |
Date: |
Fri, 27 Jun 2008 15:58:38 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 08/06/27 15:58:37
Index: image.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- image.el 25 Jun 2008 02:48:03 -0000 1.83
+++ image.el 27 Jun 2008 15:58:36 -0000 1.84
@@ -208,8 +208,8 @@
(defun image-jpeg-p (data)
"Value is non-nil if DATA, a string, consists of JFIF image data.
We accept the tag Exif because that is the same format."
- (setq data (string-to-unibyte data))
- (when (string-match "\\`\xff\xd8" data)
+ (setq data (ignore-errors (string-to-unibyte data)))
+ (when (and data (string-match-p "\\`\xff\xd8" data))
(catch 'jfif
(let ((len (length data)) (i 2))
(while (< i len)
@@ -224,7 +224,7 @@
(when (and (>= code #xe0) (<= code #xef))
;; APP0 LEN1 LEN2 "JFIF\0"
(throw 'jfif
- (string-match "JFIF\\|Exif"
+ (string-match-p "JFIF\\|Exif"
(substring data i (min (+ i nbytes) len)))))
(setq i (+ i 1 nbytes))))))))
@@ -240,7 +240,7 @@
(let ((regexp (car (car types)))
(image-type (cdr (car types))))
(if (or (and (symbolp image-type)
- (string-match regexp data))
+ (string-match-p regexp data))
(and (consp image-type)
(funcall (car image-type) data)
(setq image-type (cdr image-type))))
@@ -264,7 +264,7 @@
(image-type (cdr (car types)))
data)
(if (or (and (symbolp image-type)
- (looking-at regexp))
+ (looking-at-p regexp))
(and (consp image-type)
(funcall (car image-type)
(or data
@@ -302,7 +302,7 @@
"Determine the type of image file FILE from its name.
Value is a symbol specifying the image type, or nil if type cannot
be determined."
- (assoc-default file image-type-file-name-regexps 'string-match))
+ (assoc-default file image-type-file-name-regexps 'string-match-p))
;;;###autoload