2018-10-08 22:33:22 -04:00
|
|
|
;;; timeclock.el --- mode for keeping track of how much you work -*- lexical-binding:t -*-
|
2000-08-14 12:45:50 +00:00
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
;; Copyright (C) 1999-2022 Free Software Foundation, Inc.
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
;; Created: 25 Mar 1999
|
2020-09-08 16:12:43 +02:00
|
|
|
;; Old-Version: 2.6.1
|
2000-08-14 12:45:50 +00:00
|
|
|
;; Keywords: calendar data
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:07:58 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-08-14 12:45:50 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:07:58 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; This mode is for keeping track of time intervals. You can use it
|
|
|
|
;; for whatever purpose you like, but the typical scenario is to keep
|
|
|
|
;; track of how much time you spend working on certain projects.
|
|
|
|
;;
|
|
|
|
;; Use `timeclock-in' when you start on a project, and `timeclock-out'
|
|
|
|
;; when you're done. Once you've collected some data, you can use
|
|
|
|
;; `timeclock-workday-remaining' to see how much time is left to be
|
2003-07-11 13:15:05 +00:00
|
|
|
;; worked today (where `timeclock-workday' specifies the length of the
|
|
|
|
;; working day), and `timeclock-when-to-leave' to calculate when you're free.
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;; You'll probably want to bind the timeclock commands to some handy
|
2021-08-26 16:23:29 +02:00
|
|
|
;; keystrokes. Assuming C-c t is unbound, you might use:
|
2000-08-14 12:45:50 +00:00
|
|
|
;;
|
2021-08-26 16:23:29 +02:00
|
|
|
;; (define-key (kbd "C-c t i") 'timeclock-in)
|
|
|
|
;; (define-key (kbd "C-c t o") 'timeclock-out)
|
|
|
|
;; (define-key (kbd "C-c t c") 'timeclock-change)
|
|
|
|
;; (define-key (kbd "C-c t r") 'timeclock-reread-log)
|
|
|
|
;; (define-key (kbd "C-c t u") 'timeclock-update-mode-line)
|
|
|
|
;; (define-key (kbd "C-c t w") 'timeclock-when-to-leave-string)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;; If you want Emacs to display the amount of time "left" to your
|
2012-06-02 18:56:09 +08:00
|
|
|
;; workday in the mode-line, you can either set the value of
|
|
|
|
;; `timeclock-mode-line-display' to t using M-x customize, or you can
|
2012-09-17 13:41:04 +08:00
|
|
|
;; add this code to your init file:
|
2000-08-14 12:45:50 +00:00
|
|
|
;;
|
|
|
|
;; (require 'timeclock)
|
2012-06-02 18:56:09 +08:00
|
|
|
;; (timeclock-mode-line-display)
|
2000-08-14 12:45:50 +00:00
|
|
|
;;
|
2012-06-02 18:56:09 +08:00
|
|
|
;; To cancel this mode line display at any time, just call
|
|
|
|
;; `timeclock-mode-line-display' again.
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;; You may also want Emacs to ask you before exiting, if you are
|
2004-04-04 21:30:49 +00:00
|
|
|
;; currently working on a project. This can be done either by setting
|
2000-08-14 12:45:50 +00:00
|
|
|
;; `timeclock-ask-before-exiting' to t using M-x customize (this is
|
2012-09-17 13:41:04 +08:00
|
|
|
;; the default), or by adding the following to your init file:
|
2000-08-14 12:45:50 +00:00
|
|
|
;;
|
2018-10-08 22:33:22 -04:00
|
|
|
;; (add-hook 'kill-emacs-query-functions #'timeclock-query-out)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
2014-01-26 18:02:28 -08:00
|
|
|
;; NOTE: If you change your timelog file without using timeclock's
|
2000-08-14 12:45:50 +00:00
|
|
|
;; functions, or if you change the value of any of timeclock's
|
|
|
|
;; customizable variables, you should run the command
|
|
|
|
;; `timeclock-reread-log'. This will recompute any discrepancies in
|
|
|
|
;; your average working time, and will make sure that the various
|
|
|
|
;; display functions return the correct value.
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2018-10-08 22:33:22 -04:00
|
|
|
(require 'cl-lib)
|
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
(defgroup timeclock nil
|
2005-04-05 18:35:17 +00:00
|
|
|
"Keeping track of the time that gets spent."
|
2000-08-14 12:45:50 +00:00
|
|
|
:group 'data)
|
|
|
|
|
|
|
|
;;; User Variables:
|
|
|
|
|
2013-03-11 22:08:21 -04:00
|
|
|
(defcustom timeclock-file (locate-user-emacs-file "timelog" ".timelog")
|
2008-03-07 04:43:35 +00:00
|
|
|
"The file used to store timeclock data in."
|
2014-01-26 18:02:28 -08:00
|
|
|
:version "24.4" ; added locate-user-emacs-file
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'file)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-workday (* 8 60 60)
|
2008-03-08 23:18:42 +00:00
|
|
|
"The length of a work period in seconds."
|
Make some defcustom types more restrictive
* lisp/abbrev.el (abbrev-suggest-hint-threshold):
* lisp/bookmark.el (bookmark-bmenu-file-column)
(bookmark-menu-length):
* lisp/buff-menu.el (Buffer-menu-size-width)
(Buffer-menu-mode-width):
* lisp/calendar/calendar.el (calendar-week-start-day)
(calendar-intermonth-spacing, calendar-column-width)
(calendar-day-digit-width):
* lisp/calc/calc.el (calc-undo-length):
* lisp/calendar/timeclock.el (timeclock-workday):
* lisp/comint.el (comint-buffer-maximum-size)
(comint-input-ring-size):
* lisp/doc-view.el (doc-view-resolution, doc-view-image-width):
* lisp/emacs-lisp/bytecomp.el (byte-compile-docstring-max-column):
* lisp/emacs-lisp/comp.el (native-comp-debug)
(native-comp-verbose, native-comp-async-jobs-number):
* lisp/emacs-lisp/package.el (package-name-column-width)
(package-version-column-width, package-status-column-width)
(package-archive-column-width):
* lisp/eshell/esh-mode.el (eshell-buffer-maximum-lines):
* lisp/frame.el (blink-cursor-blinks):
* lisp/info.el (Info-breadcrumbs-depth):
* lisp/jit-lock.el (jit-lock-chunk-size):
* lisp/kmacro.el (kmacro-ring-max):
* lisp/menu-bar.el (yank-menu-length, yank-menu-max-items):
* lisp/midnight.el (clean-buffer-list-delay-general)
(clean-buffer-list-delay-special):
* lisp/net/dictionary.el (dictionary-port)
(dictionary-proxy-port):
* lisp/net/ldap.el (ldap-default-port):
* lisp/net/pop3.el (pop3-port, pop3-stream-length):
* lisp/net/rcirc.el (rcirc-default-port):
* lisp/net/sieve-manage.el (sieve-manage-default-port):
* lisp/play/spook.el (spook-phrase-default-count):
* lisp/play/tetris.el (tetris-buffer-width)
(tetris-buffer-height, tetris-width, tetris-height)
(tetris-top-left-x, tetris-top-left-y):
* lisp/profiler.el (profiler-sampling-interval):
* lisp/progmodes/sql.el (sql-port):
* lisp/recentf.el (recentf-max-menu-items):
* lisp/strokes.el (strokes-grid-resolution):
* lisp/tab-bar.el (tab-bar-tab-name-truncated-max):
* lisp/term/xterm.el (xterm-max-cut-length):
* lisp/time.el (display-time-interval, world-clock-timer-second):
* lisp/url/url-cache.el (url-cache-expire-time):
* lisp/url/url-cookie.el (url-cookie-save-interval):
* lisp/url/url-history.el (url-history-save-interval):
* lisp/url/url-queue.el (url-queue-parallel-processes)
(url-queue-timeout):
* lisp/url/url-vars.el (url-max-password-attempts)
(url-max-redirections):
* lisp/vc/emerge.el (emerge-min-visible-lines):
* lisp/vc/vc.el (vc-log-show-limit):
* lisp/window.el (window-min-height, window-min-width):
* lisp/winner.el (winner-ring-size): Use :type natnum.
* lisp/savehist.el (savehist-file-modes): Fix setting to nil value and
use :type natnum.
2022-07-05 16:26:45 +02:00
|
|
|
:type 'natnum)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
2021-08-27 03:10:46 +02:00
|
|
|
(defvar timeclock--previous-workday nil)
|
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
(defcustom timeclock-relative t
|
2008-03-07 04:43:35 +00:00
|
|
|
"Whether to make reported time relative to `timeclock-workday'.
|
2000-08-14 12:45:50 +00:00
|
|
|
For example, if the length of a normal workday is eight hours, and you
|
|
|
|
work four hours on Monday, then the amount of time \"remaining\" on
|
|
|
|
Tuesday is twelve hours -- relative to an averaged work period of
|
|
|
|
eight hours -- or eight hours, non-relative. So relative time takes
|
2003-07-11 13:15:05 +00:00
|
|
|
into account any discrepancy of time under-worked or over-worked on
|
2012-06-02 18:56:09 +08:00
|
|
|
previous days. This only affects the timeclock mode line display."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'boolean)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-get-project-function 'timeclock-ask-for-project
|
2008-03-07 04:43:35 +00:00
|
|
|
"The function used to determine the name of the current project.
|
2000-08-14 12:45:50 +00:00
|
|
|
When clocking in, and no project is specified, this function will be
|
2004-04-04 21:30:49 +00:00
|
|
|
called to determine what is the current project to be worked on.
|
2000-08-14 12:45:50 +00:00
|
|
|
If this variable is nil, no questions will be asked."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'function)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-get-reason-function 'timeclock-ask-for-reason
|
2008-03-07 04:43:35 +00:00
|
|
|
"A function used to determine the reason for clocking out.
|
2000-08-14 12:45:50 +00:00
|
|
|
When clocking out, and no reason is specified, this function will be
|
2004-04-04 21:30:49 +00:00
|
|
|
called to determine what is the reason.
|
2000-08-14 12:45:50 +00:00
|
|
|
If this variable is nil, no questions will be asked."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'function)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-get-workday-function nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"A function used to determine the length of today's workday.
|
2000-08-14 12:45:50 +00:00
|
|
|
The first time that a user clocks in each day, this function will be
|
2004-04-04 21:30:49 +00:00
|
|
|
called to determine what is the length of the current workday. If
|
2002-07-12 23:38:01 +00:00
|
|
|
the return value is nil, or equal to `timeclock-workday', nothing special
|
2003-02-04 13:24:35 +00:00
|
|
|
will be done. If it is a quantity different from `timeclock-workday',
|
2002-07-12 23:38:01 +00:00
|
|
|
however, a record will be output to the timelog file to note the fact that
|
2004-04-04 21:30:49 +00:00
|
|
|
that day has a length that is different from the norm."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type '(choice (const nil) function))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-ask-before-exiting t
|
2008-03-07 04:43:35 +00:00
|
|
|
"If non-nil, ask if the user wants to clock out before exiting Emacs.
|
2004-04-04 21:30:49 +00:00
|
|
|
This variable only has effect if set with \\[customize]."
|
2000-08-14 12:45:50 +00:00
|
|
|
:set (lambda (symbol value)
|
|
|
|
(if value
|
2018-10-08 22:33:22 -04:00
|
|
|
(add-hook 'kill-emacs-query-functions #'timeclock-query-out)
|
|
|
|
(remove-hook 'kill-emacs-query-functions #'timeclock-query-out))
|
2013-08-21 21:09:08 -04:00
|
|
|
(set symbol value))
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'boolean)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defvar timeclock-update-timer nil
|
|
|
|
"The timer used to update `timeclock-mode-string'.")
|
|
|
|
|
2003-06-12 17:28:48 +00:00
|
|
|
;; For byte-compiler.
|
|
|
|
(defvar display-time-hook)
|
2012-06-02 18:56:09 +08:00
|
|
|
(defvar timeclock-mode-line-display)
|
2003-06-12 17:28:48 +00:00
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
(defcustom timeclock-use-display-time t
|
2012-06-02 18:56:09 +08:00
|
|
|
"If non-nil, use `display-time-hook' for doing mode line updates.
|
2004-04-04 21:30:49 +00:00
|
|
|
The advantage of this is that one less timer has to be set running
|
2012-02-28 00:17:21 -08:00
|
|
|
amok in Emacs's process space. The disadvantage is that it requires
|
2004-04-04 21:30:49 +00:00
|
|
|
you to have `display-time' running. If you don't want to use
|
2012-06-02 18:56:09 +08:00
|
|
|
`display-time', but still want the mode line to show how much time is
|
2003-07-11 13:15:05 +00:00
|
|
|
left, set this variable to nil. Changing the value of this variable
|
2012-06-02 18:56:09 +08:00
|
|
|
while timeclock information is being displayed in the mode line has no
|
|
|
|
effect. You should call the function `timeclock-mode-line-display' with
|
2003-07-11 13:15:05 +00:00
|
|
|
a positive argument to force an update."
|
2000-08-14 12:45:50 +00:00
|
|
|
:set (lambda (symbol value)
|
|
|
|
(let ((currently-displaying
|
2012-06-02 18:56:09 +08:00
|
|
|
(and (boundp 'timeclock-mode-line-display)
|
|
|
|
timeclock-mode-line-display)))
|
2000-08-14 12:45:50 +00:00
|
|
|
;; if we're changing to the state that
|
2012-06-02 18:56:09 +08:00
|
|
|
;; `timeclock-mode-line-display' is already using, don't
|
2000-08-14 12:45:50 +00:00
|
|
|
;; bother toggling it. This happens on the initial loading
|
|
|
|
;; of timeclock.el.
|
|
|
|
(if (and currently-displaying
|
|
|
|
(or (and value
|
|
|
|
(boundp 'display-time-hook)
|
2018-10-08 22:33:22 -04:00
|
|
|
(memq #'timeclock-update-mode-line
|
2000-08-14 12:45:50 +00:00
|
|
|
display-time-hook))
|
|
|
|
(and (not value)
|
|
|
|
timeclock-update-timer)))
|
|
|
|
(setq currently-displaying nil))
|
|
|
|
(and currently-displaying
|
2013-08-21 21:09:08 -04:00
|
|
|
(setq timeclock-mode-line-display nil))
|
|
|
|
(set symbol value)
|
2000-08-14 12:45:50 +00:00
|
|
|
(and currently-displaying
|
2013-08-21 21:09:08 -04:00
|
|
|
(setq timeclock-mode-line-display t))
|
|
|
|
;; FIXME: The return value isn't used, AFAIK!
|
|
|
|
value))
|
2000-08-14 12:45:50 +00:00
|
|
|
:type 'boolean
|
|
|
|
:require 'time)
|
|
|
|
|
|
|
|
(defcustom timeclock-first-in-hook nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"A hook run for the first \"in\" event each day.
|
2000-08-14 12:45:50 +00:00
|
|
|
Note that this hook is run before recording any events. Thus the
|
|
|
|
value of `timeclock-hours-today', `timeclock-last-event' and the
|
|
|
|
return value of function `timeclock-last-period' are relative previous
|
|
|
|
to today."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'hook)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-load-hook nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"Hook that gets run after timeclock has been loaded."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'hook)
|
2020-01-16 23:06:04 -08:00
|
|
|
(make-obsolete-variable 'timeclock-load-hook
|
|
|
|
"use `with-eval-after-load' instead." "28.1")
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-in-hook nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"A hook run every time an \"in\" event is recorded."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'hook)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-day-over-hook nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"A hook that is run when the workday has been completed.
|
2003-07-10 01:02:11 +00:00
|
|
|
This hook is only run if the current time remaining is being displayed
|
2012-06-02 18:56:09 +08:00
|
|
|
in the mode line. See the variable `timeclock-mode-line-display'."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'hook)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-out-hook nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"A hook run every time an \"out\" event is recorded."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'hook)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-done-hook nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"A hook run every time a project is marked as completed."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'hook)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defcustom timeclock-event-hook nil
|
2008-03-07 04:43:35 +00:00
|
|
|
"A hook run every time any event is recorded."
|
2018-10-08 22:33:22 -04:00
|
|
|
:type 'hook)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defvar timeclock-last-event nil
|
|
|
|
"A list containing the last event that was recorded.
|
2000-10-29 05:18:48 +00:00
|
|
|
The format of this list is (CODE TIME PROJECT).")
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defvar timeclock-last-event-workday nil
|
|
|
|
"The number of seconds in the workday of `timeclock-last-event'.")
|
|
|
|
|
|
|
|
;;; Internal Variables:
|
|
|
|
|
|
|
|
(defvar timeclock-discrepancy nil
|
|
|
|
"A variable containing the time discrepancy before the last event.
|
|
|
|
Normally, timeclock assumes that you intend to work for
|
|
|
|
`timeclock-workday' seconds every day. Any days in which you work
|
|
|
|
more or less than this amount is considered either a positive or
|
2004-04-04 21:30:49 +00:00
|
|
|
a negative discrepancy. If you work in such a manner that the
|
2000-08-14 12:45:50 +00:00
|
|
|
discrepancy is always brought back to zero, then you will by
|
|
|
|
definition have worked an average amount equal to `timeclock-workday'
|
|
|
|
each day.")
|
|
|
|
|
|
|
|
(defvar timeclock-elapsed nil
|
|
|
|
"A variable containing the time elapsed for complete periods today.
|
|
|
|
This value is not accurate enough to be useful by itself. Rather,
|
|
|
|
call `timeclock-workday-elapsed', to determine how much time has been
|
|
|
|
worked so far today. Also, if `timeclock-relative' is nil, this value
|
2006-08-09 11:51:57 +00:00
|
|
|
will be the same as `timeclock-discrepancy'.")
|
|
|
|
|
|
|
|
(defvar timeclock-use-elapsed nil
|
2012-06-02 18:56:09 +08:00
|
|
|
"Non-nil if the mode line should display time elapsed, not remaining.")
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defvar timeclock-last-period nil
|
|
|
|
"Integer representing the number of seconds in the last period.
|
2004-04-04 21:30:49 +00:00
|
|
|
Note that you shouldn't access this value, but instead should use the
|
|
|
|
function `timeclock-last-period'.")
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defvar timeclock-mode-string nil
|
2012-06-02 18:56:09 +08:00
|
|
|
"The timeclock string (optionally) displayed in the mode line.
|
2003-05-27 18:36:40 +00:00
|
|
|
The time is bracketed by <> if you are clocked in, otherwise by [].")
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defvar timeclock-day-over nil
|
|
|
|
"The date of the last day when notified \"day over\" for.")
|
|
|
|
|
|
|
|
;;; User Functions:
|
|
|
|
|
|
|
|
;;;###autoload
|
2013-08-21 21:09:08 -04:00
|
|
|
(define-minor-mode timeclock-mode-line-display
|
2012-06-02 18:56:09 +08:00
|
|
|
"Toggle display of the amount of time left today in the mode line.
|
2003-05-27 18:36:40 +00:00
|
|
|
If `timeclock-use-display-time' is non-nil (the default), then
|
2012-06-02 18:56:09 +08:00
|
|
|
the function `display-time-mode' must be active, and the mode line
|
2003-05-27 18:36:40 +00:00
|
|
|
will be updated whenever the time display is updated. Otherwise,
|
|
|
|
the timeclock will use its own sixty second timer to do its
|
2012-06-02 18:56:09 +08:00
|
|
|
updating. With prefix ARG, turn mode line display on if and only
|
|
|
|
if ARG is positive. Returns the new status of timeclock mode line
|
2021-08-27 03:10:46 +02:00
|
|
|
display (non-nil means on).
|
|
|
|
|
|
|
|
If using a customized `timeclock-workday' value, this should be
|
|
|
|
set before switching this mode on."
|
2013-08-21 21:09:08 -04:00
|
|
|
:global t
|
2003-05-27 18:36:40 +00:00
|
|
|
;; cf display-time-mode.
|
|
|
|
(setq timeclock-mode-string "")
|
|
|
|
(or global-mode-string (setq global-mode-string '("")))
|
2013-08-21 21:09:08 -04:00
|
|
|
(if timeclock-mode-line-display
|
|
|
|
(progn
|
|
|
|
(or (memq 'timeclock-mode-string global-mode-string)
|
|
|
|
(setq global-mode-string
|
|
|
|
(append global-mode-string '(timeclock-mode-string))))
|
2018-10-08 22:33:22 -04:00
|
|
|
(add-hook 'timeclock-event-hook #'timeclock-update-mode-line)
|
2013-08-21 21:09:08 -04:00
|
|
|
(when timeclock-update-timer
|
|
|
|
(cancel-timer timeclock-update-timer)
|
|
|
|
(setq timeclock-update-timer nil))
|
|
|
|
(if (boundp 'display-time-hook)
|
2018-10-08 22:33:22 -04:00
|
|
|
(remove-hook 'display-time-hook #'timeclock-update-mode-line))
|
2013-08-21 21:09:08 -04:00
|
|
|
(if timeclock-use-display-time
|
|
|
|
(progn
|
|
|
|
;; Update immediately so there is a visible change
|
|
|
|
;; on calling this function.
|
|
|
|
(if display-time-mode
|
|
|
|
(timeclock-update-mode-line)
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 08:41:44 -07:00
|
|
|
(message "Activate `display-time-mode' or turn off \
|
|
|
|
`timeclock-use-display-time' to see timeclock information"))
|
2018-10-08 22:33:22 -04:00
|
|
|
(add-hook 'display-time-hook #'timeclock-update-mode-line))
|
2013-08-21 21:09:08 -04:00
|
|
|
(setq timeclock-update-timer
|
|
|
|
(run-at-time nil 60 'timeclock-update-mode-line))))
|
|
|
|
(setq global-mode-string
|
|
|
|
(delq 'timeclock-mode-string global-mode-string))
|
2018-10-08 22:33:22 -04:00
|
|
|
(remove-hook 'timeclock-event-hook #'timeclock-update-mode-line)
|
2013-08-21 21:09:08 -04:00
|
|
|
(if (boundp 'display-time-hook)
|
|
|
|
(remove-hook 'display-time-hook
|
2018-10-08 22:33:22 -04:00
|
|
|
#'timeclock-update-mode-line))
|
2013-08-21 21:09:08 -04:00
|
|
|
(when timeclock-update-timer
|
|
|
|
(cancel-timer timeclock-update-timer)
|
|
|
|
(setq timeclock-update-timer nil))))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
(defsubst timeclock-time-to-date (&optional time)
|
2003-06-12 17:28:48 +00:00
|
|
|
"Convert the TIME value to a textual date string."
|
|
|
|
(format-time-string "%Y/%m/%d" time))
|
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-in (&optional arg project find-project)
|
|
|
|
"Clock in, recording the current time moment in the timelog.
|
|
|
|
With a numeric prefix ARG, record the fact that today has only that
|
2008-03-08 23:18:42 +00:00
|
|
|
many hours in it to be worked. If ARG is a non-numeric prefix argument
|
2000-08-14 12:45:50 +00:00
|
|
|
\(non-nil, but not a number), 0 is assumed (working on a holiday or
|
|
|
|
weekend). *If not called interactively, ARG should be the number of
|
|
|
|
_seconds_ worked today*. This feature only has effect the first time
|
|
|
|
this function is called within a day.
|
|
|
|
|
2004-04-04 21:30:49 +00:00
|
|
|
PROJECT is the project being clocked into. If PROJECT is nil, and
|
2000-08-14 12:45:50 +00:00
|
|
|
FIND-PROJECT is non-nil -- or the user calls `timeclock-in'
|
|
|
|
interactively -- call the function `timeclock-get-project-function' to
|
|
|
|
discover the name of the project."
|
|
|
|
(interactive
|
|
|
|
(list (and current-prefix-arg
|
|
|
|
(if (numberp current-prefix-arg)
|
|
|
|
(* current-prefix-arg 60 60)
|
|
|
|
0))))
|
|
|
|
(if (equal (car timeclock-last-event) "i")
|
|
|
|
(error "You've already clocked in!")
|
|
|
|
(unless timeclock-last-event
|
|
|
|
(timeclock-reread-log))
|
2002-07-13 18:56:04 +00:00
|
|
|
;; Either no log file, or day has rolled over.
|
|
|
|
(unless (and timeclock-last-event
|
|
|
|
(equal (timeclock-time-to-date
|
|
|
|
(cadr timeclock-last-event))
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
(timeclock-time-to-date)))
|
2000-08-14 12:45:50 +00:00
|
|
|
(let ((workday (or (and (numberp arg) arg)
|
|
|
|
(and arg 0)
|
|
|
|
(and timeclock-get-workday-function
|
|
|
|
(funcall timeclock-get-workday-function))
|
|
|
|
timeclock-workday)))
|
|
|
|
(run-hooks 'timeclock-first-in-hook)
|
|
|
|
;; settle the discrepancy for the new day
|
|
|
|
(setq timeclock-discrepancy
|
2002-07-13 18:56:04 +00:00
|
|
|
(- (or timeclock-discrepancy 0) workday))
|
2000-08-14 12:45:50 +00:00
|
|
|
(if (not (= workday timeclock-workday))
|
2007-05-10 16:32:30 +00:00
|
|
|
(timeclock-log "h" (number-to-string
|
|
|
|
(/ workday (if (zerop (% workday (* 60 60)))
|
2018-10-08 22:33:22 -04:00
|
|
|
60 60.0)
|
|
|
|
60))))))
|
2000-08-14 12:45:50 +00:00
|
|
|
(timeclock-log "i" (or project
|
|
|
|
(and timeclock-get-project-function
|
2009-10-02 03:48:36 +00:00
|
|
|
(or find-project
|
|
|
|
(called-interactively-p 'interactive))
|
2000-08-14 12:45:50 +00:00
|
|
|
(funcall timeclock-get-project-function))))
|
|
|
|
(run-hooks 'timeclock-in-hook)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-out (&optional arg reason find-reason)
|
|
|
|
"Clock out, recording the current time moment in the timelog.
|
|
|
|
If a prefix ARG is given, the user has completed the project that was
|
|
|
|
begun during the last time segment.
|
|
|
|
|
|
|
|
REASON is the user's reason for clocking out. If REASON is nil, and
|
|
|
|
FIND-REASON is non-nil -- or the user calls `timeclock-out'
|
|
|
|
interactively -- call the function `timeclock-get-reason-function' to
|
|
|
|
discover the reason."
|
|
|
|
(interactive "P")
|
2001-11-03 15:50:05 +00:00
|
|
|
(or timeclock-last-event
|
|
|
|
(error "You haven't clocked in!"))
|
2000-08-14 12:45:50 +00:00
|
|
|
(if (equal (downcase (car timeclock-last-event)) "o")
|
|
|
|
(error "You've already clocked out!")
|
|
|
|
(timeclock-log
|
|
|
|
(if arg "O" "o")
|
|
|
|
(or reason
|
|
|
|
(and timeclock-get-reason-function
|
2009-10-02 03:48:36 +00:00
|
|
|
(or find-reason (called-interactively-p 'interactive))
|
2000-08-14 12:45:50 +00:00
|
|
|
(funcall timeclock-get-reason-function))))
|
|
|
|
(run-hooks 'timeclock-out-hook)
|
|
|
|
(if arg
|
|
|
|
(run-hooks 'timeclock-done-hook))))
|
|
|
|
|
2011-11-17 09:40:48 -08:00
|
|
|
;; Should today-only be removed in favor of timeclock-relative? - gm
|
2003-06-12 17:28:48 +00:00
|
|
|
(defsubst timeclock-workday-remaining (&optional today-only)
|
|
|
|
"Return the number of seconds until the workday is complete.
|
|
|
|
The amount returned is relative to the value of `timeclock-workday'.
|
|
|
|
If TODAY-ONLY is non-nil, the value returned will be relative only to
|
2003-07-10 01:02:11 +00:00
|
|
|
the time worked today, and not to past time."
|
2003-06-12 17:28:48 +00:00
|
|
|
(let ((discrep (timeclock-find-discrep)))
|
|
|
|
(if discrep
|
2003-07-10 01:02:11 +00:00
|
|
|
(- (if today-only (cadr discrep)
|
|
|
|
(car discrep)))
|
2003-06-12 17:28:48 +00:00
|
|
|
0.0)))
|
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-status-string (&optional show-seconds today-only)
|
2003-07-10 01:02:11 +00:00
|
|
|
"Report the overall timeclock status at the present moment.
|
|
|
|
If SHOW-SECONDS is non-nil, display second resolution.
|
|
|
|
If TODAY-ONLY is non-nil, the display will be relative only to time
|
|
|
|
worked today, ignoring the time worked on previous days."
|
2000-08-14 12:45:50 +00:00
|
|
|
(interactive "P")
|
2018-10-08 22:33:22 -04:00
|
|
|
(let* ((remainder (timeclock-workday-remaining
|
|
|
|
(or today-only
|
|
|
|
(not timeclock-relative))))
|
|
|
|
(last-in (equal (car timeclock-last-event) "i"))
|
|
|
|
(status
|
2000-08-14 12:45:50 +00:00
|
|
|
(format "Currently %s since %s (%s), %s %s, leave at %s"
|
|
|
|
(if last-in "IN" "OUT")
|
|
|
|
(if show-seconds
|
|
|
|
(format-time-string "%-I:%M:%S %p"
|
|
|
|
(nth 1 timeclock-last-event))
|
|
|
|
(format-time-string "%-I:%M %p"
|
|
|
|
(nth 1 timeclock-last-event)))
|
|
|
|
(or (nth 2 timeclock-last-event)
|
|
|
|
(if last-in "**UNKNOWN**" "workday over"))
|
|
|
|
(timeclock-seconds-to-string remainder show-seconds t)
|
|
|
|
(if (> remainder 0)
|
|
|
|
"remaining" "over")
|
2018-10-08 22:33:22 -04:00
|
|
|
(timeclock-when-to-leave-string show-seconds today-only))))
|
2009-10-02 03:48:36 +00:00
|
|
|
(if (called-interactively-p 'interactive)
|
2005-09-18 12:41:39 +00:00
|
|
|
(message "%s" status)
|
2000-08-14 12:45:50 +00:00
|
|
|
status)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-change (&optional arg project)
|
2004-04-04 21:30:49 +00:00
|
|
|
"Change to working on a different project.
|
|
|
|
This clocks out of the current project, then clocks in on a new one.
|
|
|
|
With a prefix ARG, consider the previous project as finished at the
|
|
|
|
time of changeover. PROJECT is the name of the last project you were
|
|
|
|
working on."
|
2000-08-14 12:45:50 +00:00
|
|
|
(interactive "P")
|
|
|
|
(timeclock-out arg)
|
2009-10-02 03:48:36 +00:00
|
|
|
(timeclock-in nil project (called-interactively-p 'interactive)))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-query-out ()
|
2004-04-04 21:30:49 +00:00
|
|
|
"Ask the user whether to clock out.
|
2003-05-27 18:36:40 +00:00
|
|
|
This is a useful function for adding to `kill-emacs-query-functions'."
|
2003-06-12 17:28:48 +00:00
|
|
|
(and (equal (car timeclock-last-event) "i")
|
|
|
|
(y-or-n-p "You're currently clocking time, clock out? ")
|
|
|
|
(timeclock-out))
|
|
|
|
;; Unconditionally return t for `kill-emacs-query-functions'.
|
|
|
|
t)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-reread-log ()
|
|
|
|
"Re-read the timeclock, to account for external changes.
|
|
|
|
Returns the new value of `timeclock-discrepancy'."
|
|
|
|
(interactive)
|
|
|
|
(setq timeclock-discrepancy nil)
|
|
|
|
(timeclock-find-discrep)
|
2012-06-02 18:56:09 +08:00
|
|
|
(if (and timeclock-discrepancy timeclock-mode-line-display)
|
|
|
|
(timeclock-update-mode-line))
|
2000-08-14 12:45:50 +00:00
|
|
|
timeclock-discrepancy)
|
|
|
|
|
|
|
|
(defun timeclock-seconds-to-string (seconds &optional show-seconds
|
|
|
|
reverse-leader)
|
|
|
|
"Convert SECONDS into a compact time string.
|
|
|
|
If SHOW-SECONDS is non-nil, make the resolution of the return string
|
|
|
|
include the second count. If REVERSE-LEADER is non-nil, it means to
|
|
|
|
output a \"+\" if the time value is negative, rather than a \"-\".
|
|
|
|
This is used when negative time values have an inverted meaning (such
|
|
|
|
as with time remaining, where negative time really means overtime)."
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(let ((s (abs (truncate seconds))))
|
|
|
|
(format (if show-seconds "%s%d:%02d:%02d" "%s%d:%02d")
|
2000-08-14 12:45:50 +00:00
|
|
|
(if (< seconds 0) (if reverse-leader "+" "-") "")
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(/ s 3600) (% (/ s 60) 60) (% s 60))))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
2000-10-29 05:18:48 +00:00
|
|
|
(defsubst timeclock-currently-in-p ()
|
2000-08-14 12:45:50 +00:00
|
|
|
"Return non-nil if the user is currently clocked in."
|
|
|
|
(equal (car timeclock-last-event) "i"))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-workday-remaining-string (&optional show-seconds
|
|
|
|
today-only)
|
|
|
|
"Return a string representing the amount of time left today.
|
|
|
|
Display second resolution if SHOW-SECONDS is non-nil. If TODAY-ONLY
|
|
|
|
is non-nil, the display will be relative only to time worked today.
|
|
|
|
See `timeclock-relative' for more information about the meaning of
|
|
|
|
\"relative to today\"."
|
|
|
|
(interactive)
|
|
|
|
(let ((string (timeclock-seconds-to-string
|
|
|
|
(timeclock-workday-remaining today-only)
|
|
|
|
show-seconds t)))
|
2009-10-02 03:48:36 +00:00
|
|
|
(if (called-interactively-p 'interactive)
|
2005-09-18 12:41:39 +00:00
|
|
|
(message "%s" string)
|
2000-08-14 12:45:50 +00:00
|
|
|
string)))
|
|
|
|
|
2001-05-08 21:12:41 +00:00
|
|
|
(defsubst timeclock-workday-elapsed ()
|
2002-07-03 13:18:53 +00:00
|
|
|
"Return the number of seconds worked so far today.
|
2000-08-14 12:45:50 +00:00
|
|
|
If RELATIVE is non-nil, the amount returned will be relative to past
|
|
|
|
time worked. The default is to return only the time that has elapsed
|
|
|
|
so far today."
|
2001-05-08 21:12:41 +00:00
|
|
|
(let ((discrep (timeclock-find-discrep)))
|
|
|
|
(if discrep
|
|
|
|
(nth 2 discrep)
|
|
|
|
0.0)))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
2001-05-08 21:12:41 +00:00
|
|
|
(defun timeclock-workday-elapsed-string (&optional show-seconds)
|
2000-08-14 12:45:50 +00:00
|
|
|
"Return a string representing the amount of time worked today.
|
|
|
|
Display seconds resolution if SHOW-SECONDS is non-nil. If RELATIVE is
|
|
|
|
non-nil, the amount returned will be relative to past time worked."
|
|
|
|
(interactive)
|
2001-05-08 21:12:41 +00:00
|
|
|
(let ((string (timeclock-seconds-to-string (timeclock-workday-elapsed)
|
|
|
|
show-seconds)))
|
2009-10-02 03:48:36 +00:00
|
|
|
(if (called-interactively-p 'interactive)
|
2005-09-18 12:41:39 +00:00
|
|
|
(message "%s" string)
|
2000-08-14 12:45:50 +00:00
|
|
|
string)))
|
|
|
|
|
2016-11-17 22:50:40 -08:00
|
|
|
(define-obsolete-function-alias 'timeclock-time-to-seconds 'float-time "26.1")
|
New function time-convert
This replaces the awkward reuse of encode-time to both convert
calendrical timestamps to Lisp timestamps, and to convert Lisp
timestamps to other forms. Now, encode-time does just the
former and the new function does just the latter.
The new function builds on a suggestion by Lars Ingebrigtsen in:
https://lists.gnu.org/r/emacs-devel/2019-07/msg00801.html
and refined by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2019-07/msg00803.html
* doc/lispref/os.texi (Time of Day, Time Conversion):
* doc/misc/emacs-mime.texi (time-date):
* etc/NEWS: Update documentation.
* lisp/calendar/cal-dst.el (calendar-next-time-zone-transition):
* lisp/calendar/time-date.el (seconds-to-time, days-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-add-item):
* lisp/emacs-lisp/cl-extra.el (cl--random-time):
* lisp/emacs-lisp/timer.el (timer--time-setter)
(timer-next-integral-multiple-of-time):
* lisp/find-lisp.el (find-lisp-format-time):
* lisp/gnus/gnus-diary.el (gnus-user-format-function-d):
* lisp/gnus/gnus-group.el (gnus-group-set-timestamp):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-show-org-agenda):
* lisp/gnus/nnrss.el (nnrss-normalize-date):
* lisp/gnus/nnspool.el (nnspool-request-newgroups):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/net/pop3.el (pop3-uidl-dele):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-clock-in)
(org-clock-out, org-clock-sum):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cc-cmds.el (c-progress-init)
(c-progress-update):
* lisp/progmodes/cperl-mode.el (cperl-time-fontification):
* lisp/progmodes/flymake.el (flymake--schedule-timer-maybe):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
* lisp/tar-mode.el (tar-octal-time):
* lisp/time.el (emacs-uptime):
* lisp/url/url-auth.el (url-digest-auth-make-cnonce):
* lisp/url/url-util.el (url-lazy-message):
* lisp/vc/vc-cvs.el (vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg-state-fast):
* lisp/xt-mouse.el (xterm-mouse-event):
* test/lisp/emacs-lisp/timer-tests.el:
(timer-next-integral-multiple-of-time-2):
Use time-convert, not encode-time.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
Don’t use now-removed FORM argument for encode-time.
It wasn’t crucial anyway.
* lisp/emacs-lisp/byte-opt.el (side-effect-free-fns): Add time-convert.
* lisp/emacs-lisp/elint.el (elint-unknown-builtin-args):
Update encode-time signature to match current arg set.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Use timer-convert with t rather than doing it by hand.
* src/timefns.c (time_hz_ticks, time_form_stamp, lisp_time_form_stamp):
Remove; no longer needed.
(decode_lisp_time): Rturn the form instead of having a *PFORM arg.
All uses changed.
(time_arith): Just return TICKS if HZ is 1.
(Fencode_time): Remove argument FORM. All callers changed.
Do not attempt to encode time values; just encode
decoded (calendrical) times.
Unless CURRENT_TIME_LIST, just return VALUE since HZ is 1.
(Ftime_convert): New function, which does the time value
conversion that bleeding-edge encode-time formerly did.
Return TIME if it is easy to see that it is already
of the correct form.
(Fcurrent_time): Mention in doc that the form is planned to change.
* test/src/timefns-tests.el (decode-then-encode-time):
Don’t use (encode-time nil).
2019-08-05 17:38:52 -07:00
|
|
|
(define-obsolete-function-alias 'timeclock-seconds-to-time 'time-convert "26.1")
|
2003-06-12 17:28:48 +00:00
|
|
|
|
2011-11-17 09:40:48 -08:00
|
|
|
;; Should today-only be removed in favor of timeclock-relative? - gm
|
2000-10-29 05:18:48 +00:00
|
|
|
(defsubst timeclock-when-to-leave (&optional today-only)
|
2004-04-04 21:30:49 +00:00
|
|
|
"Return a time value representing the end of today's workday.
|
2000-08-14 12:45:50 +00:00
|
|
|
If TODAY-ONLY is non-nil, the value returned will be relative only to
|
2003-07-10 01:02:11 +00:00
|
|
|
the time worked today, and not to past time."
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(time-since (let ((discrep (timeclock-find-discrep)))
|
|
|
|
(if discrep
|
|
|
|
(if today-only
|
|
|
|
(cadr discrep)
|
|
|
|
(car discrep))
|
|
|
|
0))))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun timeclock-when-to-leave-string (&optional show-seconds
|
|
|
|
today-only)
|
2004-04-04 21:30:49 +00:00
|
|
|
"Return a string representing the end of today's workday.
|
2000-08-14 12:45:50 +00:00
|
|
|
This string is relative to the value of `timeclock-workday'. If
|
2003-07-10 01:02:11 +00:00
|
|
|
SHOW-SECONDS is non-nil, the value printed/returned will include
|
|
|
|
seconds. If TODAY-ONLY is non-nil, the value returned will be
|
|
|
|
relative only to the time worked today, and not to past time."
|
2011-11-17 09:40:48 -08:00
|
|
|
;; Should today-only be removed in favor of timeclock-relative? - gm
|
2000-08-14 12:45:50 +00:00
|
|
|
(interactive)
|
|
|
|
(let* ((then (timeclock-when-to-leave today-only))
|
|
|
|
(string
|
|
|
|
(if show-seconds
|
|
|
|
(format-time-string "%-I:%M:%S %p" then)
|
|
|
|
(format-time-string "%-I:%M %p" then))))
|
2009-10-02 03:48:36 +00:00
|
|
|
(if (called-interactively-p 'interactive)
|
2005-09-18 12:41:39 +00:00
|
|
|
(message "%s" string)
|
2000-08-14 12:45:50 +00:00
|
|
|
string)))
|
|
|
|
|
2007-06-04 23:49:26 +00:00
|
|
|
(defun timeclock-make-hours-explicit (old-default)
|
|
|
|
"Specify all workday lengths in `timeclock-file'.
|
|
|
|
OLD-DEFAULT hours are set for every day that has no number indicated."
|
|
|
|
(interactive "P")
|
|
|
|
(if old-default (setq old-default (prefix-numeric-value old-default))
|
2020-09-23 13:35:55 +02:00
|
|
|
(error "`timeclock-make-hours-explicit' requires an explicit argument"))
|
2007-06-04 23:49:26 +00:00
|
|
|
(let ((extant-timelog (find-buffer-visiting timeclock-file))
|
|
|
|
current-date)
|
|
|
|
(with-current-buffer (find-file-noselect timeclock-file t)
|
|
|
|
(unwind-protect
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (progn (skip-chars-forward "\n") (not (eobp)))
|
|
|
|
;; This is just a variant of `timeclock-moment-regexp'.
|
|
|
|
(unless (looking-at
|
|
|
|
(concat "^\\([bhioO]\\) \\([0-9]+/[0-9]+/[0-9]+\\) "
|
|
|
|
"\\([0-9]+:[0-9]+:[0-9]+\\)"))
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 08:41:44 -07:00
|
|
|
(error "Can't parse `%s'" timeclock-file))
|
2007-06-04 23:49:26 +00:00
|
|
|
(let ((this-date (match-string 2)))
|
|
|
|
(unless (or (and current-date
|
|
|
|
(string= this-date current-date))
|
|
|
|
(string= (match-string 1) "h"))
|
|
|
|
(insert (format "h %s %s %s\n" (match-string 2)
|
|
|
|
(match-string 3) old-default)))
|
|
|
|
(if (string-match "^[ih]" (match-string 1)) ; ignore logouts
|
|
|
|
(setq current-date this-date)))
|
|
|
|
(forward-line))
|
|
|
|
(save-buffer)))
|
|
|
|
(unless extant-timelog (kill-buffer (current-buffer)))))))
|
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
;;; Internal Functions:
|
|
|
|
|
|
|
|
(defvar timeclock-project-list nil)
|
|
|
|
(defvar timeclock-last-project nil)
|
|
|
|
|
2001-04-11 15:51:19 +00:00
|
|
|
(defun timeclock-completing-read (prompt alist &optional default)
|
2019-06-19 23:13:31 +02:00
|
|
|
"A version of `completing-read'.
|
2008-03-08 23:18:42 +00:00
|
|
|
PROMPT, ALIST and DEFAULT are used for the PROMPT, COLLECTION and DEF
|
|
|
|
arguments of `completing-read'."
|
2019-06-19 23:10:04 +02:00
|
|
|
(declare (obsolete completing-read "27.1"))
|
|
|
|
(completing-read prompt alist nil nil nil nil default))
|
2001-04-11 15:51:19 +00:00
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
(defun timeclock-ask-for-project ()
|
|
|
|
"Ask the user for the project they are clocking into."
|
2019-06-19 23:10:04 +02:00
|
|
|
(completing-read
|
Use `format-prompt' when prompting with default values
* lisp/woman.el (woman-file-name):
* lisp/wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* lisp/w32-fns.el (w32-set-system-coding-system):
* lisp/vc/vc.el (vc-print-root-log):
* lisp/vc/vc-annotate.el (vc-annotate):
* lisp/vc/emerge.el (emerge-read-file-name):
* lisp/vc/ediff.el (ediff-directories)
(ediff-directory-revisions, ediff-directories3)
(ediff-merge-directories, )
(ediff-merge-directories-with-ancestor)
(ediff-merge-directory-revisions)
(ediff-merge-directory-revisions-with-ancestor)
(ediff-merge-revisions, ediff-merge-revisions-with-ancestor)
(ediff-revision):
* lisp/vc/ediff-util.el (ediff-toggle-regexp-match):
* lisp/vc/ediff-mult.el (ediff-filegroup-action):
* lisp/vc/add-log.el (prompt-for-change-log-name):
* lisp/textmodes/table.el (table-insert-row-column)
(table-span-cell, table-split-cell-horizontally)
(table-split-cell, table-justify, table-generate-source)
(table-insert-sequence, table-capture)
(table--read-from-minibuffer, table--query-justification):
* lisp/textmodes/sgml-mode.el (sgml-tag, sgml-tag-help):
* lisp/textmodes/reftex-ref.el (reftex-goto-label):
* lisp/textmodes/refer.el (refer-get-bib-files):
* lisp/textmodes/css-mode.el (css-lookup-symbol):
* lisp/term.el (serial-read-name, serial-read-speed):
* lisp/speedbar.el (speedbar-change-initial-expansion-list):
* lisp/simple.el (previous-matching-history-element)
(set-variable):
* lisp/ses.el (ses-read-cell, ses-set-column-width):
* lisp/replace.el (query-replace-read-from)
(occur-read-primary-args):
* lisp/rect.el (string-rectangle, string-insert-rectangle):
* lisp/progmodes/tcl.el (tcl-help-on-word):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/python.el (python-eldoc-at-point):
* lisp/progmodes/octave.el (octave-completing-read)
(octave-update-function-file-comment, octave-insert-defun):
* lisp/progmodes/inf-lisp.el (lisp-symprompt):
* lisp/progmodes/cperl-mode.el (cperl-info-on-command)
(cperl-perldoc):
* lisp/progmodes/compile.el (compilation-find-file):
* lisp/net/rcirc.el (rcirc-prompt-for-encryption):
* lisp/net/eww.el (eww):
* lisp/net/browse-url.el (browse-url-with-browser-kind):
* lisp/man.el (man):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/mail/mailalias.el (build-mail-aliases):
* lisp/mail/mailabbrev.el (merge-mail-abbrevs)
(rebuild-mail-abbrevs):
* lisp/locate.el (locate-prompt-for-search-string):
* lisp/isearch.el (isearch-occur):
* lisp/international/ogonek.el (ogonek-read-encoding)
(ogonek-read-prefix):
* lisp/international/mule.el (read-buffer-file-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system, recode-region):
* lisp/international/mule-cmds.el ()
(universal-coding-system-argument, search-unencodable-char)
(select-safe-coding-system-interactively):
* lisp/info.el (Info-search, Info-search-backward, Info-menu):
* lisp/info-look.el (info-lookup-interactive-arguments):
* lisp/imenu.el (imenu--completion-buffer):
* lisp/ibuf-ext.el (mode, used-mode, ibuffer-mark-by-mode):
* lisp/hi-lock.el (hi-lock-unface-buffer)
(hi-lock-read-face-name):
* lisp/help.el (view-emacs-news, where-is):
* lisp/help-fns.el (describe-variable, describe-symbol)
(describe-keymap):
* lisp/gnus/mm-decode.el (mm-save-part):
* lisp/gnus/gnus-sum.el (gnus-summary-browse-url):
* lisp/gnus/gnus-group.el (gnus-group--read-bug-ids)
(gnus-group-set-current-level):
* lisp/frame.el (make-frame-on-monitor)
(close-display-connection, select-frame-by-name):
* lisp/format.el (format-encode-buffer, format-encode-region):
* lisp/files.el (recode-file-name):
* lisp/files-x.el (read-file-local-variable)
(read-file-local-variable-value, )
(read-file-local-variable-mode):
* lisp/ffap.el (ffap-menu-ask):
* lisp/faces.el (face-read-string):
* lisp/facemenu.el (facemenu-set-charset):
* lisp/erc/erc-dcc.el (erc-dcc-do-GET-command):
* lisp/emulation/edt-mapper.el (edt-mapper):
* lisp/emacs-lisp/trace.el (trace--read-args)
(trace-function-foreground, trace-function-background):
* lisp/emacs-lisp/smie.el (smie-config-set-indent):
* lisp/emacs-lisp/re-builder.el (reb-change-syntax):
* lisp/emacs-lisp/package.el (describe-package):
* lisp/emacs-lisp/find-func.el (read-library-name)
(find-function-read):
* lisp/emacs-lisp/ert.el (ert-read-test-name)
(ert-run-tests-interactively):
* lisp/emacs-lisp/disass.el (disassemble):
* lisp/emacs-lisp/debug.el (debug-on-entry)
(debug-on-variable-change):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-read-regexp):
* lisp/dired-x.el (dired--mark-suffix-interactive-spec):
* lisp/dired-aux.el (dired-diff):
* lisp/cus-edit.el (custom-variable-prompt, customize-mode)
(customize-changed-options):
* lisp/completion.el (interactive-completion-string-reader):
* lisp/calendar/timeclock.el (timeclock-ask-for-project):
* lisp/calc/calcalg3.el (calc-get-fit-variables):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-bin.el (calc-word-size):
* lisp/bookmark.el (bookmark-set-internal):
* lisp/abbrev.el (read-abbrev-file): Use `format-prompt' for
prompting (bug#12443).
2020-09-06 16:56:44 +02:00
|
|
|
(format-prompt "Clock into which project"
|
|
|
|
(or timeclock-last-project
|
|
|
|
(car timeclock-project-list)))
|
2018-10-08 22:33:22 -04:00
|
|
|
timeclock-project-list
|
2019-06-19 23:10:04 +02:00
|
|
|
nil nil nil nil
|
2001-04-11 15:51:19 +00:00
|
|
|
(or timeclock-last-project
|
|
|
|
(car timeclock-project-list))))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defvar timeclock-reason-list nil)
|
|
|
|
|
|
|
|
(defun timeclock-ask-for-reason ()
|
|
|
|
"Ask the user for the reason they are clocking out."
|
2019-06-19 23:10:04 +02:00
|
|
|
(completing-read "Reason for clocking out: " timeclock-reason-list))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
2012-06-02 18:56:09 +08:00
|
|
|
(defun timeclock-update-mode-line ()
|
|
|
|
"Update the `timeclock-mode-string' displayed in the mode line.
|
2003-07-10 01:02:11 +00:00
|
|
|
The value of `timeclock-relative' affects the display as described in
|
|
|
|
that variable's documentation."
|
2000-08-14 12:45:50 +00:00
|
|
|
(interactive)
|
2006-08-09 11:51:57 +00:00
|
|
|
(let ((remainder
|
|
|
|
(if timeclock-use-elapsed
|
|
|
|
(timeclock-workday-elapsed)
|
|
|
|
(timeclock-workday-remaining (not timeclock-relative))))
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
(last-in (equal (car timeclock-last-event) "i"))
|
|
|
|
(todays-date (timeclock-time-to-date)))
|
2000-08-14 12:45:50 +00:00
|
|
|
(when (and (< remainder 0)
|
|
|
|
(not (and timeclock-day-over
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
(equal timeclock-day-over todays-date))))
|
|
|
|
(setq timeclock-day-over todays-date)
|
2000-08-14 12:45:50 +00:00
|
|
|
(run-hooks 'timeclock-day-over-hook))
|
|
|
|
(setq timeclock-mode-string
|
2003-05-27 18:36:40 +00:00
|
|
|
(propertize
|
|
|
|
(format " %c%s%c "
|
2017-05-06 19:16:49 +02:00
|
|
|
(if last-in ?< ?\[)
|
2003-05-27 18:36:40 +00:00
|
|
|
(timeclock-seconds-to-string remainder nil t)
|
2017-05-06 19:16:49 +02:00
|
|
|
(if last-in ?> ?\]))
|
2003-05-27 18:36:40 +00:00
|
|
|
'help-echo "timeclock: time remaining"))))
|
|
|
|
|
|
|
|
(put 'timeclock-mode-string 'risky-local-variable t)
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(defun timeclock-log (code &optional project)
|
|
|
|
"Log the event CODE to the timeclock log, at the time of call.
|
|
|
|
If PROJECT is a string, it represents the project which the event is
|
2000-10-29 05:18:48 +00:00
|
|
|
being logged for. Normally only \"in\" events specify a project."
|
2007-05-10 16:32:30 +00:00
|
|
|
(let ((extant-timelog (find-buffer-visiting timeclock-file)))
|
2007-06-04 23:49:26 +00:00
|
|
|
(with-current-buffer (find-file-noselect timeclock-file t)
|
2007-05-10 16:32:30 +00:00
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(if (not (bolp))
|
|
|
|
(insert "\n"))
|
|
|
|
(let ((now (current-time)))
|
|
|
|
(insert code " "
|
|
|
|
(format-time-string "%Y/%m/%d %H:%M:%S" now)
|
2007-06-04 23:49:26 +00:00
|
|
|
(or (and (stringp project)
|
2007-05-10 16:32:30 +00:00
|
|
|
(> (length project) 0)
|
|
|
|
(concat " " project))
|
|
|
|
"")
|
|
|
|
"\n")
|
|
|
|
(if (equal (downcase code) "o")
|
|
|
|
(setq timeclock-last-period
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(float-time
|
|
|
|
(time-subtract now (cadr timeclock-last-event)))
|
2007-05-10 16:32:30 +00:00
|
|
|
timeclock-discrepancy
|
|
|
|
(+ timeclock-discrepancy
|
|
|
|
timeclock-last-period)))
|
|
|
|
(setq timeclock-last-event (list code now project)))))
|
|
|
|
(save-buffer)
|
2007-06-04 23:49:26 +00:00
|
|
|
(unless extant-timelog (kill-buffer (current-buffer)))))
|
|
|
|
(run-hooks 'timeclock-event-hook))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
2000-10-29 05:18:48 +00:00
|
|
|
(defvar timeclock-moment-regexp
|
|
|
|
(concat "\\([bhioO]\\)\\s-+"
|
|
|
|
"\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)\\s-+"
|
|
|
|
"\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)[ \t]*" "\\([^\n]*\\)"))
|
|
|
|
|
2018-10-08 22:33:22 -04:00
|
|
|
(defun timeclock-read-moment ()
|
2000-08-14 12:45:50 +00:00
|
|
|
"Read the moment under point from the timelog."
|
2000-10-29 05:18:48 +00:00
|
|
|
(if (looking-at timeclock-moment-regexp)
|
|
|
|
(let ((code (match-string 1))
|
|
|
|
(year (string-to-number (match-string 2)))
|
|
|
|
(mon (string-to-number (match-string 3)))
|
|
|
|
(mday (string-to-number (match-string 4)))
|
|
|
|
(hour (string-to-number (match-string 5)))
|
|
|
|
(min (string-to-number (match-string 6)))
|
|
|
|
(sec (string-to-number (match-string 7)))
|
|
|
|
(project (match-string 8)))
|
|
|
|
(list code (encode-time sec min hour mday mon year) project))))
|
|
|
|
|
2000-08-14 12:45:50 +00:00
|
|
|
(defun timeclock-last-period (&optional moment)
|
|
|
|
"Return the value of the last event period.
|
|
|
|
If the last event was a clock-in, the period will be open ended, and
|
|
|
|
growing every second. Otherwise, it is a fixed amount which has been
|
|
|
|
recorded to disk. If MOMENT is non-nil, use that as the current time.
|
|
|
|
This is only provided for coherency when used by
|
|
|
|
`timeclock-discrepancy'."
|
|
|
|
(if (equal (car timeclock-last-event) "i")
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(float-time (time-subtract moment (cadr timeclock-last-event)))
|
2000-08-14 12:45:50 +00:00
|
|
|
timeclock-last-period))
|
|
|
|
|
2018-10-08 22:33:22 -04:00
|
|
|
(cl-defstruct (timeclock-entry
|
|
|
|
(:constructor nil) (:copier nil)
|
|
|
|
(:type list))
|
|
|
|
begin end project comment
|
|
|
|
;; FIXME: Documented in docstring of timeclock-log-data, but I can't see
|
|
|
|
;; where it's used in the code.
|
|
|
|
final-p)
|
|
|
|
|
2000-10-29 05:18:48 +00:00
|
|
|
(defsubst timeclock-entry-length (entry)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the length of ENTRY in seconds."
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(float-time (time-subtract (cadr entry) (car entry))))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defsubst timeclock-entry-list-length (entry-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the total length of ENTRY-LIST in seconds."
|
2000-10-29 05:18:48 +00:00
|
|
|
(let ((length 0))
|
2008-03-08 23:18:42 +00:00
|
|
|
(dolist (entry entry-list)
|
|
|
|
(setq length (+ length (timeclock-entry-length entry))))
|
2000-10-29 05:18:48 +00:00
|
|
|
length))
|
|
|
|
|
|
|
|
(defsubst timeclock-entry-list-begin (entry-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the start time of the first element of ENTRY-LIST."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-entry-begin (car entry-list)))
|
|
|
|
|
|
|
|
(defsubst timeclock-entry-list-end (entry-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the end time of the last element of ENTRY-LIST."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-entry-end (car (last entry-list))))
|
|
|
|
|
|
|
|
(defsubst timeclock-entry-list-span (entry-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the total time in seconds spanned by ENTRY-LIST."
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(float-time (time-subtract (timeclock-entry-list-end entry-list)
|
|
|
|
(timeclock-entry-list-begin entry-list))))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defsubst timeclock-entry-list-break (entry-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the total break time (span - length) in ENTRY-LIST."
|
2000-10-29 05:18:48 +00:00
|
|
|
(- (timeclock-entry-list-span entry-list)
|
|
|
|
(timeclock-entry-list-length entry-list)))
|
|
|
|
|
2018-10-08 22:33:22 -04:00
|
|
|
(defun timeclock-entry-list-projects (entry-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return a list of all the projects in ENTRY-LIST."
|
2018-10-08 22:33:22 -04:00
|
|
|
(let (projects)
|
2008-03-08 23:18:42 +00:00
|
|
|
(dolist (entry entry-list)
|
2018-10-08 22:33:22 -04:00
|
|
|
(cl-pushnew (timeclock-entry-project entry) projects :test #'equal))
|
2000-10-29 05:18:48 +00:00
|
|
|
projects))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-required (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the required length of DAY in seconds, default `timeclock-workday'."
|
2001-04-24 01:39:55 +00:00
|
|
|
(or (car day) timeclock-workday))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defsubst timeclock-day-length (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the actual length of DAY in seconds."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-entry-list-length (cdr day)))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-debt (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the debt (required - actual) associated with DAY, in seconds."
|
2000-10-29 05:18:48 +00:00
|
|
|
(- (timeclock-day-required day)
|
|
|
|
(timeclock-day-length day)))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-begin (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the start time of DAY."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-entry-list-begin (cdr day)))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-end (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the end time of DAY."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-entry-list-end (cdr day)))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-span (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the span of DAY."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-entry-list-span (cdr day)))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-break (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the total break time of DAY."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-entry-list-break (cdr day)))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-projects (day)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return a list of all the projects in DAY."
|
2008-07-30 02:13:37 +00:00
|
|
|
(timeclock-entry-list-projects (cddr day)))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
2013-08-21 21:09:08 -04:00
|
|
|
(defun timeclock-day-list-template (func day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Template for summing the result of FUNC on each element of DAY-LIST."
|
2013-08-21 21:09:08 -04:00
|
|
|
(let ((length 0))
|
|
|
|
(dolist (day day-list)
|
|
|
|
(setq length (+ length (funcall func day))))
|
|
|
|
length))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defun timeclock-day-list-required (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return total required length of DAY-LIST, in seconds."
|
2013-08-21 21:09:08 -04:00
|
|
|
(timeclock-day-list-template #'timeclock-day-required day-list))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defun timeclock-day-list-length (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return actual length of DAY-LIST, in seconds."
|
2013-08-21 21:09:08 -04:00
|
|
|
(timeclock-day-list-template #'timeclock-day-length day-list))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defun timeclock-day-list-debt (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return total debt (required - actual) of DAY-LIST."
|
2013-08-21 21:09:08 -04:00
|
|
|
(timeclock-day-list-template #'timeclock-day-debt day-list))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defsubst timeclock-day-list-begin (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the start time of DAY-LIST."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-day-begin (car day-list)))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-list-end (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the end time of DAY-LIST."
|
2000-10-29 05:18:48 +00:00
|
|
|
(timeclock-day-end (car (last day-list))))
|
|
|
|
|
|
|
|
(defun timeclock-day-list-span (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the span of DAY-LIST."
|
2013-08-21 21:09:08 -04:00
|
|
|
(timeclock-day-list-template #'timeclock-day-span day-list))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defun timeclock-day-list-break (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the total break of DAY-LIST."
|
2013-08-21 21:09:08 -04:00
|
|
|
(timeclock-day-list-template #'timeclock-day-break day-list))
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
(defun timeclock-day-list-projects (day-list)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return a list of all the projects in DAY-LIST."
|
2000-10-29 05:18:48 +00:00
|
|
|
(let (projects)
|
2008-03-08 23:18:42 +00:00
|
|
|
(dolist (day day-list)
|
|
|
|
(dolist (proj (timeclock-day-projects day))
|
2018-10-08 22:33:22 -04:00
|
|
|
(cl-pushnew proj projects :test #'equal)))
|
2000-10-29 05:18:48 +00:00
|
|
|
projects))
|
|
|
|
|
|
|
|
(defsubst timeclock-current-debt (&optional log-data)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the seconds debt from LOG-DATA, default `timeclock-log-data'."
|
2000-10-29 05:18:48 +00:00
|
|
|
(nth 0 (or log-data (timeclock-log-data))))
|
|
|
|
|
|
|
|
(defsubst timeclock-day-alist (&optional log-data)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the date alist from LOG-DATA, default `timeclock-log-data'."
|
2000-10-29 05:18:48 +00:00
|
|
|
(nth 1 (or log-data (timeclock-log-data))))
|
|
|
|
|
|
|
|
(defun timeclock-day-list (&optional log-data)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return a list of the cdrs of the date alist from LOG-DATA."
|
|
|
|
(let (day-list)
|
|
|
|
(dolist (date-list (timeclock-day-alist log-data))
|
2018-10-08 22:33:22 -04:00
|
|
|
(push (cdr date-list) day-list))
|
2000-10-29 05:18:48 +00:00
|
|
|
day-list))
|
|
|
|
|
|
|
|
(defsubst timeclock-project-alist (&optional log-data)
|
2008-03-08 23:18:42 +00:00
|
|
|
"Return the project alist from LOG-DATA, default `timeclock-log-data'."
|
2000-10-29 05:18:48 +00:00
|
|
|
(nth 2 (or log-data (timeclock-log-data))))
|
|
|
|
|
|
|
|
(defun timeclock-log-data (&optional recent-only filename)
|
|
|
|
"Return the contents of the timelog file, in a useful format.
|
2003-07-10 01:02:11 +00:00
|
|
|
If the optional argument RECENT-ONLY is non-nil, only show the contents
|
|
|
|
from the last point where the time debt (see below) was set.
|
|
|
|
If the optional argument FILENAME is non-nil, it is used instead of
|
|
|
|
the file specified by `timeclock-file.'
|
|
|
|
|
2000-10-29 05:18:48 +00:00
|
|
|
A timelog contains data in the form of a single entry per line.
|
|
|
|
Each entry has the form:
|
|
|
|
|
|
|
|
CODE YYYY/MM/DD HH:MM:SS [COMMENT]
|
|
|
|
|
|
|
|
CODE is one of: b, h, i, o or O. COMMENT is optional when the code is
|
|
|
|
i, o or O. The meanings of the codes are:
|
|
|
|
|
|
|
|
b Set the current time balance, or \"time debt\". Useful when
|
|
|
|
archiving old log data, when a debt must be carried forward.
|
|
|
|
The COMMENT here is the number of seconds of debt.
|
|
|
|
|
|
|
|
h Set the required working time for the given day. This must
|
|
|
|
be the first entry for that day. The COMMENT in this case is
|
2004-04-04 21:30:49 +00:00
|
|
|
the number of hours in this workday. Floating point amounts
|
|
|
|
are allowed.
|
2000-10-29 05:18:48 +00:00
|
|
|
|
|
|
|
i Clock in. The COMMENT in this case should be the name of the
|
|
|
|
project worked on.
|
|
|
|
|
|
|
|
o Clock out. COMMENT is unnecessary, but can be used to provide
|
|
|
|
a description of how the period went, for example.
|
|
|
|
|
|
|
|
O Final clock out. Whatever project was being worked on, it is
|
|
|
|
now finished. Useful for creating summary reports.
|
|
|
|
|
|
|
|
When this function is called, it will return a data structure with the
|
|
|
|
following format:
|
|
|
|
|
|
|
|
(DEBT ENTRIES-BY-DAY ENTRIES-BY-PROJECT)
|
|
|
|
|
|
|
|
DEBT is a floating point number representing the number of seconds
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 08:41:44 -07:00
|
|
|
“owed” before any work was done. For a new file (one without a `b'
|
2000-10-29 05:18:48 +00:00
|
|
|
entry), this is always zero.
|
|
|
|
|
|
|
|
The two entries lists have similar formats. They are both alists,
|
|
|
|
where the CAR is the index, and the CDR is a list of time entries.
|
|
|
|
For ENTRIES-BY-DAY, the CAR is a textual date string, of the form
|
|
|
|
YYYY/MM/DD. For ENTRIES-BY-PROJECT, it is the name of the project
|
|
|
|
worked on, or t for the default project.
|
|
|
|
|
|
|
|
The CDR for ENTRIES-BY-DAY is slightly different than for
|
|
|
|
ENTRIES-BY-PROJECT. It has the following form:
|
|
|
|
|
|
|
|
(DAY-LENGTH TIME-ENTRIES...)
|
|
|
|
|
|
|
|
For ENTRIES-BY-PROJECT, there is no DAY-LENGTH member. It is simply a
|
|
|
|
list of TIME-ENTRIES. Note that if DAY-LENGTH is nil, it means
|
|
|
|
whatever is the default should be used.
|
|
|
|
|
|
|
|
A TIME-ENTRY is a recorded time interval. It has the following format
|
|
|
|
\(although generally one does not have to manipulate these entries
|
|
|
|
directly; see below):
|
|
|
|
|
|
|
|
(BEGIN-TIME END-TIME PROJECT [COMMENT] [FINAL-P])
|
|
|
|
|
|
|
|
Anyway, suffice it to say there are a lot of structures. Typically
|
|
|
|
the user is expected to manipulate to the day(s) or project(s) that he
|
|
|
|
or she wants, at which point the following helper functions may be
|
|
|
|
used:
|
|
|
|
|
|
|
|
timeclock-day-required
|
|
|
|
timeclock-day-length
|
|
|
|
timeclock-day-debt
|
|
|
|
timeclock-day-begin
|
|
|
|
timeclock-day-end
|
|
|
|
timeclock-day-span
|
|
|
|
timeclock-day-break
|
|
|
|
timeclock-day-projects
|
|
|
|
|
|
|
|
timeclock-day-list-required
|
|
|
|
timeclock-day-list-length
|
|
|
|
timeclock-day-list-debt
|
|
|
|
timeclock-day-list-begin
|
|
|
|
timeclock-day-list-end
|
|
|
|
timeclock-day-list-span
|
|
|
|
timeclock-day-list-break
|
|
|
|
timeclock-day-list-projects
|
|
|
|
|
|
|
|
timeclock-entry-length
|
|
|
|
timeclock-entry-begin
|
|
|
|
timeclock-entry-end
|
|
|
|
timeclock-entry-project
|
|
|
|
timeclock-entry-comment
|
|
|
|
|
|
|
|
timeclock-entry-list-length
|
|
|
|
timeclock-entry-list-begin
|
|
|
|
timeclock-entry-list-end
|
|
|
|
timeclock-entry-list-span
|
|
|
|
timeclock-entry-list-break
|
|
|
|
timeclock-entry-list-projects
|
|
|
|
|
|
|
|
A few comments should make the use of the above functions obvious:
|
|
|
|
|
|
|
|
`required' is the amount of time that must be spent during a day, or
|
|
|
|
sequence of days, in order to have no debt.
|
|
|
|
|
|
|
|
`length' is the actual amount of time that was spent.
|
|
|
|
|
|
|
|
`debt' is the difference between required time and length. A
|
|
|
|
negative debt signifies overtime.
|
|
|
|
|
|
|
|
`begin' is the earliest moment at which work began.
|
|
|
|
|
|
|
|
`end' is the final moment work was done.
|
|
|
|
|
|
|
|
`span' is the difference between begin and end.
|
|
|
|
|
|
|
|
`break' is the difference between span and length.
|
|
|
|
|
|
|
|
`project' is the project that was worked on, and `projects' is a
|
|
|
|
list of all the projects that were worked on during a given period.
|
|
|
|
|
|
|
|
`comment', where it applies, could mean anything.
|
|
|
|
|
|
|
|
There are a few more functions available, for locating day and entry
|
|
|
|
lists:
|
|
|
|
|
|
|
|
timeclock-day-alist LOG-DATA
|
|
|
|
timeclock-project-alist LOG-DATA
|
|
|
|
timeclock-current-debt LOG-DATA
|
|
|
|
|
|
|
|
See the documentation for the given function if more info is needed."
|
2011-05-06 18:24:04 -07:00
|
|
|
(let ((log-data (list 0.0 nil nil))
|
|
|
|
(now (current-time))
|
|
|
|
last-date-limited last-date-seconds last-date
|
|
|
|
(line 0) last beg day entry event)
|
2000-10-29 05:18:48 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents (or filename timeclock-file))
|
|
|
|
(when recent-only
|
|
|
|
(goto-char (point-max))
|
|
|
|
(unless (re-search-backward "^b\\s-+" nil t)
|
|
|
|
(goto-char (point-min))))
|
|
|
|
(while (or (setq event (timeclock-read-moment))
|
|
|
|
(and beg (not last)
|
|
|
|
(setq last t event (list "o" now))))
|
|
|
|
(setq line (1+ line))
|
2018-10-08 22:33:22 -04:00
|
|
|
(pcase (car event)
|
|
|
|
("b"
|
|
|
|
(setcar log-data (string-to-number (nth 2 event))))
|
|
|
|
("h"
|
|
|
|
(setq last-date-limited (timeclock-time-to-date (cadr event))
|
|
|
|
last-date-seconds (* (string-to-number (nth 2 event))
|
|
|
|
3600.0)))
|
|
|
|
("i"
|
|
|
|
(if beg
|
|
|
|
(error "Error in format of timelog file, line %d" line)
|
|
|
|
(setq beg t))
|
|
|
|
(setq entry (list (cadr event) nil
|
|
|
|
(and (> (length (nth 2 event)) 0)
|
|
|
|
(nth 2 event))))
|
|
|
|
(let ((date (timeclock-time-to-date (cadr event))))
|
|
|
|
(if (and last-date
|
|
|
|
(not (equal date last-date)))
|
|
|
|
(progn
|
|
|
|
(setcar (cdr log-data)
|
|
|
|
(cons (cons last-date day)
|
|
|
|
(cadr log-data)))
|
|
|
|
(setq day (list (and last-date-limited
|
|
|
|
last-date-seconds))))
|
|
|
|
(unless day
|
|
|
|
(setq day (list (and last-date-limited
|
|
|
|
last-date-seconds)))))
|
|
|
|
(setq last-date date
|
|
|
|
last-date-limited nil)))
|
|
|
|
((or "o" "O")
|
|
|
|
(if (not beg)
|
|
|
|
(error "Error in format of timelog file, line %d" line)
|
|
|
|
(setq beg nil))
|
|
|
|
(setcar (cdr entry) (cadr event))
|
|
|
|
(let ((desc (and (> (length (nth 2 event)) 0)
|
|
|
|
(nth 2 event))))
|
|
|
|
(if desc
|
|
|
|
(nconc entry (list (nth 2 event))))
|
|
|
|
(if (equal (car event) "O")
|
|
|
|
(nconc entry (if desc
|
|
|
|
(list t)
|
|
|
|
(list nil t))))
|
|
|
|
(nconc day (list entry))
|
|
|
|
(setq desc (nth 2 entry))
|
|
|
|
(let ((proj (assoc desc (nth 2 log-data))))
|
|
|
|
(if (null proj)
|
|
|
|
(setcar (cddr log-data)
|
|
|
|
(cons (cons desc (list entry))
|
|
|
|
(nth 2 log-data)))
|
|
|
|
(nconc (cdr proj) (list entry)))))))
|
2000-10-29 05:18:48 +00:00
|
|
|
(forward-line))
|
|
|
|
(if day
|
|
|
|
(setcar (cdr log-data)
|
|
|
|
(cons (cons last-date day)
|
|
|
|
(cadr log-data))))
|
|
|
|
log-data)))
|
|
|
|
|
2001-05-08 21:12:41 +00:00
|
|
|
(defun timeclock-find-discrep ()
|
2003-07-10 01:02:11 +00:00
|
|
|
"Calculate time discrepancies, in seconds.
|
|
|
|
The result is a three element list, containing the total time
|
|
|
|
discrepancy, today's discrepancy, and the time worked today."
|
2000-10-29 05:18:48 +00:00
|
|
|
;; This is not implemented in terms of the functions above, because
|
|
|
|
;; it's a bit wasteful to read all of that data in, just to throw
|
|
|
|
;; away more than 90% of the information afterwards.
|
2001-04-24 01:39:55 +00:00
|
|
|
;;
|
|
|
|
;; If it were implemented using those functions, it would look
|
|
|
|
;; something like this:
|
|
|
|
;; (let ((days (timeclock-day-alist (timeclock-log-data)))
|
|
|
|
;; (total 0.0))
|
|
|
|
;; (while days
|
|
|
|
;; (setq total (+ total (- (timeclock-day-length (cdar days))
|
|
|
|
;; (timeclock-day-required (cdar days))))
|
|
|
|
;; days (cdr days)))
|
|
|
|
;; total)
|
|
|
|
(let* ((now (current-time))
|
|
|
|
(todays-date (timeclock-time-to-date now))
|
2001-05-10 01:00:50 +00:00
|
|
|
(first t) (accum 0) (elapsed 0)
|
2011-05-06 18:24:04 -07:00
|
|
|
event beg last-date
|
2001-04-24 01:39:55 +00:00
|
|
|
last-date-limited last-date-seconds)
|
2021-08-27 03:10:46 +02:00
|
|
|
(when (or (not timeclock-discrepancy)
|
|
|
|
;; The length of the workday has changed, so recompute.
|
|
|
|
(not (equal timeclock-workday timeclock--previous-workday)))
|
2001-04-24 01:39:55 +00:00
|
|
|
(when (file-readable-p timeclock-file)
|
2001-03-16 21:39:31 +00:00
|
|
|
(setq timeclock-project-list nil
|
|
|
|
timeclock-last-project nil
|
|
|
|
timeclock-reason-list nil
|
|
|
|
timeclock-elapsed 0)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents timeclock-file)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(unless (re-search-backward "^b\\s-+" nil t)
|
|
|
|
(goto-char (point-min)))
|
|
|
|
(while (setq event (timeclock-read-moment))
|
|
|
|
(cond ((equal (car event) "b")
|
|
|
|
(setq accum (string-to-number (nth 2 event))))
|
|
|
|
((equal (car event) "h")
|
|
|
|
(setq last-date-limited
|
|
|
|
(timeclock-time-to-date (cadr event))
|
|
|
|
last-date-seconds
|
|
|
|
(* (string-to-number (nth 2 event)) 3600.0)))
|
|
|
|
((equal (car event) "i")
|
|
|
|
(when (and (nth 2 event)
|
|
|
|
(> (length (nth 2 event)) 0))
|
|
|
|
(add-to-list 'timeclock-project-list (nth 2 event))
|
|
|
|
(setq timeclock-last-project (nth 2 event)))
|
|
|
|
(let ((date (timeclock-time-to-date (cadr event))))
|
2001-05-08 21:12:41 +00:00
|
|
|
(if (if last-date
|
|
|
|
(not (equal date last-date))
|
|
|
|
first)
|
2001-03-16 21:39:31 +00:00
|
|
|
(setq first nil
|
2001-05-08 21:12:41 +00:00
|
|
|
accum (- accum (if last-date-limited
|
|
|
|
last-date-seconds
|
|
|
|
timeclock-workday))))
|
2001-03-16 21:39:31 +00:00
|
|
|
(setq last-date date
|
|
|
|
last-date-limited nil)
|
|
|
|
(if beg
|
2000-08-14 12:45:50 +00:00
|
|
|
(error "Error in format of timelog file!")
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(setq beg (cadr event)))))
|
2001-03-16 21:39:31 +00:00
|
|
|
((equal (downcase (car event)) "o")
|
|
|
|
(if (and (nth 2 event)
|
|
|
|
(> (length (nth 2 event)) 0))
|
|
|
|
(add-to-list 'timeclock-reason-list (nth 2 event)))
|
2001-05-08 21:12:41 +00:00
|
|
|
(if (not beg)
|
|
|
|
(error "Error in format of timelog file!")
|
|
|
|
(setq timeclock-last-period
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(float-time (time-subtract (cadr event) beg))
|
2001-05-08 21:12:41 +00:00
|
|
|
accum (+ timeclock-last-period accum)
|
|
|
|
beg nil))
|
2001-03-16 21:39:31 +00:00
|
|
|
(if (equal last-date todays-date)
|
|
|
|
(setq timeclock-elapsed
|
|
|
|
(+ timeclock-last-period timeclock-elapsed)))))
|
|
|
|
(setq timeclock-last-event event
|
|
|
|
timeclock-last-event-workday
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
(if (equal todays-date last-date-limited)
|
2001-03-16 21:39:31 +00:00
|
|
|
last-date-seconds
|
|
|
|
timeclock-workday))
|
|
|
|
(forward-line))
|
2021-08-27 03:10:46 +02:00
|
|
|
(setq timeclock-discrepancy accum
|
|
|
|
timeclock--previous-workday timeclock-workday))))
|
2001-05-10 01:55:51 +00:00
|
|
|
(unless timeclock-last-event-workday
|
|
|
|
(setq timeclock-last-event-workday timeclock-workday))
|
2003-05-27 18:36:40 +00:00
|
|
|
(setq accum (or timeclock-discrepancy 0)
|
2001-05-10 02:46:38 +00:00
|
|
|
elapsed (or timeclock-elapsed elapsed))
|
2001-04-24 01:39:55 +00:00
|
|
|
(if timeclock-last-event
|
|
|
|
(if (equal (car timeclock-last-event) "i")
|
2001-05-08 21:12:41 +00:00
|
|
|
(let ((last-period (timeclock-last-period now)))
|
|
|
|
(setq accum (+ accum last-period)
|
|
|
|
elapsed (+ elapsed last-period)))
|
2001-04-24 01:39:55 +00:00
|
|
|
(if (not (equal (timeclock-time-to-date
|
|
|
|
(cadr timeclock-last-event))
|
|
|
|
(timeclock-time-to-date now)))
|
|
|
|
(setq accum (- accum timeclock-last-event-workday)))))
|
2001-05-08 21:12:41 +00:00
|
|
|
(list accum (- elapsed timeclock-last-event-workday)
|
|
|
|
elapsed)))
|
2001-03-16 21:39:31 +00:00
|
|
|
|
|
|
|
;;; A reporting function that uses timeclock-log-data
|
|
|
|
|
|
|
|
(defun timeclock-day-base (&optional time)
|
2003-07-10 01:02:11 +00:00
|
|
|
"Given a time within a day, return 0:0:0 within that day.
|
|
|
|
If optional argument TIME is non-nil, use that instead of the current time."
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
(let ((decoded (decode-time time)))
|
2019-07-30 13:08:21 +02:00
|
|
|
(setf (decoded-time-second decoded) 0)
|
|
|
|
(setf (decoded-time-minute decoded) 0)
|
|
|
|
(setf (decoded-time-hour decoded) 0)
|
Simplify use of encode-time
Most uses of (apply #'encode-time foo) can now be replaced
with (encode-time foo). Make similar simplifications.
* lisp/calendar/time-date.el (date-to-time):
* lisp/calendar/timeclock.el (timeclock-when-to-leave)
(timeclock-day-base, timeclock-generate-report):
* lisp/emacs-lisp/timer.el (timer-set-idle-time):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/gnus/gnus-art.el (article-make-date-line):
* lisp/gnus/gnus-delay.el (gnus-delay-article)
(gnus-delay-send-queue):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event--decode-datefield):
* lisp/gnus/gnus-logic.el (gnus-advanced-date):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/gnus/nndiary.el (nndiary-compute-reminders):
* lisp/mail/ietf-drums.el (ietf-drums-parse-date):
* lisp/net/tramp-adb.el (tramp-adb-ls-output-time-less-p):
* lisp/org/org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-progress, org-agenda-show-clocking-issues):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-get-sum-start, org-clock-sum)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-colview-construct-allowed-dates)
* lisp/org/org-macro.el (org-macro--vc-modified-time):
* lisp/org/org-table.el (org-table-eval-formula):
* lisp/org/org.el (org-current-time, org-store-link)
(org-time-today, org-read-date, org-read-date-display)
(org-display-custom-time, org-time-string-to-time)
(org-timestamp-change, org-timestamp--to-internal-time):
* lisp/url/url-dav.el (url-dav-process-date-property):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time)
(vc-cvs-parse-entry):
Simplify use of encode-time.
* lisp/org/org-clock.el (org-clock-get-clocked-time):
(org-clock-resolve, org-resolve-clocks, org_clock_out)
(org-clock-update-time-maybe):
Avoid some rounding problems with encode-time and float-time.
* lisp/org/org-clock.el (org-clock-in, org-clock-update-time-maybe):
* lisp/org/org-colview.el (org-columns--age-to-minutes):
* lisp/org/org.el (org-get-scheduled-time, org-get-deadline-time)
(org-add-planning-info, org-2ft, org-time-string-to-absolute)
(org-closest-date):
Use org-time-string-to-time instead of doing it by hand with
encode-time.
* lisp/org/org.el (org-current-time): Simplify rounding.
(org-read-date): Avoid extra trip through encode-time.
2019-02-10 20:25:22 -08:00
|
|
|
(encode-time decoded)))
|
2001-03-16 21:39:31 +00:00
|
|
|
|
2007-06-04 23:49:26 +00:00
|
|
|
(defun timeclock-mean (l)
|
|
|
|
"Compute the arithmetic mean of the values in the list L."
|
2018-10-08 22:33:22 -04:00
|
|
|
(if (not (consp l))
|
|
|
|
0
|
|
|
|
(let ((total 0))
|
|
|
|
(dolist (thisl l)
|
|
|
|
(setq total (+ total thisl)))
|
|
|
|
(/ total (length l)))))
|
2001-03-16 21:39:31 +00:00
|
|
|
|
|
|
|
(defun timeclock-generate-report (&optional html-p)
|
2003-07-10 01:02:11 +00:00
|
|
|
"Generate a summary report based on the current timelog file.
|
|
|
|
By default, the report is in plain text, but if the optional argument
|
2004-04-04 21:30:49 +00:00
|
|
|
HTML-P is non-nil, HTML markup is added."
|
2007-06-04 23:49:26 +00:00
|
|
|
(interactive "P")
|
2001-03-16 21:39:31 +00:00
|
|
|
(let ((log (timeclock-log-data))
|
|
|
|
(today (timeclock-day-base)))
|
|
|
|
(if html-p (insert "<p>"))
|
|
|
|
(insert "Currently ")
|
|
|
|
(let ((project (nth 2 timeclock-last-event))
|
|
|
|
(begin (nth 1 timeclock-last-event))
|
|
|
|
done)
|
|
|
|
(if (timeclock-currently-in-p)
|
|
|
|
(insert "IN")
|
2008-03-15 02:54:45 +00:00
|
|
|
(if (zerop (length project))
|
2001-03-16 21:39:31 +00:00
|
|
|
(progn (insert "Done Working Today")
|
|
|
|
(setq done t))
|
|
|
|
(insert "OUT")))
|
|
|
|
(unless done
|
|
|
|
(insert " since " (format-time-string "%Y/%m/%d %-I:%M %p" begin))
|
|
|
|
(if html-p
|
|
|
|
(insert "<br>\n<b>")
|
|
|
|
(insert "\n*"))
|
|
|
|
(if (timeclock-currently-in-p)
|
|
|
|
(insert "Working on "))
|
|
|
|
(if html-p
|
2001-04-09 23:36:36 +00:00
|
|
|
(insert project "</b><br>\n")
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert project "*\n"))
|
|
|
|
(let ((proj-data (cdr (assoc project (timeclock-project-alist log))))
|
Simplify use of encode-time
Most uses of (apply #'encode-time foo) can now be replaced
with (encode-time foo). Make similar simplifications.
* lisp/calendar/time-date.el (date-to-time):
* lisp/calendar/timeclock.el (timeclock-when-to-leave)
(timeclock-day-base, timeclock-generate-report):
* lisp/emacs-lisp/timer.el (timer-set-idle-time):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/gnus/gnus-art.el (article-make-date-line):
* lisp/gnus/gnus-delay.el (gnus-delay-article)
(gnus-delay-send-queue):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event--decode-datefield):
* lisp/gnus/gnus-logic.el (gnus-advanced-date):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/gnus/nndiary.el (nndiary-compute-reminders):
* lisp/mail/ietf-drums.el (ietf-drums-parse-date):
* lisp/net/tramp-adb.el (tramp-adb-ls-output-time-less-p):
* lisp/org/org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-progress, org-agenda-show-clocking-issues):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-get-sum-start, org-clock-sum)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-colview-construct-allowed-dates)
* lisp/org/org-macro.el (org-macro--vc-modified-time):
* lisp/org/org-table.el (org-table-eval-formula):
* lisp/org/org.el (org-current-time, org-store-link)
(org-time-today, org-read-date, org-read-date-display)
(org-display-custom-time, org-time-string-to-time)
(org-timestamp-change, org-timestamp--to-internal-time):
* lisp/url/url-dav.el (url-dav-process-date-property):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time)
(vc-cvs-parse-entry):
Simplify use of encode-time.
* lisp/org/org-clock.el (org-clock-get-clocked-time):
(org-clock-resolve, org-resolve-clocks, org_clock_out)
(org-clock-update-time-maybe):
Avoid some rounding problems with encode-time and float-time.
* lisp/org/org-clock.el (org-clock-in, org-clock-update-time-maybe):
* lisp/org/org-colview.el (org-columns--age-to-minutes):
* lisp/org/org.el (org-get-scheduled-time, org-get-deadline-time)
(org-add-planning-info, org-2ft, org-time-string-to-absolute)
(org-closest-date):
Use org-time-string-to-time instead of doing it by hand with
encode-time.
* lisp/org/org.el (org-current-time): Simplify rounding.
(org-read-date): Avoid extra trip through encode-time.
2019-02-10 20:25:22 -08:00
|
|
|
(two-weeks-ago (time-subtract today (* 2 7 24 60 60)))
|
2001-03-16 21:39:31 +00:00
|
|
|
two-week-len today-len)
|
|
|
|
(while proj-data
|
2004-04-27 22:44:39 +00:00
|
|
|
(if (not (time-less-p
|
2001-03-16 21:39:31 +00:00
|
|
|
(timeclock-entry-begin (car proj-data)) today))
|
|
|
|
(setq today-len (timeclock-entry-list-length proj-data)
|
|
|
|
proj-data nil)
|
|
|
|
(if (and (null two-week-len)
|
2004-04-27 22:44:39 +00:00
|
|
|
(not (time-less-p
|
2001-03-16 21:39:31 +00:00
|
|
|
(timeclock-entry-begin (car proj-data))
|
|
|
|
two-weeks-ago)))
|
|
|
|
(setq two-week-len (timeclock-entry-list-length proj-data)))
|
|
|
|
(setq proj-data (cdr proj-data))))
|
|
|
|
(if (null two-week-len)
|
|
|
|
(setq two-week-len today-len))
|
|
|
|
(if html-p (insert "<p>"))
|
2001-04-24 01:39:55 +00:00
|
|
|
(if today-len
|
|
|
|
(insert "\nTime spent on this task today: "
|
|
|
|
(timeclock-seconds-to-string today-len)
|
|
|
|
". In the last two weeks: "
|
|
|
|
(timeclock-seconds-to-string two-week-len))
|
|
|
|
(if two-week-len
|
|
|
|
(insert "\nTime spent on this task in the last two weeks: "
|
|
|
|
(timeclock-seconds-to-string two-week-len))))
|
2001-03-16 21:39:31 +00:00
|
|
|
(if html-p (insert "<br>"))
|
|
|
|
(insert "\n"
|
|
|
|
(timeclock-seconds-to-string (timeclock-workday-elapsed))
|
|
|
|
" worked today, "
|
|
|
|
(timeclock-seconds-to-string (timeclock-workday-remaining))
|
|
|
|
" remaining, done at "
|
|
|
|
(timeclock-when-to-leave-string) "\n")))
|
|
|
|
(if html-p (insert "<p>"))
|
|
|
|
(insert "\nThere have been "
|
|
|
|
(number-to-string
|
|
|
|
(length (timeclock-day-alist log)))
|
|
|
|
" days of activity, starting "
|
|
|
|
(caar (last (timeclock-day-alist log))))
|
|
|
|
(if html-p (insert "</p>"))
|
|
|
|
(when html-p
|
|
|
|
(insert "<p>
|
|
|
|
<table>
|
|
|
|
<td width=\"25\"><br></td><td>
|
|
|
|
<table border=1 cellpadding=3>
|
|
|
|
<tr><th><i>Statistics</i></th>
|
|
|
|
<th>Entire</th>
|
|
|
|
<th>-30 days</th>
|
|
|
|
<th>-3 mons</th>
|
|
|
|
<th>-6 mons</th>
|
|
|
|
<th>-1 year</th>
|
|
|
|
</tr>")
|
|
|
|
(let* ((day-list (timeclock-day-list))
|
Simplify use of encode-time
Most uses of (apply #'encode-time foo) can now be replaced
with (encode-time foo). Make similar simplifications.
* lisp/calendar/time-date.el (date-to-time):
* lisp/calendar/timeclock.el (timeclock-when-to-leave)
(timeclock-day-base, timeclock-generate-report):
* lisp/emacs-lisp/timer.el (timer-set-idle-time):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/gnus/gnus-art.el (article-make-date-line):
* lisp/gnus/gnus-delay.el (gnus-delay-article)
(gnus-delay-send-queue):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event--decode-datefield):
* lisp/gnus/gnus-logic.el (gnus-advanced-date):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/gnus/nndiary.el (nndiary-compute-reminders):
* lisp/mail/ietf-drums.el (ietf-drums-parse-date):
* lisp/net/tramp-adb.el (tramp-adb-ls-output-time-less-p):
* lisp/org/org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-progress, org-agenda-show-clocking-issues):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-get-sum-start, org-clock-sum)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-colview-construct-allowed-dates)
* lisp/org/org-macro.el (org-macro--vc-modified-time):
* lisp/org/org-table.el (org-table-eval-formula):
* lisp/org/org.el (org-current-time, org-store-link)
(org-time-today, org-read-date, org-read-date-display)
(org-display-custom-time, org-time-string-to-time)
(org-timestamp-change, org-timestamp--to-internal-time):
* lisp/url/url-dav.el (url-dav-process-date-property):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time)
(vc-cvs-parse-entry):
Simplify use of encode-time.
* lisp/org/org-clock.el (org-clock-get-clocked-time):
(org-clock-resolve, org-resolve-clocks, org_clock_out)
(org-clock-update-time-maybe):
Avoid some rounding problems with encode-time and float-time.
* lisp/org/org-clock.el (org-clock-in, org-clock-update-time-maybe):
* lisp/org/org-colview.el (org-columns--age-to-minutes):
* lisp/org/org.el (org-get-scheduled-time, org-get-deadline-time)
(org-add-planning-info, org-2ft, org-time-string-to-absolute)
(org-closest-date):
Use org-time-string-to-time instead of doing it by hand with
encode-time.
* lisp/org/org.el (org-current-time): Simplify rounding.
(org-read-date): Avoid extra trip through encode-time.
2019-02-10 20:25:22 -08:00
|
|
|
(thirty-days-ago (time-subtract today (* 30 24 60 60)))
|
|
|
|
(three-months-ago (time-subtract today (* 90 24 60 60)))
|
|
|
|
(six-months-ago (time-subtract today (* 180 24 60 60)))
|
|
|
|
(one-year-ago (time-subtract today (* 365 24 60 60)))
|
2001-03-16 21:39:31 +00:00
|
|
|
(time-in (vector (list t) (list t) (list t) (list t) (list t)))
|
|
|
|
(time-out (vector (list t) (list t) (list t) (list t) (list t)))
|
|
|
|
(breaks (vector (list t) (list t) (list t) (list t) (list t)))
|
|
|
|
(workday (vector (list t) (list t) (list t) (list t) (list t)))
|
2022-08-01 00:38:33 -07:00
|
|
|
(lengths (vector 0 thirty-days-ago three-months-ago
|
2001-03-16 21:39:31 +00:00
|
|
|
six-months-ago one-year-ago)))
|
|
|
|
;; collect statistics from complete timelog
|
2008-03-15 02:54:45 +00:00
|
|
|
(dolist (day day-list)
|
2018-10-08 22:33:22 -04:00
|
|
|
(dotimes (i 5)
|
|
|
|
(unless (time-less-p
|
|
|
|
(timeclock-day-begin day)
|
|
|
|
(aref lengths i))
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(let ((base (timeclock-day-base (timeclock-day-begin day))))
|
2018-10-08 22:33:22 -04:00
|
|
|
(nconc (aref time-in i)
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(list (float-time (time-subtract
|
|
|
|
(timeclock-day-begin day)
|
|
|
|
base))))
|
2018-10-08 22:33:22 -04:00
|
|
|
(let ((span (timeclock-day-span day))
|
|
|
|
(len (timeclock-day-length day))
|
|
|
|
(req (timeclock-day-required day)))
|
|
|
|
;; If the day's actual work length is less than
|
|
|
|
;; 70% of its span, then likely the exit time
|
|
|
|
;; and break amount are not worthwhile adding to
|
|
|
|
;; the statistic
|
|
|
|
(when (and (> span 0)
|
|
|
|
(> (/ (float len) (float span)) 0.70))
|
|
|
|
(nconc (aref time-out i)
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-22 18:32:31 -08:00
|
|
|
(list (float-time (time-subtract
|
|
|
|
(timeclock-day-end day)
|
|
|
|
base))))
|
2018-10-08 22:33:22 -04:00
|
|
|
(nconc (aref breaks i) (list (- span len))))
|
|
|
|
(if req
|
|
|
|
(setq len (+ len (- timeclock-workday req))))
|
|
|
|
(nconc (aref workday i) (list len)))))))
|
2001-03-16 21:39:31 +00:00
|
|
|
;; average statistics
|
2018-10-08 22:33:22 -04:00
|
|
|
(dotimes (i 5)
|
|
|
|
(aset time-in i (timeclock-mean (cdr (aref time-in i))))
|
|
|
|
(aset time-out i (timeclock-mean (cdr (aref time-out i))))
|
|
|
|
(aset breaks i (timeclock-mean (cdr (aref breaks i))))
|
|
|
|
(aset workday i (timeclock-mean (cdr (aref workday i)))))
|
2001-03-16 21:39:31 +00:00
|
|
|
;; Output the HTML table
|
|
|
|
(insert "<tr>\n")
|
|
|
|
(insert "<td align=\"center\">Time in</td>\n")
|
2018-10-08 22:33:22 -04:00
|
|
|
(dotimes (i 5)
|
|
|
|
(insert "<td align=\"right\">"
|
|
|
|
(timeclock-seconds-to-string (aref time-in i))
|
|
|
|
"</td>\n"))
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert "</tr>\n")
|
2001-04-24 01:39:55 +00:00
|
|
|
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert "<tr>\n")
|
|
|
|
(insert "<td align=\"center\">Time out</td>\n")
|
2018-10-08 22:33:22 -04:00
|
|
|
(dotimes (i 5)
|
|
|
|
(insert "<td align=\"right\">"
|
|
|
|
(timeclock-seconds-to-string (aref time-out i))
|
|
|
|
"</td>\n"))
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert "</tr>\n")
|
2001-04-24 01:39:55 +00:00
|
|
|
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert "<tr>\n")
|
|
|
|
(insert "<td align=\"center\">Break</td>\n")
|
2018-10-08 22:33:22 -04:00
|
|
|
(dotimes (i 5)
|
|
|
|
(insert "<td align=\"right\">"
|
|
|
|
(timeclock-seconds-to-string (aref breaks i))
|
|
|
|
"</td>\n"))
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert "</tr>\n")
|
2001-04-24 01:39:55 +00:00
|
|
|
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert "<tr>\n")
|
|
|
|
(insert "<td align=\"center\">Workday</td>\n")
|
2018-10-08 22:33:22 -04:00
|
|
|
(dotimes (i 5)
|
|
|
|
(insert "<td align=\"right\">"
|
|
|
|
(timeclock-seconds-to-string (aref workday i))
|
|
|
|
"</td>\n"))
|
2001-03-16 21:39:31 +00:00
|
|
|
(insert "</tr>\n"))
|
|
|
|
(insert "<tfoot>
|
|
|
|
<td colspan=\"6\" align=\"center\">
|
|
|
|
<i>These are approximate figures</i></td>
|
|
|
|
</tfoot>
|
|
|
|
</table>
|
|
|
|
</td></table>")))))
|
|
|
|
|
|
|
|
;;; A helpful little function
|
|
|
|
|
|
|
|
(defun timeclock-visit-timelog ()
|
2003-07-10 01:02:11 +00:00
|
|
|
"Open the file named by `timeclock-file' in another window."
|
2001-03-16 21:39:31 +00:00
|
|
|
(interactive)
|
|
|
|
(find-file-other-window timeclock-file))
|
2000-08-14 12:45:50 +00:00
|
|
|
|
|
|
|
(provide 'timeclock)
|
|
|
|
|
|
|
|
(run-hooks 'timeclock-load-hook)
|
|
|
|
|
|
|
|
;; make sure we know the list of reasons, projects, and have computed
|
|
|
|
;; the last event and current discrepancy.
|
|
|
|
(if (file-readable-p timeclock-file)
|
2018-10-08 22:33:22 -04:00
|
|
|
;; FIXME: Loading a file should not have these kinds of side-effects.
|
2000-08-14 12:45:50 +00:00
|
|
|
(timeclock-reread-log))
|
|
|
|
|
|
|
|
;;; timeclock.el ends here
|