summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2014-09-26 10:01:17 +0800
committerLeo Liu <sdl.web@gmail.com>2014-09-26 10:01:17 +0800
commitd73f2d856cdce1fed213d8d4f693dc60be9553cb (patch)
treed6d6a3c02f33d076b82bd18329f7a9414e904f86 /lisp/emacs-lisp
parent89b354a55e30978444ada5d388e18f5e06bde583 (diff)
downloademacs-d73f2d856cdce1fed213d8d4f693dc60be9553cb.tar.gz
emacs-d73f2d856cdce1fed213d8d4f693dc60be9553cb.tar.bz2
emacs-d73f2d856cdce1fed213d8d4f693dc60be9553cb.zip
* emacs-lisp/cl-extra.el (cl-parse-integer): Fix last change.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-extra.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index c8404e0bc2d..e10844069ef 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -415,7 +415,8 @@ as an integer unless JUNK-ALLOWED is non-nil."
(skip-whitespace)
(cond ((and junk-allowed (null sum)) sum)
(junk-allowed (* sign sum))
- ((/= start end) (error "Not an integer string: %s" string))
+ ((or (/= start end) (null sum))
+ (error "Not an integer string: `%s'" string))
(t (* sign sum)))))))