diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-04-27 13:40:46 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-27 13:40:46 +0800 |
| commit | 15cd8efd049338ec4a42ba00e96d2baf2c3cc51a (patch) | |
| tree | 53a9ec557ed6c37b2a0e60abc1bf46d349df7554 /lisp/term/ns-win.el | |
| parent | a8e7d6d783219972c08fd49a3a2afaf26eb139c2 (diff) | |
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/ns-win.el')
| -rw-r--r-- | lisp/term/ns-win.el | 1 |
1 files changed, 1 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)) |