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 trunk.
[bpt/emacs.git]
/
src
/
termhooks.h
diff --git
a/src/termhooks.h
b/src/termhooks.h
index
a050c32
..
9cea0c1
100644
(file)
--- a/
src/termhooks.h
+++ b/
src/termhooks.h
@@
-26,9
+26,6
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "systime.h" /* for Time */
INLINE_HEADER_BEGIN
#include "systime.h" /* for Time */
INLINE_HEADER_BEGIN
-#ifndef TERMHOOKS_INLINE
-# define TERMHOOKS_INLINE INLINE
-#endif
enum scroll_bar_part {
scroll_bar_nowhere = -1,
enum scroll_bar_part {
scroll_bar_nowhere = -1,
@@
-608,12
+605,12
@@
struct terminal
/* Most code should use these functions to set Lisp fields in struct
terminal. */
/* Most code should use these functions to set Lisp fields in struct
terminal. */
-
TERMHOOKS_
INLINE void
+INLINE void
tset_charset_list (struct terminal *t, Lisp_Object val)
{
t->charset_list = val;
}
tset_charset_list (struct terminal *t, Lisp_Object val)
{
t->charset_list = val;
}
-
TERMHOOKS_
INLINE void
+INLINE void
tset_selection_alist (struct terminal *t, Lisp_Object val)
{
t->Vselection_alist = val;
tset_selection_alist (struct terminal *t, Lisp_Object val)
{
t->Vselection_alist = val;
@@
-659,6
+656,14
@@
extern unsigned char *encode_terminal_code (struct glyph *, int,
extern void close_gpm (int gpm_fd);
#endif
extern void close_gpm (int gpm_fd);
#endif
+#ifdef WINDOWSNT
+extern int cursorX (struct tty_display_info *);
+extern int cursorY (struct tty_display_info *);
+#else
+#define cursorX(t) curX(t)
+#define cursorY(t) curY(t)
+#endif
+
INLINE_HEADER_END
#endif /* EMACS_TERMHOOKS_H */
INLINE_HEADER_END
#endif /* EMACS_TERMHOOKS_H */