[Emacs-diffs] Changes to emacs/lisp/org/org-clock.el,v

[Carsten Dominik]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Carsten Dominik <cdominik>      08/07/24 13:59:57

Index: org-clock.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-clock.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- org-clock.el        2 Jul 2008 13:27:18 -0000       1.5
+++ org-clock.el        24 Jul 2008 13:59:53 -0000      1.6
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.05a
+;; Version: 6.06a
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -54,8 +54,8 @@
          (integer :tag "When at least N clock entries")))
 
 (defcustom org-clock-out-when-done t
-  "When t, the clock will be stopped when the relevant entry is marked DONE.
-When nil, clock will keep running until stopped explicitly with
+  "When non-nil, the clock will be stopped when the relevant entry is marked 
DONE.
+A nil value means, clock will keep running until stopped explicitly with
 `C-c C-x C-o', or until the clock is started in a different item."
   :group 'org-clock
   :type 'boolean)
@@ -207,7 +207,7 @@
 (defun org-clock-in (&optional select)
   "Start the clock on the current item.
 If necessary, clock-out of the currently active clock.
-With prefix arg SELECT, offer a list of recently clocked ta sks to
+With prefix arg SELECT, offer a list of recently clocked tasks to
 clock into.  When SELECT is `C-u C-u', clock into the current task and mark
 is as the default task, a special task that will always be offered in
 the clocking selection, associated with the letter `d'."
@@ -638,7 +638,7 @@
      ((string-match "\\([-+][0-9]+\\)$" skey)
       (setq shift (string-to-number (match-string 1 skey))
            key (intern (substring skey 0 (match-beginning 1))))))
-    (unless shift
+    (when (= shift 0)
       (cond ((eq key 'yesterday) (setq key 'today shift -1))
            ((eq key 'lastweek)  (setq key 'week  shift -1))
            ((eq key 'lastmonth) (setq key 'month shift -1))
@@ -690,6 +690,11 @@
             (s (match-string 1))
             block shift ins y mw d date wp m)
        (cond
+        ((equal s "yesterday") (setq s "today-1"))
+        ((equal s "lastweek") (setq s "thisweek-1"))
+        ((equal s "lastmonth") (setq s "thismonth-1"))
+        ((equal s "lastyear") (setq s "thisyear-1")))
+       (cond
         ((string-match 
"^\\(today\\|thisweek\\|thismonth\\|thisyear\\)\\([-+][0-9]+\\)?$" s)
          (setq block (match-string 1 s)
                shift (if (match-end 2)