Mercurial > emacs

changeset 101319:a776dcbbb2c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(EmacsPrefsController-setDefaultFont:,-setColors:): Raise the frame.
author Adrian Robert <Adrian.B.Robert@gmail.com>
date Wed, 21 Jan 2009 17:56:37 +0000
parents 06994fb0863f
children 989377128d72
files src/ChangeLog src/nsterm.m
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Jan 21 17:28:05 2009 +0000
+++ b/src/ChangeLog	Wed Jan 21 17:56:37 2009 +0000
@@ -7,6 +7,7 @@
 	handle Ctrl-tab.  (Bug#1841)
 	(ns_get_color): Use unsigned long long for scanned hex string value.
 	(ns_term_shutdown): Abort on non SIGTERM signals.
+	(EmacsPrefsController-setDefaultFont:,-setColors:): Raise the frame.
 
 	* nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore DPI.
 	(Bug#1316)
--- a/src/nsterm.m	Wed Jan 21 17:28:05 2009 +0000
+++ b/src/nsterm.m	Wed Jan 21 17:56:37 2009 +0000
@@ -6198,7 +6198,8 @@
 - (IBAction)runHelp: (id)sender
 {
   Feval (Fcons (intern ("info"),
-              Fcons (build_string ("(ns-emacs)Preferences Panel"), Qnil)));
+                Fcons (build_string ("(emacs)Mac / GNUstep Customization"),
+                       Qnil)));
   SET_FRAME_GARBAGED (frame);
   ns_send_appdefined (-1);
 }
@@ -6208,6 +6209,7 @@
 {
   Lisp_Object lispFrame;
   XSETFRAME (lispFrame, frame);
+  ns_raise_frame(frame);
   Fns_popup_color_panel (lispFrame);
 }
 
@@ -6216,6 +6218,7 @@
 {
   Lisp_Object lispFrame;
   XSETFRAME (lispFrame, frame);
+  ns_raise_frame(frame);
   Fns_popup_font_panel (lispFrame);
 }