X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7c82f3e23e37cc848a38b1f8be7149fd672a6393..f2536958ec711b50a0cf8714defb921193ea8ae4:/lisp/mail/rmailsort.el

diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index 38e24295e8..1eb60c2d54 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -1,10 +1,10 @@
 ;;; rmailsort.el --- Rmail: sort messages
 
-;; Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1993-1994, 2001-2016 Free Software Foundation,
+;; Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
 
@@ -88,7 +88,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order."
   "Sort messages of current Rmail buffer by other correspondent.
 This uses either the \"From\", \"Sender\", \"To\", or
 \"Apparently-To\" header, downcased.  Uses the first header not
-excluded by `rmail-dont-reply-to-names'.  If prefix argument
+excluded by `mail-dont-reply-to-names'.  If prefix argument
 REVERSE is non-nil, sorts in reverse order."
   (interactive "P")
   (rmail-sort-messages reverse
@@ -99,13 +99,12 @@ REVERSE is non-nil, sorts in reverse order."
 			   '("From" "Sender" "To" "Apparently-To"))))))
 
 (defun rmail-select-correspondent (msg fields)
-  "Find the first header not excluded by `rmail-dont-reply-to-names'.
+  "Find the first header not excluded by `mail-dont-reply-to-names'.
 MSG is a message number.  FIELDS is a list of header names."
   (let ((ans ""))
     (while (and fields (string= ans ""))
       (setq ans
-	    ;; NB despite the name, this lives in mail-utils.el.
-	    (rmail-dont-reply-to
+	    (mail-dont-reply-to
 	     (mail-strip-quoted-names
 	      (or (rmail-get-header (car fields) msg) ""))))
       (setq fields (cdr fields)))