diff options
author | Bill Wohler <wohler@newt.com> | 2011-07-11 20:25:46 -0700 |
---|---|---|
committer | Bill Wohler <wohler@newt.com> | 2011-07-11 20:25:46 -0700 |
commit | 644509873286e39a24207d47fea38bd11d1d6386 (patch) | |
tree | 3bf26520735b30e1523bc7c48446038835a5fdb7 | |
parent | b1f5845471eeb5fc41bb6fb7777b2b31beadc726 (diff) | |
download | emacs-644509873286e39a24207d47fea38bd11d1d6386.tar.gz |
* mh-xface.el (mh-picon-get-image): Remove quote from block argument.
* mh-mime.el (mh-mh-directive-present-p): Ditto.
-rw-r--r-- | lisp/mh-e/ChangeLog | 6 | ||||
-rw-r--r-- | lisp/mh-e/mh-mime.el | 6 | ||||
-rw-r--r-- | lisp/mh-e/mh-xface.el | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 2a254c89d25..d6ee6329ae7 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,9 @@ +2011-07-12 Henrique Martins <henrique@martins.cc> (tiny change) + + * mh-xface.el (mh-picon-get-image): Remove quote from block + argument. + * mh-mime.el (mh-mh-directive-present-p): Ditto. + 2011-07-10 Bill Wohler <wohler@newt.com> Release MH-E version 8.2.90. diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index bc5080a5d30..0327b64a33f 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1690,19 +1690,19 @@ buffer, while END defaults to the end of the buffer." (unless begin (setq begin (point-min))) (unless end (setq end (point-max))) (save-excursion - (block 'search-for-mh-directive + (block search-for-mh-directive (goto-char begin) (while (re-search-forward "^#" end t) (let ((s (buffer-substring-no-properties (point) (mh-line-end-position)))) (cond ((equal s "")) ((string-match "^forw[ \t\n]+" s) - (return-from 'search-for-mh-directive t)) + (return-from search-for-mh-directive t)) (t (let ((first-token (car (split-string s "[ \t;@]")))) (when (and first-token (string-match mh-media-type-regexp first-token)) - (return-from 'search-for-mh-directive t))))))) + (return-from search-for-mh-directive t))))))) nil))) (defun mh-minibuffer-read-type (filename &optional default) diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el index 1c7531b59d1..179b552d536 100644 --- a/lisp/mh-e/mh-xface.el +++ b/lisp/mh-e/mh-xface.el @@ -207,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 - (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 @@ -215,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) - 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) - 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) - do (return-from 'loop file3))) + do (return-from loop file3))) ;; facedb search ;; Search order for user@foo.net: ;; [path]net/foo/user @@ -241,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 (return-from 'loop z1) + do (return-from loop z1) 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))))) |