Merge from trunk.

4 files changed, 20 insertions, 11 deletions

diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 5012d8af650..6af9c2478fc 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -394,7 +394,7 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
 ;; Matches ham radio call signs.
 ;; Help from: Mat Maessen N2NJZ <maessm@rpi.edu>, Mark Feit
 ;; <mark@era.com>, Michael Covington <mcovingt@ai.uga.edu>.
-;; Examples: DX504 DX515 K5MRU K8DHK KA9WGN KA9WGN KD3FU KD6EUI KD6HBW
+;; Examples: DX504 DX515 K5MRU K8DHK KA9WGN KD3FU KD6EUI KD6HBW
 ;; KE9TV KF0NV N1API N3FU N3GZE N3IGS N4KCC N7IKQ N9HHU W4YHF W6ANK WA2SUH
 ;; WB7VZI N2NJZ NR3G KJ4KK AB4UM AL7NI KH6OH WN3KBT N4TMI W1A N0NZO
 (defconst mail-extr-ham-call-sign-pattern
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 2e18c7ce23a..056bfebb1e5 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -1,6 +1,6 @@
 ;;; mailclient.el --- mail sending via system's mail client.
 
-;; Copyright (C) 2005-2012 Free Software Foundation
+;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
 ;; Author: David Reitter <david.reitter@gmail.com>
 ;; Keywords: mail
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f0068e81811..18d928e4b90 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1,4 +1,4 @@
-;;; sendmail.el --- mail sending commands for Emacs.  -*- byte-compile-dynamic: t -*-
+;;; sendmail.el --- mail sending commands for Emacs
 
 ;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2012
 ;;   Free Software Foundation, Inc.
@@ -730,6 +730,7 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and
       (set (make-local-variable 'comment-start-skip)
 	   (concat "^" (regexp-quote mail-yank-prefix) "[ \t]*")))
   (make-local-variable 'adaptive-fill-regexp)
+  ;; Also update the paragraph-separate entry if you change this.
   (setq adaptive-fill-regexp
 	(concat "[ \t]*[-[:alnum:]]+>+[ \t]*\\|"
 		adaptive-fill-regexp))
@@ -743,11 +744,14 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and
   ;; lines that delimit forwarded messages.
   ;; Lines containing just >= 3 dashes, perhaps after whitespace,
   ;; are also sometimes used and should be separators.
-  (setq paragraph-separate (concat (regexp-quote mail-header-separator)
-				"$\\|\t*\\([-|#;>* ]\\|(?[0-9]+[.)]\\)+$"
-				"\\|[ \t]*[[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|"
-				"--\\( \\|-+\\)$\\|"
-				page-delimiter)))
+  (setq paragraph-separate
+	(concat (regexp-quote mail-header-separator)
+		;; This is based on adaptive-fill-regexp (presumably
+		;; the idea is to allow navigation etc of cited paragraphs).
+		"$\\|\t*[-–!|#%;>*·•‣⁃◦ ]+$"
+		"\\|[ \t]*[-[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|"
+		"--\\( \\|-+\\)$\\|"
+		page-delimiter)))
 
 
 (defun mail-header-end ()
@@ -1986,4 +1990,9 @@ you can move to one of them and type C-c C-c to recover that one."
 
 (provide 'sendmail)
 
+;; Local Variables:
+;; byte-compile-dynamic: t
+;; coding: utf-8
+;; End:
+
 ;;; sendmail.el ends here
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'."
 	  from to)
       (goto-char (point-min))
       (search-forward "\n\^_" nil t)	; Skip BABYL header.
-      (if (= (setq from (point)) (point-max))
-	  (error "The input file contains no messages"))
+      (setq from (point))
       (goto-char (point-max))
       (search-backward "\n\^_" from 'mv)
-      (setq to (point))
+      (if (= from (setq to (point)))
+	  (error "The input file contains no messages"))
       (unless (and coding-system
 		   (coding-system-p coding-system))
 	(setq coding-system