# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1232706714 0
# Node ID 27828d2e3209d320bc007d76695cbeee5fe02de6
# Parent  5b58e8f46076b1a9fb05586dda6a1ae97eb42760
* nsterm.m (EmacsView-readSelectionFromPasteboard:) (writeSelectionToPasteboard:types:): New stubbed-out methods for NSServicesRequests protocol. (Bug#1435)

diff -r 5b58e8f46076 -r 27828d2e3209 src/ChangeLog
--- a/src/ChangeLog	Fri Jan 23 09:58:02 2009 +0000
+++ b/src/ChangeLog	Fri Jan 23 10:31:54 2009 +0000
@@ -1,6 +1,15 @@
 2009-01-23  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
 	* emacs.c (main): Do fork+exec under --daemon in Cocoa.
+	(ns_no_defaults): New declaration.
+	(main): Use it.
+	* nsterm.h (ns_no_defaults): New declaration.
+	* nsfns.m (x_get_string_resource): Don't read when ns_no_defaults.
+	* nsterm.m (ns_no_defaults): New variable.
+	(ns_initialize): Don't read defaults when ns_no_defaults.
+	(EmacsView-readSelectionFromPasteboard:)
+	(writeSelectionToPasteboard:types:): New stubbed-out methods for
+	NSServicesRequests protocol. (Bug#1435)
 
 2009-01-23  Giorgos Keramidas  <keramida@freebsd.org>  (tiny change)
 
diff -r 5b58e8f46076 -r 27828d2e3209 src/nsterm.m
--- a/src/nsterm.m	Fri Jan 23 09:58:02 2009 +0000
+++ b/src/nsterm.m	Fri Jan 23 10:31:54 2009 +0000
@@ -5575,6 +5575,29 @@
 }
 
 
+/* The next two methods are part of NSServicesRequests informal protocol,
+   supposedly called when a services menu item is chosen from this app.
+   But this should not happen because we override the services menu with our
+   own entries which call ns-perform-service.
+   Nonetheless, it appeared to happen here (under strange circumstances):
+   http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=1435 
+   So let's at least stub them out until further investigation can be done. */
+
+- (BOOL) readSelectionFromPasteboard: (NSPasteboard *)pb
+{
+  /* we could call ns_string_from_pasteboard(pboard) here but then it should
+     be written into the buffer in place of the existing selection..
+     ordinary service calls go through functions defined in ns-win.el */
+  return NO;
+}
+
+- (BOOL) writeSelectionToPasteboard: (NSPasteboard *)pb types: (NSArray *)types
+{
+  /* supposed to write for as many of types as we are able */
+  return NO;
+}
+
+
 /* setMini =YES means set from internal (gives a finder icon), NO means set nil
    (gives a miniaturized version of the window); currently we use the latter for
    frames whose active buffer doesn't correspond to any file