From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/64438 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: smtpmail.el: set-buffer-file-coding-system takes too many args Date: Sat, 24 Mar 2007 20:18:45 +0100 Message-ID: References: <87d55svxxu.fsf@latte.josefsson.org> <87irfjf8m9.fsf@latte.josefsson.org> Reply-To: Reiner Steib NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1174764101 16932 80.91.229.12 (24 Mar 2007 19:21:41 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 24 Mar 2007 19:21:41 +0000 (UTC) Cc: emacs-devel@gnu.org, dmaze@MIT.EDU, ding@gnus.org, Miles Bader To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 24 20:21:33 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HVBnw-0007uh-F1 for ged-emacs-devel@m.gmane.org; Sat, 24 Mar 2007 20:21:32 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HVBpy-0004jn-Mf for ged-emacs-devel@m.gmane.org; Sat, 24 Mar 2007 14:23:38 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HVBpu-0004dr-R4 for emacs-devel@gnu.org; Sat, 24 Mar 2007 15:23:34 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HVBpu-0004bS-0B for emacs-devel@gnu.org; Sat, 24 Mar 2007 15:23:34 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HVBpt-0004b3-O5 for emacs-devel@gnu.org; Sat, 24 Mar 2007 14:23:33 -0500 Original-Received: from mail.uni-ulm.de ([134.60.1.11]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1HVBnn-0007sg-Ju; Sat, 24 Mar 2007 15:21:24 -0400 Original-Received: from bridgekeeper.physik.uni-ulm.de (bridgekeeper.physik.uni-ulm.de [134.60.10.123]) by mail.uni-ulm.de (8.13.8/8.13.8) with ESMTP id l2OJLKF3020827; Sat, 24 Mar 2007 20:21:20 +0100 (MET) Original-Received: from localhost (bridgekeeper.physik.uni-ulm.de [134.60.10.123]) by bridgekeeper.physik.uni-ulm.de (Postfix) with ESMTP id E2AAC129A2; Sat, 24 Mar 2007 20:21:19 +0100 (CET) X-Face: 3Phac&+dw=IZHjhua]bp}LH<*p{qzj8u+ List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:68492 gmane.emacs.gnus.general:64438 Archived-At: 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 * 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/