[Emacs-diffs] Changes to emacs/lisp/mail/feedmail.el

[Richard M . Stallman]

Index: emacs/lisp/mail/feedmail.el
diff -c emacs/lisp/mail/feedmail.el:1.25 emacs/lisp/mail/feedmail.el:1.26
*** emacs/lisp/mail/feedmail.el:1.25    Mon Oct  3 01:12:41 2005
--- emacs/lisp/mail/feedmail.el Thu Nov  3 21:34:54 2005
***************
*** 1372,1378 ****
              (if (string-match tracer (buffer-name buffy))
                  (progn
                    (insert "SMTP Trace from " (buffer-name buffy) 
"\n---------------")
!                   (insert-buffer buffy)
                    (insert "\n\n"))))
           (buffer-list))))))
  
--- 1372,1378 ----
              (if (string-match tracer (buffer-name buffy))
                  (progn
                    (insert "SMTP Trace from " (buffer-name buffy) 
"\n---------------")
!                   (insert-buffer-substring buffy)
                    (insert "\n\n"))))
           (buffer-list))))))
  
***************
*** 1989,1995 ****
          (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)
  
          ;; require one newline at the end.
          (goto-char (point-max))
--- 1989,1995 ----
          (set-buffer feedmail-prepped-text-buffer) (erase-buffer)
  
          ;; jam contents of user-supplied mail buffer into our scratch buffer
!         (insert-buffer-substring feedmail-raw-text-buffer)
  
          ;; require one newline at the end.
          (goto-char (point-max))
***************
*** 2215,2221 ****
                (erase-buffer)
                ;; not life's most efficient methodology, but spraying isn't
                ;; an every-5-minutes event either
!               (insert-buffer 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
--- 2215,2221 ----
                (erase-buffer)
                ;; not life's most efficient methodology, but spraying isn't
                ;; an every-5-minutes event either
!               (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