diff options
| author | Paul Eggert | 2011-05-22 14:16:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-22 14:16:24 -0700 |
| commit | 3f7390b223e8f55faab66259515eed073ebf0f9b (patch) | |
| tree | 8f630c9300ca22cb3434151795994fef806afc70 /src/xselect.c | |
| parent | f518ae90a612e83f8b5148211f54e1f6de445b81 (diff) | |
| parent | 6307db393033c905554048d4d965cfbdad6760ba (diff) | |
| download | emacs-3f7390b223e8f55faab66259515eed073ebf0f9b.tar.gz emacs-3f7390b223e8f55faab66259515eed073ebf0f9b.zip | |
Merge from mainline.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xselect.c b/src/xselect.c index c0b1fd4658f..3fb7077995a 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -103,7 +103,7 @@ static Lisp_Object clean_local_selection_data (Lisp_Object); | |||
| 103 | 103 | ||
| 104 | static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, | 104 | static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, |
| 105 | QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, | 105 | QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, |
| 106 | QATOM_PAIR; | 106 | QATOM_PAIR, QSAVE_TARGETS; |
| 107 | 107 | ||
| 108 | static Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ | 108 | static Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ |
| 109 | static Lisp_Object QUTF8_STRING; /* This is a type of selection. */ | 109 | static Lisp_Object QUTF8_STRING; /* This is a type of selection. */ |