emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Accepted] [Orgmode] silence byte compiler warnings about european-calen


From: Carsten Dominik
Subject: [Accepted] [Orgmode] silence byte compiler warnings about european-calendar-style
Date: Tue, 14 Sep 2010 09:31:29 +0200 (CEST)

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

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C87aanlzejg.fsf_-_%40Rainer.invalid%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] silence byte compiler warnings about 
> european-calendar-style
> Date: Mon, 13 Sep 2010 23:25:39 -0000
> From: Achim Gratz <address@hidden>
> X-Patchwork-Id: 272
> Message-Id: <address@hidden>
> To: address@hidden
> 
> I've investigated further and defvaralias doesn't silence the warnings,
> but "with-no-warnings" does.
> 
> ---
> lisp/org-agenda.el |    3 ++-
>  lisp/org.el        |    7 ++++---
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index 32c65db..9f94fa6 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -7279,7 +7279,8 @@ the resulting entry will not be shown.  When TEXT is 
> empty, switch to
>        (let ((calendar-date-display-form
>            (if (if (boundp 'calendar-date-style)
>                    (eq calendar-date-style 'european)
> -                (org-bound-and-true-p european-calendar-style)) ; Emacs 22
> +                (with-no-warnings ;; european-calendar-style is obsolete as 
> of version 23.1
> +                  (org-bound-and-true-p european-calendar-style))) ; Emacs 22
>                '(day " " month " " year)
>              '(month " " day " " year))))
>  
> diff --git a/lisp/org.el b/lisp/org.el
> index 668d469..70dd482 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -14604,9 +14604,10 @@ user function argument order change dependent on 
> argument order."
>       (list arg2 arg1 arg3))
>         ((eq calendar-date-style 'iso)
>       (list arg2 arg3 arg1)))
> -    (if (org-bound-and-true-p european-calendar-style)
> -     (list arg2 arg1 arg3)
> -      (list arg1 arg2 arg3))))
> +    (with-no-warnings ;; european-calendar-style is obsolete as of version 
> 23.1
> +      (if (org-bound-and-true-p european-calendar-style)
> +       (list arg2 arg1 arg3)
> +     (list arg1 arg2 arg3)))))
>  
>  (defun org-eval-in-calendar (form &optional keepdate)
>    "Eval FORM in the calendar window and return to current window.
> 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]