* todos.el (todos-edit-quit): After editing an item, make sure to

return to its category.

diff --git a/lisp/calendar/ChangeLog b/lisp/calendar/ChangeLog
index fe8f83e2df2973d79b23621000759f9a1be702d1..43fbbf2ec41bfe84127ead5749e8ad038c3d88bd 100644 (file)
--- a/lisp/calendar/ChangeLog
+++ b/lisp/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-31  Stephen Berman  <stephen.berman@gmx.net>
+
+       * todos.el (todos-edit-quit): After editing an item, make sure to
+       return to its category.
+
 2013-05-31  Stephen Berman  <stephen.berman@gmx.net>
 
        * todos.el: Clean up code.  Uncapitalize file name in first line.

diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el
index 2e28e9e9bfc154d21b9560333f97d7a7b218a9a9..0bbf139b7ee5a8f9bee1984a5d9204f7e72d455f 100644 (file)
--- a/lisp/calendar/todos.el
+++ b/lisp/calendar/todos.el
@@ -1385,7 +1385,8 @@ in the number or names of categories."
   (if (> (buffer-size) (- (point-max) (point-min)))
       ;; We got here via `e m'.
       (let ((item (buffer-string))
-           (regex "\\(\n\\)[^[:blank:]]"))
+           (regex "\\(\n\\)[^[:blank:]]")
+           (buf (buffer-base-buffer)))
        (while (not (string-match (concat todos-date-string-start
                                          todos-date-pattern) item))
          (setq item (read-from-minibuffer
@@ -1395,7 +1396,9 @@ in the number or names of categories."
          (setq item (replace-regexp-in-string regex "\n\t" item nil nil 1))
          (delete-region (point-min) (point-max))
          (insert item))
-       (kill-buffer))
+       (kill-buffer)
+       (unless (eq (current-buffer) buf)
+         (set-window-buffer (selected-window) (set-buffer buf))))
     ;; We got here via `F e'.
     (when (todos-check-format)
       ;; FIXME: separate out sexp check?