comparison lisp/startup.el @ 98596:6560d393fd4d

(command-line): Don't invoke tool-bar-mode if it is not fboundp.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 10 Oct 2008 08:53:14 +0000
parents d26dc6b50206
children 38e69a51ceaf
comparison
equal deleted inserted replaced
98595:d26dc6b50206 98596:6560d393fd4d
900 900
901 ;; Enable tool-bar-mode if necessary. Note that we might enable it 901 ;; Enable tool-bar-mode if necessary. Note that we might enable it
902 ;; even in tty frames, which means that there is a tool-bar if Emacs 902 ;; even in tty frames, which means that there is a tool-bar if Emacs
903 ;; later opens a graphical frame. 903 ;; later opens a graphical frame.
904 (unless (or noninteractive emacs-basic-display 904 (unless (or noninteractive emacs-basic-display
905 (not (fboundp 'tool-bar-mode))
905 ;; The tool-bar-lines parameter is nil if starting on a 906 ;; The tool-bar-lines parameter is nil if starting on a
906 ;; tty; it is 0 if starting on a graphical display with 907 ;; tty; it is 0 if starting on a graphical display with
907 ;; the toolbar disabled via X resources. 908 ;; the toolbar disabled via X resources.
908 (and (numberp (frame-parameter nil 'tool-bar-lines)) 909 (and (numberp (frame-parameter nil 'tool-bar-lines))
909 (<= (frame-parameter nil 'tool-bar-lines) 0))) 910 (<= (frame-parameter nil 'tool-bar-lines) 0)))