(Fexpand_file_name): In the no-handler case, after

[bpt/emacs.git] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index e431053..bddbeed 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -241,7 +241,7 @@ This is normally copied from `default-directory' when Emacs starts.")
     ("--cursor-color" 1 x-handle-switch cursor-color)
     ("--vertical-scroll-bars" 0 x-handle-switch vertical-scroll-bars t)
     ("--line-spacing" 1 x-handle-numeric-switch line-spacing)
-    ("--border-color" 1 x-handle-switch border-width)
+    ("--border-color" 1 x-handle-switch border-color)
     ("--smid" 1 x-handle-smid))
   "Alist of X Windows options.
 Each element has the form
@@ -807,7 +807,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   (unless (or noninteractive
               (and (memq window-system '(x w32))
                    (<= (frame-parameter nil 'menu-bar-lines) 0)))
-    (menu-bar-mode t))
+    (menu-bar-mode 1))
 
   ;; If frame was created with a tool bar, switch tool-bar-mode on.
   (unless (or noninteractive
@@ -1623,7 +1623,7 @@ normal otherwise."
                                 "-funcall"
                                 "-e"))  ; what the source used to say
                  (setq tem (intern (or argval (pop command-line-args-left))))
-                 (if (arrayp (symbol-function tem))
+                 (if (commandp tem)
                      (command-execute tem)
                    (funcall tem)))