aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2009-02-14 02:52:17 +0000
committerRichard M. Stallman2009-02-14 02:52:17 +0000
commitc7eb0ba1f8963c6c24417b9ddceeab867210c73f (patch)
tree187213be563cd20be6f557dd055c333fa6f2023e
parentc9ae6ddd1e059435fa315d4bca72d28c85eb458c (diff)
downloademacs-c7eb0ba1f8963c6c24417b9ddceeab867210c73f.tar.gz
emacs-c7eb0ba1f8963c6c24417b9ddceeab867210c73f.zip
(rmail-convert-file-maybe): Turn off case-fold-search.
(rmail-add-mbox-headers): Likewise.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mail/rmail.el32
2 files changed, 22 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95f8c59e01b..101ab014e25 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-02-14 Richard M Stallman <rms@gnu.org>
2
3 * mail/rmail.el (rmail-convert-file-maybe): Turn off case-fold-search.
4 (rmail-add-mbox-headers): Likewise.
5
12009-02-13 Eli Zaretskii <eliz@gnu.org> 62009-02-13 Eli Zaretskii <eliz@gnu.org>
2 7
3 * files.el (load-library): Doc fix. 8 * files.el (load-library): Doc fix.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7890eb1b9ed..4c234cab0d3 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -891,21 +891,22 @@ If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
891 (widen) 891 (widen)
892 (goto-char (point-min)) 892 (goto-char (point-min))
893 ;; Detect previous Babyl format files. 893 ;; Detect previous Babyl format files.
894 (cond ((looking-at "BABYL OPTIONS:") 894 (let ((case-fold-search nil))
895 ;; The file is Babyl version 5. Use unrmail to convert 895 (cond ((looking-at "BABYL OPTIONS:")
896 ;; it. 896 ;; The file is Babyl version 5. Use unrmail to convert
897 (rmail-convert-babyl-to-mbox)) 897 ;; it.
898 ((looking-at "Version: 5\n") 898 (rmail-convert-babyl-to-mbox))
899 ;; Losing babyl file made by old version of Rmail. Fix the 899 ((looking-at "Version: 5\n")
900 ;; babyl file header and use unrmail to convert to mbox 900 ;; Losing babyl file made by old version of Rmail. Fix the
901 ;; format. 901 ;; babyl file header and use unrmail to convert to mbox
902 (let ((buffer-read-only nil)) 902 ;; format.
903 (insert "BABYL OPTIONS: -*- rmail -*-\n") 903 (let ((buffer-read-only nil))
904 (rmail-convert-babyl-to-mbox))) 904 (insert "BABYL OPTIONS: -*- rmail -*-\n")
905 ((equal (point-min) (point-max)) 905 (rmail-convert-babyl-to-mbox)))
906 (message "Empty Rmail file.")) 906 ((equal (point-min) (point-max))
907 ((looking-at "From ")) 907 (message "Empty Rmail file."))
908 (t (error "Invalid mbox file")))) 908 ((looking-at "From "))
909 (t (error "Invalid mbox file")))))
909 910
910(defun rmail-error-bad-format (&optional msgnum) 911(defun rmail-error-bad-format (&optional msgnum)
911 "Report that the buffer is not in the mbox file format. 912 "Report that the buffer is not in the mbox file format.
@@ -1973,6 +1974,7 @@ new messages. Return the number of new messages."
1973 (let ((count 0) 1974 (let ((count 0)
1974 (start (point)) 1975 (start (point))
1975 (value "------U-") 1976 (value "------U-")
1977 (case-fold-search nil)
1976 limit) 1978 limit)
1977 ;; Detect an empty inbox file. 1979 ;; Detect an empty inbox file.
1978 (unless (= start (point-max)) 1980 (unless (= start (point-max))