From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: [Accepted] silence byte compiler warnings about european-calendar-style Date: Tue, 14 Sep 2010 09:31:29 +0200 (CEST) Message-ID: <20100914073129.C788D74D757@u016822.science.uva.nl> References: <87aanlzejg.fsf_-_@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=56264 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OvPzJ-0003Df-Vy for emacs-orgmode@gnu.org; Tue, 14 Sep 2010 03:31:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OvPzI-0006hN-Oj for emacs-orgmode@gnu.org; Tue, 14 Sep 2010 03:31:33 -0400 Received: from u016822.science.uva.nl ([146.50.39.34]:49333) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvPzI-0006hG-HE for emacs-orgmode@gnu.org; Tue, 14 Sep 2010 03:31:32 -0400 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org 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 > X-Patchwork-Id: 272 > Message-Id: <87aanlzejg.fsf_-_@Rainer.invalid> > To: emacs-orgmode@gnu.org > > 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. >