aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Robert2009-02-01 17:32:52 +0000
committerAdrian Robert2009-02-01 17:32:52 +0000
commit516907a2b9c749baa962fd456dee84875331ee58 (patch)
tree30966b21a83c7d66b5c4e681c6e6ca0ede35bfb0
parent8ad093db016b77a82e7cf7a78e52e812b82442ff (diff)
downloademacs-516907a2b9c749baa962fd456dee84875331ee58.tar.gz
emacs-516907a2b9c749baa962fd456dee84875331ee58.zip
* term/ns-win.el (ns-save-preferences): Save ns-confirm-quit option.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/ns-win.el3
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c86e665a8eb..40d280d9bca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-02-01 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * term/ns-win.el (ns-save-preferences): Save ns-confirm-quit option.
4
12009-02-01 Michael Albinus <michael.albinus@gmx.de> 52009-02-01 Michael Albinus <michael.albinus@gmx.de>
2 6
3 Sync with Tramp 2.1.15. 7 Sync with Tramp 2.1.15.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index bb37ecbb705..430f4df72da 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -990,6 +990,7 @@ Lines are highlighted according to `ns-input-line'."
990(defvar ns-antialias-text) 990(defvar ns-antialias-text)
991(defvar ns-use-qd-smoothing) 991(defvar ns-use-qd-smoothing)
992(defvar ns-use-system-highlight-color) 992(defvar ns-use-system-highlight-color)
993(defvar ns-confirm-quit)
993 994
994(declare-function ns-set-resource "nsfns.m" (owner name value)) 995(declare-function ns-set-resource "nsfns.m" (owner name value))
995(declare-function ns-font-name "nsfns.m" (name)) 996(declare-function ns-font-name "nsfns.m" (name))
@@ -1013,6 +1014,8 @@ Lines are highlighted according to `ns-input-line'."
1013 (if ns-use-qd-smoothing "YES" "NO")) 1014 (if ns-use-qd-smoothing "YES" "NO"))
1014 (ns-set-resource nil "UseSystemHighlightColor" 1015 (ns-set-resource nil "UseSystemHighlightColor"
1015 (if ns-use-system-highlight-color "YES" "NO")) 1016 (if ns-use-system-highlight-color "YES" "NO"))
1017 (ns-set-resource nil "ConfirmQuit"
1018 (if ns-confirm-quit "YES" "NO"))
1016 ;; Default frame parameters 1019 ;; Default frame parameters
1017 (let ((p (frame-parameters)) 1020 (let ((p (frame-parameters))
1018 v) 1021 v)