From 08c57d3e622dea1f76579d60bc151f2f5f2351a9 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Sat, 24 Mar 2007 18:56:23 +0000 Subject: [PATCH] Signal an error when used with Emacs 22+ or XEmacs. (smtpmail-send-it): Remove NOMODIFY argument of `set-buffer-file-coding-system' for compatibility with Emacs 21. --- contrib/ChangeLog | 6 ++++++ contrib/smtpmail.el | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index fc534b2b5..7f2009aec 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2007-03-24 Reiner Steib + + * smtpmail.el: Signal an error when used with Emacs 22+ or XEmacs. + (smtpmail-send-it): Remove NOMODIFY argument of + `set-buffer-file-coding-system' for compatibility with Emacs 21. + 2007-01-06 Simon Josefsson * README: Mention that smtpmail.el doesn't work on XEmacs. diff --git a/contrib/smtpmail.el b/contrib/smtpmail.el index e1e742a1d..498fb2ae9 100644 --- a/contrib/smtpmail.el +++ b/contrib/smtpmail.el @@ -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 `smtpmail.el' bundled with Emacs."))) + (require 'sendmail) (autoload 'starttls-open-stream "starttls") (autoload 'starttls-negotiate "starttls") @@ -248,7 +254,13 @@ This is relative to `smtpmail-queue-dir'.") ;; 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 t) + ;; This file (`gnus/contrib/smtpmail.el') is only useful for Emacs + ;; which doesn't support the thried 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 @@ This is relative to `smtpmail-queue-dir'.") (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) -- 2.25.1