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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7869bee211c8cf3f0c9bcd87fc68d7f962428910..b1c21261017ca087c4b316f0d419e32a1eeddacb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 60f798792d1cf08f07b0d79269891993223cf495..6a857a10fdad64b8dde6d396f52b82bae41747e5 100644 (file)
--- 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))