(menu-bar-tools-menu): Call read-mail-command

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 75559d1d9557c8bfe5291a5690ce7250ed54e17d..a51fd018c6449237938c523e0bf14ae3270749cf 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -558,11 +558,11 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
        (if (memq 'file-error (get (car error) 'error-conditions))
            (format "%s: %s"
                     (nth 1 error)
-                    (mapconcat '(lambda (obj) (prin1-to-string obj t))
+                    (mapconcat (lambda (obj) (prin1-to-string obj t))
                                (cdr (cdr error)) ", "))
          (format "%s: %s"
                   (get (car error) 'error-message)
-                  (mapconcat '(lambda (obj) (prin1-to-string obj t))
+                  (mapconcat (lambda (obj) (prin1-to-string obj t))
                              (cdr error) ", "))))
       'external-debugging-output)
      (setq window-system nil)
@@ -642,8 +642,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (if (fboundp 'frame-initialize)
       (frame-initialize))
   ;; If frame was created with a menu bar, set menu-bar-mode on.
-  (if (or (not (memq window-system '(x w32)))
-         (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0))
+  (if (and (not noninteractive)
+          (or (not (memq window-system '(x w32)))
+              (> (cdr (assq 'menu-bar-lines (frame-parameters))) 0)))
       (menu-bar-mode t))
 
   (run-hooks 'before-init-hook)
@@ -697,14 +698,16 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
                    ;; If we loaded a compiled file, set
                    ;; `user-init-file' to the source version if that
                    ;; exists.
-                   (if (and user-init-file
-                            (equal (file-name-extension user-init-file)
-                                   "elc"))
-                       (let ((el (concat (file-name-sans-extension
-                                          user-init-file)
-                                         ".el")))
-                         (if (file-exists-p el)
-                             (setq user-init-file el))))
+                   (when (and user-init-file
+                              (equal (file-name-extension user-init-file)
+                                     "elc")
+                              (file-exists-p user-init-file-1))
+                     (when (file-newer-than-file-p
+                            user-init-file-1 user-init-file)
+                       (message "Warning: %s is newer than %s"
+                                user-init-file-1 user-init-file)
+                       (sit-for 1))
+                     (setq user-init-file user-init-file-1))
                    (or inhibit-default-init
                        (let ((inhibit-startup-message nil))
                          ;; Users are supposed to be told their rights.
@@ -895,7 +898,7 @@ Getting New Versions        How to obtain the latest version of Emacs.
 ")
                             (insert "\n\n" (emacs-version)
                                     "
-Copyright (C) 1999 Free Software Foundation, Inc."))
+Copyright (C) 2000 Free Software Foundation, Inc."))
                         ;; If keys have their default meanings,
                         ;; use precomputed string to save lots of time.
                         (if (and (eq (key-binding "\C-h") 'help-command)
@@ -939,6 +942,11 @@ Mode-specific menu   C-mouse-3 (third button, with CTRL)"))
 \(`C-' means use the CTRL key.  `M-' means use the Meta (or Alt) key.
 If you have no Meta key, you may instead type ESC followed by the character.)")
                         (and auto-save-list-file-prefix
+                             ;; Don't signal an error if the
+                             ;; directory for auto-save-list files
+                             ;; does not yet exist.
+                             (file-directory-p (file-name-directory
+                                                auto-save-list-file-prefix))
                              (directory-files
                               (file-name-directory auto-save-list-file-prefix)
                               nil
@@ -952,7 +960,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
 
                         (insert "\n\n" (emacs-version)
                                 "
-Copyright (C) 1999 Free Software Foundation, Inc.")
+Copyright (C) 2000 Free Software Foundation, Inc.")
                         (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
                                  (eq (key-binding "\C-h\C-d") 'describe-distribution)
                                  (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
@@ -992,8 +1000,8 @@ Type \\[describe-distribution] for information on getting the latest version."))
           (append '(("--funcall") ("--load") ("--insert") ("--kill")
                     ("--directory") ("--eval") ("--execute")
                     ("--find-file") ("--visit") ("--file"))
-                  (mapcar '(lambda (elt)
-                             (list (concat "-" (car elt))))
+                  (mapcar (lambda (elt)
+                            (list (concat "-" (car elt))))
                           command-switch-alist)))
          (line 0))