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

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/23 10:31:55

Modified files:
        src            : nsterm.m ChangeLog 

Log message:
        * nsterm.m (EmacsView-readSelectionFromPasteboard:) 
(writeSelectionToPasteboard:types:): New stubbed-out methods for 
NSServicesRequests protocol. (Bug#1435)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7305&r2=1.7306

Patches:
Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- nsterm.m    23 Jan 2009 09:58:03 -0000      1.50
+++ nsterm.m    23 Jan 2009 10:31:54 -0000      1.51
@@ -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

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7305
retrieving revision 1.7306
diff -u -b -r1.7305 -r1.7306
--- ChangeLog   23 Jan 2009 09:12:53 -0000      1.7305
+++ ChangeLog   23 Jan 2009 10:31:54 -0000      1.7306
@@ -1,6 +1,15 @@
 2009-01-23  Adrian Robert  <address@hidden>
 
        * 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  <address@hidden>  (tiny change)