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).

3 files changed, 3 insertions, 0 deletions

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index feac0f1c537..6dd9eed0d2b 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -923,6 +923,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html
   (ns-set-resource nil "ApplePressAndHoldEnabled" "NO")
 
+  (x-apply-session-resources)
   (setq ns-initialized t))
 
 (add-to-list 'handle-args-function-alist '(ns . x-handle-args))
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 3e1c4161667..a4fac3441db 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -309,6 +309,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 
   ;; Set to a system sound if you want a fancy bell.
   (set-message-beep 'ok)
+  (x-apply-session-resources)
   (setq w32-initialized t))
 
 (add-to-list 'handle-args-function-alist '(w32 . x-handle-args))
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))