aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-01-09 21:22:13 -0500
committerGlenn Morris2012-01-09 21:22:13 -0500
commitb09a806e0f072bcd5b385fd0be544b5afe5ad3ac (patch)
tree0170ec1c43eb018fd363163823bd4669643e0360
parenta0db8d43d73d107fd786f01eb70547e16b62fb8f (diff)
downloademacs-b09a806e0f072bcd5b385fd0be544b5afe5ad3ac.tar.gz
emacs-b09a806e0f072bcd5b385fd0be544b5afe5ad3ac.zip
* lisp/mail/unrmail.el (unrmail): Tweak previous change.
(for trailing whitespace in otherwise empty BABYL files).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/unrmail.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfc21373806..bf229a4acbc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-01-10 Glenn Morris <rgm@gnu.org>
2
3 * mail/unrmail.el (unrmail): Tweak previous change.
4
12012-01-09 Chong Yidong <cyd@gnu.org> 52012-01-09 Chong Yidong <cyd@gnu.org>
2 6
3 * custom.el (custom-safe-themes): Use SHA-256 for hashing. 7 * custom.el (custom-safe-themes): Use SHA-256 for hashing.
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 929f97746b0..af16bbf8c73 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -66,11 +66,11 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
66 from to) 66 from to)
67 (goto-char (point-min)) 67 (goto-char (point-min))
68 (search-forward "\n\^_" nil t) ; Skip BABYL header. 68 (search-forward "\n\^_" nil t) ; Skip BABYL header.
69 (if (= (setq from (point)) (point-max)) 69 (setq from (point))
70 (error "The input file contains no messages"))
71 (goto-char (point-max)) 70 (goto-char (point-max))
72 (search-backward "\n\^_" from 'mv) 71 (search-backward "\n\^_" from 'mv)
73 (setq to (point)) 72 (if (= from (setq to (point)))
73 (error "The input file contains no messages"))
74 (unless (and coding-system 74 (unless (and coding-system
75 (coding-system-p coding-system)) 75 (coding-system-p coding-system))
76 (setq coding-system 76 (setq coding-system