Mercurial > emacs
changeset 29590:193c8aa827d1
(command-line, command-line-1): Don't quote lambda.
(command-line): Don't call menu-bar-mode if not interactive.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 12 Jun 2000 05:26:55 +0000 |
| parents | 793e4f0f455a |
| children | b70f4500968f |
| files | lisp/startup.el |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Mon Jun 12 05:23:37 2000 +0000 +++ b/lisp/startup.el Mon Jun 12 05:26:55 2000 +0000 @@ -558,11 +558,11 @@ (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 @@ (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) @@ -999,8 +1000,8 @@ (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))