[Emacs-diffs] /srv/bzr/emacs/trunk r105120: * mh-xface.el (mh-picon-get-image): Remove quote from block argument.

[Bill Wohler]

------------------------------------------------------------
revno: 105120
committer: Bill Wohler <address@hidden>
branch nick: trunk
timestamp: Mon 2011-07-11 20:25:46 -0700
message:
  * mh-xface.el (mh-picon-get-image): Remove quote from block argument.
  * mh-mime.el (mh-mh-directive-present-p): Ditto.
modified:
  lisp/mh-e/ChangeLog
  lisp/mh-e/mh-mime.el
  lisp/mh-e/mh-xface.el

=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog       2011-07-11 15:48:46 +0000
+++ b/lisp/mh-e/ChangeLog       2011-07-12 03:25:46 +0000
@@ -1,3 +1,9 @@
+2011-07-12  Henrique Martins  <address@hidden>   (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  <address@hidden>
 
        Release MH-E version 8.2.90.

=== modified file 'lisp/mh-e/mh-mime.el'
--- a/lisp/mh-e/mh-mime.el      2011-07-10 22:31:33 +0000
+++ b/lisp/mh-e/mh-mime.el      2011-07-12 03:25:46 +0000
@@ -1690,19 +1690,19 @@
   (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)

=== modified file 'lisp/mh-e/mh-xface.el'
--- a/lisp/mh-e/mh-xface.el     2011-07-09 20:19:10 +0000
+++ b/lisp/mh-e/mh-xface.el     2011-07-12 03:25:46 +0000
@@ -207,7 +207,7 @@
       (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
               ;; address@hidden search
               (loop for dir in mh-picon-existing-directory-list
                     do (loop for type in mh-picon-image-types
@@ -215,15 +215,15 @@
                              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 address@hidden:
               ;;   [path]net/foo/user
@@ -241,11 +241,11 @@
                                       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)))))