* calendar/todo-mode.el (todo-edit-item--next-key): If next key is

not a character, ignore it instead of raising an error.

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7869bee211c..b1c21261017 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2014-07-25  Stephen Berman  <stephen.berman@gmx.net>
 
+        * calendar/todo-mode.el (todo-edit-item--next-key): If next key is
+        not a character, ignore it instead of raising an error.
+
+2014-07-25  Stephen Berman  <stephen.berman@gmx.net>
+
         * calendar/todo-mode.el: Fix handling of marked items and make
         minor code improvements.
         (todo-edit-item): If there are marked items, ensure user can only
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 60f798792d1..6a857a10fda 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -5551,8 +5551,8 @@ already entered and those still available."
                                                         '(add/edit delete))
                                               " comment"))))
                           params " "))
-         (this-key (char-to-string
-                    (read-key (concat todo-edit-item--prompt p->k))))
+         (this-key (let ((key (read-key (concat todo-edit-item--prompt p->k))))
+                     (and (characterp key) (char-to-string key))))
          (this-param (car (rassoc this-key params))))
     (pcase this-param
       (`edit (todo-edit-item--text))