(ediff-files, ediff-files3, ediff-merge-files)

[gnu-emacs] / lisp / mail / feedmail.el

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 8a69ae7802df40906e7bc2a5777f9b4801fab62e..3bd287541cf89f045aea58d6392d36b6a4e791e7 100644 (file)
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -3,7 +3,7 @@
 
 ;; This file is part of GNU Emacs.
 
-;; Author: Bill Carpenter <bill@bubblegum.net>, <bill@carpenter.ORG>
+;; Author: Bill Carpenter <bill@carpenter.ORG>
 ;; Version: 8
 ;; Keywords: email, queue, mail, sendmail, message, spray, smtp, draft
 ;; X-URL: <URL:http://www.carpenter.org/feedmail/feedmail.html>
@@ -308,7 +308,7 @@
 (defgroup feedmail nil
   "Assist other email packages to massage outgoing messages."
   :link '(url-link "http://www.carpenter.org/feedmail/feedmail.html")
-  :link '(emacs-commentary "feedmail")
+  :link '(emacs-commentary-link "feedmail")
   :group 'mail)
 
 (defgroup feedmail-misc nil
@@ -428,7 +428,7 @@ the same Fcc: treatment applies to both Bcc: and Resent-Bcc: lines."
 
 (defcustom feedmail-nuke-body-in-fcc nil
   "*If non-nil remove body of message in copies saved via Fcc:.
-If an positive integer value, leave (up to) that many lines of the
+If a positive integer value, leave (up to) that many lines of the
 beginning of the body intact.  The result is that the Fcc: copy will
 consist only of the message headers, serving as a sort of an outgoing
 message log."
@@ -684,11 +684,11 @@ in the saved message if you use Fcc:."
 
 (defcustom feedmail-fiddle-headers-upwardly t
   "*Non-nil means fiddled header fields should go at the top of the header.
-Nil means insert them at the bottom.  This is mostly a novelty issue since
+nil means insert them at the bottom.  This is mostly a novelty issue since
 the standards define the ordering of header fields to be immaterial and it's
 fairly likely that some MTA along the way will have its own idea of what the
 order should be, regardless of what you specify."
-  :group 'feedmail-header
+  :group 'feedmail-headers
   :type 'boolean
   )
 
@@ -706,7 +706,7 @@ For an explanation of fiddle-plexes, see the documentation for the
 variable feedmail-fiddle-plex-blurb.  In contrast to some other fiddle-plex
 manipulation functions, in this context, it makes no sense to have an element
 which is nil, t, or a simple string."
-  :group 'feedmail-header
+  :group 'feedmail-headers
   :type '(repeat (choice function)
                 sexp) ; too complex to be described accurately
   )
@@ -845,7 +845,7 @@ doesn't end with a slash.  Default, except on VMS, is \"$HOME/mail/q\"."
   (if (memq system-type '(axp-vms vax-vms))
       (expand-file-name (concat (getenv "HOME") "[.MAIL.DRAFT]"))
     (concat (getenv "HOME") "/mail/draft"))
-  "*Name of an directory where draft messages will be queued.
+  "*Name of a directory where draft messages will be queued.
 Directory will be created if necessary.  Should be a string that
 doesn't end with a slash.  Default, except on VMS, is \"$HOME/mail/draft\"."
   :group 'feedmail-queue
@@ -1278,7 +1278,7 @@ function, for example, to archive all of your sent messages someplace
 
 
 (defvar feedmail-is-a-resend nil
-  "*Non-nil means the the message is a Resend (in the RFC-822 sense).
+  "*Non-nil means the message is a Resend (in the RFC-822 sense).
 This affects the composition of certain headers.  feedmail sets this
 variable as soon as it starts prepping the message text buffer, so any
 user-supplied functions can rely on it.  Users shouldn't set or change this
@@ -1372,7 +1372,7 @@ complicated cases."
              (if (string-match tracer (buffer-name buffy))
                  (progn
                    (insert "SMTP Trace from " (buffer-name buffy) "\n---------------")
-                   (insert-buffer buffy)
+                   (insert-buffer-substring buffy)
                    (insert "\n\n"))))
           (buffer-list))))))
 
@@ -1835,7 +1835,7 @@ the counts."
              (setq blobbet (file-name-nondirectory blobby))
              (if (string-match "^[0-9][0-9][0-9]-" blobbet)
                  (let ((water-mark))
-                   (setq water-mark (string-to-int (substring blobbet 0 3)))
+                   (setq water-mark (string-to-number (substring blobbet 0 3)))
                    (if (> water-mark high-water) (setq high-water water-mark))))
              (setq q-cnt (1+ q-cnt)))
             (t (setq q-oth (1+ q-oth)))
@@ -1943,7 +1943,7 @@ mapped to mostly alphanumerics for safety."
               (file-exists-p a-s-file-name)
               (delete-file a-s-file-name))))
     (if feedmail-queue-chatty
-       (progn (message (concat "FQM: Queued in " filename))
+       (progn (message "%s" (concat "FQM: Queued in " filename))
               (sit-for feedmail-queue-chatty-sit-for)))
     (if feedmail-queue-chatty
        (progn
@@ -1989,7 +1989,7 @@ mapped to mostly alphanumerics for safety."
          (set-buffer feedmail-prepped-text-buffer) (erase-buffer)
 
          ;; jam contents of user-supplied mail buffer into our scratch buffer
-         (insert-buffer feedmail-raw-text-buffer)
+         (insert-buffer-substring feedmail-raw-text-buffer)
 
          ;; require one newline at the end.
          (goto-char (point-max))
@@ -2215,7 +2215,7 @@ feedmail-fiddle-plex-blurb."
                (erase-buffer)
                ;; not life's most efficient methodology, but spraying isn't
                ;; an every-5-minutes event either
-               (insert-buffer feedmail-prepped-text-buffer)
+               (insert-buffer-substring feedmail-prepped-text-buffer)
                ;; There's a good case to me made that each separate transmission of
                ;; a message in the spray should have a distinct Message-Id:.  There
                ;; is also a less compelling argument in the other direction.  I think
@@ -2670,4 +2670,5 @@ been weeded out."
 
 (provide 'feedmail)
 
+;;; arch-tag: ec27b380-11c0-4dfd-8436-f636cf2bb992
 ;;; feedmail.el ends here