From 35f5afbca1779f7b6d1d78cae97437a56fd5a9ba Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 13 Nov 2015 11:23:35 +0200 Subject: [PATCH] Fix last change in shr.el * lisp/net/shr.el (shr--have-one-fringe-p): Rename from have-fringes-p. All callers changed. Doc fix. (Bug#21895) --- lisp/net/shr.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 23e2dc1f874..a48d098fe26 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -203,9 +203,8 @@ cid: URL as the argument.") (goto-char begin) (shr-insert-document dom)))) -(defun have-fringes-p () - "Return t if fringe-columns is bound, and either (fringe-columns 'left) or -\(fringe-columns 'right) returns nonzero." +(defun shr--have-one-fringe-p () + "Return non-nil if we know at least one of the fringes has non-zero width." (and (fboundp 'fringe-columns) (or (not (zerop (fringe-columns 'right))) (not (zerop (fringe-columns 'left)))))) @@ -237,13 +236,13 @@ DOM should be a parse tree as generated by (if (not shr-use-fonts) (- (window-body-width) 1 (if (and (null shr-width) - (not (have-fringes-p))) + (not (shr--have-one-fringe-p))) 0 1)) (- (window-body-width nil t) (* 2 (frame-char-width)) (if (and (null shr-width) - (not (have-fringes-p))) + (not (shr--have-one-fringe-p))) (* (frame-char-width) 2) 0)))))) (shr-descend dom) @@ -467,7 +466,7 @@ size, and full-buffer size." ;; to usurp one column for the ;; continuation glyph. (if (and (null shr-width) - (not (have-fringes-p))) + (not (shr--have-one-fringe-p))) (* (frame-char-width) 2) 0)))) (shr-insert text) -- 2.39.5