summaryrefslogtreecommitdiff
path: root/lisp/term/x-win.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-04-27 13:40:46 +0800
committerChong Yidong <cyd@gnu.org>2012-04-27 13:40:46 +0800
commit15cd8efd049338ec4a42ba00e96d2baf2c3cc51a (patch)
tree53a9ec557ed6c37b2a0e60abc1bf46d349df7554 /lisp/term/x-win.el
parenta8e7d6d783219972c08fd49a3a2afaf26eb139c2 (diff)
downloademacs-15cd8efd049338ec4a42ba00e96d2baf2c3cc51a.tar.gz
Fix application of menu-bar-mode etc. by X resources.
* lisp/startup.el (x-apply-session-resources): New function. * lisp/term/ns-win.el (ns-initialize-window-system): * lisp/term/w32-win.el (w32-initialize-window-system): * lisp/term/x-win.el (x-initialize-window-system): Use it to properly set menu-bar-mode and other vars from X resources, even if the initial frame is not a window-system frame (Bug#2299).
Diffstat (limited to 'lisp/term/x-win.el')
-rw-r--r--lisp/term/x-win.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 21d49267b21..498cc01fe22 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1445,6 +1445,7 @@ Request data types in the order specified by `x-select-request-type'."
;; :help "Paste (yank) text most recently cut/copied")
;; nil))
+ (x-apply-session-resources)
(setq x-initialized t))
(add-to-list 'handle-args-function-alist '(x . x-handle-args))