[Emacs-diffs] emacs/lisp ChangeLog dos-w32.el mail/feedmail.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/08/28 04:06:04

Modified files:
        lisp           : ChangeLog dos-w32.el 
        lisp/mail      : feedmail.el 

Log message:
        * mail/feedmail.el: Use CL macros.
        (feedmail-run-the-queue, feedmail-send-it-immediately):
        * dos-w32.el (find-buffer-file-type): Replace uses of
        default-buffer-file-type with (default-value 'buffer-file-type).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16033&r2=1.16034
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dos-w32.el?cvsroot=emacs&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/feedmail.el?cvsroot=emacs&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16033
retrieving revision 1.16034
diff -u -b -r1.16033 -r1.16034
--- ChangeLog   28 Aug 2009 03:18:49 -0000      1.16033
+++ ChangeLog   28 Aug 2009 04:05:58 -0000      1.16034
@@ -1,3 +1,10 @@
+2009-08-28  Stefan Monnier  <address@hidden>
+
+       * mail/feedmail.el: Use CL macros.
+       (feedmail-run-the-queue, feedmail-send-it-immediately):
+       * dos-w32.el (find-buffer-file-type): Replace uses of
+       default-buffer-file-type with (default-value 'buffer-file-type).
+
 2009-08-28  Glenn Morris  <address@hidden>
 
        * calendar/diary-lib.el (diary-list-entries, diary-goto-entry)

Index: dos-w32.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dos-w32.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- dos-w32.el  17 Jan 2009 12:34:09 -0000      1.57
+++ dos-w32.el  28 Aug 2009 04:06:03 -0000      1.58
@@ -72,15 +72,12 @@
        (setq alist (cdr alist)))
       found)))
 
-;; Silence compiler. Defined in src/buffer.c on DOS_NT.
-(defvar default-buffer-file-type)
-
 ;; Don't check for untranslated file systems here.
 (defun find-buffer-file-type (filename)
   (let ((match (find-buffer-file-type-match filename))
        (code))
     (if (not match)
-       default-buffer-file-type
+       (default-value 'buffer-file-type)
       (setq code (cdr match))
       (cond ((memq code '(nil t)) code)
            ((and (symbolp code) (fboundp code))

Index: mail/feedmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/feedmail.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- mail/feedmail.el    31 Jul 2008 05:33:47 -0000      1.35
+++ mail/feedmail.el    28 Aug 2009 04:06:03 -0000      1.36
@@ -286,7 +286,7 @@
 
 (defconst feedmail-patch-level "8")
 
-(eval-when-compile (require 'smtpmail))
+(eval-when-compile (require 'smtpmail) (require 'cl))
 (autoload 'mail-do-fcc "sendmail")
 
 (defgroup feedmail nil
@@ -481,11 +481,10 @@
 (defcustom feedmail-force-binary-write t
   "*If non-nil, force writing file as binary (this applies to queues and Fcc:).
 On systems where there is a difference between binary and text files,
-feedmail will temporarily manipulate the values of `buffer-file-type'
-and/or `default-buffer-file-type' to make the writing as binary.  If
-nil, writing will be in text mode.  On systems where there is no
-distinction or where it is controlled by other variables or other
-means, this option has no effect."
+feedmail will temporarily manipulate the value of `buffer-file-type'
+to make the writing as binary.  If nil, writing will be in text mode.
+On systems where there is no distinction or where it is controlled by other
+variables or other means, this option has no effect."
   :group 'feedmail-misc
   :type 'boolean
   )
@@ -1601,9 +1600,9 @@
                           (not
                            (let ((mail-header-separator 
feedmail-queue-alternative-mail-header-separator))
                              (feedmail-find-eoh t)))))
-                 (let ((file-name-buffer-file-type-alist nil) 
(default-buffer-file-type nil))
-                   (erase-buffer) (insert-file-contents maybe-file))
-               )
+                 (letf ((file-name-buffer-file-type-alist nil)
+                         ((default-value 'buffer-file-type) nil))
+                   (erase-buffer) (insert-file-contents maybe-file)))
              ;; if M-H-S not found and (a-M-H-S is non-nil and is found)
              ;; temporarily set M-H-S to the value of a-M-H-S
              (if (and (not (feedmail-find-eoh t))
@@ -1913,7 +1912,8 @@
        (setq filename buffer-file-name)
       (setq filename (feedmail-create-queue-filename queue-directory)))
     ;; make binary file on DOS/Win95/WinNT, etc
-    (let ((buffer-file-type feedmail-force-binary-write)) (write-file 
filename))
+    (let ((buffer-file-type feedmail-force-binary-write))
+      (write-file filename))
     ;; convenient for moving from draft to q, for example
     (if (and previous-buffer-file-name (or (not is-fqm) (not is-in-this-dir))
             (y-or-n-p (format "FQM: Was previously %s; delete that? " 
previous-buffer-file-name)))
@@ -2086,7 +2086,8 @@
                          )))
                  (goto-char (point-min))
                  ;; re-insert and handle any Fcc fields (and, optionally, any 
Bcc).
-                 (if fcc (let ((default-buffer-file-type 
feedmail-force-binary-write))
+                 (if fcc (letf (((default-value 'buffer-file-type)
+                                  feedmail-force-binary-write))
                            (insert fcc)
                            (if (not feedmail-nuke-bcc-in-fcc)
                                (progn (if bcc-holder (insert bcc-holder))