[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el,v
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el,v |
Date: |
Sun, 13 Jan 2008 18:16:05 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Martin Rudalics <m061211> 08/01/13 18:16:05
Index: rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -b -r1.444 -r1.445
--- rmail.el 8 Jan 2008 20:45:07 -0000 1.444
+++ rmail.el 13 Jan 2008 18:16:04 -0000 1.445
@@ -1934,7 +1934,7 @@
(save-restriction
(while (not (eobp))
(setq start (point))
- (cond ((looking-at "BABYL OPTIONS:");Babyl header
+ (cond ((looking-at "BABYL OPTIONS:") ;Babyl header
(if (search-forward "\n\^_" nil t)
;; If we find the proper terminator, delete through there.
(delete-region (point-min) (point))
@@ -1953,7 +1953,12 @@
(save-excursion
(skip-chars-forward " \t\n")
(point)))
- (save-excursion
+ ;; The following let* form was wrapped in a `save-excursion'
+ ;; which in one case caused infinite looping, see:
+ ;;
http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00968.html
+ ;; Removing that form leaves `point' at the end of the
+ ;; region decoded by `rmail-decode-region' which should
+ ;; be correct.
(let* ((header-end
(progn
(save-excursion
@@ -2021,7 +2026,7 @@
rmail-mime-charset-pattern
start t))))
(intern (downcase (match-string 1))))))
- (rmail-decode-region start (point) mime-charset)))))
+ (rmail-decode-region start (point) mime-charset))))
;; Add an X-Coding-System: header if we don't have one.
(save-excursion
(goto-char start)
@@ -2051,8 +2056,8 @@
(save-restriction
(narrow-to-region start (1- (point)))
(goto-char (point-min))
- (while (search-forward "\n\^_" nil t); single char "\^_"
- (replace-match "\n^_")))); 2 chars: "^" and "_"
+ (while (search-forward "\n\^_" nil t) ; single char "\^_"
+ (replace-match "\n^_")))) ; 2 chars: "^" and "_"
(setq last-coding-system-used nil)
(or rmail-enable-mime
(not rmail-enable-multibyte)
@@ -2168,8 +2173,8 @@
(save-restriction
(narrow-to-region start (point))
(goto-char (point-min))
- (while (search-forward "\n\^_" nil t); single char
- (replace-match "\n^_")))); 2 chars: "^" and "_"
+ (while (search-forward "\n\^_" nil t) ; single char
+ (replace-match "\n^_")))) ; 2 chars: "^" and "_"
;; This is for malformed messages that don't end in newline.
;; There shouldn't be any, but some users say occasionally
;; there are some.