From: Dan Nicolaescu Date: Tue, 27 Jul 2010 04:20:51 +0000 (-0700) Subject: Remove declarations and unused variables. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~122 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37254dc10a10a40205644b670b20e757aa026343;p=emacs.git Remove declarations and unused variables. * src/term.c (Qspace, QCalign_to, QCwidth): Remove declarations. (encode_terminal_code, produce_composite_glyph): Remove unused variables. (set_tty_color_mode, term_mouse_highlight, term_get_fkeys): Remove local extern declarations. --- diff --git a/src/ChangeLog b/src/ChangeLog index d11f2d91290..7cdbb5fc10a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2010-07-27 Dan Nicolaescu + * term.c (Qspace, QCalign_to, QCwidth): Remove declarations. + (encode_terminal_code, produce_composite_glyph): Remove unused variables. + (set_tty_color_mode, term_mouse_highlight, term_get_fkeys): Remove + local extern declarations. + * xmenu.c: Do not included lwlib.h, not needed. * m/iris4d.h (XUINT, XSET): Remove, not needed. diff --git a/src/term.c b/src/term.c index 25501370cdf..85f4f2b39dd 100644 --- a/src/term.c +++ b/src/term.c @@ -132,8 +132,6 @@ static int visible_cursor; /* Display space properties */ -extern Lisp_Object Qspace, QCalign_to, QCwidth; - /* Functions to call after suspending a tty. */ Lisp_Object Vsuspend_tty_functions; @@ -712,7 +710,7 @@ encode_terminal_code (struct glyph *src, int src_len, struct coding_system *codi } else { - unsigned char *p = SDATA (string), *pend = p + SBYTES (string); + unsigned char *p = SDATA (string); if (! STRING_MULTIBYTE (string)) string = string_to_multibyte (string); @@ -1383,7 +1381,6 @@ term_get_fkeys (char **address, KBOARD *kboard) function key specification, rather than giving the user an error and refusing to run at all on such a terminal. */ - extern Lisp_Object Fidentity (Lisp_Object); term_get_fkeys_address = address; term_get_fkeys_kboard = kboard; internal_condition_case (term_get_fkeys_1, Qerror, Fidentity); @@ -1860,8 +1857,6 @@ append_composite_glyph (struct it *it) static void produce_composite_glyph (struct it *it) { - int c; - if (it->cmp_it.ch < 0) { struct composition *cmp = composition_table[it->cmp_it.id]; @@ -2256,7 +2251,6 @@ set_tty_color_mode (struct tty_display_info *tty, struct frame *f) Lisp_Object tem, val; Lisp_Object color_mode; int mode; - extern Lisp_Object Qtty_color_mode; Lisp_Object tty_color_mode_alist = Fintern_soft (build_string ("tty-color-mode-alist"), Qnil); @@ -2795,7 +2789,6 @@ term_mouse_highlight (struct frame *f, int x, int y) /* Check for mouse-face. */ { - extern Lisp_Object Qmouse_face; Lisp_Object mouse_face, overlay, position, *overlay_vec; int noverlays, obegv, ozv; struct buffer *obuf;