[Emacs-diffs] emacs-24 r117403: * calendar/todo-mode.el (todo-edit-item--next-key): If next key is

[Stephen Berman]

------------------------------------------------------------
revno: 117403
revision-id: address@hidden
parent: address@hidden
committer: Stephen Berman <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-07-25 23:53:52 +0200
message:
  * calendar/todo-mode.el (todo-edit-item--next-key): If next key is
  not a character, ignore it instead of raising an error.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calendar/todo-mode.el     todos.el-20120911155047-0ytqo2nidwqquefa-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-25 16:01:05 +0000
+++ b/lisp/ChangeLog    2014-07-25 21:53:52 +0000
@@ -1,5 +1,10 @@
 2014-07-25  Stephen Berman  <address@hidden>
 
+       * 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  <address@hidden>
+
        * 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

=== modified file 'lisp/calendar/todo-mode.el'
--- a/lisp/calendar/todo-mode.el        2014-07-25 16:01:05 +0000
+++ b/lisp/calendar/todo-mode.el        2014-07-25 21:53:52 +0000
@@ -5551,8 +5551,8 @@
                                                        '(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))