Typos.

[bpt/emacs.git] / lisp / gnus / message.el

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index f0401d0..8c6f5be 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -879,7 +879,7 @@ Defaults to `text-mode-abbrev-table'.")
                 (unbold-region b e)
                 (ununderline-region b e))))
   "Alist of mail and news faces for facemenu.
-The cdr of ech entry is a function for applying the face to a region.")
+The cdr of each entry is a function for applying the face to a region.")
 
 (defcustom message-send-hook nil
   "Hook run before sending messages."
@@ -1546,7 +1546,8 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
     (if (fboundp 'mail-abbrevs-setup)
        (mail-abbrevs-setup)
       (mail-aliases-setup)))
-  (message-set-auto-save-file-name)
+  (unless buffer-file-name
+    (message-set-auto-save-file-name))
   (mm-enable-multibyte)
   (make-local-variable 'indent-tabs-mode) ;Turn off tabs for indentation.
   (setq indent-tabs-mode nil)
@@ -3698,7 +3699,7 @@ than 988 characters long, and if they are not, trim them until they are."
   (when message-auto-save-directory
     (unless (file-directory-p
             (directory-file-name message-auto-save-directory))
-      (gnus-make-directory message-auto-save-directory))
+      (make-directory message-auto-save-directory t))
     (if (gnus-alive-p)
        (setq message-draft-article
              (nndraft-request-associate-buffer "drafts"))
@@ -4242,11 +4243,11 @@ Optional DIGEST will use digest to forward."
               (not message-forward-decoded-p))
          (insert
           (with-temp-buffer
-            (mm-disable-multibyte-mule4) ;; Must copy buffer in unibyte mode
+            (mm-disable-multibyte) ;; Must copy buffer in unibyte mode
               (insert
                (with-current-buffer forward-buffer
                  (mm-string-as-unibyte (buffer-string))))
-              (mm-enable-multibyte-mule4)
+              (mm-enable-multibyte)
               (mime-to-mml)
               (goto-char (point-min))
               (when (looking-at "From ")
@@ -4490,8 +4491,10 @@ which specify the range to operate on."
 (eval-when-compile (defvar tool-bar-map))
 (if (featurep 'xemacs)
     (require 'messagexmas)
-  (when (and (fboundp 'tool-bar-add-item-from-menu)
-            tool-bar-mode)
+  (when (and 
+        (condition-case nil (require 'tool-bar) (error nil))
+        (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.