mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Use CLIPBOARD and PRIMARY on NS (Bug#6677).

Browse source 
* lisp/term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use
QCLIPBOARD instead of QPRIMARY (Bug#6677).

* src/nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define.
(symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard,
QPRIMARY => NXPrimaryPboard.
(ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD,
NXPrimaryPboard => QPRIMARY.
(nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection,
NXSecondaryPboard = SecondarySelection.
(syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
This commit is contained in:
Jan D 2010-08-18 08:16:55 +02:00
parent 0ac3effe23
commit 64cb6c7883
4 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-08-18 Jan Djärv <jan.h.d@swipnet.se>
* term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use
QCLIPBOARD instead of QPRIMARY (Bug#6677).
2010-08-17 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/lisp.el (up-list): Obey forward-sexp-function if set.

4
lisp/term/ns-win.el
View file

@ -1003,7 +1003,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
(defun ns-get-pasteboard ()
"Returns the value of the pasteboard."
(ns-get-cut-buffer-internal 'PRIMARY))
(ns-get-cut-buffer-internal 'CLIPBOARD))
(declare-function ns-store-cut-buffer-internal "nsselect.m" (buffer string))
@ -1011,7 +1011,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
"Store STRING into the pasteboard of the Nextstep display server."
;; Check the data type of STRING.
(if (not (stringp string)) (error "Nonstring given to pasteboard"))
(ns-store-cut-buffer-internal 'PRIMARY string))
(ns-store-cut-buffer-internal 'CLIPBOARD string))
;; We keep track of the last text selected here, so we can check the
;; current selection against it, and avoid passing back our own text

11
src/ChangeLog
View file

@ -1,3 +1,14 @@
2010-08-18 David De La Harpe Golden <david@harpegolden.net>
* nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define.
(symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard,
QPRIMARY => NXPrimaryPboard.
(ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD,
NXPrimaryPboard => QPRIMARY.
(nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection,
NXSecondaryPboard = SecondarySelection.
(syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
2010-08-17 Stefan Monnier <monnier@iro.umontreal.ca>
* gtkutil.c (update_frame_tool_bar): Don't assume TOOL_BAR_ITEM_LABEL

13
src/nsselect.m
View file

@ -37,7 +37,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
#define CUT_BUFFER_SUPPORT
Lisp_Object QSECONDARY, QTEXT, QFILE_NAME;
Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME;
static Lisp_Object Vns_sent_selection_hooks;
static Lisp_Object Vns_lost_selection_hooks;
@ -46,6 +46,8 @@ static Lisp_Object Vselection_converter_alist;
static Lisp_Object Qforeign_selection;
/* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */
NSString *NXPrimaryPboard;
NSString *NXSecondaryPboard;
@ -61,7 +63,8 @@ static NSString *
symbol_to_nsstring (Lisp_Object sym)
{
CHECK_SYMBOL (sym);
if (EQ (sym, QPRIMARY)) return NSGeneralPboard;
if (EQ (sym, QCLIPBOARD)) return NSGeneralPboard;
if (EQ (sym, QPRIMARY)) return NXPrimaryPboard;
if (EQ (sym, QSECONDARY)) return NXSecondaryPboard;
if (EQ (sym, QTEXT)) return NSStringPboardType;
return [NSString stringWithUTF8String: SDATA (XSYMBOL (sym)->xname)];
@ -72,6 +75,8 @@ static Lisp_Object
ns_string_to_symbol (NSString *t)
{
if ([t isEqualToString: NSGeneralPboard])
return QCLIPBOARD;
if ([t isEqualToString: NXPrimaryPboard])
return QPRIMARY;
if ([t isEqualToString: NXSecondaryPboard])
return QSECONDARY;
@ -537,12 +542,14 @@ DEFUN ("ns-store-cut-buffer-internal", Fns_store_cut_buffer_internal,
void
nxatoms_of_nsselect (void)
{
NXSecondaryPboard = @"Selection";
NXPrimaryPboard = @"PrimarySelection";
NXSecondaryPboard = @"SecondarySelection";
}
void
syms_of_nsselect (void)
{
QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD);
QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY);
QTEXT = intern ("TEXT"); staticpro (&QTEXT);
QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME);