diff options
| author | Glenn Morris | 2011-06-29 19:54:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-06-29 19:54:16 -0700 |
| commit | cc232200f77c373da233803992a70d2d30bb73ff (patch) | |
| tree | fbc88ade4b9f7c78548aa21f59a97fba788af38a | |
| parent | ddf6fd30dbe088d71faf5bcb7d3fc35c3ea4e737 (diff) | |
| download | emacs-cc232200f77c373da233803992a70d2d30bb73ff.tar.gz emacs-cc232200f77c373da233803992a70d2d30bb73ff.zip | |
* lisp/term/ns-win.el (ns-set-resource): Declare.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b8ba010b1a8..043e12e32e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-06-30 Glenn Morris <rgm@gnu.org> | 1 | 2011-06-30 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * term/ns-win.el (ns-set-resource): Declare. | ||
| 4 | |||
| 3 | * ses.el (row, col): Declare dynamic variables honestly. | 5 | * ses.el (row, col): Declare dynamic variables honestly. |
| 4 | 6 | ||
| 5 | * textmodes/reftex-parse.el (index-tags): Declare. | 7 | * textmodes/reftex-parse.el (index-tags): Declare. |
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index fbf3e91d3d9..447d7fd2533 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -892,6 +892,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") | |||
| 892 | (declare-function ns-list-services "nsfns.m" ()) | 892 | (declare-function ns-list-services "nsfns.m" ()) |
| 893 | (declare-function x-open-connection "nsfns.m" | 893 | (declare-function x-open-connection "nsfns.m" |
| 894 | (display &optional xrm-string must-succeed)) | 894 | (display &optional xrm-string must-succeed)) |
| 895 | (declare-function ns-set-resource "nsfns.m" (owner name value)) | ||
| 895 | 896 | ||
| 896 | ;; Do the actual Nextstep Windows setup here; the above code just | 897 | ;; Do the actual Nextstep Windows setup here; the above code just |
| 897 | ;; defines functions and variables that we use now. | 898 | ;; defines functions and variables that we use now. |
| @@ -916,7 +917,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") | |||
| 916 | ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. | 917 | ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. |
| 917 | (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) | 918 | (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) |
| 918 | 919 | ||
| 919 | ;; OS X Lion introduces PressAndHold, which is unsupported by this port. | 920 | ;; OS X Lion introduces PressAndHold, which is unsupported by this port. |
| 920 | ;; See this thread for more details: | 921 | ;; See this thread for more details: |
| 921 | ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html | 922 | ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html |
| 922 | (ns-set-resource nil "ApplePressAndHoldEnabled" "NO") | 923 | (ns-set-resource nil "ApplePressAndHoldEnabled" "NO") |