[Orgmode] [Accepted] [Orgmode, 1/4] Rename org-agenda-today to org-today.

[Carsten Dominik]

Patch 416 (http://patchwork.newartisans.com/patch/416/) is now "Accepted".

Maintainer comment: No comment

This relates to the following submission:

http://mid.gmane.org/%3C1291040314-1884-1-git-send-email-julien%40danjou.info%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [Orgmode,1/4] Rename org-agenda-today to org-today.
> Date: Mon, 29 Nov 2010 19:18:31 -0000
> From: Julien Danjou <address@hidden>
> X-Patchwork-Id: 416
> Message-Id: <address@hidden>
> To: address@hidden
> Cc: Julien Danjou <address@hidden>
> 
> Signed-off-by: Julien Danjou <address@hidden>
> 
> ---
> lisp/org-agenda.el |   18 ++++++------------
>  lisp/org.el        |    6 ++++++
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index 48856c9..aee7ca7 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -3208,7 +3208,7 @@ dates."
>                                        org-timeline-show-empty-dates))
>        (org-deadline-warning-days 0)
>        (org-agenda-only-exact-dates t)
> -      (today (org-agenda-today))
> +      (today (org-today))
>        (past t)
>        args
>        s e rtn d emptyp)
> @@ -3285,7 +3285,7 @@ When EMPTY is non-nil, also include days without any 
> entries."
>            (if inactive org-ts-regexp-both org-ts-regexp)))
>        dates dates1 date day day1 day2 ts1 ts2)
>      (if force-today
> -     (setq dates (list (org-agenda-today))))
> +     (setq dates (list (org-today))))
>      (save-excursion
>        (goto-char beg)
>        (while (re-search-forward re end t)
> @@ -3396,7 +3396,7 @@ given in `org-agenda-start-on-weekday'."
>             org-agenda-start-on-weekday nil))
>        (thefiles (org-agenda-files nil 'ifmode))
>        (files thefiles)
> -      (today (org-agenda-today))
> +      (today (org-today))
>        (sd (or start-day today))
>        (start (if (or (null org-agenda-start-on-weekday)
>                       (< org-agenda-ndays 7))
> @@ -3839,7 +3839,7 @@ for a keyword.  A numeric prefix directly selects the 
> Nth keyword in
>    (org-set-sorting-strategy 'todo)
>    (org-prepare-agenda "TODO")
>    (if (and (stringp arg) (not (string-match "\\S-" arg))) (setq arg nil))
> -  (let* ((today (org-agenda-today))
> +  (let* ((today (org-today))
>        (date (calendar-gregorian-from-absolute today))
>        (kwds org-todo-keywords-for-agenda)
>        (completion-ignore-case t)
> @@ -7956,7 +7956,7 @@ belonging to the \"Work\" category."
>    (let* ((cnt 0) ; count added events
>        (org-agenda-new-buffers nil)
>        (org-deadline-warning-days 0)
> -      ;; Do not use `org-agenda-today' here because appt only takes
> +      ;; Do not use `org-today' here because appt only takes
>        ;; time and without date as argument, so it may pass wrong
>        ;; information otherwise
>        (today (org-date-to-gregorian
> @@ -7999,15 +7999,9 @@ belonging to the \"Work\" category."
>       (message "No event to add")
>        (message "Added %d event%s for today" cnt (if (> cnt 1) "s" "")))))
>  
> -(defun org-agenda-today ()
> -  "Return today date, considering `org-extend-today-until'."
> -  (time-to-days
> -   (time-subtract (current-time)
> -               (list 0 (* 3600 org-extend-today-until) 0))))
> -
>  (defun org-agenda-todayp (date)
>    "Does DATE mean today, when considering `org-extend-today-until'?"
> -  (let ((today (org-agenda-today))
> +  (let ((today (org-today))
>       (date (if (and date (listp date)) (calendar-absolute-from-gregorian 
> date)
>               date)))
>      (eq date today)))
> diff --git a/lisp/org.el b/lisp/org.el
> index 873b294..6c4c433 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -4798,6 +4798,12 @@ The following commands are available:
>                      (nthcdr 2 time))))
>      (current-time)))
>  
> +(defun org-today ()
> +  "Return today date, considering `org-extend-today-until'."
> +  (time-to-days
> +   (time-subtract (current-time)
> +               (list 0 (* 3600 org-extend-today-until) 0))))
> +
>  ;;;; Font-Lock stuff, including the activators
>  
>  (defvar org-mouse-map (make-sparse-keymap))
>