Commit 711066c8 authored by Jan Djärv's avatar Jan Djärv
Browse files

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
parent 722afcab
2014-11-01 Jan Djärv <jan.h.d@swipnet.se>
 
* 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 <dmantipov@yandex.ru>
(2014-10-31 Dmitry Antipov <dmantipov@yandex.ru>
 
* font.c (copy_font_spec): Redesign to avoid Fcopy_alist
and unnecessary initialization. Adjust comments.
......
......@@ -34,15 +34,13 @@ Updated by Christian Limpach (chris@nice.ch)
#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 @@ Updated by Christian Limpach (chris@nice.ch)
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 @@ We might have failed (and declined the request) for any number of reasons,\n\
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);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment