emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 872617a: * net/shr.el (shr-fold-text): Don't bug ou


From: Lars Ingebrigtsen
Subject: [Emacs-diffs] master 872617a: * net/shr.el (shr-fold-text): Don't bug out on zero-length text.
Date: Mon, 15 Dec 2014 05:05:11 +0000

branch: master
commit 872617ad730906f9437b90c3b90af2e2458f00f6
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    * net/shr.el (shr-fold-text): Don't bug out on zero-length text.
---
 lisp/ChangeLog  |    4 ++++
 lisp/net/shr.el |   16 +++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a0d518..364511c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-15  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/shr.el (shr-fold-text): Don't bug out on zero-length text.
+
 2014-12-14  Alan Mackenzie  <address@hidden>
 
        * lisp/cus-start.el (all): Add fast-but-imprecise-scrolling.
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 6e06a76..387bb02 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -414,13 +414,15 @@ size, and full-buffer size."
           (cdr (assq 'background-color shr-stylesheet))))))))
 
 (defun shr-fold-text (text)
-  (with-temp-buffer
-    (let ((shr-indentation 0)
-         (shr-state nil)
-         (shr-start nil)
-         (shr-internal-width (window-width)))
-      (shr-insert text)
-      (buffer-string))))
+  (if (zerop (length text))
+      text
+    (with-temp-buffer
+      (let ((shr-indentation 0)
+           (shr-state nil)
+           (shr-start nil)
+           (shr-internal-width (window-width)))
+       (shr-insert text)
+       (buffer-string)))))
 
 (define-inline shr-char-breakable-p (char)
   "Return non-nil if a line can be broken before and after CHAR."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]