[PATCH] Fix some sendmail.el problems introduced by a GNU sync.
xemacs-packages/mail-lib/ChangeLog addition:
2006-07-08 Aidan Kehoe <kehoea(a)parhasard.net>
* sendmail.el (sendmail-send-it):
Use no-conversion-unix for writing to sendmail, rather than the
buffer default, which breaks any externally-implemented MIME
handling.
* sendmail.el (mail-do-fcc):
* sendmail.el (mail-recover-1):
* sendmail.el (mail-recover):
emacs-mule -> escape-quoted. XEmacs doesn't have the emacs-mule
coding system available, and rightly so, since escape-quoted fills
the same role and exposes the internal text representation less.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/mail-lib/sendmail.el
Index: xemacs-packages/mail-lib/sendmail.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/sendmail.el,v
retrieving revision 1.19
diff -u -u -r1.19 sendmail.el
--- xemacs-packages/mail-lib/sendmail.el 2005/04/01 22:28:07 1.19
+++ xemacs-packages/mail-lib/sendmail.el 2006/07/08 15:29:23
＠＠ -1039,8 +1039,8 ＠＠
\\|^resent-cc:\\|^resent-bcc:"
delimline t))
(let* ((default-directory "/")
- ;; XEmacs: commented out #### why?
-; (coding-system-for-write selected-coding)
+ ;; XEmacs: changed to no-conversion-unix
+ (coding-system-for-write 'no-conversion-unix)
(args
(append (list (point-min) (point-max)
program
＠＠ -1214,7 +1214,12 ＠＠
;; convert the message to Babyl format.
(let ((coding-system-for-write
(or rmail-file-coding-system
- 'emacs-mule)))
+ ;; XEmacs change; emacs-mule is not available,
+ ;; escape-quoted serves much the same
+ ;; purpose. #### This means an incompatibility
+ ;; with Babyl files created with GNU Emacs, but
+ ;; that's probably okay, since no-one uses them.
+ 'escape-quoted)))
(save-excursion
(set-buffer (get-buffer-create " mail-temp"))
(setq buffer-read-only nil)
＠＠ -1747,7 +1752,9 ＠＠
(define-key (current-local-map) "v"
(lambda ()
(interactive)
- (let ((coding-system-for-read 'emacs-mule-unix))
+ ;; XEmacs change; emacs-mule is not available, escape-quoted
+ ;; serves the same purpose.
+ (let ((coding-system-for-read 'escape-quoted))
(dired-view-file))))
(define-key (current-local-map) "\C-c\C-c"
(lambda ()
＠＠ -1755,19 +1762,21 ＠＠
(let ((fname (dired-get-filename))
;; Auto-saved files are written in the internal
;; representation, so they should be read accordingly.
- (coding-system-for-read 'emacs-mule-unix))
+ ;; XEmacs change; emacs-mule is not available, escape-quoted
+ ;; serves the same purpose.
+ (coding-system-for-read 'escape-quoted))
(switch-to-buffer-other-window "*mail*")
(let ((buffer-read-only nil))
(erase-buffer)
(insert-file-contents fname nil)
- ;; insert-file-contents will set buffer-file-coding-system
- ;; to emacs-mule, which is probably not what they want to
- ;; use for sending the message. But we don't know what
- ;; was its value before the buffer was killed or Emacs
- ;; crashed. We therefore reset buffer-file-coding-system
- ;; to the default value, so that either the default does
- ;; TRT, or the user will get prompted for the right
- ;; encoding when they send the message.
+ ;; insert-file-contents will set buffer-file-coding-system to
+ ;; escape-quoted on XEmacs, which is not what they want to use
+ ;; for sending the message. But we don't know what was its
+ ;; value before the buffer was killed or Emacs crashed. We
+ ;; therefore reset buffer-file-coding-system to the default
+ ;; value, so that either the default does TRT, or the user
+ ;; will get prompted for the right encoding when they send the
+ ;; message.
(setq buffer-file-coding-system
default-buffer-file-coding-system))))))))
＠＠ -1812,7 +1821,9 ＠＠
(buffer-coding buffer-file-coding-system)
;; Auto-save files are written in internal
;; representation of non-ASCII characters.
- (coding-system-for-read 'emacs-mule-unix))
+ ;; XEmacs change; emacs-mule is not available,
+ ;; escape-quoted serves the same purpose.
+ (coding-system-for-read 'escape-quoted))
(erase-buffer)
(insert-file-contents file-name nil)
(setq buffer-file-coding-system buffer-coding)))))
--
Santa Maradona, priez pour moi!