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

[Reiner Steib <reinersteib+gmane@imap.cc>]

On Sat, Mar 24 2007, Eli Zaretskii wrote:

> I don't know why I used the NOMODIFY argument, but the code suggests I
> had some reason at the time.  While I agree to removing it, can we
> please wait until after the release?  I'd like to avoid unnecessarily
> breaking the current code, even though the risk looks all but
> nonexistent.

Agreed.

I've installed the change in Gnus (trunk and v5-10) to make
contrib/smtpmail.el work with Emacs 21 again.  Additionally, it now
errors out if used with Emacs 22+ or XEmacs.

Miles, please don't sync these changes to Emacs.  Is it feasible to
sync other future changes from Emacs to Gnus, but keep these [1]
differences in place?

The following entry was missing in contrib/ChangeLog in the trunk:

2007-02-20  Juanma Barranquero  <lekktu@gmail.com>

	* smtpmail.el (smtpmail-smtp-service, smtpmail-queue-index-file):
	Fix typos in docstrings.
	(smtpmail-local-domain, smtpmail-queue-mail): Doc fixes.

In the CVS logs of revision 7.7 and 7.1.2.7, this ChangeLog entry
isn't included.

Bye, Reiner.

[1]
--8<---------------cut here---------------start------------->8---
--- smtpmail.el	20 Feb 2007 00:21:33 -0000	7.1.2.7
+++ smtpmail.el	24 Mar 2007 19:17:04 -0000	7.1.2.9
@@ -68,6 +68,12 @@
 
 ;;; Code:
 
+;; This version of `smtpmail.el' should only be used with Emacs 21.
+(if (featurep 'xemacs)
+    (error "Please use `smtpmail.el' from the mail-lib package.")
+  (when (>= emacs-major-version 22)
+    (error "Please use `smtpmail.el' bundled with Emacs.")))
+
 (require 'sendmail)
 (autoload 'starttls-open-stream "starttls")
 (autoload 'starttls-negotiate "starttls")
@@ -248,7 +254,13 @@
 	  ;; 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)
+	  ;;
+	  ;; This file (`gnus/contrib/smtpmail.el') is only useful for Emacs
+	  ;; which doesn't support the third argument (NOMODIFY) of
+	  ;; `set-buffer-file-coding-system'.
+	  (set-buffer-file-coding-system smtpmail-code-conv-from nil)
+	  (set-buffer-modified-p nil)
+	  (force-mode-line-update)
 	  (insert-buffer-substring mailbuf)
 	  (goto-char (point-max))
 	  ;; require one newline at the end.
@@ -394,7 +406,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)
--8<---------------cut here---------------end--------------->8---
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/