aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-09-29 20:56:48 +0000
committerStefan Monnier2007-09-29 20:56:48 +0000
commitb870aa6115a0d0fdaa7e964318274511099fcbb6 (patch)
tree4ba409338c74792d780b96422494f9b2bb653968
parent4c37a4144709f6b4649de6bbbe335b280d53781e (diff)
downloademacs-b870aa6115a0d0fdaa7e964318274511099fcbb6.tar.gz
emacs-b870aa6115a0d0fdaa7e964318274511099fcbb6.zip
(term_clear_mouse_face, term_mouse_highlight)
(tty_write_glyphs_with_face): Only define is HAVE_GPM.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/term.c10
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0f2e34fe94e..70fbaad280e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12007-09-29 Stefan Monnier <monnier@iro.umontreal.ca> 12007-09-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * term.c (term_clear_mouse_face, term_mouse_highlight)
4 (tty_write_glyphs_with_face): Only define is HAVE_GPM.
5
3 * print.c (safe_debug_print): Use XHASH. 6 * print.c (safe_debug_print): Use XHASH.
4 7
5 * lisp.h (DECL_ALIGN, USE_LSB_TAG): Move logic to before definition of 8 * lisp.h (DECL_ALIGN, USE_LSB_TAG): Move logic to before definition of
diff --git a/src/term.c b/src/term.c
index f00f7b2fb75..a6c69c71bef 100644
--- a/src/term.c
+++ b/src/term.c
@@ -182,15 +182,15 @@ static int system_uses_terminfo;
182char *tparam (); 182char *tparam ();
183 183
184extern char *tgetstr (); 184extern char *tgetstr ();
185
186static void term_clear_mouse_face ();
187static void term_mouse_highlight (struct frame *f, int x, int y);
188 185
189 186
190#ifdef HAVE_GPM 187#ifdef HAVE_GPM
191#include <sys/fcntl.h> 188#include <sys/fcntl.h>
192#include "buffer.h" 189#include "buffer.h"
193 190
191static void term_clear_mouse_face ();
192static void term_mouse_highlight (struct frame *f, int x, int y);
193
194/* The device for which we have enabled gpm support (or NULL). */ 194/* The device for which we have enabled gpm support (or NULL). */
195struct tty_display_info *gpm_tty = NULL; 195struct tty_display_info *gpm_tty = NULL;
196 196
@@ -739,6 +739,8 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
739 cmcheckmagic (tty); 739 cmcheckmagic (tty);
740} 740}
741 741
742#ifdef HAVE_GPM /* Only used by GPM code. */
743
742static void 744static void
743tty_write_glyphs_with_face (f, string, len, face_id) 745tty_write_glyphs_with_face (f, string, len, face_id)
744 register struct frame *f; 746 register struct frame *f;
@@ -797,7 +799,7 @@ tty_write_glyphs_with_face (f, string, len, face_id)
797 799
798 cmcheckmagic (tty); 800 cmcheckmagic (tty);
799} 801}
800 802#endif
801 803
802/* An implementation of insert_glyphs for termcap frames. */ 804/* An implementation of insert_glyphs for termcap frames. */
803 805