[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6dd94bc 11/13: Clean up code around 'ns-list-servic
From: |
Philipp Stephani |
Subject: |
[Emacs-diffs] master 6dd94bc 11/13: Clean up code around 'ns-list-services' |
Date: |
Sun, 21 May 2017 15:51:48 -0400 (EDT) |
branch: master
commit 6dd94bcc6b44ee06917d76d638120eca2cf59377
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>
Clean up code around 'ns-list-services'
* src/nsfns.m (Fns_list_services): Remove unreachable code. In this
branch NS_IMPL_COCOA cannot be defined.
(interpret_services_menu): Define only if called to avoid compiler
warnings about unused static functions.
---
src/nsfns.m | 32 ++------------------------------
1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/nsfns.m b/src/nsfns.m
index a815ce6..00310c0 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -175,6 +175,7 @@ ns_directory_from_panel (NSSavePanel *panel)
#endif
}
+#ifndef NS_IMPL_COCOA
static Lisp_Object
interpret_services_menu (NSMenu *menu, Lisp_Object prefix, Lisp_Object old)
/* --------------------------------------------------------------------------
@@ -223,7 +224,7 @@ interpret_services_menu (NSMenu *menu, Lisp_Object prefix,
Lisp_Object old)
}
return old;
}
-
+#endif
/* ==========================================================================
@@ -2107,9 +2108,6 @@ DEFUN ("ns-list-services", Fns_list_services,
Sns_list_services, 0, 0, 0,
#else
Lisp_Object ret = Qnil;
NSMenu *svcs;
-#ifdef NS_IMPL_COCOA
- id delegate;
-#endif
check_window_system (NULL);
svcs = [[NSMenu alloc] initWithTitle: @"Services"];
@@ -2117,33 +2115,7 @@ DEFUN ("ns-list-services", Fns_list_services,
Sns_list_services, 0, 0, 0,
[NSApp registerServicesMenuSendTypes: ns_send_types
returnTypes: ns_return_types];
-/* On Tiger, services menu updating was made lazier (waits for user to
- actually click on the menu), so we have to force things along: */
-#ifdef NS_IMPL_COCOA
- delegate = [svcs delegate];
- if (delegate != nil)
- {
- if ([delegate respondsToSelector: @selector (menuNeedsUpdate:)])
- [delegate menuNeedsUpdate: svcs];
- if ([delegate respondsToSelector:
- @selector (menu:updateItem:atIndex:shouldCancel:)])
- {
- int i, len = [delegate numberOfItemsInMenu: svcs];
- for (i =0; i<len; i++)
- [svcs addItemWithTitle: @"" action: NULL keyEquivalent: @""];
- for (i =0; i<len; i++)
- if (![delegate menu: svcs
- updateItem: (NSMenuItem *)[svcs itemAtIndex: i]
- atIndex: i shouldCancel: NO])
- break;
- }
- }
-#endif
-
[svcs setAutoenablesItems: NO];
-#ifdef NS_IMPL_COCOA
- [svcs update]; /* on macOS, converts from '/' structure */
-#endif
ret = interpret_services_menu (svcs, Qnil, ret);
return ret;
- [Emacs-diffs] master updated (0821292 -> 6f1f882), Philipp Stephani, 2017/05/21
- [Emacs-diffs] master cf68bb4 02/13: Declare Nextstep unexec functions in lisp.h, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master cc6db8b 05/13: Make a function static that isn't used outside this file, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master 0446a5a 04/13: Use NSCharacterCollection instead of CTCharacterCollection, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master 6f1f882 13/13: Avoid uninitialized read, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master f04e3d6 07/13: Remove trailing semicolons in method definitions, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master 2d8215a 10/13: Remove unused automatic variables, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master 74d4304 09/13: Nextstep: Replace deprecated enumerators, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master 762be77 08/13: Nextstep: remove some deprecated method calls, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master 6dd94bc 11/13: Clean up code around 'ns-list-services',
Philipp Stephani <=
- [Emacs-diffs] master d79a4ea 03/13: Remove unused function print_regions, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master add0b69 06/13: Remove calls to deprecated setUsesScreenFonts, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master 84b28ec 01/13: Nextstep: Use instancetype explicit return type, Philipp Stephani, 2017/05/21
- [Emacs-diffs] master fa389f5 12/13: Fix call of registerServicesMenuSendTypes, Philipp Stephani, 2017/05/21