[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#32536: displayed width of man pages
From: |
Juri Linkov |
Subject: |
bug#32536: displayed width of man pages |
Date: |
Sun, 02 Sep 2018 01:27:20 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) |
> While you're there could you please do some idiomatic changes that
> avoid selecting a window in order to calculate its width:
>
> For example, replace
>
> (let ((width
> (if (window-live-p (get-buffer-window (current-buffer) t))
> (with-selected-window (get-buffer-window (current-buffer) t)
> (window-width))
> (window-width)))))
>
> with something like
>
> (window-width (get-buffer-window nil t))
>
> and
>
> (if (window-live-p (get-buffer-window (current-buffer) t))
> (with-selected-window (get-buffer-window (current-buffer) t)
> (frame-width))
> (frame-width))
>
> with something like
>
> (let ((window (get-buffer-window nil t)))
> (frame-width (and window (window-frame window))))
>
> Probably you also want to add a version tag for 'Man-width'.
Right, fixed in the next patch where a version tag is added not to
`Man-width', but to the new customizable variable `Man-width-max'.
This is better since like when man-pages are formatted in their
web versions they limit the width using the CSS property `max-width',
so like CSS has both `width' and `max-width', man.el will have
`Man-width' and `Man-width-max'.
Regarding the request for dynamic reformatting, I'm not sure if
man pages should be reformatted on resizing windows (I remember
seeing a window resize hook, but can't find it now).
Such window resize is necessary also for some other modes,
for example, when a visited image is saved to the desktop file,
it has a wrong size after loading the desktop, because the
image size is calculated when the image file is not yet displayed
in a window. The image size should be recalculated after
displaying the image buffer.
diff --git a/lisp/man.el b/lisp/man.el
index 1a6eda13b7..08a913b119 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -182,6 +182,20 @@ Man-width
(integer :tag "Fixed width" :value 65))
:group 'man)
+(defcustom Man-width-max nil
+ "Maximum number of columns allowed for the width of manual pages.
+It defines the maximum width for the case when `Man-width' is customized
+to a dynamically calculated value depending on the frame/window width.
+If the width calculated for `Man-width' is larger than the maximum width,
+it will be automatically reduced to the width defined by this variable.
+If the calculated width is smaller than the maximum width, the value
+of this variable has no effect.
+When nil, there is no limit on maximum width."
+ :type '(choice (const :tag "No limit" nil)
+ (integer :tag "Max width" :value 80))
+ :version "27.1"
+ :group 'man)
+
(defcustom Man-frame-parameters nil
"Frame parameter list for creating a new frame for a manual page."
:type '(repeat (cons :format "%v"
@@ -1041,20 +1055,19 @@ Man-start-calling
(not (or (getenv "MANWIDTH") (getenv "COLUMNS"))))
;; Since the page buffer is displayed beforehand,
;; we can select its window and get the window/frame width.
- (setenv "COLUMNS" (number-to-string
- (cond
- ((and (integerp Man-width) (> Man-width 0))
- Man-width)
- (Man-width
- (if (window-live-p (get-buffer-window
(current-buffer) t))
- (with-selected-window (get-buffer-window
(current-buffer) t)
- (frame-width))
- (frame-width)))
- (t
- (if (window-live-p (get-buffer-window
(current-buffer) t))
- (with-selected-window (get-buffer-window
(current-buffer) t)
- (window-width))
- (window-width)))))))
+ (let ((width (cond
+ ((and (integerp Man-width) (> Man-width 0))
+ Man-width)
+ (Man-width
+ (let ((window (get-buffer-window nil t)))
+ (frame-width (and window (window-frame window)))))
+ (t
+ (window-width (get-buffer-window nil t))))))
+ (when (and (integerp Man-width-max)
+ (> Man-width-max 0)
+ (> width Man-width-max))
+ (setq width (min width Man-width-max)))
+ (setenv "COLUMNS" (number-to-string width))))
;; Since man-db 2.4.3-1, man writes plain text with no escape
;; sequences when stdout is not a tty. In 2.5.0, the following
;; env-var was added to allow control of this (see Debian Bug#340673).
- bug#32536: displayed width of man pages,
Juri Linkov <=
- bug#32536: displayed width of man pages, martin rudalics, 2018/09/02
- bug#32536: displayed width of man pages, Juri Linkov, 2018/09/02
- bug#32536: displayed width of man pages, martin rudalics, 2018/09/03
- bug#32536: displayed width of man pages, Juri Linkov, 2018/09/03
- bug#32536: displayed width of man pages, martin rudalics, 2018/09/04
- bug#32536: displayed width of man pages, Juri Linkov, 2018/09/04
- bug#32536: displayed width of man pages, martin rudalics, 2018/09/05
- bug#32536: displayed width of man pages, hw, 2018/09/04
- bug#32536: displayed width of man pages, Juri Linkov, 2018/09/04
- bug#32536: displayed width of man pages, hw, 2018/09/04