From d46c6df554b71c54ed9b66122f90d79ef66f1d63 Mon Sep 17 00:00:00 2001
From: Nick Roberts <nickrob@snap.net.nz>
Date: Thu, 17 Aug 2006 21:00:44 +0000
Subject: (Fset_window_fringes): Do nothing on a tty. (Fwindow_fringes): Put ?
operator after the line break.
---
src/window.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
(limited to 'src/window.c')
diff --git a/src/window.c b/src/window.c
index 5a7655999f5..47c47fe0f51 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6656,10 +6656,12 @@ display marginal areas and the text area. */)
CHECK_NATNUM (left_width);
if (!NILP (right_width))
CHECK_NATNUM (right_width);
-
- if (!EQ (w->left_fringe_width, left_width)
- || !EQ (w->right_fringe_width, right_width)
- || !EQ (w->fringes_outside_margins, outside_margins))
+
+ /* 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)))
{
w->left_fringe_width = left_width;
w->right_fringe_width = right_width;
@@ -6687,10 +6689,11 @@ Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS). */)
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)));
}
--
cgit v1.2.3
From 017e297ea90933bfde94de5f90f9f9260ff032e8 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Fri, 18 Aug 2006 01:52:19 +0000
Subject: Comment change.
---
src/window.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/window.c')
diff --git a/src/window.c b/src/window.c
index 47c47fe0f51..ba8a541e779 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6657,7 +6657,7 @@ display marginal areas and the text area. */)
if (!NILP (right_width))
CHECK_NATNUM (right_width);
- /* Do nothing on a tty. */
+ /* 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)
--
cgit v1.2.3