emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Adam Porter <adam@alphapapa.net>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] org-agenda: Add 'none setting for org-agenda-overriding-header
Date: Wed, 23 Aug 2017 10:48:28 +0200	[thread overview]
Message-ID: <87lgma1xgj.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <8760dfko9f.fsf@alphapapa.net> (Adam Porter's message of "Tue, 22 Aug 2017 21:32:12 -0500")

Adam Porter <adam@alphapapa.net> writes:

> Here are the patches.  Please let me know if any other changes are
> needed.

Thank you! Comments follow.

> +(defmacro org-agenda--insert-overriding-header (&key default)

There is no "&key" in `defmacro'.

It should be (default).

> +  "Insert header into agenda view depending on value of `org-agenda-overriding-header'.
> +If the empty string, don't insert a header.  If any other string,
> +insert it as a header.  If nil, insert DEFAULT, which should
> +evaluate to a string."
> +  (declare (debug (&key form)))

It needs to be updated according to the above.

> +			    ;; Format week number span
> +			    (cond ((< (- d2 d1) 350)
> +				   (if (= w1 w2)
> +				       (format " (W%02d)" w1)
> +				     (format " (W%02d-W%02d)" w1 w2)))
> +				  (t ""))

  (cond ((<= 350 (- d2 d1)) "")
        ((= w1 w2) (format " (W%02d)" w1))
        (t (format " (W%02d-W%02d)" w1 w2)))

> -		    (let ((n 0) s)
> -		      (mapc (lambda (x)
> -			      (setq s (format "(%d)%s" (setq n (1+ n)) x))
> -			      (if (> (+ (current-column) (string-width s) 1) (frame-width))
> -				  (insert "\n                     "))
> -			      (insert " " s))
> -			    kwds))
> +		    (cl-loop for keyword in kwds
> +			     and num from 1
> +			     for string = (format "(%d)%s" num keyword)
> +			     when (> (+ (current-column) (string-width string) 1)
> +				     (window-width))
> +			     do (insert "\n                     ")
> +			     do (insert " " string))

Ouch. Why `cl-loop' over `dolist'? Also it looks wrong since the last
`do' is not always executed? (or is it?).

I know there is more than one way to skin a cat, but I'd rather use
a straightforward one:

  (let ((n 0))
    (dolist (k kwds)
      (let ((s (format "(%d)%s" (cl-incf n) k)))
        (when (> (+ (current-column) (string-width s) 1) (frame-width))
          (insert "\n                     "))
        (insert " " s))))


Regards,

  reply	other threads:[~2017-08-23  8:48 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-16  4:20 [PATCH] org-agenda: Add 'none setting for org-agenda-overriding-header Adam Porter
2017-08-17 14:25 ` Nicolas Goaziou
2017-08-17 19:57   ` Adam Porter
2017-08-18  9:07     ` Nicolas Goaziou
2017-08-20  2:47       ` Adam Porter
2017-08-20  8:25         ` Nicolas Goaziou
2017-08-23  1:41           ` Adam Porter
2017-08-23  2:32             ` Adam Porter
2017-08-23  8:48               ` Nicolas Goaziou [this message]
2017-09-02  2:41                 ` Adam Porter
2017-09-02  7:49                   ` Nicolas Goaziou
2017-09-03  1:44                     ` Adam Porter
2017-09-06 11:17                       ` Nicolas Goaziou
2017-09-06 23:00                         ` Adam Porter
2017-09-10 12:32                           ` Nicolas Goaziou
2017-09-06 23:06                         ` Adam Porter
2017-08-23  8:37             ` Nicolas Goaziou

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=87lgma1xgj.fsf@nicolasgoaziou.fr \
    --to=mail@nicolasgoaziou.fr \
    --cc=adam@alphapapa.net \
    --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).