From: Carsten Dominik <cdominik@newartisans.com>
To: emacs-orgmode@gnu.org
Subject: [Accepted] Re: [PATCH] org-agenda: rework ndays and span handling
Date: Fri, 3 Dec 2010 13:09:55 +0100 (CET) [thread overview]
Message-ID: <20101203120955.6A2FA8957D3@u016822.science.uva.nl> (raw)
In-Reply-To: sa3vd3baxd1.fsf@cigue.easter-eggs.fr
Patch 434 (http://patchwork.newartisans.com/patch/434/) is now "Accepted".
Maintainer comment: I still fixed the commit message to contain your original explanation, and the defcustom type of the new variable, here day, week etc must not be quoted. Thanks.
This relates to the following submission:
http://mid.gmane.org/%3Csa3vd3baxd1.fsf%40cigue.easter-eggs.fr%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] Re: [PATCH] org-agenda: rework ndays and span handling
> Date: Fri, 03 Dec 2010 16:50:50 -0000
> From: Julien Danjou <julien@danjou.info>
> X-Patchwork-Id: 434
> Message-Id: <sa3vd3baxd1.fsf@cigue.easter-eggs.fr>
> To: Carsten Dominik <carsten.dominik@gmail.com>
> Cc: Bernt Hansen <bernt@norang.ca>, Eric S Fraga <ucecesf@ucl.ac.uk>,
> emacs-orgmode@gnu.org
>
> On Fri, Dec 03 2010, Carsten Dominik wrote:
>
> > please see comments below and resubmit.
>
> Ok.
>
> > Somewhere in the docs, there should be a reference to the older
> > variable, with an index entry and a mention that the other variable
> > should be used instead. I believe that many people have
> > org-agenda-ndays in there config, in multiple places
> > (in custom commands...)
>
> Done, I've added a paragraph about that.
>
> > When you resubmit, please make sure that the extensive explanation you
> > had earlier is part of the commit message.
>
> I think it's ok.
>
> Here it is.
>
>
> >From decbd6fdab2211c435dd174b84c3945c6aaf6346 Mon Sep 17 00:00:00 2001
> From: Julien Danjou <julien@danjou.info>
> Date: Fri, 26 Nov 2010 14:22:17 +0100
> Subject: [PATCH] org-agenda: rework ndays and span handling
>
> * org-agenda.el (org-agenda-custom-commands-local-options):
> Allow org-agenda-span to be a symbol.
> (org-agenda-ndays): Make obsolete.
> (org-agenda-span): New variable superseding org-agenda-ndays.
> (org-agenda-menu): Use org-agenda-current-span.
> (org-agenda-current-span): New local variable storing current
> span.
> (org-agenda-list): Take a span instead of ndays as argument.
> This function is now responsible for computing the ndays based
> on span.
> (org-agenda-ndays-to-span): Return span only if number of days
> really matches.
> (org-agenda-span-to-ndays): New function.
> (org-agenda-manipulate-query): Use org-agenda-compute-starting-span.
> (org-agenda-goto-today): Use org-agenda-compute-starting-span.
> (org-agenda-later): Do not give compute a new span, use the
> current one.
> (org-agenda-day-view, org-agenda-week-view)
> (org-agenda-month-view, org-agenda-year-view): Stop touching
> org-agenda-ndays.
> (org-agenda-change-time-span): Only compute starting-span.
> (org-agenda-compute-starting-span): New function derived from
> the old org-agenda-compute-time-span.
> (org-agenda-set-mode-name): Compute mode based on
> org-agenda-current-span.
> (org-agenda-span-name): New function.
>
> * org-mouse.el: Replace Replace org-agenda-ndays by
> org-agenda-current-span.
>
> * org.texi, orgguide.texi: Replace org-agenda-ndays by
> org-agenda-span. Add a paragraph about org-agenda-span and say that
> org-agenda-ndays is now deprecated.
>
> Signed-off-by: Julien Danjou <julien@danjou.info>
> ---
> doc/org.texi | 21 +++--
> doc/orgguide.texi | 6 +-
> lisp/org-agenda.el | 243 +++++++++++++++++++++++++++++-----------------------
> lisp/org-mouse.el | 4 +-
> 4 files changed, 152 insertions(+), 122 deletions(-)
>
> diff --git a/doc/org.texi b/doc/org.texi
> index e2e9af5..159191f 100644
> --- a/doc/org.texi
> +++ b/doc/org.texi
> @@ -6966,16 +6966,22 @@ paper agenda, showing all the tasks for the current week or day.
> @table @kbd
> @cindex org-agenda, command
> @orgcmd{C-c a a,org-agenda-list}
> -@vindex org-agenda-ndays
> Compile an agenda for the current week from a list of Org files. The agenda
> shows the entries for each day. With a numeric prefix@footnote{For backward
> compatibility, the universal prefix @kbd{C-u} causes all TODO entries to be
> listed before the agenda. This feature is deprecated, use the dedicated TODO
> list, or a block agenda instead (@pxref{Block agenda}).} (like @kbd{C-u 2 1
> -C-c a a}) you may set the number of days to be displayed (see also the
> -variable @code{org-agenda-ndays})
> +C-c a a}) you may set the number of days to be displayed.
> @end table
>
> +@vindex org-agenda-span
> +@vindex org-agenda-ndays
> +The default number of days displayed in the agenda is set by the variable
> +@code{org-agenda-span} (or the obsolete @code{org-agenda-ndays}). This
> +variable can be set to any number of days you want to see by default in the
> +agenda, or to a span name, such a @code{day}, @code{week}, @code{month} or
> +@code{year}.
> +
> Remote editing from the agenda buffer means, for example, that you can
> change the dates of deadlines and appointments from the agenda buffer.
> The commands available in the Agenda buffer are listed in @ref{Agenda
> @@ -7621,10 +7627,9 @@ argument as well. For example, @kbd{200712 w} will jump to week 12 in
> be mapped to the interval 1938-2037.
> @c
> @orgcmd{f,org-agenda-later}
> -@vindex org-agenda-ndays
> -Go forward in time to display the following @code{org-agenda-ndays} days.
> +Go forward in time to display the following @code{org-agenda-current-span} days.
> For example, if the display covers a week, switch to the following week.
> -With prefix arg, go forward that many times @code{org-agenda-ndays} days.
> +With prefix arg, go forward that many times @code{org-agenda-current-span} days.
> @c
> @orgcmd{b,org-agenda-earlier}
> Go backward in time to display earlier dates.
> @@ -8369,7 +8374,7 @@ or, if you need to modify some parameters@footnote{Quoting depends on the
> system you use, please check the FAQ for examples.}
> @example
> emacs -eval '(org-batch-store-agenda-views \
> - org-agenda-ndays 30 \
> + org-agenda-span month \
> org-agenda-start-day "2007-11-01" \
> org-agenda-include-diary nil \
> org-agenda-files (quote ("~/org/project.org")))' \
> @@ -14033,7 +14038,7 @@ You may also modify parameters on the fly like this:
> @example
> emacs -batch -l ~/.emacs \
> -eval '(org-batch-agenda "a" \
> - org-agenda-ndays 30 \
> + org-agenda-span month \
> org-agenda-include-diary nil \
> org-agenda-files (quote ("~/org/project.org")))' \
> | lpr
> diff --git a/doc/orgguide.texi b/doc/orgguide.texi
> index b67f7f1..690111b 100644
> --- a/doc/orgguide.texi
> +++ b/doc/orgguide.texi
> @@ -1931,9 +1931,9 @@ Delete other windows.
> Switch to day/week view.
> @c
> @item f @r{and} b
> -Go forward/backward in time to display the following @code{org-agenda-ndays}
> -days. For example, if the display covers a week, switch to the
> -following/previous week.
> +Go forward/backward in time to display the following
> +@code{org-agenda-current-span} days. For example, if the display covers a
> +week, switch to the following/previous week.
> @c
> @item .
> Go to today.
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index c339f60..a4d59a2 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -242,8 +242,12 @@ you can \"misuse\" it to also add other text to the header. However,
> (const org-agenda-prefix-format :value " %-12:c%?-12t% s")
> (string))
> (list :tag "Number of days in agenda"
> - (const org-agenda-ndays)
> - (integer :value 1))
> + (const org-agenda-span)
> + (choice (const :tag "Day" 'day)
> + (const :tag "Week" 'week)
> + (const :tag "Month" 'month)
> + (const :tag "Year" 'year)
> + (integer :tag "Custom")))
> (list :tag "Fixed starting date"
> (const org-agenda-start-day)
> (string :value "2007-11-01"))
> @@ -888,12 +892,25 @@ option will be ignored."
> :group 'org-agenda-windows
> :type 'boolean)
>
> -(defcustom org-agenda-ndays 7
> - "Number of days to include in overview display.
> +(defcustom org-agenda-ndays nil
> + "Number of days to include in overview display.
> Should be 1 or 7.
> +Obsolete, see `org-agenda-span'."
> + :group 'org-agenda-daily/weekly
> + :type 'integer)
> +
> +(make-obsolete-variable 'org-agenda-ndays 'org-agenda-span "24.1")
> +
> +(defcustom org-agenda-span 'week
> + "Number of days to include in overview display.
> +Can be day, week, month, year, or any number of days.
> Custom commands can set this variable in the options section."
> :group 'org-agenda-daily/weekly
> - :type 'integer)
> + :type '(choice (const :tag "Day" 'day)
> + (const :tag "Week" 'week)
> + (const :tag "Month" 'month)
> + (const :tag "Year" 'year)
> + (integer :tag "Custom")))
>
> (defcustom org-agenda-start-on-weekday 1
> "Non-nil means start the overview always on the specified weekday.
> @@ -1825,19 +1842,19 @@ The following commands are available:
> ("View"
> ["Day View" org-agenda-day-view
> :active (org-agenda-check-type nil 'agenda)
> - :style radio :selected (equal org-agenda-ndays 1)
> + :style radio :selected (eq org-agenda-current-span 'day)
> :keys "v d (or just d)"]
> ["Week View" org-agenda-week-view
> :active (org-agenda-check-type nil 'agenda)
> - :style radio :selected (equal org-agenda-ndays 7)
> + :style radio :selected (eq org-agenda-current-span 'week)
> :keys "v w (or just w)"]
> ["Month View" org-agenda-month-view
> :active (org-agenda-check-type nil 'agenda)
> - :style radio :selected (member org-agenda-ndays '(28 29 30 31))
> + :style radio :selected (eq org-agenda-current-span 'month)
> :keys "v m"]
> ["Year View" org-agenda-year-view
> :active (org-agenda-check-type nil 'agenda)
> - :style radio :selected (member org-agenda-ndays '(365 366))
> + :style radio :selected (eq org-agenda-current-span 'year)
> :keys "v y"]
> "--"
> ["Include Diary" org-agenda-toggle-diary
> @@ -3323,7 +3340,8 @@ When EMPTY is non-nil, also include days without any entries."
> (defvar org-agenda-last-arguments nil
> "The arguments of the previous call to `org-agenda'.")
> (defvar org-starting-day nil) ; local variable in the agenda buffer
> -(defvar org-agenda-span nil) ; local variable in the agenda buffer
> +(defvar org-agenda-current-span nil
> + "The current span used in the agenda view.") ; local variable in the agenda buffer
> (defvar org-include-all-loc nil) ; local variable
>
> (defvar org-agenda-entry-types '(:deadline :scheduled :timestamp :sexp)
> @@ -3360,7 +3378,7 @@ somewhat less efficient) way of determining what is included in
> the daily/weekly agenda, see `org-agenda-skip-function'.")
>
> ;;;###autoload
> -(defun org-agenda-list (&optional include-all start-day ndays)
> +(defun org-agenda-list (&optional include-all start-day span)
> "Produce a daily/weekly view from all files in variable `org-agenda-files'.
> The view will be for the current day or week, but from the overview buffer
> you will be able to go to other days/weeks.
> @@ -3371,35 +3389,36 @@ This feature is considered obsolete, please use the TODO list or a block
> agenda instead.
>
> With a numeric prefix argument in an interactive call, the agenda will
> -span INCLUDE-ALL days. Lisp programs should instead specify NDAYS to change
> -the number of days. NDAYS defaults to `org-agenda-ndays'.
> +span INCLUDE-ALL days. Lisp programs should instead specify SPAN to change
> +the number of days. SPAN defaults to `org-agenda-span'.
>
> START-DAY defaults to TODAY, or to the most recent match for the weekday
> given in `org-agenda-start-on-weekday'."
> (interactive "P")
> (if (and (integerp include-all) (> include-all 0))
> - (setq ndays include-all include-all nil))
> - (setq ndays (or ndays org-agenda-ndays)
> - start-day (or start-day org-agenda-start-day))
> + (setq span include-all include-all nil))
> + (setq start-day (or start-day org-agenda-start-day))
> (if org-agenda-overriding-arguments
> (setq include-all (car org-agenda-overriding-arguments)
> start-day (nth 1 org-agenda-overriding-arguments)
> - ndays (nth 2 org-agenda-overriding-arguments)))
> + span (nth 2 org-agenda-overriding-arguments)))
> (if (stringp start-day)
> ;; Convert to an absolute day number
> (setq start-day (time-to-days (org-read-date nil t start-day))))
> - (setq org-agenda-last-arguments (list include-all start-day ndays))
> + (setq org-agenda-last-arguments (list include-all start-day span))
> (org-compile-prefix-format 'agenda)
> (org-set-sorting-strategy 'agenda)
> - (let* ((org-agenda-start-on-weekday
> - (if (or (equal ndays 7) (and (null ndays) (equal 7 org-agenda-ndays)))
> - org-agenda-start-on-weekday nil))
> - (thefiles (org-agenda-files nil 'ifmode))
> - (files thefiles)
> + (let* ((span (org-agenda-ndays-to-span (or span org-agenda-ndays org-agenda-span)))
> (today (org-agenda-today))
> (sd (or start-day today))
> + (ndays (org-agenda-span-to-ndays span sd))
> + (org-agenda-start-on-weekday
> + (if (eq ndays 7)
> + org-agenda-start-on-weekday))
> + (thefiles (org-agenda-files nil 'ifmode))
> + (files thefiles)
> (start (if (or (null org-agenda-start-on-weekday)
> - (< org-agenda-ndays 7))
> + (< ndays 7))
> sd
> (let* ((nt (calendar-day-of-week
> (calendar-gregorian-from-absolute sd)))
> @@ -3409,24 +3428,19 @@ given in `org-agenda-start-on-weekday'."
> (day-numbers (list start))
> (day-cnt 0)
> (inhibit-redisplay (not debug-on-error))
> - s e rtn rtnall file date d start-pos end-pos todayp nd
> + s e rtn rtnall file date d start-pos end-pos todayp
> clocktable-start clocktable-end filter)
> (setq org-agenda-redo-command
> - (list 'org-agenda-list (list 'quote include-all) start-day ndays))
> - ;; Make the list of days
> - (setq ndays (or ndays org-agenda-ndays)
> - nd ndays)
> - (while (> ndays 1)
> - (push (1+ (car day-numbers)) day-numbers)
> - (setq ndays (1- ndays)))
> + (list 'org-agenda-list (list 'quote include-all) start-day (list 'quote span)))
> + (dotimes (n (1- ndays))
> + (push (1+ (car day-numbers)) day-numbers))
> (setq day-numbers (nreverse day-numbers))
> (setq clocktable-start (car day-numbers)
> clocktable-end (1+ (or (org-last day-numbers) 0)))
> (org-prepare-agenda "Day/Week")
> (org-set-local 'org-starting-day (car day-numbers))
> (org-set-local 'org-include-all-loc include-all)
> - (org-set-local 'org-agenda-span
> - (org-agenda-ndays-to-span nd))
> + (org-set-local 'org-agenda-current-span (org-agenda-ndays-to-span span))
> (when (and (or include-all org-agenda-include-all-todo)
> (member today day-numbers))
> (setq files thefiles
> @@ -3454,7 +3468,7 @@ given in `org-agenda-start-on-weekday'."
> (if org-agenda-overriding-header
> (insert (org-add-props (copy-sequence org-agenda-overriding-header)
> nil 'face 'org-agenda-structure) "\n")
> - (insert (capitalize (symbol-name (org-agenda-ndays-to-span nd)))
> + (insert (org-agenda-span-name span)
> "-agenda"
> (if (< (- d2 d1) 350)
> (if (= w1 w2)
> @@ -3519,7 +3533,7 @@ given in `org-agenda-start-on-weekday'."
> (if rtnall (insert
> (org-finalize-agenda-entries
> (org-agenda-add-time-grid-maybe
> - rtnall nd todayp))
> + rtnall ndays todayp))
> "\n"))
> (put-text-property s (1- (point)) 'day d)
> (put-text-property s (1- (point)) 'org-day-cnt day-cnt))))
> @@ -3560,7 +3574,31 @@ given in `org-agenda-start-on-weekday'."
> (message "")))
>
> (defun org-agenda-ndays-to-span (n)
> - (cond ((< n 7) 'day) ((= n 7) 'week) ((< n 32) 'month) (t 'year)))
> + "Return a span symbol for a span of N days, or N if none matches."
> + (cond ((symbolp n) n)
> + ((= n 1) 'day)
> + ((= n 7) 'week)
> + (t n)))
> +
> +(defun org-agenda-span-to-ndays (span start-day)
> + "Return ndays from SPAN starting at START-DAY."
> + (cond ((numberp span) span)
> + ((eq span 'day) 1)
> + ((eq span 'week) 7)
> + ((eq span 'month)
> + (let ((date (calendar-gregorian-from-absolute start-day)))
> + (calendar-last-day-of-month (car date) (caddr date))))
> + ((eq span 'year)
> + (let ((date (calendar-gregorian-from-absolute start-day)))
> + (if (calendar-leap-year-p (caddr date)) 366 365)))))
> +
> +(defun org-agenda-span-name (span)
> + "Return a SPAN name."
> + (if (null span)
> + ""
> + (if (symbolp span)
> + (capitalize (symbol-name span))
> + (format "%d days" span))))
>
> ;;; Agenda word search
>
> @@ -6000,11 +6038,9 @@ Negative selection means regexp must not match for selection of an entry."
> (cond
> (tdpos (goto-char tdpos))
> ((eq org-agenda-type 'agenda)
> - (let* ((sd (org-agenda-today))
> - (comp (org-agenda-compute-time-span sd org-agenda-span))
> + (let* ((sd (org-agenda-compute-starting-span (org-agenda-today) (or org-agenda-ndays org-agenda-span)))
> (org-agenda-overriding-arguments org-agenda-last-arguments))
> - (setf (nth 1 org-agenda-overriding-arguments) (car comp))
> - (setf (nth 2 org-agenda-overriding-arguments) (cdr comp))
> + (setf (nth 1 org-agenda-overriding-arguments) sd)
> (org-agenda-redo)
> (org-agenda-find-same-or-today-or-agenda)))
> (t (error "Cannot find today")))))
> @@ -6021,28 +6057,28 @@ Negative selection means regexp must not match for selection of an entry."
> With prefix ARG, go forward that many times the current span."
> (interactive "p")
> (org-agenda-check-type t 'agenda)
> - (let* ((span org-agenda-span)
> + (let* ((span org-agenda-current-span)
> (sd org-starting-day)
> (greg (calendar-gregorian-from-absolute sd))
> (cnt (org-get-at-bol 'org-day-cnt))
> - greg2 nd)
> + greg2)
> (cond
> ((eq span 'day)
> - (setq sd (+ arg sd) nd 1))
> + (setq sd (+ arg sd)))
> ((eq span 'week)
> - (setq sd (+ (* 7 arg) sd) nd 7))
> + (setq sd (+ (* 7 arg) sd)))
> ((eq span 'month)
> (setq greg2 (list (+ (car greg) arg) (nth 1 greg) (nth 2 greg))
> sd (calendar-absolute-from-gregorian greg2))
> - (setcar greg2 (1+ (car greg2)))
> - (setq nd (- (calendar-absolute-from-gregorian greg2) sd)))
> + (setcar greg2 (1+ (car greg2))))
> ((eq span 'year)
> (setq greg2 (list (car greg) (nth 1 greg) (+ arg (nth 2 greg)))
> sd (calendar-absolute-from-gregorian greg2))
> - (setcar (nthcdr 2 greg2) (1+ (nth 2 greg2)))
> - (setq nd (- (calendar-absolute-from-gregorian greg2) sd))))
> + (setcar (nthcdr 2 greg2) (1+ (nth 2 greg2))))
> + (t
> + (setq sd (+ (* span arg) sd))))
> (let ((org-agenda-overriding-arguments
> - (list (car org-agenda-last-arguments) sd nd t)))
> + (list (car org-agenda-last-arguments) sd span t)))
> (org-agenda-redo)
> (org-agenda-find-same-or-today-or-agenda cnt))))
>
> @@ -6085,7 +6121,6 @@ With prefix ARG, go backward that many times the current span."
> "Switch to daily view for agenda.
> With argument DAY-OF-YEAR, switch to that day of the year."
> (interactive "P")
> - (setq org-agenda-ndays 1)
> (org-agenda-change-time-span 'day day-of-year))
> (defun org-agenda-week-view (&optional iso-week)
> "Switch to daily view for agenda.
> @@ -6095,7 +6130,6 @@ week. Any digits before this encode a year. So 200712 means
> week 12 of year 2007. Years in the range 1938-2037 can also be
> written as 2-digit years."
> (interactive "P")
> - (setq org-agenda-ndays 7)
> (org-agenda-change-time-span 'week iso-week))
> (defun org-agenda-month-view (&optional month)
> "Switch to monthly view for agenda.
> @@ -6120,70 +6154,61 @@ written as 2-digit years."
> "Change the agenda view to SPAN.
> SPAN may be `day', `week', `month', `year'."
> (org-agenda-check-type t 'agenda)
> - (if (and (not n) (equal org-agenda-span span))
> + (if (and (not n) (equal org-agenda-current-span span))
> (error "Viewing span is already \"%s\"" span))
> (let* ((sd (or (org-get-at-bol 'day)
> org-starting-day))
> - (computed (org-agenda-compute-time-span sd span n))
> + (sd (org-agenda-compute-starting-span sd span n))
> (org-agenda-overriding-arguments
> - (list (car org-agenda-last-arguments)
> - (car computed) (cdr computed) t)))
> + (list (car org-agenda-last-arguments) sd span t)))
> (org-agenda-redo)
> (org-agenda-find-same-or-today-or-agenda))
> (org-agenda-set-mode-name)
> (message "Switched to %s view" span))
>
> -(defun org-agenda-compute-time-span (sd span &optional n)
> - "Compute starting date and number of days for agenda.
> +(defun org-agenda-compute-starting-span (sd span &optional n)
> + "Compute starting date for agenda.
> SPAN may be `day', `week', `month', `year'. The return value
> is a cons cell with the starting date and the number of days,
> so that the date SD will be in that range."
> (let* ((greg (calendar-gregorian-from-absolute sd))
> (dg (nth 1 greg))
> (mg (car greg))
> - (yg (nth 2 greg))
> - nd w1 y1 m1 thisweek)
> + (yg (nth 2 greg)))
> (cond
> ((eq span 'day)
> (when n
> (setq sd (+ (calendar-absolute-from-gregorian
> (list mg 1 yg))
> - n -1)))
> - (setq nd 1))
> + n -1))))
> ((eq span 'week)
> (let* ((nt (calendar-day-of-week
> (calendar-gregorian-from-absolute sd)))
> (d (if org-agenda-start-on-weekday
> (- nt org-agenda-start-on-weekday)
> - 0)))
> + 0))
> + y1)
> (setq sd (- sd (+ (if (< d 0) 7 0) d)))
> (when n
> (require 'cal-iso)
> - (setq thisweek (car (calendar-iso-from-absolute sd)))
> (when (> n 99)
> (setq y1 (org-small-year-to-year (/ n 100))
> n (mod n 100)))
> (setq sd
> (calendar-absolute-from-iso
> (list n 1
> - (or y1 (nth 2 (calendar-iso-from-absolute sd)))))))
> - (setq nd 7)))
> + (or y1 (nth 2 (calendar-iso-from-absolute sd)))))))))
> ((eq span 'month)
> - (when (and n (> n 99))
> - (setq y1 (org-small-year-to-year (/ n 100))
> - n (mod n 100)))
> - (setq sd (calendar-absolute-from-gregorian
> - (list (or n mg) 1 (or y1 yg)))
> - nd (- (calendar-absolute-from-gregorian
> - (list (1+ (or n mg)) 1 (or y1 yg)))
> - sd)))
> + (let (y1)
> + (when (and n (> n 99))
> + (setq y1 (org-small-year-to-year (/ n 100))
> + n (mod n 100)))
> + (setq sd (calendar-absolute-from-gregorian
> + (list (or n mg) 1 (or y1 yg))))))
> ((eq span 'year)
> (setq sd (calendar-absolute-from-gregorian
> - (list 1 1 (or n yg)))
> - nd (- (calendar-absolute-from-gregorian
> - (list 1 1 (1+ (or n yg))))
> - sd))))
> - (cons sd nd)))
> + (list 1 1 (or n yg))))))
> + sd))
>
> (defun org-agenda-next-date-line (&optional arg)
> "Jump to the next line indicating a date in agenda buffer."
> @@ -6336,36 +6361,36 @@ When called with a prefix argument, include all archive files as well."
> (defun org-agenda-set-mode-name ()
> "Set the mode name to indicate all the small mode settings."
> (setq mode-name
> - (concat "Org-Agenda"
> - (if (get 'org-agenda-files 'org-restrict) " []" "")
> - (if (equal org-agenda-ndays 1) " Day" "")
> - (if (equal org-agenda-ndays 7) " Week" "")
> - (if org-agenda-follow-mode " Follow" "")
> - (if org-agenda-entry-text-mode " ETxt" "")
> - (if org-agenda-include-diary " Diary" "")
> - (if org-agenda-include-deadlines " Ddl" "")
> - (if org-agenda-use-time-grid " Grid" "")
> - (if (and (boundp 'org-habit-show-habits)
> - org-habit-show-habits) " Habit" "")
> - (if (consp org-agenda-show-log) " LogAll"
> - (if org-agenda-show-log " Log" ""))
> - (if (or org-agenda-filter (get 'org-agenda-filter
> - :preset-filter))
> - (concat " {" (mapconcat
> - 'identity
> - (append (get 'org-agenda-filter
> - :preset-filter)
> - org-agenda-filter) "") "}")
> - "")
> - (if org-agenda-archives-mode
> - (if (eq org-agenda-archives-mode t)
> - " Archives"
> - (format " :%s:" org-archive-tag))
> - "")
> - (if org-agenda-clockreport-mode
> - (if (eq org-agenda-clockreport-mode 'with-filter)
> - " Clock{}" " Clock")
> - "")))
> + (list "Org-Agenda"
> + (if (get 'org-agenda-files 'org-restrict) " []" "")
> + " "
> + '(:eval (org-agenda-span-name org-agenda-current-span))
> + (if org-agenda-follow-mode " Follow" "")
> + (if org-agenda-entry-text-mode " ETxt" "")
> + (if org-agenda-include-diary " Diary" "")
> + (if org-agenda-include-deadlines " Ddl" "")
> + (if org-agenda-use-time-grid " Grid" "")
> + (if (and (boundp 'org-habit-show-habits)
> + org-habit-show-habits) " Habit" "")
> + (if (consp org-agenda-show-log) " LogAll"
> + (if org-agenda-show-log " Log" ""))
> + (if (or org-agenda-filter (get 'org-agenda-filter
> + :preset-filter))
> + (concat " {" (mapconcat
> + 'identity
> + (append (get 'org-agenda-filter
> + :preset-filter)
> + org-agenda-filter) "") "}")
> + "")
> + (if org-agenda-archives-mode
> + (if (eq org-agenda-archives-mode t)
> + " Archives"
> + (format " :%s:" org-archive-tag))
> + "")
> + (if org-agenda-clockreport-mode
> + (if (eq org-agenda-clockreport-mode 'with-filter)
> + " Clock{}" " Clock")
> + "")))
> (force-mode-line-update))
>
> (defun org-agenda-post-command-hook ()
> diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
> index e16c977..d18a12d 100644
> --- a/lisp/org-mouse.el
> +++ b/lisp/org-mouse.el
> @@ -1100,10 +1100,10 @@ This means, between the beginning of line and the point."
> "--"
> ["Day View" org-agenda-day-view
> :active (org-agenda-check-type nil 'agenda)
> - :style radio :selected (equal org-agenda-ndays 1)]
> + :style radio :selected (eq org-agenda-current-span 'day)]
> ["Week View" org-agenda-week-view
> :active (org-agenda-check-type nil 'agenda)
> - :style radio :selected (equal org-agenda-ndays 7)]
> + :style radio :selected (eq org-agenda-current-span 'week)]
> "--"
> ["Show Logbook entries" org-agenda-log-mode
> :style toggle :selected org-agenda-show-log
> --
> 1.7.2.3
>
>
next prev parent reply other threads:[~2010-12-03 12:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-29 10:49 [PATCH] org-agenda: rework ndays and span handling Julien Danjou
2010-11-29 11:14 ` Carsten Dominik
2010-11-29 11:17 ` Julien Danjou
2010-11-30 23:53 ` Carsten Dominik
2010-12-01 3:59 ` Puneeth
2010-12-01 9:24 ` Julien Danjou
2010-12-01 9:48 ` Puneeth
2010-12-01 10:15 ` Eric S Fraga
2010-12-01 13:09 ` Julien Danjou
2010-12-01 14:09 ` Eric S Fraga
2010-12-03 2:11 ` Bernt Hansen
2010-12-03 8:00 ` Carsten Dominik
2010-12-03 9:30 ` Julien Danjou
2010-12-03 10:06 ` Carsten Dominik
2010-12-03 11:50 ` Julien Danjou
2010-12-03 12:09 ` Carsten Dominik [this message]
2010-12-06 13:27 ` [Accepted] " Julien Danjou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101203120955.6A2FA8957D3@u016822.science.uva.nl \
--to=cdominik@newartisans.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).