From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Thu, 29 Jan 2009 10:38:16 +0000 (+0000)
Subject: * nsterm.h (EmacsPrefsController.cursorBlinkSlider): Only define
X-Git-Tag: emacs-pretest-23.0.90~90
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d72a4afa742b06438a53ad2a1c5fc31ccf4accbc;p=emacs.git

* nsterm.h (EmacsPrefsController.cursorBlinkSlider): Only define
	under GNUstep.
	(ns_query_color): New declaration.

	* nsterm.m (ns_confirm_quit): New variable.
	(ns_set_default_prefs, syms_of_nsterm, ns_term_init): Initialize it.
	(EmacsApp-applicationShouldTerminate:): Use it.
	(EmacsPrefsController): Let user set it.
	(ns_query_color): New function.
	(ns_defined_color): Use it.
	(ns_initialize): Drop.
	(ns_term_init): Add two lines from ns_initialize(), and set
	input_interrupt_mode to nil.

	* image.c (svg_load_image): Don't right-shift background RGB when
	obtained from FRAME_BACKGROUND_PIXEL. Under HAVE_NS use ns_query_color.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ee6b952e435..1f5163c556c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2009-01-29  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* nsterm.h (EmacsPrefsController.cursorBlinkSlider): Only define
+	under GNUstep.
+	(ns_query_color): New declaration.
+
+	* nsterm.m (ns_confirm_quit): New variable.
+	(ns_set_default_prefs, syms_of_nsterm, ns_term_init): Initialize it.
+	(EmacsApp-applicationShouldTerminate:): Use it.
+	(EmacsPrefsController): Let user set it.
+	(ns_query_color): New function.
+	(ns_defined_color): Use it.
+	(ns_initialize): Drop.
+	(ns_term_init): Add two lines from ns_initialize(), and set
+	input_interrupt_mode to nil.
+
+	* image.c (svg_load_image): Don't right-shift background RGB when
+	obtained from FRAME_BACKGROUND_PIXEL. Under HAVE_NS use ns_query_color.
+
 2009-01-28  Kenichi Handa  <handa@m17n.org>
 
 	* fontset.c (font_for_char): Use assq_no_quit, not assoc_no_quit.