From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 13 Dec 2014 18:03:31 +0000 (+0100)
Subject: * net/shr.el (shr-next-link): Don't error out at eob.
X-Git-Tag: emacs-25.0.90~2635^2~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ea175894a02c2e0a7a0da34c4e1181f9b8b2bea;p=emacs.git

* net/shr.el (shr-next-link): Don't error out at eob.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27337e9ab0a..37f637b503a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* net/shr.el (shr-next-link): Don't error out at eob.
+
 2014-12-05  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
 
 	* isearch.el (isearch-open-necessary-overlays): Open overlay
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 15dd8dfefa9..6e06a76bf2a 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -265,8 +265,9 @@ redirects somewhere else."
   "Skip to the next link."
   (interactive)
   (let ((skip (text-property-any (point) (point-max) 'help-echo nil)))
-    (if (not (setq skip (text-property-not-all skip (point-max)
-					       'help-echo nil)))
+    (if (or (eobp)
+	    (not (setq skip (text-property-not-all skip (point-max)
+						   'help-echo nil))))
 	(message "No next link")
       (goto-char skip)
       (message "%s" (get-text-property (point) 'help-echo)))))