[Emacs-diffs] emacs/src nsterm.h nsterm.m ChangeLog

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/21 18:13:27

Modified files:
        src            : nsterm.h nsterm.m ChangeLog 

Log message:
        * nsterm.h (EmacsPrefsController): Add -setPanelFromDefaultValues.  * 
nsterm.m (EmacsPrefsController-setPanelFromDefaultValues) New function.  
(EmacsPrefsController-resetToDefaults:): Use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.h?cvsroot=emacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7292&r2=1.7293

Patches:
Index: nsterm.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- nsterm.h    8 Jan 2009 03:15:52 -0000       1.17
+++ nsterm.h    21 Jan 2009 18:13:26 -0000      1.18
@@ -355,6 +355,7 @@
 
 - (void) showForFrame: (struct frame *)f;
 - (void) setPanelFromValues;
+- (void) setPanelFromDefaultValues;
 - (void) setValuesFromPanel;
 @end
 

Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- nsterm.m    21 Jan 2009 17:56:38 -0000      1.44
+++ nsterm.m    21 Jan 2009 18:13:26 -0000      1.45
@@ -6090,6 +6090,7 @@
 }
 
 
+/* If you change this, change setPanelFromDefaultValues too. */
 - (void) setPanelFromValues
 {
   int cursorType
@@ -6120,6 +6121,23 @@
 }
 
 
+/* This and ns_set_default_prefs should be changed together. */
+- (void) setPanelFromDefaultValues
+{
+  [expandSpaceSlider setFloatValue: 0.0];
+  [cursorTypeMatrix selectCellWithTag: 1]; /* filled box */
+  selectItemWithTag (alternateModMenu, meta_modifier);
+  selectItemWithTag (commandModMenu, super_modifier);
+#ifdef NS_IMPL_COCOA
+  selectItemWithTag (controlModMenu, ctrl_modifier);
+  selectItemWithTag (functionModMenu, 0); /* none */
+  [smoothFontsCheck setState: YES];
+  [useQuickdrawCheck setState: NO];
+  [useSysHiliteCheck setState: YES];
+#endif
+}
+
+
 - (void) setValuesFromPanel
 {
   int altTag = [[alternateModMenu selectedItem] tag];
@@ -6190,8 +6208,7 @@
 
 - (IBAction)resetToDefaults: (id)sender
 {
-  ns_set_default_prefs ();
-  [self setPanelFromValues];
+  [self setPanelFromDefaultValues];
 }
 
 

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7292
retrieving revision 1.7293
diff -u -b -r1.7292 -r1.7293
--- ChangeLog   21 Jan 2009 17:56:37 -0000      1.7292
+++ ChangeLog   21 Jan 2009 18:13:26 -0000      1.7293
@@ -2,12 +2,16 @@
 
        * nsmenu.m (NSMENUPROFILE): Change #if style.
 
-       * nsterm.m: (x_set_frame_alpha): Add prototype.
+       * nsterm.h (EmacsPrefsController): Add -setPanelFromDefaultValues.
+
+       * nsterm.m (x_set_frame_alpha): Add prototype.
        (ns_fake_keydown, EmacsView-keyUp:): New variable and function to
        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.
+       (EmacsPrefsController-setPanelFromDefaultValues) New function.
+       (EmacsPrefsController-resetToDefaults:): Use it. (Bug#1801)
 
        * nsimage.m (EmacsImage+allocInitFromFile:): Set to ignore DPI.
        (Bug#1316)