[Emacs-diffs] /srv/bzr/emacs/trunk r99628: Don't end parsing rfc822 addresses prematurely (Bug#5692)

[Andreas Schwab]

------------------------------------------------------------
revno: 99628
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2010-03-07 18:34:40 +0100
message:
  Don't end parsing rfc822 addresses prematurely (Bug#5692)
  
  * mail/rfc822.el (rfc822-addresses): Move catch clause down around
  call to rfc822-bad-address.  (Bug#5692)
modified:
  lisp/ChangeLog
  lisp/mail/rfc822.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-07 14:45:53 +0000
+++ b/lisp/ChangeLog    2010-03-07 17:34:40 +0000
@@ -1,3 +1,8 @@
+2010-03-07  Andreas Schwab  <address@hidden>
+
+       * mail/rfc822.el (rfc822-addresses): Move catch clause down around
+       call to rfc822-bad-address.  (Bug#5692)
+
 2010-03-07  Štěpán Němec  <address@hidden>  (tiny change)
 
        * vc-git.el (vc-git-annotate-extract-revision-at-line): Use

=== modified file 'lisp/mail/rfc822.el'
--- a/lisp/mail/rfc822.el       2010-01-13 08:35:10 +0000
+++ b/lisp/mail/rfc822.el       2010-03-07 17:34:40 +0000
@@ -296,26 +296,26 @@
                   ;; initial value to prevent rfc822-bad-address from
                   ;; raising a wrong-type-argument error
                   (rfc822-address-start (point)))
-              (catch 'address         ; this is for rfc822-bad-address
-                (rfc822-nuke-whitespace)
-                (while (not (eobp))
-                  (setq rfc822-address-start (point))
-                  (setq tem
-                        (cond ((rfc822-looking-at ?\,)
-                               nil)
-                              ((looking-at "[][\000-\037@;:\\.>)]")
-                               (forward-char)
-                               (rfc822-bad-address
-                                (format "Strange character \\%c found"
-                                        (preceding-char))))
-                              (t
-                               (rfc822-addresses-1 t))))
-                  (cond ((null tem))
-                        ((stringp tem)
-                         (setq list (cons tem list)))
-                        (t
-                         (setq list (nconc (nreverse tem) list)))))
-                (nreverse list))))
+             (rfc822-nuke-whitespace)
+             (while (not (eobp))
+               (setq rfc822-address-start (point))
+               (setq tem
+                     (cond ((rfc822-looking-at ?\,)
+                            nil)
+                           ((looking-at "[][\000-\037@;:\\.>)]")
+                            (forward-char)
+                            (catch 'address ; this is for rfc822-bad-address
+                              (rfc822-bad-address
+                               (format "Strange character \\%c found"
+                                       (preceding-char)))))
+                           (t
+                            (rfc822-addresses-1 t))))
+               (cond ((null tem))
+                     ((stringp tem)
+                      (setq list (cons tem list)))
+                     (t
+                      (setq list (nconc (nreverse tem) list)))))
+             (nreverse list)))
        (and buf (kill-buffer buf))))))
 
 (provide 'rfc822)