Merge from emacs--rel--22

[bpt/emacs.git] / lisp / mail / rmailsum.el

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index a9184d3..9c9ba7a 100644 (file)
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -8,10 +8,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -1323,6 +1321,13 @@ argument says to read a file name and use that file as the inbox."
     (end-of-buffer))
   (forward-line -1))
 
+(declare-function rmail-abort-edit "rmailedit" ())
+(declare-function rmail-cease-edit "rmailedit"())
+(declare-function rmail-set-label "rmailkwd" (l state &optional n))
+(declare-function rmail-output-read-file-name "rmailout" ())
+(declare-function rmail-output-read-rmail-file-name  "rmailout" ())
+(declare-function mail-send-and-exit "sendmail" (&optional arg))
+
 (defvar rmail-summary-edit-map nil)
 (if rmail-summary-edit-map
     nil
@@ -1697,5 +1702,5 @@ KEYWORDS is a comma-separated list of labels."
 
 (provide 'rmailsum)
 
-;;; arch-tag: 556079ee-75c1-47f5-9884-2e0a0bc6c5a1
+;; arch-tag: 556079ee-75c1-47f5-9884-2e0a0bc6c5a1
 ;;; rmailsum.el ends here