Mercurial > emacs
comparison src/term.c @ 112434:9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 22 Jan 2011 18:56:06 -0800 |
| parents | 42e22c4f06b7 |
| children |
comparison
equal
deleted
inserted
replaced
| 112433:7b649f6eac4f | 112434:9de5a68b57e1 |
|---|---|
| 1947 if (it->glyphless_method == GLYPHLESS_DISPLAY_ACRONYM) | 1947 if (it->glyphless_method == GLYPHLESS_DISPLAY_ACRONYM) |
| 1948 { | 1948 { |
| 1949 if (! STRINGP (acronym) && CHAR_TABLE_P (Vglyphless_char_display)) | 1949 if (! STRINGP (acronym) && CHAR_TABLE_P (Vglyphless_char_display)) |
| 1950 acronym = CHAR_TABLE_REF (Vglyphless_char_display, it->c); | 1950 acronym = CHAR_TABLE_REF (Vglyphless_char_display, it->c); |
| 1951 buf[0] = '['; | 1951 buf[0] = '['; |
| 1952 str = STRINGP (acronym) ? (char *) SDATA (acronym) : ""; | 1952 str = STRINGP (acronym) ? SSDATA (acronym) : ""; |
| 1953 for (len = 0; len < 6 && str[len] && ASCII_BYTE_P (str[len]); len++) | 1953 for (len = 0; len < 6 && str[len] && ASCII_BYTE_P (str[len]); len++) |
| 1954 buf[1 + len] = str[len]; | 1954 buf[1 + len] = str[len]; |
| 1955 buf[1 + len] = ']'; | 1955 buf[1 + len] = ']'; |
| 1956 len += 2; | 1956 len += 2; |
| 1957 } | 1957 } |
| 3155 #ifdef HAVE_GPM | 3155 #ifdef HAVE_GPM |
| 3156 terminal->mouse_position_hook = term_mouse_position; | 3156 terminal->mouse_position_hook = term_mouse_position; |
| 3157 tty->mouse_highlight.mouse_face_window = Qnil; | 3157 tty->mouse_highlight.mouse_face_window = Qnil; |
| 3158 #endif | 3158 #endif |
| 3159 | 3159 |
| 3160 | 3160 |
| 3161 #ifndef DOS_NT | 3161 #ifndef DOS_NT |
| 3162 set_tty_hooks (terminal); | 3162 set_tty_hooks (terminal); |
| 3163 | 3163 |
| 3164 { | 3164 { |
| 3165 int fd; | 3165 int fd; |
| 3798 #endif /* !DOS_NT */ | 3798 #endif /* !DOS_NT */ |
| 3799 | 3799 |
| 3800 encode_terminal_src = NULL; | 3800 encode_terminal_src = NULL; |
| 3801 encode_terminal_dst = NULL; | 3801 encode_terminal_dst = NULL; |
| 3802 } | 3802 } |
| 3803 |