[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 35f5afb: Fix last change in shr.el
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 35f5afb: Fix last change in shr.el |
Date: |
Fri, 13 Nov 2015 09:24:28 +0000 |
branch: master
commit 35f5afbca1779f7b6d1d78cae97437a56fd5a9ba
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 23e2dc1..a48d098 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 35f5afb: Fix last change in shr.el,
Eli Zaretskii <=