[Emacs-diffs] master 41bba4b: * lisp/simple.el (goto-history-element): Don't burp on t history.

[Stefan Monnier]

branch: master
commit 41bba4b40f6e07924a3681ffeabb26ca48424095
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * lisp/simple.el (goto-history-element): Don't burp on t history.
---
 lisp/ChangeLog |   18 +++++++++++-------
 lisp/simple.el |    4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b25988d..c5d2e6c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-11  Stefan Monnier  <address@hidden>
+
+       * simple.el (goto-history-element): Don't burp on t history.
+
 2015-03-10  Paul Eggert  <address@hidden>
 
        Prefer "initialize" to "initialise"
@@ -46,14 +50,14 @@
 
 2015-03-08  Dmitry Gutov  <address@hidden>
 
-       * 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  <address@hidden>
 
-       * 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  <address@hidden>
@@ -277,8 +281,8 @@
 2015-03-03  Agustín Martín Domingo  <address@hidden>
 
        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 1e64f99..4deb4cf 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))