diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xselect.c | 4 |
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 @@ 2011-05-12 Paul Eggert <eggert@cs.ucla.edu> + * xselect.c (last_event_timestamp): Remove duplicate decl. + * xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes that always fit in int. Use a sentinel instead of a counter, to 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; #define SELECTION_QUANTUM(dpy) ((XMaxRequestSize(dpy) << 2) - 100) -/* The timestamp of the last input event Emacs received from the X server. */ -/* Defined in keyboard.c. */ -extern unsigned long last_event_timestamp; - /* This is an association list whose elements are of the form ( SELECTION-NAME SELECTION-VALUE SELECTION-TIMESTAMP FRAME) SELECTION-NAME is a lisp symbol, whose name is the name of an X Atom. |