mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(timeclock-completing-read): new function.

Browse source 
(timeclock-ask-for-project, timeclock-ask-for-reason): Call
`timeclock-completing-read', which works under XEmacs as well.
This commit is contained in:
John Wiegley 2001-04-11 15:51:19 +00:00
parent 3f75af1b60
commit 978bd3eafc
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/ChangeLog
View file

@ -1,3 +1,17 @@
2001-04-10 John Wiegley <johnw@gnu.org>
* 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 <walters@cis.ohio-state.edu>
* eshell/em-hist.el (eshell-previous-matching-input): Don't
display "History item" if the the minibuffer is active.
2001-04-11 Gerd Moellmann <gerd@gnu.org>
* startup.el (command-line): Output a newline after printing

26
lisp/calendar/timeclock.el
View file

@ -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."