procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from mainline.

Browse source
This commit is contained in:
Paul Eggert 2011-05-22 14:16:24 -07:00
commit 3f7390b223
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2011-05-22 Paul Eggert <eggert@cs.ucla.edu>
* xselect.c (QSAVE_TARGETS): New static var, to fix build failure.
2011-05-22 Chong Yidong <cyd@stupidchicken.com>
* xselect.c (syms_of_xselect): Include character.h; use DEFSYM.

2
src/xselect.c
View file

@ -103,7 +103,7 @@ static Lisp_Object clean_local_selection_data (Lisp_Object);
static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL,
QATOM_PAIR;
QATOM_PAIR, QSAVE_TARGETS;
static Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */
static Lisp_Object QUTF8_STRING; /* This is a type of selection. */