Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99633. ------------------------------------------------------------ revno: 99633 committer: Juri Linkov branch nick: trunk timestamp: Mon 2010-03-08 19:14:53 +0200 message: Fix numeric keywords. diff: === modified file 'lisp/net/hmac-def.el' --- lisp/net/hmac-def.el 2010-01-13 08:35:10 +0000 +++ lisp/net/hmac-def.el 2010-03-08 17:14:53 +0000 @@ -3,7 +3,7 @@ ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI -;; Keywords: HMAC, RFC 2104 +;; Keywords: HMAC, RFC-2104 ;; This file is part of GNU Emacs. === modified file 'lisp/net/hmac-md5.el' --- lisp/net/hmac-md5.el 2010-01-13 08:35:10 +0000 +++ lisp/net/hmac-md5.el 2010-03-08 17:14:53 +0000 @@ -3,7 +3,7 @@ ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI -;; Keywords: HMAC, RFC 2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5 +;; Keywords: HMAC, RFC-2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5 ;; This file is part of GNU Emacs. ------------------------------------------------------------ revno: 99632 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-03-08 11:17:30 -0500 message: Additional fix for rfc822-addresses (Bug#5692). * mail/rfc822.el (rfc822-addresses): Use nested catches to ensure that all errors are caught, and that the return value is always a list (Bug#5692). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-08 13:00:18 +0000 +++ lisp/ChangeLog 2010-03-08 16:17:30 +0000 @@ -1,3 +1,9 @@ +2010-03-08 Chong Yidong + + * mail/rfc822.el (rfc822-addresses): Use nested catches to ensure + that all errors are caught, and that the return value is always a + list (Bug#5692). + 2010-03-08 Kenichi Handa * language/misc-lang.el (windows-1256): New coding system. === modified file 'lisp/mail/rfc822.el' --- lisp/mail/rfc822.el 2010-03-07 17:34:40 +0000 +++ lisp/mail/rfc822.el 2010-03-08 16:17:30 +0000 @@ -290,32 +290,36 @@ (replace-match "\\1 " t)) (goto-char (point-min)) - (let ((list ()) - tem - ;; This is for rfc822-bad-address. Give it a non-nil - ;; initial value to prevent rfc822-bad-address from - ;; raising a wrong-type-argument error - (rfc822-address-start (point))) - (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))) + ;; Give `rfc822-address-start' a non-nil initial value to + ;; prevent `rfc822-bad-address' from raising a + ;; `wrong-type-argument' error. + (let* ((rfc822-address-start (point)) + list tem + (err + (catch 'address + ;; Note that `rfc822-nuke-whitespace' and + ;; `rfc822-looking-at' can throw. + (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 ; 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))))) + nil))) + (nreverse (append (if err (list err)) list)))) (and buf (kill-buffer buf)))))) (provide 'rfc822) ------------------------------------------------------------ revno: 99631 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2010-03-08 14:00:18 +0100 message: Fix typos in Changelogs. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-02-20 14:11:20 +0000 +++ lib-src/ChangeLog 2010-03-08 13:00:18 +0000 @@ -21,7 +21,7 @@ 2009-11-23 Tobias Ringström (tiny change) - * etags.c (absolute_filename): Use memove if we have it for + * etags.c (absolute_filename): Use memmove if we have it for overlapping copy. 2009-11-04 Dan Nicolaescu === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-08 11:39:36 +0000 +++ lisp/ChangeLog 2010-03-08 13:00:18 +0000 @@ -11,7 +11,7 @@ 2010-03-07 Štěpán Němec (tiny change) * vc-git.el (vc-git-annotate-extract-revision-at-line): Use - vc-git-root as default direcotry for revision path (Bug#5657). + vc-git-root as default directory for revision path (Bug#5657). 2010-03-06 Chong Yidong @@ -81,7 +81,7 @@ 2010-03-01 Alan Mackenzie * cc-engine.el (c-remove-stale-state-cache): Take account of when - `good-pos' is in the same macro as `here'. Fixes bug 5649. + `good-pos' is in the same macro as `here'. Fixes bug#5649. 2010-02-28 Katsumi Yamaoka @@ -190,8 +190,8 @@ 2010-02-20 Kevin Ryde - * progmodes/compile.el (compilation-error-regexp-alist-alist): In - `watcom' anchor regexp to start of line, to avoid slowness + * progmodes/compile.el (compilation-error-regexp-alist-alist): + In `watcom' anchor regexp to start of line, to avoid slowness (Bug#5599). 2010-02-20 Eli Zaretskii @@ -256,9 +256,9 @@ 2010-02-17 Mark A. Hershberger - * vc-bzr.el: fix typo in Known Bugs section. + * vc-bzr.el: Fix typo in Known Bugs section. - * isearch.el (isearch-update-post-hook): New hook + * isearch.el (isearch-update-post-hook): New hook. (isearch-update): Use the new hook. 2010-02-16 Michael Albinus ------------------------------------------------------------ revno: 99630 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Mon 2010-03-08 20:40:36 +0900 message: Fix bug# in ChangeLog. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-08 01:53:37 +0000 +++ lisp/ChangeLog 2010-03-08 11:39:36 +0000 @@ -1,7 +1,7 @@ 2010-03-08 Kenichi Handa * language/misc-lang.el (windows-1256): New coding system. - (cp1256): New alias of windows-1256 (bug#5684). + (cp1256): New alias of windows-1256 (bug#5690). 2010-03-07 Andreas Schwab ------------------------------------------------------------ revno: 99629 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Mon 2010-03-08 20:30:58 +0900 message: Add coding system windows-1256 (alias cp1256). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-07 17:34:40 +0000 +++ lisp/ChangeLog 2010-03-08 01:53:37 +0000 @@ -1,3 +1,8 @@ +2010-03-08 Kenichi Handa + + * language/misc-lang.el (windows-1256): New coding system. + (cp1256): New alias of windows-1256 (bug#5684). + 2010-03-07 Andreas Schwab * mail/rfc822.el (rfc822-addresses): Move catch clause down around === modified file 'lisp/language/misc-lang.el' --- lisp/language/misc-lang.el 2010-01-13 08:35:10 +0000 +++ lisp/language/misc-lang.el 2010-03-08 01:50:35 +0000 @@ -50,6 +50,14 @@ :charset-list '(iso-8859-6) :mime-charset 'iso-8859-6) +(define-coding-system 'windows-1256 + "windows-1256 (Arabic) encoding (MIME: WINDOWS-1256)" + :coding-type 'charset + :mnemonic ?A + :charset-list '(windows-1256) + :mime-charset 'windows-1256) +(define-coding-system-alias 'cp1256 'windows-1256) + (provide 'misc-lang) ;; arch-tag: 6953585c-1a1a-4c09-be82-a2518afb6074 ------------------------------------------------------------ revno: 99628 committer: Andreas Schwab 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) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-07 14:45:53 +0000 +++ lisp/ChangeLog 2010-03-07 17:34:40 +0000 @@ -1,3 +1,8 @@ +2010-03-07 Andreas Schwab + + * 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 (tiny change) * vc-git.el (vc-git-annotate-extract-revision-at-line): Use === modified file 'lisp/mail/rfc822.el' --- lisp/mail/rfc822.el 2010-01-13 08:35:10 +0000 +++ 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) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.