[Emacs-diffs] Changes to emacs/src/window.c,v

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Nick Roberts <nickrob>  06/08/17 21:00:44

Index: window.c
===================================================================
RCS file: /sources/emacs/emacs/src/window.c,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -b -r1.553 -r1.554
--- window.c    18 Jul 2006 13:29:55 -0000      1.553
+++ window.c    17 Aug 2006 21:00:44 -0000      1.554
@@ -6657,9 +6657,11 @@
   if (!NILP (right_width))
     CHECK_NATNUM (right_width);
 
-  if (!EQ (w->left_fringe_width, left_width)
+      /* Do nothing on a tty.  */
+  if (FRAME_WINDOW_P (WINDOW_XFRAME (w))
+      && (!EQ (w->left_fringe_width, left_width)
       || !EQ (w->right_fringe_width, right_width)
-      || !EQ (w->fringes_outside_margins, outside_margins))
+         || !EQ (w->fringes_outside_margins, outside_margins)))
     {
       w->left_fringe_width = left_width;
       w->right_fringe_width = right_width;
@@ -6687,10 +6689,11 @@
      Lisp_Object window;
 {
   struct window *w = decode_window (window);
+
   return Fcons (make_number (WINDOW_LEFT_FRINGE_WIDTH (w)),
                Fcons (make_number (WINDOW_RIGHT_FRINGE_WIDTH (w)),
-                      Fcons ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) ?
-                              Qt : Qnil), Qnil)));
+                      Fcons ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
+                              ? Qt : Qnil), Qnil)));
 }