HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org
[bpt/emacs.git]
/
src
/
w32inevt.h
diff --git
a/src/w32inevt.h
b/src/w32inevt.h
index
9ca5250
..
8a7e4fe
100644
(file)
--- a/
src/w32inevt.h
+++ b/
src/w32inevt.h
@@
-1,5
+1,5
@@
-/* Input routines for GNU Emacs on the Microsoft W
32
API.
- Copyright (C) 1995, 2001-201
1
Free Software Foundation, Inc.
+/* Input routines for GNU Emacs on the Microsoft W
indows
API.
+ Copyright (C) 1995, 2001-201
3
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-19,7
+19,9
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef EMACS_W32INEVT_H
#define EMACS_W32INEVT_H
#ifndef EMACS_W32INEVT_H
#define EMACS_W32INEVT_H
-extern int w32_console_read_socket (struct terminal *term, int numchars,
+extern int w32_console_unicode_input;
+
+extern int w32_console_read_socket (struct terminal *term,
struct input_event *hold_quit);
extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
Lisp_Object *bar_window,
struct input_event *hold_quit);
extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
Lisp_Object *bar_window,
@@
-28,4
+30,3
@@
extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
unsigned long *time);
#endif /* EMACS_W32INEVT_H */
unsigned long *time);
#endif /* EMACS_W32INEVT_H */
-