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

3 files changed, 17 insertions, 18 deletions

diff --git a/src/termchar.h b/src/termchar.h
index 1a9d6015148..5502ca22949 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -1,5 +1,5 @@
 /* Flags and parameters describing terminal's characteristics.
-   Copyright (C) 1985, 1986, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xfns.c b/src/xfns.c
index 6ff6b16d5b4..66f0a2e94a4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4756,7 +4756,7 @@ x_create_tip_frame (dpyinfo, parms, text)
   x_default_parameter (f, parms, Qborder_width, make_number (2),
 		       "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
 
-  /* This defaults to 1 in order to match xterm.  We recognize either
+  /* This defaults to 2 in order to match xterm.  We recognize either
      internalBorderWidth or internalBorder (which is what xterm calls
      it).  */
   if (NILP (Fassq (Qinternal_border_width, parms)))
diff --git a/src/xterm.c b/src/xterm.c
index c47b52d881c..c64a73d8aa6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -482,6 +482,7 @@ x_update_begin (f)
   /* 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 @@ x_catch_errors_unwind (old_val)
 {
   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 @@ x_delete_display (dpyinfo)
      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 @@ x_create_frame_display (struct x_display_info *dpyinfo)
   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;