diff options
| author | Eli Zaretskii | 2017-07-08 10:49:36 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-07-08 10:49:36 +0300 |
| commit | 5df239fc6ffbbb16ea6e5546fbec1508bf2cb4b7 (patch) | |
| tree | 9b1b8baff1c3ca9c9c560460b34a7951723f621c /src/buffer.c | |
| parent | b8ead34f5df92b771520f4d090ff6cde49ca5705 (diff) | |
| parent | 13786d5e7d0aa0a37d7f81d1a1b82eddd3472796 (diff) | |
| download | emacs-5df239fc6ffbbb16ea6e5546fbec1508bf2cb4b7.tar.gz emacs-5df239fc6ffbbb16ea6e5546fbec1508bf2cb4b7.zip | |
Support display of line numbers natively
This merges branch 'line-numbers'.
* src/buffer.c (disable_line_numbers_overlay_at_eob): New
function.
* src/lisp.h (disable_line_numbers_overlay_at_eob): Add prototype.
* src/dispextern.h (struct it): New members pt_lnum, lnum,
lnum_bytepos, lnum_width, and lnum_pixel_width.
* src/indent.c (line_number_display_width): New function,
refactored from line-number width calculations in vertical-motion.
(Fvertical_motion): Call line_number_display_width when the width
of line-number display is needed.
(Fline_number_display_width): New defun.
(syms_of_indent): Defsubr it.
* src/indent.c (Fvertical_motion): Help C-n/C-p estimate correctly
the width used up by line numbers by looking near the window-start
point. If window-start is outside of the accessible portion,
temporarily widen the buffer.
* src/term.c (produce_glyphs): Adjust tab stops for the horizontal
space taken by the line-number display.
* src/xdisp.c (display_count_lines_logically)
(display_count_lines_visually, maybe_produce_line_number)
(should_produce_line_number, row_text_area_empty): New functions.
(try_window_reusing_current_matrix): Don't use this method when
display-line-numbers is in effect.
(try_window_id, try_cursor_movement): Disable these optimizations
when the line-number-current-line face is different from
line-number face and for relative line numbers.
(try_window_id, redisplay_window, try_cursor_movement): For
visual line-number display, disable the same redisplay
optimizations as for relative.
(x_produce_glyphs): Adjust tab stops for the horizontal
space taken by the line-number display.
(hscroll_window_tree): Adjust hscroll calculations to line-number
display.
(DISP_INFINITY): Renamed from INFINITY to avoid clashes with
math.h; all users changed.
(set_cursor_from_row): Fix calculation of cursor X coordinate in
R2L rows with display-produced glyphs at the beginning.
(display_line): Use should_produce_line_number to determine
whether a line number should be produced for each glyph row, and
maybe_produce_line_number to produce line numbers.
Don't display line numbers in the minibuffer and in tooltip
frames.
Call row_text_area_empty to verify that a glyph
row's text area is devoid of any glyphs that came from a buffer or
a string. This fixes a bug with empty-lines indication
disappearing when line numbers or line-prefix are displayed.
(syms_of_xdisp) <display-line-numbers, display-line-numbers-widen>
<display-line-number-width>: New buffer-local variables.
<display-line-numbers-current-absolute>: New variable.
* lisp/cus-start.el (standard): Provide customization forms for
display-line-numbers and its sub-features.
* lisp/faces.el (line-number, line-number-current-line): New faces.
* lisp/frame.el: Add display-line-numbers, display-line-numbers-widen,
display-line-numbers-current-absolute, and
display-line-number-width to the list of variables that should
trigger redisplay of the current buffer.
* lisp/menu-bar.el (menu-bar-showhide-menu): Add menu-bar item to
turn display-line-numbers on and off.
(toggle-display-line-numbers): New function.
* lisp/simple.el (last--line-number-width): New internal variable.
(line-move-visual): Use it to adjust temporary-goal-column when
line-number display changes its width.
* doc/emacs/basic.texi (Position Info): Add cross-reference to
"Display Custom", for line-number display.
* doc/emacs/custom.texi (Init Rebinding):
* doc/emacs/modes.texi (Minor Modes): Remove references to
linum-mode.
* doc/emacs/display.texi (Display Custom): Describe the
line-number display.
* doc/lispref/display.texi (Size of Displayed Text): Document
line-number-display-width.
* etc/NEWS: Document display-line-numbers and its customizations.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c index 80dbd3318dc..780e4d7a7d6 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -3054,6 +3054,33 @@ mouse_face_overlay_overlaps (Lisp_Object overlay) | |||
| 3054 | return i < n; | 3054 | return i < n; |
| 3055 | } | 3055 | } |
| 3056 | 3056 | ||
| 3057 | /* Return the value of the 'display-line-numbers-disable' property at | ||
| 3058 | EOB, if there's an overlay at ZV with a non-nil value of that property. */ | ||
| 3059 | Lisp_Object | ||
| 3060 | disable_line_numbers_overlay_at_eob (void) | ||
| 3061 | { | ||
| 3062 | ptrdiff_t n, i, size; | ||
| 3063 | Lisp_Object *v, tem = Qnil; | ||
| 3064 | Lisp_Object vbuf[10]; | ||
| 3065 | USE_SAFE_ALLOCA; | ||
| 3066 | |||
| 3067 | size = ARRAYELTS (vbuf); | ||
| 3068 | v = vbuf; | ||
| 3069 | n = overlays_in (ZV, ZV, 0, &v, &size, NULL, NULL); | ||
| 3070 | if (n > size) | ||
| 3071 | { | ||
| 3072 | SAFE_NALLOCA (v, 1, n); | ||
| 3073 | overlays_in (ZV, ZV, 0, &v, &n, NULL, NULL); | ||
| 3074 | } | ||
| 3075 | |||
| 3076 | for (i = 0; i < n; ++i) | ||
| 3077 | if ((tem = Foverlay_get (v[i], Qdisplay_line_numbers_disable), | ||
| 3078 | !NILP (tem))) | ||
| 3079 | break; | ||
| 3080 | |||
| 3081 | SAFE_FREE (); | ||
| 3082 | return tem; | ||
| 3083 | } | ||
| 3057 | 3084 | ||
| 3058 | 3085 | ||
| 3059 | /* Fast function to just test if we're at an overlay boundary. */ | 3086 | /* Fast function to just test if we're at an overlay boundary. */ |