HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2012 to FSF copyright years for Emacs files
[bpt/emacs.git]
/
lisp
/
mh-e
/
mh-xface.el
diff --git
a/lisp/mh-e/mh-xface.el
b/lisp/mh-e/mh-xface.el
index
d197a8f
..
5749a2c
100644
(file)
--- a/
lisp/mh-e/mh-xface.el
+++ b/
lisp/mh-e/mh-xface.el
@@
-1,6
+1,6
@@
;;; mh-xface.el --- MH-E X-Face and Face header field display
;;; mh-xface.el --- MH-E X-Face and Face header field display
-;; Copyright (C) 2002
, 2003, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
+;; Copyright (C) 2002
-2003, 2005-2012
Free Software Foundation, Inc.
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
@@
-75,7
+75,8
@@
in this order is used."
(x-face (setq raw (mh-uncompface x-face)
type 'pbm))
(url (setq type 'url))
(x-face (setq raw (mh-uncompface x-face)
type 'pbm))
(url (setq type 'url))
- (t (multiple-value-setq (type raw) (mh-picon-get-image))))
+ (t (multiple-value-setq (type raw)
+ (values-list (mh-picon-get-image)))))
(when type
(goto-char (point-min))
(when (re-search-forward "^from:" (point-max) t)
(when type
(goto-char (point-min))
(when (re-search-forward "^from:" (point-max) t)
@@
-124,7
+125,8
@@
in this order is used."
(defun mh-face-to-png (data)
"Convert base64 encoded DATA to png image."
(with-temp-buffer
(defun mh-face-to-png (data)
"Convert base64 encoded DATA to png image."
(with-temp-buffer
- (set-buffer-multibyte nil)
+ (if (fboundp 'set-buffer-multibyte)
+ (set-buffer-multibyte nil))
(insert data)
(ignore-errors (base64-decode-region (point-min) (point-max)))
(buffer-string)))
(insert data)
(ignore-errors (base64-decode-region (point-min) (point-max)))
(buffer-string)))
@@
-132,7
+134,8
@@
in this order is used."
(defun mh-uncompface (data)
"Run DATA through `uncompface' to generate bitmap."
(with-temp-buffer
(defun mh-uncompface (data)
"Run DATA through `uncompface' to generate bitmap."
(with-temp-buffer
- (set-buffer-multibyte nil)
+ (if (fboundp 'set-buffer-multibyte)
+ (set-buffer-multibyte nil))
(insert data)
(when (and mh-uncompface-executable
(equal (call-process-region (point-min) (point-max)
(insert data)
(when (and mh-uncompface-executable
(equal (call-process-region (point-min) (point-max)
@@
-204,7
+207,7
@@
The directories are searched for in the order they appear in the list.")
(cond (cached-value (return-from mh-picon-get-image cached-value))
((not host-list) (return-from mh-picon-get-image nil)))
(setq match
(cond (cached-value (return-from mh-picon-get-image cached-value))
((not host-list) (return-from mh-picon-get-image nil)))
(setq match
- (block
'
loop
+ (block loop
;; u@h search
(loop for dir in mh-picon-existing-directory-list
do (loop for type in mh-picon-image-types
;; u@h search
(loop for dir in mh-picon-existing-directory-list
do (loop for type in mh-picon-image-types
@@
-212,15
+215,15
@@
The directories are searched for in the order they appear in the list.")
for file1 = (format "%s/%s.%s"
dir canonical-address type)
when (file-exists-p file1)
for file1 = (format "%s/%s.%s"
dir canonical-address type)
when (file-exists-p file1)
- do (return-from
'
loop file1)
+ do (return-from loop file1)
;; [path]user
for file2 = (format "%s/%s.%s" dir user type)
when (file-exists-p file2)
;; [path]user
for file2 = (format "%s/%s.%s" dir user type)
when (file-exists-p file2)
- do (return-from
'
loop file2)
+ do (return-from loop file2)
;; [path]host
for file3 = (format "%s/%s.%s" dir host type)
when (file-exists-p file3)
;; [path]host
for file3 = (format "%s/%s.%s" dir host type)
when (file-exists-p file3)
- do (return-from
'
loop file3)))
+ do (return-from loop file3)))
;; facedb search
;; Search order for user@foo.net:
;; [path]net/foo/user
;; facedb search
;; Search order for user@foo.net:
;; [path]net/foo/user
@@
-238,11
+241,11
@@
The directories are searched for in the order they appear in the list.")
do (loop for type in mh-picon-image-types
for z1 = (format "%s.%s" y type)
when (file-exists-p z1)
do (loop for type in mh-picon-image-types
for z1 = (format "%s.%s" y type)
when (file-exists-p z1)
- do (return-from
'
loop z1)
+ do (return-from loop z1)
for z2 = (format "%s/face.%s"
y type)
when (file-exists-p z2)
for z2 = (format "%s/face.%s"
y type)
when (file-exists-p z2)
- do (return-from
'
loop z2)))))))
+ do (return-from loop z2)))))))
(setf (gethash canonical-address mh-picon-cache)
(mh-picon-file-contents match)))))
(setf (gethash canonical-address mh-picon-cache)
(mh-picon-file-contents match)))))
@@
-270,12
+273,13
@@
file contents as a string is returned. If FILE is nil, then both
elements of the list are nil."
(if (stringp file)
(with-temp-buffer
elements of the list are nil."
(if (stringp file)
(with-temp-buffer
- (set-buffer-multibyte nil)
+ (if (fboundp 'set-buffer-multibyte)
+ (set-buffer-multibyte nil))
(let ((type (and (string-match ".*\\.\\(...\\)$" file)
(intern (match-string 1 file)))))
(insert-file-contents-literally file)
(let ((type (and (string-match ".*\\.\\(...\\)$" file)
(intern (match-string 1 file)))))
(insert-file-contents-literally file)
- (
values
type (buffer-string))))
- (
values
nil nil)))
+ (
list
type (buffer-string))))
+ (
list
nil nil)))
\f
\f
@@
-469,5
+473,4
@@
The argument CHANGE is ignored."
;; sentence-end-double-space: nil
;; End:
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: a79dd33f-d0e5-4b19-a53a-be690f90229a
;;; mh-xface.el ends here
;;; mh-xface.el ends here