diff options
| author | Nick Roberts <nickrob@snap.net.nz> | 2006-08-17 21:00:44 +0000 |
|---|---|---|
| committer | Nick Roberts <nickrob@snap.net.nz> | 2006-08-17 21:00:44 +0000 |
| commit | d46c6df554b71c54ed9b66122f90d79ef66f1d63 (patch) | |
| tree | 52c37f47ceb0fabce12dabf721e785e54ef98530 /src/window.c | |
| parent | 454e31b372768c8fb24eb10150e4032e3833af90 (diff) | |
| download | emacs-d46c6df554b71c54ed9b66122f90d79ef66f1d63.tar.gz | |
(Fset_window_fringes): Do nothing on a tty.
(Fwindow_fringes): Put ? operator after the line break.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 15 |
1 files changed, 9 insertions, 6 deletions
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))); } |