Commit 35f5afbc authored by Eli Zaretskii's avatar Eli Zaretskii

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)
parent 508e77b7
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment