(EmacsPrefsController-setDefaultFont:,-setColors:): Raise the frame.

diff --git a/src/ChangeLog b/src/ChangeLog
index 79f24287812c2c2645c3dc9d90877d50c7e1cd39..78be848beb6916a3128f8a9ea069b868cd34369c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)

diff --git a/src/nsterm.m b/src/nsterm.m
index 9b89c833cd9846d2757e15e98333a0c510b94505..e34570062c8b8e7fb3a31f210370bfbeee991ccc 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6198,7 +6198,8 @@ static void selectItemWithTag (NSPopUpButton *popup, int tag)
 - (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 @@ static void selectItemWithTag (NSPopUpButton *popup, int tag)
 {
   Lisp_Object lispFrame;
   XSETFRAME (lispFrame, frame);
+  ns_raise_frame(frame);
   Fns_popup_color_panel (lispFrame);
 }
 
@@ -6216,6 +6218,7 @@ static void selectItemWithTag (NSPopUpButton *popup, int tag)
 {
   Lisp_Object lispFrame;
   XSETFRAME (lispFrame, frame);
+  ns_raise_frame(frame);
   Fns_popup_font_panel (lispFrame);
 }