[Emacs-diffs] trunk r118245: nsselect.m cleanup, remove unused, declare vars static.

[Jan D.]

------------------------------------------------------------
revno: 118245
revision-id: address@hidden
parent: address@hidden
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Sat 2014-11-01 12:41:50 +0100
message:
  nsselect.m cleanup, remove unused, declare vars static.
  
  * nsselect.m (QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME)
  (NXPrimaryPboard, NXSecondaryPboard): Declare static.
  (Qforeign_selection): Remove.
  (ns_get_local_selection): Identation fix.
  (syms_of_nsselect): Remove Qforeign_selection, ns-lost-selection-hooks
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsselect.m                 nsselect.m-20091113204419-o5vbwnq5f7feedwu-8745

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-01 11:37:14 +0000
+++ b/src/ChangeLog     2014-11-01 11:41:50 +0000
@@ -1,10 +1,16 @@
 2014-11-01  Jan Djärv  <address@hidden>
 
+       * nsselect.m (QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME)
+       (NXPrimaryPboard, NXSecondaryPboard): Declare static.
+       (Qforeign_selection): Remove.
+       (ns_get_local_selection): Identation fix.
+       (syms_of_nsselect): Remove Qforeign_selection, ns-lost-selection-hooks
+
        * nsselect.m (ns_get_local_selection): Remove calling of
        functions in Vselection_converter_alist (Bug#18911).
        (syms_of_nsselect): Remove Vselection_converter_alist.
 
-2014-10-31  Dmitry Antipov  <address@hidden>
+(2014-10-31  Dmitry Antipov  <address@hidden>
 
        * font.c (copy_font_spec): Redesign to avoid Fcopy_alist
        and unnecessary initialization.  Adjust comments.

=== modified file 'src/nsselect.m'
--- a/src/nsselect.m    2014-11-01 11:37:14 +0000
+++ b/src/nsselect.m    2014-11-01 11:41:50 +0000
@@ -34,15 +34,13 @@
 #include "termhooks.h"
 #include "keyboard.h"
 
-Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME;
+static Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME;
 
 static Lisp_Object Vselection_alist;
 
-static Lisp_Object Qforeign_selection;
-
 /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */
-NSString *NXPrimaryPboard;
-NSString *NXSecondaryPboard;
+static NSString *NXPrimaryPboard;
+static NSString *NXSecondaryPboard;
 
 
 static NSMutableDictionary *pasteboard_changecount;
@@ -208,7 +206,7 @@
 
 Lisp_Object
 ns_get_local_selection (Lisp_Object selection_name,
-                       Lisp_Object target_type)
+                        Lisp_Object target_type)
 {
   Lisp_Object local_value;
   local_value = assq_no_quit (selection_name, Vselection_alist);
@@ -533,15 +531,4 @@
 This hook doesn't let you change the behavior of Emacs's selection replies,\n\
 it merely informs you that they have happened.");
   Vns_sent_selection_hooks = Qnil;
-
-  DEFVAR_LISP ("ns-lost-selection-hooks", Vns_lost_selection_hooks,
-               "A list of functions to be called when Emacs loses an X 
selection.\n\
-\(This happens when some other X client makes its own selection\n\
-or when a Lisp program explicitly clears the selection.)\n\
-The functions are called with one argument, the selection type\n\
-\(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD').");
-  Vns_lost_selection_hooks = Qnil;
-
-  Qforeign_selection = intern_c_string ("foreign-selection");
-  staticpro (&Qforeign_selection);
 }