Commit 2a6dca26 authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

Remove XEmacs compat code from timeclock.el

* lisp/calendar/timeclock.el (timeclock-completing-read)
(timeclock-ask-for-project, timeclock-ask-for-reason): Remove
XEmacs compat code.
parent 20164ad9
Pipeline #2176 failed with stage
in 90 minutes and 2 seconds
......@@ -586,23 +586,20 @@ OLD-DEFAULT hours are set for every day that has no number indicated."
(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.
"A version of `completing-read.
PROMPT, ALIST and DEFAULT are used for the PROMPT, COLLECTION and DEF
arguments of `completing-read'."
(if (featurep 'xemacs)
(let ((str (completing-read prompt alist)))
(if (or (null str) (zerop (length str)))
default
str))
(completing-read prompt alist nil nil nil nil default)))
(declare (obsolete completing-read "27.1"))
(completing-read prompt alist nil nil nil nil default))
(defun timeclock-ask-for-project ()
"Ask the user for the project they are clocking into."
(timeclock-completing-read
(completing-read
(format "Clock into which project (default %s): "
(or timeclock-last-project
(car timeclock-project-list)))
timeclock-project-list
nil nil nil nil
(or timeclock-last-project
(car timeclock-project-list))))
......@@ -610,8 +607,7 @@ arguments of `completing-read'."
(defun timeclock-ask-for-reason ()
"Ask the user for the reason they are clocking out."
(timeclock-completing-read "Reason for clocking out: "
timeclock-reason-list))
(completing-read "Reason for clocking out: " timeclock-reason-list))
(define-obsolete-function-alias 'timeclock-update-modeline
'timeclock-update-mode-line "24.3")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment