From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.bugs Subject: quick fix to todo-mode patch + followup question Date: 03 Jun 2002 12:06:58 +0200 Sender: bug-gnu-emacs-admin@gnu.org Message-ID: References: NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1023099586 19642 127.0.0.1 (3 Jun 2002 10:19:46 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 3 Jun 2002 10:19:46 +0000 (UTC) Return-path: Original-Received: from fencepost.gnu.org ([199.232.76.164]) by main.gmane.org with esmtp (Exim 3.33 #1 (Debian)) id 17EowE-00056h-00 for ; Mon, 03 Jun 2002 12:19:46 +0200 Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 17Eols-0007Zi-00; Mon, 03 Jun 2002 06:09:04 -0400 Original-Received: from steve.ims.uni-stuttgart.de ([141.58.127.232]) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 17Eojr-0004m2-00 for ; Mon, 03 Jun 2002 06:06:59 -0400 Original-Received: (from steve@localhost) by steve.ims.uni-stuttgart.de (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) id g53A6wK01311; Mon, 3 Jun 2002 12:06:58 +0200 X-Authentication-Warning: steve.ims.uni-stuttgart.de: steve set sender to steve@ims.uni-stuttgart.de using -f Original-To: bug-gnu-emacs@gnu.org In-Reply-To: Original-Lines: 75 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 Errors-To: bug-gnu-emacs-admin@gnu.org X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.0.9 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Bug reports for GNU Emacs, the Swiss army knife of text editors List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.bugs:1765 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:1765 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 * 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 ()