aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-05-12 09:38:09 -0700
committerPaul Eggert2011-05-12 09:38:09 -0700
commit841f1b75c4724d853b94ba6fd6e3b87571d3dca6 (patch)
tree8d69aaf74441688c1be55c5680e622bcb4c29bbb /src
parentd230cb74b5a1f6bb8d340e11ca1a661e5ce6a7ae (diff)
downloademacs-841f1b75c4724d853b94ba6fd6e3b87571d3dca6.tar.gz
emacs-841f1b75c4724d853b94ba6fd6e3b87571d3dca6.zip
* xselect.c (last_event_timestamp): Remove duplicate decl.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xselect.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 42c91399095..8dd4ba209c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-05-12 Paul Eggert <eggert@cs.ucla.edu> 12011-05-12 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xselect.c (last_event_timestamp): Remove duplicate decl.
4
3 * xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes 5 * xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes
4 that always fit in int. Use a sentinel instead of a counter, to 6 that always fit in int. Use a sentinel instead of a counter, to
5 avoid a temp and to allay GCC's concerns about possible int overflow. 7 avoid a temp and to allay GCC's concerns about possible int overflow.
diff --git a/src/xselect.c b/src/xselect.c
index f11fc40fce8..e279b398149 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -121,10 +121,6 @@ static Lisp_Object Qforeign_selection;
121 121
122#define SELECTION_QUANTUM(dpy) ((XMaxRequestSize(dpy) << 2) - 100) 122#define SELECTION_QUANTUM(dpy) ((XMaxRequestSize(dpy) << 2) - 100)
123 123
124/* The timestamp of the last input event Emacs received from the X server. */
125/* Defined in keyboard.c. */
126extern unsigned long last_event_timestamp;
127
128/* This is an association list whose elements are of the form 124/* This is an association list whose elements are of the form
129 ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) 125 ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME)
130 SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. 126 SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom.