Buglet in last diary change

Buglet in last diary change

[Kai Großjohann]

Without the following change, invoking diary produces a void-variable
error.  However, I guess that this change is wrong.  Does anyone know
what's the right change?

Index: lisp/calendar/diary-lib.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.60
diff -u -r1.60 diary-lib.el
--- lisp/calendar/diary-lib.el	16 Nov 2002 19:17:20 -0000	1.60
+++ lisp/calendar/diary-lib.el	17 Nov 2002 20:07:33 -0000
@@ -1614,6 +1614,7 @@
 		    (diary-name-pattern calendar-month-name-array t)
 		    "\\)"))
 	   (day "[0-9]+")
+           (month "[0-9]+")
 	   (year "-?[0-9]+"))
        (mapconcat 'eval calendar-date-display-form ""))
      "\\(\\(: .*\\)\\|\\(\n +.*\\)\\)*\n=+$")


kai
-- 
~/.signature is: umop ap!sdn    (Frank Nobis)

Re: Buglet in last diary change

[Alan Shutko]

kai.grossjohann@uni-duisburg.de (Kai Großjohann) writes:

> Without the following change, invoking diary produces a void-variable
> error.  However, I guess that this change is wrong.  Does anyone know
> what's the right change?

What backtrace do you get on that?  I put in the last diary stuff,
but I don't see the problem here.  Oh... I bet you're using european
date display.  No, the default value doesn't seem to use month.  What
is your value for calendar-date-display-form?

-- 
Alan Shutko <ats@acm.org> - In a variety of flavors!
There's more than one way to scan a cat.

Re: Buglet in last diary change

[Alan Shutko]

Alan Shutko <ats@acm.org> writes:

> What is your value for calendar-date-display-form?

I see the docs specify month should be allowed there, so I'll figure
out if your change is right, or what it should be.

-- 
Alan Shutko <ats@acm.org> - In a variety of flavors!
Gold diggers do it for advancement.

Re: Buglet in last diary change

[Kai Großjohann]

Alan Shutko <ats@acm.org> writes:

> What backtrace do you get on that?  I put in the last diary stuff,
> but I don't see the problem here.  Oh... I bet you're using european
> date display.  No, the default value doesn't seem to use month.  What
> is your value for calendar-date-display-form?

Oh, yes, I should have mentioned this.  I use an ISO-ish date format:

(setq calendar-date-display-form
      '((format "%04d-%02d-%02d%s"
		(string-to-number year)
		(string-to-number month)
		(string-to-number day)
		(if dayname (concat " " dayname) ""))))
(setq calendar-time-display-form '(24-hours ":" minutes
					    (if time-zone " (")
					    time-zone
					    (if time-zone ")")))

kai
-- 
~/.signature is: umop ap!sdn    (Frank Nobis)

Re: Buglet in last diary change

[Alan Shutko]

kai.grossjohann@uni-duisburg.de (Kai Großjohann) writes:

> Without the following change, invoking diary produces a void-variable
> error.  However, I guess that this change is wrong.  Does anyone know
> what's the right change?

After looking at it, I think that change is right.  A month is just a
number (otherwise it's monthname).  So that's the right thing to put
into the regexp in place of month.

-- 
Alan Shutko <ats@acm.org> - In a variety of flavors!
Confidence is the feeling you have beforeyou understand the problem.

Re: Buglet in last diary change

[Kai Großjohann]

Alan Shutko <ats@acm.org> writes:

> After looking at it, I think that change is right.  A month is just a
> number (otherwise it's monthname).  So that's the right thing to put
> into the regexp in place of month.

OK.  Committed.

kai
-- 
~/.signature is: umop ap!sdn    (Frank Nobis)

Re: Buglet in last diary change

[Richard Stallman]

Your fix is probably right; please install it.  I think it is not
needed for the standard value of calendar-date-display-form, but
legitimate alternative values can use `month'.


Envelope-to: rms@gnu.org
Delivery-date: Sun, 17 Nov 2002 15:41:46 -0500
To: emacs-devel@gnu.org
X-Injected-Via-Gmane: http://gmane.org/
From: kai.grossjohann@uni-duisburg.de (Kai =?iso-8859-1?q?Gro=DFjohann?=)
Subject: Buglet in last diary change
Organization: University of Dortmund, Germany
Cancel-Lock: sha1:NHvURS82NQER7XguntWou9aFACQ=
Sender: emacs-devel-admin@gnu.org
Date: Sun, 17 Nov 2002 21:10:04 +0100

Without the following change, invoking diary produces a void-variable
error.  However, I guess that this change is wrong.  Does anyone know
what's the right change?

Index: lisp/calendar/diary-lib.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/diary-lib.el,v
retrieving revision 1.60
diff -u -r1.60 diary-lib.el
--- lisp/calendar/diary-lib.el	16 Nov 2002 19:17:20 -0000	1.60
+++ lisp/calendar/diary-lib.el	17 Nov 2002 20:07:33 -0000
@@ -1614,6 +1614,7 @@
 		    (diary-name-pattern calendar-month-name-array t)
 		    "\\)"))
 	   (day "[0-9]+")
+           (month "[0-9]+")
 	   (year "-?[0-9]+"))
        (mapconcat 'eval calendar-date-display-form ""))
      "\\(\\(: .*\\)\\|\\(\n +.*\\)\\)*\n=+$")


kai
-- 
~/.signature is: umop ap!sdn    (Frank Nobis)




_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel

Re: Buglet in last diary change

[Kai Großjohann]

Richard Stallman <rms@gnu.org> writes:

> Your fix is probably right; please install it.  I think it is not
> needed for the standard value of calendar-date-display-form, but
> legitimate alternative values can use `month'.

I've installed the fix.  I use an ISO-ish format YYYY-MM-DD.

kai
-- 
~/.signature is: umop ap!sdn    (Frank Nobis)