Mercurial > emacs
changeset 72437:bdd61b05f84f
(Fset_window_fringes): Do nothing on a tty.
(Fwindow_fringes): Put ? operator after the line break.
| author | Nick Roberts <nickrob@snap.net.nz> |
|---|---|
| date | Thu, 17 Aug 2006 21:00:44 +0000 |
| parents | 34e079ee9d15 |
| children | d08eb7bd3ca2 |
| files | src/window.c |
| diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Thu Aug 17 21:00:13 2006 +0000 +++ b/src/window.c Thu Aug 17 21:00:44 2006 +0000 @@ -6656,10 +6656,12 @@ 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 @@ 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))); }