From: Glenn Morris Date: Mon, 20 Jan 2014 19:44:56 +0000 (-0500) Subject: Fix spelling of "GNUstep" X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~323 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6c4680aa241f3599a2d7cf93a977c338b52c062;p=emacs.git Fix spelling of "GNUstep" --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 98df632bf89..fa427396c75 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3571,7 +3571,7 @@ * term/ns-win.el (ns-initialize-window-system): Rename Help to Info in menu bar. - * menu-bar.el: Move GNUStep specific menus... + * menu-bar.el: Move GNUstep specific menus... * term/ns-win.el (ns-initialize-window-system): ... to here. diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 70c91de558f..ba6519f3c09 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -898,7 +898,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (x-open-connection (system-name) nil t) - ;; Add GNUStep menu items Services, Hide and Quit. Rename Help to Info + ;; Add GNUstep menu items Services, Hide and Quit. Rename Help to Info ;; and put it first (i.e. omit from menu-bar-final-items. (if (featurep 'gnustep) (progn diff --git a/src/ChangeLog b/src/ChangeLog index 62b9febea25..ac7624ee4ab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1103,9 +1103,9 @@ 2013-12-08 Jan Djärv - * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating. + * nsterm.m (updateFrameSize:): Fix GNUstep toolbar not updating. - * emacs.c (main): Call fixup_locale a second time for GNUStep. + * emacs.c (main): Call fixup_locale a second time for GNUstep. 2013-12-08 Martin Rudalics @@ -1147,7 +1147,7 @@ * nsterm.m (x_set_window_size): Remove fprintf. (init): Define always. Set applicationDidFinishLaunchingCalled - for GNUStep. + for GNUstep. (applicationDidFinishLaunching:): Set applicationDidFinishLaunchingCalled. (applicationDidBecomeActive:): Call applicationDidFinishLaunching if @@ -2610,7 +2610,7 @@ * nsterm.m (Qcocoa, Qgnustep): New variables. (syms_of_nsterm): Defsym Qcocoa, Qgnustep. Fprovide appropriate one. - (ns_get_color): Make selection color work for GNUStep also. + (ns_get_color): Make selection color work for GNUstep also. 2013-10-18 Eli Zaretskii @@ -3868,7 +3868,7 @@ 2013-09-15 Jan Djärv * nsfns.m (Fx_create_frame): Fix font driver registration for - GNUStep. + GNUstep. * font.c (syms_of_font): Check MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 for syms_of_macfont. @@ -7120,7 +7120,7 @@ init_process_emacs, undoing 06-22 change. If CYGWIN, do not tickle glib, as that causes Cygwin bootstrap to fail. Do not set lib_child_handler if it's already initialized, which may - help avoid problems on GNUStep. + help avoid problems on GNUstep. 2013-06-23 Paul Eggert @@ -7828,7 +7828,7 @@ NS_IMPL_COCOA. (x_set_cursor_type): Remove declaration. (ns_update_begin): Only use r and bp if NS_IMPL_COCOA. - (ns_update_end, ns_focus, ns_unfocus): Remove GNUStep specific code. + (ns_update_end, ns_focus, ns_unfocus): Remove GNUstep specific code. (x_set_window_size): Remove 3 pixels from toolbar if NS_IMPL_GNUSTEP. (ns_get_color): Use F suffix on float. (ns_color_to_lisp, ns_query_color): Use EmacsCGFloat. @@ -7850,7 +7850,7 @@ (changeFont:): size is CGFloat. (keyDown:): Check for Delete when NS_IMPL_GNUSTEP. Disable warning about permanent text. - (characterIndexForPoint:): Adjust return type depending on GNUStep + (characterIndexForPoint:): Adjust return type depending on GNUstep version. (mouseDown:): delta is CGFloat. (updateFrameSize): Remove unised variable f. @@ -7868,7 +7868,7 @@ (mouseDragged:): Remove unised variable edge. (EmacsDocument): Implement for NS_IMPL_GNUSTEP. - * nsterm.h (EmacsCGFloat): Typedef for OSX and GNUStep when the size + * nsterm.h (EmacsCGFloat): Typedef for OSX and GNUstep when the size of CGFloat differs. (EmacsApp): New variable nextappdefined. Declare sendFromMainThread when NS_IMPL_GNUSTEP. @@ -7884,7 +7884,7 @@ (x_activate_menubar): Surround with ifdef NS_IMPL_COCOA (fillWithWidgetValue:): Add cast to SEL for setAction. (addSubmenuWithTitle:forFrame:): Add cast to SEL for action. - (update_frame_tool_bar): Update code for GNUStep. + (update_frame_tool_bar): Update code for GNUstep. (clearAll): New method. (addDisplayItemWithImage:idx:tag:helpText:enabled:): Handle new tag argument. Call insertItemWithItemIdentifier when NS_IMPL_GNUSTEP. @@ -7913,8 +7913,8 @@ (Fns_read_file_name): Keep track if panel is for save. Use ns_filename_from_panel/ns_directory_from_panel. (Fns_list_services): delegate only used for COCOA. - (Fns_convert_utf8_nfd_to_nfc): Remove warning for GNUStep. - Just return the input if GNUStep. + (Fns_convert_utf8_nfd_to_nfc): Remove warning for GNUstep. + Just return the input if GNUstep. (x_screen_planes): Remove. (Fxw_color_values): Use EmacsCGFloat (Fns_display_monitor_attributes_list): Only get screen number for diff --git a/src/emacs.c b/src/emacs.c index af01e8431a5..18f6a089dbb 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1227,7 +1227,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #ifdef HAVE_NS ns_pool = ns_alloc_autorelease_pool (); #ifdef NS_IMPL_GNUSTEP - /* GNUStep stupidly resets our locale settings after we made them. */ + /* GNUstep stupidly resets our locale settings after we made them. */ fixup_locale (); #endif diff --git a/src/nsmenu.m b/src/nsmenu.m index 63a6453d2a1..f8cd07478ed 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1096,7 +1096,7 @@ update_frame_tool_bar (struct frame *f) /* Check if this is a separator. */ if (EQ (TOOLPROP (TOOL_BAR_ITEM_TYPE), Qt)) { - /* Skip separators. Newer OSX don't show them, and on GNUStep they + /* Skip separators. Newer OSX don't show them, and on GNUstep they are wide as a button, thus overflowing the toolbar most of the time. */ continue; @@ -1936,7 +1936,7 @@ void syms_of_nsmenu (void) { #ifndef NS_IMPL_COCOA - /* Don't know how to keep track of this in Next/Open/Gnustep. Always + /* Don't know how to keep track of this in Next/Open/GNUstep. Always update menus there. */ trackingMenu = 1; #endif diff --git a/src/nsterm.h b/src/nsterm.h index 796d6ef8ca0..f058541027a 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -51,7 +51,7 @@ along with GNU Emacs. If not, see . */ #ifdef __OBJC__ -/* CGFloat on GNUStep may be 4 or 8 byte, but functions expect float* for some +/* CGFloat on GNUstep may be 4 or 8 byte, but functions expect float* for some versions. On Cocoa >= 10.5, functions expect CGFloat*. Make compatible type. */ #ifdef NS_IMPL_COCOA diff --git a/src/nsterm.m b/src/nsterm.m index 686db4c68ce..34e9320af95 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3433,7 +3433,7 @@ ns_send_appdefined (int value) /*NSTRACE (ns_send_appdefined); */ #ifdef NS_IMPL_GNUSTEP - // GNUStep needs postEvent to happen on the main thread. + // GNUstep needs postEvent to happen on the main thread. if (! [[NSThread currentThread] isMainThread]) { EmacsApp *app = (EmacsApp *)NSApp; @@ -3503,7 +3503,7 @@ check_native_fs () } #endif -/* GNUStep and OSX <= 10.4 does not have cancelTracking. */ +/* GNUstep and OSX <= 10.4 does not have cancelTracking. */ #if defined (NS_IMPL_COCOA) && \ MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 /* Check if menu open should be canceled or continued as normal. */ @@ -5750,7 +5750,7 @@ not_in_argv (NSString *arg) if (! [self isFullscreen]) { #ifdef NS_IMPL_GNUSTEP - // GNUStep does not always update the tool bar height. Force it. + // GNUstep does not always update the tool bar height. Force it. if (toolbar) update_frame_tool_bar (emacsframe); #endif @@ -7648,7 +7648,7 @@ Default is t for OSX >= 10.7, nil otherwise. */); DEFVAR_BOOL ("ns-use-srgb-colorspace", ns_use_srgb_colorspace, doc: /*Non-nil means to use sRGB colorspace on OSX >= 10.7. Note that this does not apply to images. -This variable is ignored on OSX < 10.7 and GNUStep. Default is t. */); +This variable is ignored on OSX < 10.7 and GNUstep. Default is t. */); ns_use_srgb_colorspace = YES; /* TODO: move to common code */ diff --git a/src/process.c b/src/process.c index 763d2fd504a..94033fa7ee3 100644 --- a/src/process.c +++ b/src/process.c @@ -6232,7 +6232,7 @@ handle_child_signal (int sig) lib_child_handler (sig); #ifdef NS_IMPL_GNUSTEP - /* NSTask in GNUStep sets its child handler each time it is called. + /* NSTask in GNUstep sets its child handler each time it is called. So we must re-set ours. */ catch_child_signal(); #endif