diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/nsselect.m | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index 8863bd27f16..1544b16dc9d 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* NeXT/Open/GNUstep / MacOSX Cocoa selection processing for emacs. | 1 | /* NeXT/Open/GNUstep / MacOSX Cocoa selection processing for emacs. |
| 2 | Copyright (C) 1993-1994, 2005-2006, 2008-2014 Free Software | 2 | Copyright (C) 1993-1994, 2005-2006, 2008-2015 Free Software |
| 3 | Foundation, Inc. | 3 | Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -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 */ |