2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15ad2b888a9..869a2f3deb7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-14  Stephen Berman  <stephen.berman@gmx.net>
+
+        * calendar/todos.el (todos-edit-multiline, todos-edit-quit):
+        Revert buffer renaming.
+
 2013-02-11  Stephen Berman  <stephen.berman@gmx.net>
 
         * calendar/todos.el (todos-edit-quit): On quitting file editing,
diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el
index a67a98e27b0..e3bac9fb60a 100644
--- a/lisp/calendar/todos.el
+++ b/lisp/calendar/todos.el
@@ -4882,7 +4882,6 @@ the format of Diary entries."
   ""                                    ;FIXME
   (interactive)
   (widen)
-  (rename-buffer todos-edit-buffer)
   (todos-edit-mode)
   (remove-overlays) ; nil nil 'before-string)
   (message "%s" (substitute-command-keys
@@ -4919,7 +4918,6 @@ in the number or names of categories."
         ;; (todos-repair-categories-sexp)
         ;; Compare (todos-make-categories-list t) with sexp and if
         ;; different ask (todos-update-categories-sexp) ?
-        (rename-buffer (file-name-nondirectory todos-current-todos-file))
         (todos-mode)
         (let* ((cat-beg (concat "^" (regexp-quote todos-category-beg)
                                 "\\(.*\\)$"))