diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2022-06-02 21:12:04 -0700 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-06-09 10:08:15 +0300 |
| commit | 43f8690ebf3439af90cf72c619e75afb4cff1a83 (patch) | |
| tree | 9572243dd76216782e643fc4ccba8411f5cc4713 /lisp/eshell/em-ls.el | |
| parent | d18e60fef172cf38b92108144f54ed10ddf67488 (diff) | |
| download | emacs-43f8690ebf3439af90cf72c619e75afb4cff1a83.tar.gz emacs-43f8690ebf3439af90cf72c619e75afb4cff1a83.tar.bz2 emacs-43f8690ebf3439af90cf72c619e75afb4cff1a83.zip | |
Account for remapped faces in $COLUMNS and $LINES in Eshell
* src/window.h (window_body_unit): New enum...
(window_body_width): ... use it.
* src/window.c (window_body_unit_from_symbol): New function.
(window_body_height, window_body_width): Make PIXELWISE a
'window_body_unit'.
(window-body-height, window-body-width): Accept 'remap' for PIXELWISE.
(window-lines-pixel-dimensions, window_change_record_windows)
(run_window_change_functions, resize_frame_windows, grow_mini_window)
(shrink_mini_window, scroll-left, scroll-right): Update calls to
'window_body_height' and 'window_body_width'.
* src/indent.c (compute_motion): Update calls to 'window_body_width'.
* lisp/eshell/em-ls.el (eshell-ls-find-column-widths)
(eshell-ls-find-column-lengths): Use 'window-body-width'.
* lisp/eshell/esh-var.el (eshell-variable-aliases-list): Use
'window-body-width' and 'window-body-height'.
* test/lisp/eshell/esh-var-tests.el (esh-var-test/window-height)
(esh-var-test/window-width): Rename to...
(esh-var-test/lines-var, esh-var-test/columns-var): ... and update
expected value.
* doc/lispref/windows.texi (Window Sizes): Document new behavior of
PIXELWISE argument for 'window-body-width' and 'window-body-height'.
* etc/NEWS: Announce this change (bug#55696).
Diffstat (limited to 'lisp/eshell/em-ls.el')
| -rw-r--r-- | lisp/eshell/em-ls.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 874591d2501..bebb0d81b5b 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -800,7 +800,7 @@ to use, and each member of which is the width of that column (+ 2 (length (car file)))) files)) ;; must account for the added space... - (max-width (+ (window-width) 2)) + (max-width (+ (window-body-width nil 'remap) 2)) (best-width 0) col-widths) @@ -845,7 +845,7 @@ to use, and each member of which is the width of that column (lambda (file) (+ 2 (length (car file)))) files)) - (max-width (+ (window-width) 2)) + (max-width (+ (window-body-width nil 'remap) 2)) col-widths colw) |