2000-12-20 11:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* uudecode.el (uudecode-decode-region-external): make-temp-file
	may not be defined.

	* binhex.el (defalias): eval-and-compile.

	* message.el (message-tool-bar-map): New function.
	(message-mode): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f98f4ed..3ba8840 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-20 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * uudecode.el (uudecode-decode-region-external): make-temp-file
+       may not be defined.
+
+       * binhex.el (defalias): eval-and-compile.
+
+       * message.el (message-tool-bar-map): New function.
+       (message-mode): Use it.
+
 2000-12-20 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nntp.el (nntp-find-connection): Remove the entry.

diff --git a/lisp/binhex.el b/lisp/binhex.el
index 81f8f96..9215f25 100644 (file)
--- a/lisp/binhex.el
+++ b/lisp/binhex.el
@@ -28,7 +28,7 @@
 
 (eval-when-compile (require 'cl))
 
-(eval-when-compile
+(eval-and-compile
   (defalias 'binhex-char-int
     (if (fboundp 'char-int)
        'char-int

diff --git a/lisp/message.el b/lisp/message.el
index 1764363..88ab1a3 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1458,10 +1458,11 @@ Point is left at the beginning of the narrowed-to region."
    ["Body" message-goto-body t]
    ["Signature" message-goto-signature t]))
 
+(defvar message-tool-bar-map 'unset)
+
 (eval-when-compile
   (defvar facemenu-add-face-function)
-  (defvar facemenu-remove-face-function)
-  (defvar message-tool-bar-map))
+  (defvar facemenu-remove-face-function))
 
 ;;;###autoload
 (defun message-mode ()
@@ -1532,7 +1533,7 @@ M-RET    message-newline-and-reformat (break the line and reformat)."
     (set (make-local-variable 'font-lock-defaults)
         '(message-font-lock-keywords t))
     (if (boundp 'tool-bar-map)
-       (set (make-local-variable 'tool-bar-map) message-tool-bar-map)))
+       (set (make-local-variable 'tool-bar-map) (message-tool-bar-map))))
   (easy-menu-add message-mode-menu message-mode-map)
   (easy-menu-add message-mode-field-menu message-mode-map)
   ;; Allow mail alias things.
@@ -4492,33 +4493,37 @@ which specify the range to operate on."
 (defalias 'message-exchange-point-and-mark 'exchange-point-and-mark)
 
 ;; Support for toolbar
+(if (featurep 'xemacs)
+    (require 'messagexmas))
+
 (eval-when-compile 
   (defvar tool-bar-map)
   (defvar tool-bar-mode))
-(if (featurep 'xemacs)
-    (require 'messagexmas)
-  (when (and (>= (string-to-int emacs-version) 21)
-            ;; I hate warnings --zsh.
-            (fboundp 'tool-bar-add-item-from-menu)
-            tool-bar-mode)
-    (defvar message-tool-bar-map
-      (let ((tool-bar-map (copy-keymap tool-bar-map)))
-       ;; Zap some items which aren't so relevant and take up space.
-       (dolist (key '(print-buffer kill-buffer save-buffer write-file
-                                   dired open-file))
-         (define-key tool-bar-map (vector key) nil))
-       
-       (tool-bar-add-item-from-menu
-        'message-send-and-exit "mail_send" message-mode-map)
-       (tool-bar-add-item-from-menu
-        'message-kill-buffer "close" message-mode-map)
-       (tool-bar-add-item-from-menu
-        'message-dont-send "cancel" message-mode-map)
-       (tool-bar-add-item-from-menu
-        'mml-attach-file "attach" message-mode-map)
-       (tool-bar-add-item-from-menu
-        'ispell-message "spell" message-mode-map)
-       tool-bar-map))))
+
+(defun message-tool-bar-map ()
+  (if (eq message-tool-bar-map 'unset)
+      (setq message-tool-bar-map
+           (if (and (fboundp 'tool-bar-add-item-from-menu)
+                    tool-bar-mode)
+               (let ((tool-bar-map (copy-keymap tool-bar-map)))
+                 ;; Zap some items which aren't so relevant and take up space.
+                 (dolist (key '(print-buffer kill-buffer save-buffer 
+                                             write-file dired open-file))
+                   (define-key tool-bar-map (vector key) nil))
+                 
+                 (tool-bar-add-item-from-menu
+                  'message-send-and-exit "mail_send" message-mode-map)
+                 (tool-bar-add-item-from-menu
+                  'message-kill-buffer "close" message-mode-map)
+                 (tool-bar-add-item-from-menu
+                  'message-dont-send "cancel" message-mode-map)
+                 (tool-bar-add-item-from-menu
+                  'mml-attach-file "attach" message-mode-map)
+                 (tool-bar-add-item-from-menu
+                  'ispell-message "spell" message-mode-map)
+                 tool-bar-map)
+             nil))
+    message-tool-bar-map))
 
 ;;; Group name completion.
 

diff --git a/lisp/uudecode.el b/lisp/uudecode.el
index 9f423eb..b7168c6 100644 (file)
--- a/lisp/uudecode.el
+++ b/lisp/uudecode.el
@@ -102,9 +102,13 @@ used is specified by `uudecode-decoder-program'."
                                               (match-string 1)))))
        (setq tempfile (if file-name
                           (expand-file-name file-name)
-                        (let ((temporary-file-directory
-                               uudecode-temporary-file-directory))
-                          (make-temp-file "uu"))))
+                          (if (fboundp 'make-temp-file)
+                              (let ((temporary-file-directory
+                                     uudecode-temporary-file-directory))
+                                (make-temp-file "uu"))
+                            (expand-file-name
+                             (make-temp-name "uu")
+                             uudecode-temporary-file-directory))))
        (let ((cdir default-directory)
              default-process-coding-system)
          (unwind-protect