diff options
| author | Juanma Barranquero | 2011-09-09 03:06:52 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-09-09 03:06:52 +0200 |
| commit | 5e617bc2b62189768814fafd1a875e89a094d3ef (patch) | |
| tree | d96d22e012035d044557abf4de0b8e30b03d61b7 /src/msdos.c | |
| parent | 9b1c252e294bed3aef0d2f2fc5d1fa9f72df9ee8 (diff) | |
| download | emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.tar.gz emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.zip | |
Whitespace changes.
Diffstat (limited to 'src/msdos.c')
| -rw-r--r-- | src/msdos.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/msdos.c b/src/msdos.c index 3f12bc85cbe..6b6e365a165 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -296,7 +296,7 @@ mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window, | |||
| 296 | FOR_EACH_FRAME (tail, frame) | 296 | FOR_EACH_FRAME (tail, frame) |
| 297 | XFRAME (frame)->mouse_moved = 0; | 297 | XFRAME (frame)->mouse_moved = 0; |
| 298 | 298 | ||
| 299 | *f = SELECTED_FRAME(); | 299 | *f = SELECTED_FRAME (); |
| 300 | *bar_window = Qnil; | 300 | *bar_window = Qnil; |
| 301 | mouse_get_xy (&ix, &iy); | 301 | mouse_get_xy (&ix, &iy); |
| 302 | *time = event_timestamp (); | 302 | *time = event_timestamp (); |
| @@ -310,7 +310,7 @@ mouse_check_moved (void) | |||
| 310 | int x, y; | 310 | int x, y; |
| 311 | 311 | ||
| 312 | mouse_get_xy (&x, &y); | 312 | mouse_get_xy (&x, &y); |
| 313 | SELECTED_FRAME()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y); | 313 | SELECTED_FRAME ()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y); |
| 314 | mouse_last_x = x; | 314 | mouse_last_x = x; |
| 315 | mouse_last_y = y; | 315 | mouse_last_y = y; |
| 316 | } | 316 | } |
| @@ -582,7 +582,7 @@ dos_set_window_size (int *rows, int *cols) | |||
| 582 | /* If the dimensions changed, the mouse highlight info is invalid. */ | 582 | /* If the dimensions changed, the mouse highlight info is invalid. */ |
| 583 | if (current_rows != *rows || current_cols != *cols) | 583 | if (current_rows != *rows || current_cols != *cols) |
| 584 | { | 584 | { |
| 585 | struct frame *f = SELECTED_FRAME(); | 585 | struct frame *f = SELECTED_FRAME (); |
| 586 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); | 586 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); |
| 587 | Lisp_Object window = hlinfo->mouse_face_window; | 587 | Lisp_Object window = hlinfo->mouse_face_window; |
| 588 | 588 | ||
| @@ -639,7 +639,7 @@ msdos_set_cursor_shape (struct frame *f, int start_line, int width) | |||
| 639 | /* Avoid the costly BIOS call if F isn't the currently selected | 639 | /* Avoid the costly BIOS call if F isn't the currently selected |
| 640 | frame. Allow for NULL as unconditionally meaning the selected | 640 | frame. Allow for NULL as unconditionally meaning the selected |
| 641 | frame. */ | 641 | frame. */ |
| 642 | if (f && f != SELECTED_FRAME()) | 642 | if (f && f != SELECTED_FRAME ()) |
| 643 | return; | 643 | return; |
| 644 | 644 | ||
| 645 | if (tty->termscript) | 645 | if (tty->termscript) |
| @@ -776,7 +776,7 @@ IT_ring_bell (struct frame *f) | |||
| 776 | static void | 776 | static void |
| 777 | IT_set_face (int face) | 777 | IT_set_face (int face) |
| 778 | { | 778 | { |
| 779 | struct frame *sf = SELECTED_FRAME(); | 779 | struct frame *sf = SELECTED_FRAME (); |
| 780 | struct face *fp = FACE_FROM_ID (sf, face); | 780 | struct face *fp = FACE_FROM_ID (sf, face); |
| 781 | struct face *dfp = FACE_FROM_ID (sf, DEFAULT_FACE_ID); | 781 | struct face *dfp = FACE_FROM_ID (sf, DEFAULT_FACE_ID); |
| 782 | unsigned long fg, bg, dflt_fg, dflt_bg; | 782 | unsigned long fg, bg, dflt_fg, dflt_bg; |
| @@ -868,7 +868,7 @@ IT_write_glyphs (struct frame *f, struct glyph *str, int str_len) | |||
| 868 | 868 | ||
| 869 | if (str_len <= 0) return; | 869 | if (str_len <= 0) return; |
| 870 | 870 | ||
| 871 | sf = SELECTED_FRAME(); | 871 | sf = SELECTED_FRAME (); |
| 872 | 872 | ||
| 873 | /* Since faces get cached and uncached behind our back, we can't | 873 | /* Since faces get cached and uncached behind our back, we can't |
| 874 | rely on their indices in the cache being consistent across | 874 | rely on their indices in the cache being consistent across |
| @@ -1755,7 +1755,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist) | |||
| 1755 | if (redraw) | 1755 | if (redraw) |
| 1756 | { | 1756 | { |
| 1757 | face_change_count++; /* forces xdisp.c to recompute basic faces */ | 1757 | face_change_count++; /* forces xdisp.c to recompute basic faces */ |
| 1758 | if (f == SELECTED_FRAME()) | 1758 | if (f == SELECTED_FRAME ()) |
| 1759 | redraw_frame (f); | 1759 | redraw_frame (f); |
| 1760 | } | 1760 | } |
| 1761 | } | 1761 | } |
| @@ -1772,7 +1772,7 @@ internal_terminal_init (void) | |||
| 1772 | { | 1772 | { |
| 1773 | static int init_needed = 1; | 1773 | static int init_needed = 1; |
| 1774 | char *term = getenv ("TERM"), *colors; | 1774 | char *term = getenv ("TERM"), *colors; |
| 1775 | struct frame *sf = SELECTED_FRAME(); | 1775 | struct frame *sf = SELECTED_FRAME (); |
| 1776 | struct tty_display_info *tty; | 1776 | struct tty_display_info *tty; |
| 1777 | 1777 | ||
| 1778 | #ifdef HAVE_X_WINDOWS | 1778 | #ifdef HAVE_X_WINDOWS |
| @@ -1923,7 +1923,7 @@ dos_get_saved_screen (char **screen, int *rows, int *cols) | |||
| 1923 | void | 1923 | void |
| 1924 | check_x (void) | 1924 | check_x (void) |
| 1925 | { | 1925 | { |
| 1926 | if (! FRAME_MSDOS_P (SELECTED_FRAME())) | 1926 | if (! FRAME_MSDOS_P (SELECTED_FRAME ())) |
| 1927 | error ("Not running under a window system"); | 1927 | error ("Not running under a window system"); |
| 1928 | } | 1928 | } |
| 1929 | 1929 | ||
| @@ -2442,12 +2442,12 @@ dos_rawgetc (void) | |||
| 2442 | { | 2442 | { |
| 2443 | struct input_event event; | 2443 | struct input_event event; |
| 2444 | union REGS regs; | 2444 | union REGS regs; |
| 2445 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME()); | 2445 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME ()); |
| 2446 | EVENT_INIT (event); | 2446 | EVENT_INIT (event); |
| 2447 | 2447 | ||
| 2448 | #ifndef HAVE_X_WINDOWS | 2448 | #ifndef HAVE_X_WINDOWS |
| 2449 | /* Maybe put the cursor where it should be. */ | 2449 | /* Maybe put the cursor where it should be. */ |
| 2450 | IT_cmgoto (SELECTED_FRAME()); | 2450 | IT_cmgoto (SELECTED_FRAME ()); |
| 2451 | #endif | 2451 | #endif |
| 2452 | 2452 | ||
| 2453 | /* The following condition is equivalent to `kbhit ()', except that | 2453 | /* The following condition is equivalent to `kbhit ()', except that |
| @@ -2692,7 +2692,7 @@ dos_rawgetc (void) | |||
| 2692 | /* Generate SELECT_WINDOW_EVENTs when needed. */ | 2692 | /* Generate SELECT_WINDOW_EVENTs when needed. */ |
| 2693 | if (!NILP (Vmouse_autoselect_window)) | 2693 | if (!NILP (Vmouse_autoselect_window)) |
| 2694 | { | 2694 | { |
| 2695 | mouse_window = window_from_coordinates (SELECTED_FRAME(), | 2695 | mouse_window = window_from_coordinates (SELECTED_FRAME (), |
| 2696 | mouse_last_x, | 2696 | mouse_last_x, |
| 2697 | mouse_last_y, | 2697 | mouse_last_y, |
| 2698 | 0, 0); | 2698 | 0, 0); |
| @@ -2718,7 +2718,7 @@ dos_rawgetc (void) | |||
| 2718 | previous_help_echo_string = help_echo_string; | 2718 | previous_help_echo_string = help_echo_string; |
| 2719 | help_echo_string = help_echo_object = help_echo_window = Qnil; | 2719 | help_echo_string = help_echo_object = help_echo_window = Qnil; |
| 2720 | help_echo_pos = -1; | 2720 | help_echo_pos = -1; |
| 2721 | note_mouse_highlight (SELECTED_FRAME(), mouse_last_x, mouse_last_y); | 2721 | note_mouse_highlight (SELECTED_FRAME (), mouse_last_x, mouse_last_y); |
| 2722 | /* If the contents of the global variable help_echo has | 2722 | /* If the contents of the global variable help_echo has |
| 2723 | changed, generate a HELP_EVENT. */ | 2723 | changed, generate a HELP_EVENT. */ |
| 2724 | if (!NILP (help_echo_string) || !NILP (previous_help_echo_string)) | 2724 | if (!NILP (help_echo_string) || !NILP (previous_help_echo_string)) |
| @@ -2913,7 +2913,7 @@ IT_menu_display (XMenu *menu, int y, int x, int pn, int *faces, int disp_help) | |||
| 2913 | int i, j, face, width, mx, my, enabled, mousehere, row, col; | 2913 | int i, j, face, width, mx, my, enabled, mousehere, row, col; |
| 2914 | struct glyph *text, *p; | 2914 | struct glyph *text, *p; |
| 2915 | const unsigned char *q; | 2915 | const unsigned char *q; |
| 2916 | struct frame *sf = SELECTED_FRAME(); | 2916 | struct frame *sf = SELECTED_FRAME (); |
| 2917 | 2917 | ||
| 2918 | menu_help_message = NULL; | 2918 | menu_help_message = NULL; |
| 2919 | 2919 | ||
| @@ -3092,7 +3092,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, | |||
| 3092 | int statecount, x, y, i, b, screensize, leave, result, onepane; | 3092 | int statecount, x, y, i, b, screensize, leave, result, onepane; |
| 3093 | int title_faces[4]; /* face to display the menu title */ | 3093 | int title_faces[4]; /* face to display the menu title */ |
| 3094 | int faces[4], buffers_num_deleted = 0; | 3094 | int faces[4], buffers_num_deleted = 0; |
| 3095 | struct frame *sf = SELECTED_FRAME(); | 3095 | struct frame *sf = SELECTED_FRAME (); |
| 3096 | Lisp_Object saved_echo_area_message, selectface; | 3096 | Lisp_Object saved_echo_area_message, selectface; |
| 3097 | 3097 | ||
| 3098 | /* Just in case we got here without a mouse present... */ | 3098 | /* Just in case we got here without a mouse present... */ |
| @@ -3539,10 +3539,10 @@ init_environment (int argc, char **argv, int skip_args) | |||
| 3539 | /* Some lusers set TMPDIR=e:, probably because some losing | 3539 | /* Some lusers set TMPDIR=e:, probably because some losing |
| 3540 | programs cannot handle multiple slashes if they use e:/. | 3540 | programs cannot handle multiple slashes if they use e:/. |
| 3541 | e: fails in `access' below, so we interpret e: as e:/. */ | 3541 | e: fails in `access' below, so we interpret e: as e:/. */ |
| 3542 | tmp_len = strlen(tmp); | 3542 | tmp_len = strlen (tmp); |
| 3543 | if (tmp[tmp_len - 1] != '/' && tmp[tmp_len - 1] != '\\') | 3543 | if (tmp[tmp_len - 1] != '/' && tmp[tmp_len - 1] != '\\') |
| 3544 | { | 3544 | { |
| 3545 | strcpy(buf, tmp); | 3545 | strcpy (buf, tmp); |
| 3546 | buf[tmp_len++] = '/', buf[tmp_len] = 0; | 3546 | buf[tmp_len++] = '/', buf[tmp_len] = 0; |
| 3547 | tmp = buf; | 3547 | tmp = buf; |
| 3548 | } | 3548 | } |