diff options
| author | David Reitter | 2011-06-21 11:45:36 -0700 |
|---|---|---|
| committer | David Reitter | 2011-06-21 11:45:36 -0700 |
| commit | cd93b3593035164d988fd4a21084dc60226b5b33 (patch) | |
| tree | 3a795c7957ceaf90b904f2a973b0611895d34d3f | |
| parent | a9041e6caf73abe867602bc60f2f3d48601a908d (diff) | |
| download | emacs-cd93b3593035164d988fd4a21084dc60226b5b33.tar.gz emacs-cd93b3593035164d988fd4a21084dc60226b5b33.zip | |
ns-win: set ApplePressAndHoldEnabled to NO as it is unsupported.
This is in preparation for OS X "Lion"; it is a stop-gap solution
until this new input mechanism is supported correctly.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2055ce2b7c7..5c6c84fe3db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-06-21 Tim Harper <timcharper@gmail.com> | ||
| 2 | |||
| 3 | * term/ns-win.el (ns-initialize-window-system): set | ||
| 4 | application-specific `ApplePressAndHoldEnabled' system | ||
| 5 | resource to NO as it is not yet supported by the NS port. | ||
| 6 | |||
| 1 | 2011-06-21 Juanma Barranquero <lekktu@gmail.com> | 7 | 2011-06-21 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * misc.el (list-dynamic-libraries--refresh): Compute header here... | 9 | * misc.el (list-dynamic-libraries--refresh): Compute header here... |
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 712929ecec0..fbf3e91d3d9 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -916,6 +916,11 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") | |||
| 916 | ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. | 916 | ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. |
| 917 | (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) | 917 | (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) |
| 918 | 918 | ||
| 919 | ;; OS X Lion introduces PressAndHold, which is unsupported by this port. | ||
| 920 | ;; See this thread for more details: | ||
| 921 | ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html | ||
| 922 | (ns-set-resource nil "ApplePressAndHoldEnabled" "NO") | ||
| 923 | |||
| 919 | (setq ns-initialized t)) | 924 | (setq ns-initialized t)) |
| 920 | 925 | ||
| 921 | (add-to-list 'handle-args-function-alist '(ns . x-handle-args)) | 926 | (add-to-list 'handle-args-function-alist '(ns . x-handle-args)) |