diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/xselect.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xselect.c b/src/xselect.c index 4f1a452023a..2d656cfec9a 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -100,14 +100,14 @@ static Lisp_Object clean_local_selection_data (Lisp_Object); | |||
| 100 | #endif | 100 | #endif |
| 101 | 101 | ||
| 102 | 102 | ||
| 103 | Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, | 103 | static Lisp_Object QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP, |
| 104 | QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, | 104 | QTEXT, QDELETE, QMULTIPLE, QINCR, QEMACS_TMP, QTARGETS, QATOM, QNULL, |
| 105 | QATOM_PAIR; | 105 | QATOM_PAIR; |
| 106 | 106 | ||
| 107 | Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ | 107 | static Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */ |
| 108 | Lisp_Object QUTF8_STRING; /* This is a type of selection. */ | 108 | static Lisp_Object QUTF8_STRING; /* This is a type of selection. */ |
| 109 | 109 | ||
| 110 | Lisp_Object Qcompound_text_with_extensions; | 110 | static Lisp_Object Qcompound_text_with_extensions; |
| 111 | 111 | ||
| 112 | static Lisp_Object Qforeign_selection; | 112 | static Lisp_Object Qforeign_selection; |
| 113 | 113 | ||