* lisp/simple.el (goto-history-element): Don't burp on t history.

2 files changed, 14 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b25988de516..c5d2e6c95fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (goto-history-element): Don't burp on t history.
+
 2015-03-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         Prefer "initialize" to "initialise"
@@ -46,14 +50,14 @@
 
 2015-03-08  Dmitry Gutov  <dgutov@yandex.ru>
 
-        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
-        `font-lock-constant-face' for nil, true and false.  Highlight
-        `self' as a keyword.  (Bug#17733)
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords):
+        Use `font-lock-constant-face' for nil, true and false.
+        Highlight `self' as a keyword.  (Bug#17733)
 
 2015-03-08  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-        * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
-        beginning of regexp also after open brace or vertical bar.
+        * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re):
+        Expect beginning of regexp also after open brace or vertical bar.
         (Bug#20026)
 
 2015-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -277,8 +281,8 @@
 2015-03-03  Agustín Martín Domingo  <agustin6martin@gmail.com>
 
         Improve string search in `flyspell-word-search-*`. (Bug#16800)
-        * textmodes/flyspell.el (flyspell-duplicate-distance): Limit
-        default search distance for duplicated words to 40000.
+        * textmodes/flyspell.el (flyspell-duplicate-distance):
+        Limit default search distance for duplicated words to 40000.
         (flyspell-word-search-backward, flyspell-word-search-forward):
         Search as full word with defined casechars, not as substring.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 1e64f998fd4..4deb4cfce2e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1940,7 +1940,9 @@ The argument NABS specifies the absolute history position."
         (user-error (if minibuffer-default
                         "End of defaults; no next item"
                       "End of history; no default available")))
-    (if (> nabs (length (symbol-value minibuffer-history-variable)))
+    (if (> nabs (if (listp (symbol-value minibuffer-history-variable))
+                    (length (symbol-value minibuffer-history-variable))
+                  0))
         (user-error "Beginning of history; no preceding item"))
     (unless (memq last-command '(next-history-element
                                  previous-history-element))