Mercurial > emacs
diff src/xterm.c @ 83277:886073e54ccb
Fix some superflous deviations from CVS, plus apply some cosmetics.
* etc/TODO: Fix deviation from CVS.
* lisp/emulation/viper-util.el: Ditto.
* lisp/international/mule-cmds.el: Ditto.
* lisp/progmodes/gdb-ui.el: Ditto.
* src/termchar.h: Ditto.
* src/xfns.c (Fx_create_frame): Ditto.
* lisp/term/rxvt.el: Don't embed `(require 'server)' in eval-when-compile.
* lisp/term/xterm.el: Ditto.
* src/xterm.c (x_delete_display): Cosmetic change.
* src/xterm.c (x_create_frame_display): Cosmetic change.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-317
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 23 Mar 2005 12:53:42 +0000 |
parents | 87d0734390da |
children | 0a18b9f190e2 |
line wrap: on
line diff
--- a/src/xterm.c Wed Mar 23 10:40:00 2005 +0000 +++ b/src/xterm.c Wed Mar 23 12:53:42 2005 +0000 @@ -482,6 +482,7 @@ /* Nothing to do. */ } + /* Start update of window W. Set the global variable updated_window to the window being updated and set output_cursor to the cursor position of W. */ @@ -7542,7 +7543,7 @@ { Lisp_Object first = XCAR (old_val); Display *dpy = XSAVE_VALUE (first)->pointer; - + /* The display may have been closed before this function is called. Check if it is still open before calling XSync. */ if (x_display_info_for_display (dpy) != 0) @@ -10618,17 +10619,15 @@ struct x_display_info *dpyinfo; { int i; - - { - /* Delete the generic struct display for this X display. */ - struct display *d; - for (d = display_list; d; d = d->next_display) - if (d->type == output_x_window && d->display_info.x == dpyinfo) - { - delete_display (d); - break; - } - } + struct display *d; + + /* Delete the generic struct display for this X display. */ + for (d = display_list; d; d = d->next_display) + if (d->type == output_x_window && d->display_info.x == dpyinfo) + { + delete_display (d); + break; + } delete_keyboard_wait_descriptor (dpyinfo->connection); @@ -10826,11 +10825,11 @@ display->delete_display_hook = x_delete_frame_display; display->rif = &x_redisplay_interface; - display->scroll_region_ok = 1; /* We'll scroll partial frames. */ + display->scroll_region_ok = 1; /* We'll scroll partial frames. */ display->char_ins_del_ok = 1; - display->line_ins_del_ok = 1; /* We'll just blt 'em. */ - display->fast_clear_end_of_line = 1; /* X does this well. */ - display->memory_below_frame = 0; /* We don't remember what scrolls + display->line_ins_del_ok = 1; /* We'll just blt 'em. */ + display->fast_clear_end_of_line = 1; /* X does this well. */ + display->memory_below_frame = 0; /* We don't remember what scrolls off the bottom. */ return display;