diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-06-27 14:11:16 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-06-27 14:11:16 -0400 |
| commit | 3468f4350a8fc68f0397c784ea140f91295db5c7 (patch) | |
| tree | 697fa83d280f437eac187ed790d770679084a72a | |
| parent | 6431f2e619d1ce4cff097a3837f6b9e931f1f61a (diff) | |
| download | emacs-3468f4350a8fc68f0397c784ea140f91295db5c7.tar.gz | |
* startup.el (command-line): Recognize "0" X resource value.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d4862e17a73..7c12b3f5ec2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-06-27 Chong Yidong <cyd@stupidchicken.com> + * startup.el (command-line): Recognize "0" X resource value. + +2010-06-27 Chong Yidong <cyd@stupidchicken.com> + * startup.el (command-line): Use X resources to set the value of menu-bar-mode and tool-bar-mode, before calling frame-initialize. diff --git a/lisp/startup.el b/lisp/startup.el index 67ebf47c5dd..e954409497a 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -889,7 +889,7 @@ opening the first frame (e.g. open a connection to an X server).") no-blinking-cursor t)) ;; Check X resources if available. ((memq initial-window-system '(x w32 ns)) - (let ((no-vals '("no" "off" "false"))) + (let ((no-vals '("no" "off" "false" "0"))) (if (member (x-get-resource "menuBar" "MenuBar") no-vals) (setq menu-bar-mode nil)) (if (member (x-get-resource "toolBar" "ToolBar") no-vals) |