quick fix to todo-mode patch + followup question

[Stephen Berman <steve@ims.uni-stuttgart.de>]

I just discovered a silly mistake I made in the todo-mode patch I
posted here last Wednesday: I bound `todo-kill-buffer' to `q' in
todo-edit-mode, which prevents `q' from being a self-inserting key
when editing a multiline TODO item.  Please apply the below patch to
my previous patch.

I made this diff against my previous patch, which was itself against
the current CVS todo-mode, because it is small and that patch is
rather big.  If I should discover further mistakes in my patch code, I
would like to follow this same procedure.  Is this appropriate?  The
alternative, essentially resubmitting the large patch augmented with a
small change, seems like a waste of bandwidth.  This consideration
also leads me to ask the following question: If I implement further
extensions to todo-mode, would it also be acceptable to submit them as
patches to my large patch, i.e., basically to treat my patch as the
status quo of todo-mode?  This may seem presumptuous, since my patch
hasn't been applied and may never be.  However, the new code in the
patch is almost as long as the todo-mode code contained in Emacs, so
again, diffing against that every time seems like massive redundancy.
A possible alternative would be to rename the file and submit it to
gnu-emacs-sources, but I don't think this is appropriate, since after
all half the code still comes from Oliver Seidel, not me: I haven't
rewritten todo-mode, I've extended it.  So to sum up, my general
question is: what's the appropriate way to submit incremental fixes or
extensions to a not-yet-applied large patch to an Emacs package (one
that doubles the code base of the package)?

--Steve Berman

Here are the todo-mode ChangeLog entry and diff against my patch:

2002-06-03  Stephen Berman  <steve@ims.uni-stuttgart.de>

	* todo-mode-srb.el (todo-edit-mode):
	Change key binding of todo-kill-buffer from `q' to
	`C-c C-c', so that `q' can be self-inserted in the editing buffer.
	(todo-edit-multiline): Change message displayed upon entering editing
	buffer to reflect corrected key binding of todo-kill-buffer.

*** todo-mode.el~	Mon Jun  3 11:09:49 2002 (patched version 1.50)
--- todo-mode.el	Mon Jun  3 11:09:49 2002
***************
*** 861,867 ****
  	 (make-indirect-buffer
   	  (file-name-nondirectory todo-file-do) buffer-name))
  	(todo-edit-mode)
! 	(message "To finish editing and return to TODO item list, type q.")
  	(widen) ; in case the item is filed
  	(goto-char here)
  	;; This bit of code insures that, if the last unfiled or filed item
--- 867,873 ----
  	 (make-indirect-buffer
   	  (file-name-nondirectory todo-file-do) buffer-name))
  	(todo-edit-mode)
! 	(message "To finish editing and return to TODO item list, type C-c C-c.")
  	(widen) ; in case the item is filed
  	(goto-char here)
  	;; This bit of code insures that, if the last unfiled or filed item
***************
*** 1869,1875 ****
    "Major mode for editing items in the TODO list.
  
  \\{todo-edit-mode-map}"
!   (local-set-key (kbd "q") 'todo-kill-buffer)
    (add-hook 'todo-edit-mode-hook 'turn-on-auto-fill))
  
  (defun todo-categories-mode ()
--- 1875,1881 ----
    "Major mode for editing items in the TODO list.
  
  \\{todo-edit-mode-map}"
!   (local-set-key (kbd "C-c C-c") 'todo-kill-buffer)
    (add-hook 'todo-edit-mode-hook 'turn-on-auto-fill))
  
  (defun todo-categories-mode ()