2 files changed, 7 insertions, 2 deletions

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)))))