2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7763d257224..8b7f62a306e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2014-11-18  Juri Linkov  <juri@linkov.net>
 
+        * simple.el (next-line-or-history-element): Wrap next-line
+        in with-no-warnings.
+        (previous-line-or-history-element): Wrap previous-line
+        in with-no-warnings.
+
+2014-11-18  Juri Linkov  <juri@linkov.net>
+
         * progmodes/grep.el (grep-compute-defaults):
         Compute grep-highlight-matches before its use.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index fda7040ccb8..2a471652da2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1992,7 +1992,8 @@ next element of the minibuffer history in the minibuffer."
   (or arg (setq arg 1))
   (let ((old-point (point)))
     (condition-case nil
-        (next-line arg)
+        (with-no-warnings
+          (next-line arg))
       (end-of-buffer
        ;; Restore old position since `line-move-visual' moves point to
        ;; the end of the line when it fails to go to the next line.
@@ -2007,7 +2008,8 @@ previous element of the minibuffer history in the minibuffer."
   (or arg (setq arg 1))
   (let ((old-point (point)))
     (condition-case nil
-        (previous-line arg)
+        (with-no-warnings
+          (previous-line arg))
       (beginning-of-buffer
        ;; Restore old position since `line-move-visual' moves point to
        ;; the beginning of the line when it fails to go to the previous line.