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

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

[Reiner Steib]

Eli,

could comment on this (your 2006-11-24 change to smtpmail.el), please?

Bye, Reiner.


Original message follows...

On Sun, Jan 07 2007, Reiner Steib wrote:

> On Sun, Jan 07 2007, Simon Josefsson wrote:
>
>> Reiner Steib <reinersteib+gmane@imap.cc> writes:
>>> BTW: Is NOMODIFY really useful here?  In both cases,
>>> `set-buffer-file-coding-system' is followed by
>>> `insert-buffer-substring' which will mark the buffer modified anyhow.
>>> What am I missing?
>>
>> Hm, I agree that it looks funny.  Maybe you could ask whomever applied
>> this, if it is really needed?  I agree that it doesn't seem very
>> useful, and the modified-flag seems rather pointless for temporary
>> buffers anyway.
>
> Eli, we wonder if the NOMODIFY argument to
> `set-buffer-file-coding-system' in your 2006-11-24 change of
> `smtpmail.el' (see below) is useful.  NOMODIFY breaks compatibility
> with Emacs 21.  Although it's not a goal for `smtpmail.el' in Emacs
> CVS to be compatible with Emacs 21, it would be "nice-to-have" because
> `smtpmail.el' provides very useful features for Gnus user on Emacs 21
> (SMTP-AUTH, STARTTLS, ...).  This was the reason why we include a copy
> of `smtpmail.el' from Emacs in Gnus' contrib directory.
>
> (See
> http://thread.gmane.org/gmane.emacs.gnus.general/64222/focus=64233 for
> the rest of this thread.)
>
> ,----
> | 2006-11-24  Eli Zaretskii  <eliz@gnu.org>
> | 
> | 	* mail/smtpmail.el (smtpmail-send-it):
> | 	Copy buffer-file-coding-system from the mail buffer.  Possibly add a
> | 	MIME header for the message encoding.
> | 	Bind coding-system-for-write around the call to mail-do-fcc.
> | 	Use smtpmail-code-conv-from to encode queued mail messages.
> `----
>
> --- smtpmail.el	18 Oct 2006 11:11:32 -0000	1.88
> +++ smtpmail.el	24 Nov 2006 14:32:19 -0000	1.89
> @@ -244,6 +244,11 @@
>  	(save-excursion
>  	  (set-buffer tembuf)
>  	  (erase-buffer)
> +	  ;; Use the same buffer-file-coding-system as in the mail
> +	  ;; 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)
>  	  (insert-buffer-substring mailbuf)
>  	  (goto-char (point-max))
>  	  ;; require one newline at the end.
>
> [...]
> @@ -370,6 +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)
>  		(insert-buffer-substring tembuf)
>  		(write-file file-data)
>  		(set-buffer buffer-elisp)

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

[Eli Zaretskii]

> From: Reiner Steib <reinersteib+gmane@imap.cc>
> Cc: ding@gnus.org, David Z Maze <dmaze@MIT.EDU>, <emacs-devel@gnu.org>
> Date: Sat, 24 Mar 2007 13:30:56 +0100
> 
> Eli,
> 
> could comment on this (your 2006-11-24 change to smtpmail.el), please?

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.

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

[Reiner Steib]

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/

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

[Miles Bader]

Reiner Steib <reinersteib+gmane@imap.cc> writes:
> 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?

Of course.

If _no_ (future) changes to smtpmail.el should be copied between Emacs
and Gnus, then I could just change the arch-tag: in contrib/smtpmail.el,
which will effectively make them different files.

[Syncing applies _changes_ to files (using patches), so it's quite
possible to drop one change but still apply future changes.]

-Miles
-- 
97% of everything is grunge

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

[Reiner Steib]

On Sun, Mar 25 2007, Miles Bader wrote:

> Reiner Steib <reinersteib+gmane@imap.cc> writes:
>> 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?
>
> Of course.
>
> If _no_ (future) changes to smtpmail.el should be copied between Emacs
> and Gnus, then I could just change the arch-tag: in contrib/smtpmail.el,
> which will effectively make them different files.
>
> [Syncing applies _changes_ to files (using patches), so it's quite
> possible to drop one change but still apply future changes.]

Good.  So let's try to continue syncing the `smtpmail.el'.

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/