diff options
| author | Stephen Berman <stephen.berman@gmx.net> | 2014-07-25 23:53:52 +0200 |
|---|---|---|
| committer | Stephen Berman <stephen.berman@gmx.net> | 2014-07-25 23:53:52 +0200 |
| commit | e72e6612763d178bc283e8c8ec72325b85aa2384 (patch) | |
| tree | 6064652c6de1efcd00ddc164086d893411b76787 | |
| parent | 6dd006a86d401a494efd48a31c5fe6e511e42b52 (diff) | |
| download | emacs-e72e6612763d178bc283e8c8ec72325b85aa2384.tar.gz | |
* calendar/todo-mode.el (todo-edit-item--next-key): If next key is
not a character, ignore it instead of raising an error.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calendar/todo-mode.el | 4 |
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)) |