emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r100671: * startup.el (command-line):


From: Andreas Schwab
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r100671: * startup.el (command-line): Don't call tool-bar-setup in a tty-only build.
Date: Thu, 01 Jul 2010 00:58:19 +0200
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 100671
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2010-07-01 00:58:19 +0200
message:
  * startup.el (command-line): Don't call tool-bar-setup in a tty-only build.
modified:
  lisp/ChangeLog
  lisp/startup.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-30 22:43:52 +0000
+++ b/lisp/ChangeLog    2010-06-30 22:58:19 +0000
@@ -1,3 +1,8 @@
+2010-06-30  Andreas Schwab  <address@hidden>
+
+       * startup.el (command-line): Don't call tool-bar-setup in a
+       tty-only build.
+
 2010-06-30  Chong Yidong  <address@hidden>
 
        * ruler-mode.el (ruler--save-header-line-format): New fun.

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2010-06-27 18:11:16 +0000
+++ b/lisp/startup.el   2010-06-30 22:58:19 +0000
@@ -899,10 +899,11 @@
            (setq no-blinking-cursor t)))))
     (frame-initialize))
 
-  ;; Set up the tool-bar (even in tty frames, since Emacs might open a
-  ;; graphical frame later).
-  (unless noninteractive
-    (tool-bar-setup))
+  (when (fboundp 'x-create-frame)
+    ;; Set up the tool-bar (even in tty frames, since Emacs might open a
+    ;; graphical frame later).
+    (unless noninteractive
+      (tool-bar-setup)))
 
   ;; Turn off blinking cursor if so specified in X resources.  This is here
   ;; only because all other settings of no-blinking-cursor are here.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]