diff options
Diffstat (limited to 'lisp')
| -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 @@ | |||
| 1 | 2010-06-27 Chong Yidong <cyd@stupidchicken.com> | 1 | 2010-06-27 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * startup.el (command-line): Recognize "0" X resource value. | ||
| 4 | |||
| 5 | 2010-06-27 Chong Yidong <cyd@stupidchicken.com> | ||
| 6 | |||
| 3 | * startup.el (command-line): Use X resources to set the value of | 7 | * startup.el (command-line): Use X resources to set the value of |
| 4 | menu-bar-mode and tool-bar-mode, before calling frame-initialize. | 8 | menu-bar-mode and tool-bar-mode, before calling frame-initialize. |
| 5 | 9 | ||
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).") | |||
| 889 | no-blinking-cursor t)) | 889 | no-blinking-cursor t)) |
| 890 | ;; Check X resources if available. | 890 | ;; Check X resources if available. |
| 891 | ((memq initial-window-system '(x w32 ns)) | 891 | ((memq initial-window-system '(x w32 ns)) |
| 892 | (let ((no-vals '("no" "off" "false"))) | 892 | (let ((no-vals '("no" "off" "false" "0"))) |
| 893 | (if (member (x-get-resource "menuBar" "MenuBar") no-vals) | 893 | (if (member (x-get-resource "menuBar" "MenuBar") no-vals) |
| 894 | (setq menu-bar-mode nil)) | 894 | (setq menu-bar-mode nil)) |
| 895 | (if (member (x-get-resource "toolBar" "ToolBar") no-vals) | 895 | (if (member (x-get-resource "toolBar" "ToolBar") no-vals) |