From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#2086: 23.0.60; Todo mode bug with completing-read + patch Date: Tue, 27 Jan 2009 16:48:11 +0100 Message-ID: <87pri8agxw.fsf@escher.local.home> Reply-To: Stephen Berman , 2086@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1233073465 25930 80.91.229.12 (27 Jan 2009 16:24:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 27 Jan 2009 16:24:25 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 27 17:25:37 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LRqkd-0005DK-Jd for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Jan 2009 17:25:25 +0100 Original-Received: from localhost ([127.0.0.1]:40793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LRqjL-0004EI-Gg for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Jan 2009 11:24:03 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LRqiu-00044Z-Q1 for bug-gnu-emacs@gnu.org; Tue, 27 Jan 2009 11:23:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LRqis-000433-En for bug-gnu-emacs@gnu.org; Tue, 27 Jan 2009 11:23:35 -0500 Original-Received: from [199.232.76.173] (port=36778 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LRqir-00042i-Tv for bug-gnu-emacs@gnu.org; Tue, 27 Jan 2009 11:23:33 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:36463) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LRqiq-0007id-Oq for bug-gnu-emacs@gnu.org; Tue, 27 Jan 2009 11:23:33 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n0RGNTVZ001034; Tue, 27 Jan 2009 08:23:30 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n0RGK3d1032351; Tue, 27 Jan 2009 08:20:03 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stephen Berman Original-Sender: steve@escher.local.home Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Tue, 27 Jan 2009 16:20:02 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 2086 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.123307268330994 (code B ref -1); Tue, 27 Jan 2009 16:20:02 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 27 Jan 2009 16:11:23 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n0RGBJRV030988 for ; Tue, 27 Jan 2009 08:11:20 -0800 Original-Received: from mail.gnu.org ([199.232.76.166]:60386 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1LRqVQ-0001W8-OE for emacs-pretest-bug@gnu.org; Tue, 27 Jan 2009 11:09:41 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1LRqWx-0006Ba-7v for emacs-pretest-bug@gnu.org; Tue, 27 Jan 2009 11:11:18 -0500 Original-Received: from mail.gmx.net ([213.165.64.20]:43937) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1LRqWw-0006B2-IZ for emacs-pretest-bug@gnu.org; Tue, 27 Jan 2009 11:11:15 -0500 Original-Received: (qmail invoked by alias); 27 Jan 2009 16:11:09 -0000 Original-Received: from i59F57C0C.versanet.de (EHLO escher.local.home) [89.245.124.12] by mail.gmx.net (mp015) with SMTP; 27 Jan 2009 17:11:09 +0100 X-Authenticated: #20778731 X-Provags-ID: V01U2FsdGVkX1/oHrY9YOLo/hzztma+WSCgWxOPPYnMOjpKQDeGIn iT2IFpGeD51eej Original-Received: by escher.local.home (Postfix, from userid 1000) id 3FF721D129F; Tue, 27 Jan 2009 17:11:03 +0100 (CET) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.49 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Tue, 27 Jan 2009 11:23:35 -0500 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:24627 gmane.emacs.pretest.bugs:23792 Archived-At: --=-=-= GNU Emacs 23.0.60.30 (i686-pc-linux-gnu, GTK+ Version 2.14.4) of 2009-01-21 on escher 1. emacs -Q 2. Type `M-x todo-show', and in the Todo mode buffer type `s' to save ~/.todo-do, then type the following sequence of Todo mode commands and input: `I item1 RET i item2 RET Newcat RET'. Widen the buffer and you see the following (modulo the time-stamp headers): -*- mode: todo; todo-categories: ("Newcat" "Todo"); -*- */* --- Newcat */* 2009-01-14 13:48 steve: item2 --- End */* --------------------------------------------------------------------------- */* --- Todo */* 2009-01-14 13:48 steve: item1 --- End */* --------------------------------------------------------------------------- 3. Now type `M-x customize-option RET history-delete-duplicates RET', toggle the value to `on (non-nil)' and save for the current session. 4. Type `M-x todo-show'. 5. In the Todo mode buffer, with category "Newcat" displayed, type `j' and at the prompt, type `Todo', to jump the the category "Todo". => Now category "Todo" is displayed, but it is empty. 6. Widen the Todo mode buffer, and this is what it now looks like: -*- mode: todo; todo-categories: ("Todo" "Newcat"); -*- */* --- Todo --- End */* --------------------------------------------------------------------------- */* --- Newcat */* 2009-01-14 13:48 steve: item2 --- End */* --------------------------------------------------------------------------- */* --- Todo */* 2009-01-14 13:48 steve: item1 --- End */* --------------------------------------------------------------------------- As a second example, after step 4 above do the following: 5'. While in category "Newcat", type `i item3 RET Todo RET' to insert "item3". => Now category "Todo" is displayed, but it contains only item3, not also item1. 6. Widen the Todo mode buffer, and this is what it now looks like: -*- mode: todo; todo-categories: ("Todo" "Newcat"); -*- */* --- Todo */* 2009-01-14 13:48 steve: item3 --- End */* --------------------------------------------------------------------------- */* --- Newcat */* 2009-01-14 13:48 steve: item2 --- End */* --------------------------------------------------------------------------- */* --- Todo */* 2009-01-14 13:48 steve: item1 --- End */* --------------------------------------------------------------------------- The problem in both cases is due, I believe, to the failure to make a copy of todo-categories before calling completing-read and to restore it afterwards. This is because, when history-delete-duplicates is non-nil, completing-read (via read_minibuf) destructively deletes the list element used as the completion and conses it on to the front, yielding a reordered list. The fix I propose, in the attached patch, is a wrapper for completing-read that copies and restores todo-categories as required. The wrapper is used instead of completing-read by todo-insert-item and todo-jump-to-category. (The resulting modularization also implements one to the "things to do" mentioned in the todo-mode.el commentary.) I also think the completing-read code in todo-mode.el should be simplified by replacing todo-category-alist. The doc string of the latter says: "Generate an alist for use in `completing-read' from `todo-categories'." AFAICS there is no need for this structure. The members of the alist, which constitutes the COLLECTION argument of completing-read, are just the single element lists of each category name. This provides no more information than the value of todo-categories itself, which as a list of strings is suitable for the COLLECTION argument. (Was there a time when completing-read took an alist but not a list of strings as the COLLECTION argument?) The wrapper uses todo-categories instead of todo-category-alist, so the patch eliminates the latter function from todo-mode.el. Finally, the patch makes the code of todo-insert-item conform to its doc string. The latter says: "With a prefix argument solicit the category, otherwise use the current category." But the code does just the opposite. I assume the desired behavior is as stated in the doc string. (In http://lists.gnu.org/archive/html/bug-gnu-emacs/2002-01/msg00543.html there was a patch that contained a fix for this, but it was not committed to CVS.) 2009-01-19 Stephen Berman * calendar/todo-mode.el (todo-category-alist): Delete. (todo-completing-read): New function. (todo-insert-item, todo-jump-to-category): Use it. (todo-insert-item): Make the use of the prefix argument conform to the doc string. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=todo-completing-read.diff Content-Description: Todo mode patch *** emacs/lisp/calendar/todo-mode.el.~1.72.~ 2009-01-09 11:48:58.000000000 +0100 --- emacs/lisp/calendar/todo-mode.el 2009-01-21 10:36:15.000000000 +0100 *************** *** 596,610 **** "New TODO entry: " (if todo-entry-prefix-function (funcall todo-entry-prefix-function))))) - (categories todo-categories) - (history (cons 'categories (1+ todo-category-number))) (current-category (nth todo-category-number todo-categories)) ! (category ! (if arg ! current-category ! (completing-read (concat "Category [" current-category "]: ") ! (todo-category-alist) nil nil nil ! history current-category)))) (todo-add-item-non-interactively new-item category)))) (defalias 'todo-cmd-inst 'todo-insert-item) --- 596,603 ---- "New TODO entry: " (if todo-entry-prefix-function (funcall todo-entry-prefix-function))))) (current-category (nth todo-category-number todo-categories)) ! (category (if arg (todo-completing-read) current-category))) (todo-add-item-non-interactively new-item category)))) (defalias 'todo-cmd-inst 'todo-insert-item) *************** *** 801,812 **** (defun todo-jump-to-category () "Jump to a category. Default is previous category." (interactive) ! (let* ((categories todo-categories) ! (history (cons 'categories (1+ todo-category-number))) ! (default (nth todo-category-number todo-categories)) ! (category (completing-read ! (concat "Category [" default "]: ") ! (todo-category-alist) nil nil nil history default))) (if (string= "" category) (setq category (nth todo-category-number todo-categories))) (setq todo-category-number --- 794,800 ---- (defun todo-jump-to-category () "Jump to a category. Default is previous category." (interactive) ! (let ((category (todo-completing-read))) (if (string= "" category) (setq category (nth todo-category-number todo-categories))) (setq todo-category-number *************** *** 861,869 **** "Return non-nil if STRING spans several lines." (> (todo-string-count-lines string) 1)) ! (defun todo-category-alist () ! "Generate an alist for use in `completing-read' from `todo-categories'." ! (mapcar #'list todo-categories)) ;; --------------------------------------------------------------------------- --- 849,867 ---- "Return non-nil if STRING spans several lines." (> (todo-string-count-lines string) 1)) ! (defun todo-completing-read () ! "Return a category name, with completion, for use in Todo mode." ! ;; make a copy of todo-categories in case history-delete-duplicates is ! ;; non-nil, which makes completing-read alter todo-categories ! (let* ((categories (copy-sequence todo-categories)) ! (history (cons 'todo-categories (1+ todo-category-number))) ! (default (nth todo-category-number todo-categories)) ! (category (completing-read ! (concat "Category [" default "]: ") ! todo-categories nil nil nil history default))) ! ;; restore the original value of todo-categories ! (setq todo-categories categories) ! category)) ;; --------------------------------------------------------------------------- --=-=-=--