diff options
| author | Jan Djärv | 2014-11-01 12:41:50 +0100 |
|---|---|---|
| committer | Jan Djärv | 2014-11-01 12:41:50 +0100 |
| commit | 711066c8c14c8bd2b7ca88fda3d9847b6622b148 (patch) | |
| tree | c8a677b22f06316722a1cb70e8be4314619de89a /src/nsselect.m | |
| parent | 722afcab51adbc97b5cc5679c87ed2115259a9a7 (diff) | |
| download | emacs-711066c8c14c8bd2b7ca88fda3d9847b6622b148.tar.gz emacs-711066c8c14c8bd2b7ca88fda3d9847b6622b148.zip | |
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
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index 8d3b567e796..bcf2ac1fe63 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -34,15 +34,13 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) | |||
| 34 | #include "termhooks.h" | 34 | #include "termhooks.h" |
| 35 | #include "keyboard.h" | 35 | #include "keyboard.h" |
| 36 | 36 | ||
| 37 | Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME; | 37 | static Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME; |
| 38 | 38 | ||
| 39 | static Lisp_Object Vselection_alist; | 39 | static Lisp_Object Vselection_alist; |
| 40 | 40 | ||
| 41 | static Lisp_Object Qforeign_selection; | ||
| 42 | |||
| 43 | /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ | 41 | /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ |
| 44 | NSString *NXPrimaryPboard; | 42 | static NSString *NXPrimaryPboard; |
| 45 | NSString *NXSecondaryPboard; | 43 | static NSString *NXSecondaryPboard; |
| 46 | 44 | ||
| 47 | 45 | ||
| 48 | static NSMutableDictionary *pasteboard_changecount; | 46 | static NSMutableDictionary *pasteboard_changecount; |
| @@ -208,7 +206,7 @@ ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype) | |||
| 208 | 206 | ||
| 209 | Lisp_Object | 207 | Lisp_Object |
| 210 | ns_get_local_selection (Lisp_Object selection_name, | 208 | ns_get_local_selection (Lisp_Object selection_name, |
| 211 | Lisp_Object target_type) | 209 | Lisp_Object target_type) |
| 212 | { | 210 | { |
| 213 | Lisp_Object local_value; | 211 | Lisp_Object local_value; |
| 214 | local_value = assq_no_quit (selection_name, Vselection_alist); | 212 | local_value = assq_no_quit (selection_name, Vselection_alist); |
| @@ -533,15 +531,4 @@ to convert into a type that we don't know about or that is inappropriate.\n\ | |||
| 533 | This hook doesn't let you change the behavior of Emacs's selection replies,\n\ | 531 | This hook doesn't let you change the behavior of Emacs's selection replies,\n\ |
| 534 | it merely informs you that they have happened."); | 532 | it merely informs you that they have happened."); |
| 535 | Vns_sent_selection_hooks = Qnil; | 533 | Vns_sent_selection_hooks = Qnil; |
| 536 | |||
| 537 | DEFVAR_LISP ("ns-lost-selection-hooks", Vns_lost_selection_hooks, | ||
| 538 | "A list of functions to be called when Emacs loses an X selection.\n\ | ||
| 539 | \(This happens when some other X client makes its own selection\n\ | ||
| 540 | or when a Lisp program explicitly clears the selection.)\n\ | ||
| 541 | The functions are called with one argument, the selection type\n\ | ||
| 542 | \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD')."); | ||
| 543 | Vns_lost_selection_hooks = Qnil; | ||
| 544 | |||
| 545 | Qforeign_selection = intern_c_string ("foreign-selection"); | ||
| 546 | staticpro (&Qforeign_selection); | ||
| 547 | } | 534 | } |