diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/nsselect.m | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index e2e5aadc10d..1544b16dc9d 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -34,8 +34,6 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) | |||
| 34 | #include "termhooks.h" | 34 | #include "termhooks.h" |
| 35 | #include "keyboard.h" | 35 | #include "keyboard.h" |
| 36 | 36 | ||
| 37 | static Lisp_Object QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME; | ||
| 38 | |||
| 39 | static Lisp_Object Vselection_alist; | 37 | static Lisp_Object Vselection_alist; |
| 40 | 38 | ||
| 41 | /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ | 39 | /* NSGeneralPboard is pretty much analogous to X11 CLIPBOARD */ |