* nsterm.m (EmacsView-readSelectionFromPasteboard:) (writeSelectionToPasteboard:types...

diff --git a/src/ChangeLog b/src/ChangeLog
index 953e1241c98bb09d14657d30e7d852cfc6c4f091..0b334b8b1ded1c077e2d207da584f3e85417503a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/nsterm.m b/src/nsterm.m
index 2f8eccbe7e9c1457e08ff22fc59f14c77f795ef0..535b7b0dc5c925b2c91a0f15d8cf739b0be91c4f 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5575,6 +5575,29 @@ extern void update_window_cursor (struct window *w, int on);
 }
 
 
+/* 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