diff options
| author | Dan Nicolaescu | 2010-07-26 21:20:51 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-26 21:20:51 -0700 |
| commit | 37254dc10a10a40205644b670b20e757aa026343 (patch) | |
| tree | 2a2d18a98d633f70977d81213ae017c125350bc2 /src | |
| parent | 71c7345a4d4752181f220533a7b8494d0e60a9aa (diff) | |
| download | emacs-37254dc10a10a40205644b670b20e757aa026343.tar.gz emacs-37254dc10a10a40205644b670b20e757aa026343.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d11f2d91290..7cdbb5fc10a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2010-07-27 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-07-27 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * term.c (Qspace, QCalign_to, QCwidth): Remove declarations. | ||
| 4 | (encode_terminal_code, produce_composite_glyph): Remove unused variables. | ||
| 5 | (set_tty_color_mode, term_mouse_highlight, term_get_fkeys): Remove | ||
| 6 | local extern declarations. | ||
| 7 | |||
| 3 | * xmenu.c: Do not included lwlib.h, not needed. | 8 | * xmenu.c: Do not included lwlib.h, not needed. |
| 4 | 9 | ||
| 5 | * m/iris4d.h (XUINT, XSET): Remove, not needed. | 10 | * 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; | |||
| 132 | 132 | ||
| 133 | /* Display space properties */ | 133 | /* Display space properties */ |
| 134 | 134 | ||
| 135 | extern Lisp_Object Qspace, QCalign_to, QCwidth; | ||
| 136 | |||
| 137 | /* Functions to call after suspending a tty. */ | 135 | /* Functions to call after suspending a tty. */ |
| 138 | Lisp_Object Vsuspend_tty_functions; | 136 | Lisp_Object Vsuspend_tty_functions; |
| 139 | 137 | ||
| @@ -712,7 +710,7 @@ encode_terminal_code (struct glyph *src, int src_len, struct coding_system *codi | |||
| 712 | } | 710 | } |
| 713 | else | 711 | else |
| 714 | { | 712 | { |
| 715 | unsigned char *p = SDATA (string), *pend = p + SBYTES (string); | 713 | unsigned char *p = SDATA (string); |
| 716 | 714 | ||
| 717 | if (! STRING_MULTIBYTE (string)) | 715 | if (! STRING_MULTIBYTE (string)) |
| 718 | string = string_to_multibyte (string); | 716 | string = string_to_multibyte (string); |
| @@ -1383,7 +1381,6 @@ term_get_fkeys (char **address, KBOARD *kboard) | |||
| 1383 | function key specification, rather than giving the user an error and | 1381 | function key specification, rather than giving the user an error and |
| 1384 | refusing to run at all on such a terminal. */ | 1382 | refusing to run at all on such a terminal. */ |
| 1385 | 1383 | ||
| 1386 | extern Lisp_Object Fidentity (Lisp_Object); | ||
| 1387 | term_get_fkeys_address = address; | 1384 | term_get_fkeys_address = address; |
| 1388 | term_get_fkeys_kboard = kboard; | 1385 | term_get_fkeys_kboard = kboard; |
| 1389 | internal_condition_case (term_get_fkeys_1, Qerror, Fidentity); | 1386 | internal_condition_case (term_get_fkeys_1, Qerror, Fidentity); |
| @@ -1860,8 +1857,6 @@ append_composite_glyph (struct it *it) | |||
| 1860 | static void | 1857 | static void |
| 1861 | produce_composite_glyph (struct it *it) | 1858 | produce_composite_glyph (struct it *it) |
| 1862 | { | 1859 | { |
| 1863 | int c; | ||
| 1864 | |||
| 1865 | if (it->cmp_it.ch < 0) | 1860 | if (it->cmp_it.ch < 0) |
| 1866 | { | 1861 | { |
| 1867 | struct composition *cmp = composition_table[it->cmp_it.id]; | 1862 | 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) | |||
| 2256 | Lisp_Object tem, val; | 2251 | Lisp_Object tem, val; |
| 2257 | Lisp_Object color_mode; | 2252 | Lisp_Object color_mode; |
| 2258 | int mode; | 2253 | int mode; |
| 2259 | extern Lisp_Object Qtty_color_mode; | ||
| 2260 | Lisp_Object tty_color_mode_alist | 2254 | Lisp_Object tty_color_mode_alist |
| 2261 | = Fintern_soft (build_string ("tty-color-mode-alist"), Qnil); | 2255 | = Fintern_soft (build_string ("tty-color-mode-alist"), Qnil); |
| 2262 | 2256 | ||
| @@ -2795,7 +2789,6 @@ term_mouse_highlight (struct frame *f, int x, int y) | |||
| 2795 | 2789 | ||
| 2796 | /* Check for mouse-face. */ | 2790 | /* Check for mouse-face. */ |
| 2797 | { | 2791 | { |
| 2798 | extern Lisp_Object Qmouse_face; | ||
| 2799 | Lisp_Object mouse_face, overlay, position, *overlay_vec; | 2792 | Lisp_Object mouse_face, overlay, position, *overlay_vec; |
| 2800 | int noverlays, obegv, ozv; | 2793 | int noverlays, obegv, ozv; |
| 2801 | struct buffer *obuf; | 2794 | struct buffer *obuf; |