[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 e0d2dc5 04/14: Fix last change in shr.el
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 e0d2dc5 04/14: Fix last change in shr.el |
Date: |
Fri, 13 Nov 2015 20:03:32 +0000 |
branch: emacs-25
commit e0d2dc5fd7205dcfd9125a35a7dc4468d9f6b2af
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)
Backport.
---
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)
- [Emacs-diffs] emacs-25 updated (26e7624 -> 84c7b38), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 82f3dc0 02/14: Another fix for MinGW64 and Cygwin builds due to notifications, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 e0d2dc5 04/14: Fix last change in shr.el,
Eli Zaretskii <=
- [Emacs-diffs] emacs-25 071b2e1 01/14: Remove intern calls and XXX comments from Fx_export_frames, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 a95781e 07/14: Add a few more variables to redisplay--variables, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 e53f226 09/14: * lisp/progmodes/elisp-mode.el: Declare function `project-roots', Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 d6b046c 08/14: * src/undo.c: Small fixes for previous change, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 93e7db1 10/14: * test/automated/simple-test.el: Add test for bug#20698 (bug#21885), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 27b93ec 05/14: Fix point positioning after transposing with negative arg, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 afd3e98 06/14: * lisp/loadup.el: Enlarge the size of the hash table to 80000., Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 9722634 12/14: * src/undo.c (run_undoable_change): Now static., Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 84c7b38 14/14: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25, Eli Zaretskii, 2015/11/13