[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/line-numbers 9776d7b 05/14: Don't display line num
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] scratch/line-numbers 9776d7b 05/14: Don't display line numbers in the minibuffer and in tooltip frames. |
Date: |
Sat, 24 Jun 2017 13:12:52 -0400 (EDT) |
branch: scratch/line-numbers
commit 9776d7bcf044722909c10c9395d18c81641f27d0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Don't display line numbers in the minibuffer and in tooltip frames.
---
src/xdisp.c | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 9b57625..19e3efb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21002,13 +21002,23 @@ display_line (struct it *it, int cursor_vpos)
min_bpos = BYTEPOS (this_line_min_pos);
/* Produce line number, if needed. */
- if (!NILP (Vdisplay_line_numbers))
+ if (!NILP (Vdisplay_line_numbers)
+#ifdef HAVE_WINDOW_SYSTEM
+ && !(FRAMEP (tip_frame)
+ && EQ (WINDOW_FRAME (it->w), tip_frame))
+#endif
+ && (!MINI_WINDOW_P (it->w)))
maybe_produce_line_number (it);
}
else if (it->area == TEXT_AREA)
{
/* Line numbers should precede the line-prefix or wrap-prefix. */
- if (!NILP (Vdisplay_line_numbers))
+ if (!NILP (Vdisplay_line_numbers)
+#ifdef HAVE_WINDOW_SYSTEM
+ && !(FRAMEP (tip_frame)
+ && EQ (WINDOW_FRAME (it->w), tip_frame))
+#endif
+ && (!MINI_WINDOW_P (it->w)))
maybe_produce_line_number (it);
/* We only do this when not calling move_it_in_display_line_to
@@ -21091,8 +21101,7 @@ display_line (struct it *it, int cursor_vpos)
row->displays_text_p = false;
if (!NILP (BVAR (XBUFFER (it->w->contents), indicate_empty_lines))
- && (!MINI_WINDOW_P (it->w)
- || (minibuf_level && EQ (it->window, minibuf_window))))
+ && (!MINI_WINDOW_P (it->w)))
row->indicate_empty_line_p = true;
}
@@ -21175,7 +21184,13 @@ display_line (struct it *it, int cursor_vpos)
if (it->area == TEXT_AREA && pending_handle_line_prefix)
{
/* Line numbers should precede the line-prefix or wrap-prefix. */
- if (!NILP (Vdisplay_line_numbers))
+ if (!NILP (Vdisplay_line_numbers)
+#ifdef HAVE_WINDOW_SYSTEM
+ && !(FRAMEP (tip_frame)
+ && EQ (WINDOW_FRAME (it->w), tip_frame))
+#endif
+ && (!MINI_WINDOW_P (it->w)
+ || (minibuf_level && EQ (it->window, minibuf_window))))
maybe_produce_line_number (it);
pending_handle_line_prefix = false;
- [Emacs-diffs] scratch/line-numbers updated (7277c0f -> ead4ab6), Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 5b648ac 04/14: Fix problems with line-number updates in Follow mode, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 77f8b86 03/14: Fix display of line numbers with fonts larger than the default, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers bbaf2f3 02/14: Fix background color beyond EOB and cursor display, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 9776d7b 05/14: Don't display line numbers in the minibuffer and in tooltip frames.,
Eli Zaretskii <=
- [Emacs-diffs] scratch/line-numbers ead4ab6 14/14: Improve documentation in NEWS., Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers efedb66 08/14: Rename display-line-width, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 13cc19a 12/14: Partial fix of hscroll of truncated lines with line numbers, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 7d7602c 06/14: Fix crashes on TTY frames due to negative lnum_width., Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 55a9298 07/14: Fix tab stops when line numbers are displayed, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 71a7294 10/14: Support a separate face for displaying the current line's number, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers d4eddb0 01/14: Fix display of indicate-empty-lines when line numbers are displayed, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 0d5c713 13/14: Move additional hscrolling code into a suitable 'if', Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers fa5e84c 09/14: Change display of current line in relative mode, Eli Zaretskii, 2017/06/24
- [Emacs-diffs] scratch/line-numbers 6e18841 11/14: Allow Lisp program to disable line-number display for specific lines, Eli Zaretskii, 2017/06/24