smtpmail.el: set-buffer-file-coding-system takes too many args

[David Z Maze <dmaze@MIT.EDU>]

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

I ran 'cvs update' after a long drought and suddenly couldn't send any
mail!  I tracked this down to a change in smtpmail.el that sets the
coding system on outgoing mail buffers; it calls
set-buffer-file-coding-system with four arguments, but my Emacs ("GNU
Emacs 21.4.1 (sparc-sun-solaris2.10, X toolkit) of 2005-05-31 on
maytag.mit.edu") only takes three.

To make things work I needed the following:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 979 bytes --]

--- smtpmail.el 27 Nov 2006 00:39:24 -0000      7.5
+++ smtpmail.el 3 Jan 2007 15:25:57 -0000
@@ -248,7 +248,7 @@
          ;; buffer, otherwise any write-region invocations (e.g., in
          ;; mail-do-fcc below) will annoy with asking for a suitable
          ;; encoding.
-         (set-buffer-file-coding-system smtpmail-code-conv-from nil t)
+         (set-buffer-file-coding-system smtpmail-code-conv-from nil)
          (insert-buffer-substring mailbuf)
          (goto-char (point-max))
          ;; require one newline at the end.
@@ -394,7 +394,7 @@
                (make-directory smtpmail-queue-dir t))
              (with-current-buffer buffer-data
                (erase-buffer)
-               (set-buffer-file-coding-system smtpmail-code-conv-from nil t)
+               (set-buffer-file-coding-system smtpmail-code-conv-from nil)
                (insert-buffer-substring tembuf)
                (write-file file-data)
                (set-buffer buffer-elisp)

[-- Attachment #3: Type: text/plain, Size: 173 bytes --]


Is the last arg necessary on some other Emacs?  Is there some Gnus
compatability shim that'll work here?  Does its status in "contrib"
affect things any?

Thanks,

  --dzm