From 978bd3eafc3d2944556e83abe9818ebdfcb04a02 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 11 Apr 2001 15:51:19 +0000 Subject: [PATCH] (timeclock-completing-read): new function. (timeclock-ask-for-project, timeclock-ask-for-reason): Call `timeclock-completing-read', which works under XEmacs as well. --- lisp/ChangeLog | 14 ++++++++++++++ lisp/calendar/timeclock.el | 26 ++++++++++++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ebb8d109f15..2e217312a7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2001-04-10 John Wiegley + + * calendar/timeclock.el (timeclock-completing-read): new function. + (timeclock-ask-for-project, timeclock-ask-for-reason): Call + `timeclock-completing-read'. + + * eshell/em-alias.el (eshell-command-aliased-p): `assoc' was + required where `member' was being used. + +2001-04-09 Colin Walters + + * eshell/em-hist.el (eshell-previous-matching-input): Don't + display "History item" if the the minibuffer is active. + 2001-04-11 Gerd Moellmann * startup.el (command-line): Output a newline after printing diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index e3cc1257770..82d1e4c3490 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -540,21 +540,31 @@ non-nil." (defvar timeclock-project-list nil) (defvar timeclock-last-project nil) +(defun timeclock-completing-read (prompt alist &optional default) + "A version of `completing-read' that works on both Emacs and XEmacs." + (if (featurep 'xemacs) + (let ((str (completing-read prompt alist))) + (if (or (null str) (= (length str) 0)) + default + str)) + (completing-read prompt alist nil nil nil nil default))) + (defun timeclock-ask-for-project () "Ask the user for the project they are clocking into." - (completing-read (format "Clock into which project (default \"%s\"): " - (or timeclock-last-project - (car timeclock-project-list))) - (mapcar 'list timeclock-project-list) - nil nil nil nil (or timeclock-last-project - (car timeclock-project-list)))) + (timeclock-completing-read + (format "Clock into which project (default \"%s\"): " + (or timeclock-last-project + (car timeclock-project-list))) + (mapcar 'list timeclock-project-list) + (or timeclock-last-project + (car timeclock-project-list)))) (defvar timeclock-reason-list nil) (defun timeclock-ask-for-reason () "Ask the user for the reason they are clocking out." - (completing-read "Reason for clocking out: " - (mapcar 'list timeclock-reason-list))) + (timeclock-completing-read "Reason for clocking out: " + (mapcar 'list timeclock-reason-list))) (defun timeclock-update-modeline () "Update the `timeclock-mode-string' displayed in the modeline." -- 2.39.5