Recent changes to Calendar/Diary

Recent changes to Calendar/Diary

[Romain Francoise]

With today's Emacs: when I do M-x calendar, instead of just telling me
that there are no diary items for today as it used to, Emacs jumps to
the next diary-anniversary entry in my diary, which is on September
25th.

Is this intentional?

-- 
Romain Francoise <romain@orebokech.com> | I used to think there is no
it's a miracle -- http://orebokech.com/ | future left at all.

Re: Recent changes to Calendar/Diary

[Stefan Monnier]

> With today's Emacs: when I do M-x calendar, instead of just telling me
> that there are no diary items for today as it used to, Emacs jumps to
> the next diary-anniversary entry in my diary, which is on September
> 25th.

> Is this intentional?

Nope.  I must have messed up something.  I'll take a look at it later today,


        Stefan

Re: Recent changes to Calendar/Diary

[Stefan Monnier]

> With today's Emacs: when I do M-x calendar, instead of just telling me
> that there are no diary items for today as it used to, Emacs jumps to
> the next diary-anniversary entry in my diary, which is on September
> 25th.

The patch I just installed should have fixed it.
Please confirm,


        Stefan

Re: Recent changes to Calendar/Diary

[Romain Francoise]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> The patch I just installed should have fixed it.

It doesn't, but reversing the order of with-current-buffer and
save-excursion in your new version of the function does.

-- 
Romain Francoise <romain@orebokech.com> | The world is a fine place,
it's a miracle -- http://orebokech.com/ | and worth fighting for.
                                        | --Ernest Hemingway

Re: Recent changes to Calendar/Diary

[Stefan Monnier]

>> The patch I just installed should have fixed it.

> It doesn't, but reversing the order of with-current-buffer and
> save-excursion in your new version of the function does.

Hmm.... curious ... I'll take yet another look,


        Stefan

Re: Recent changes to Calendar/Diary

[Romain Francoise]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Hmm.... curious ... I'll take yet another look,

Note that I installed a change yesterday to that effect.

-- 
Romain Francoise <romain@orebokech.com> | I've become someone else's
it's a miracle -- http://orebokech.com/ | nightmare...

Re: Recent changes to Calendar/Diary

[Stefan Monnier]

>> Hmm.... curious ... I'll take yet another look,
> Note that I installed a change yesterday to that effect.

I think it hides the actual problem.
A `save-excursion' around `with-current-buffer' is just very weird.

What happens if you revert your patch and apply the one below instead?


        Stefan


--- calendar.el	12 sep 2005 17:27:05 -0400	1.176
+++ calendar.el	19 sep 2005 11:45:08 -0400	
@@ -2900,8 +2900,8 @@
 MARK is a single-character string, a list of face attributes/values, or a face.
 MARK defaults to `diary-entry-marker'."
   (if (calendar-date-is-legal-p date)
+      (with-current-buffer calendar-buffer
       (save-excursion
-        (set-buffer calendar-buffer)
         (calendar-cursor-to-visible-date date)
         (let ((mark (or (and (stringp mark) (= (length mark) 1) mark) ; single-char
                         (and (listp mark) (> (length mark) 0) mark) ; attr list
@@ -2936,7 +2940,7 @@
                 ;; Apply the font aspects
                 (apply 'set-face-attribute temp-face nil mark)
                 (overlay-put
-                 (make-overlay (1- (point)) (1+ (point))) 'face temp-face))))))))
+                   (make-overlay (1- (point)) (1+ (point))) 'face temp-face)))))))))
 
 (defun calendar-star-date ()
   "Replace the date under the cursor in the calendar window with asterisks.

Re: Recent changes to Calendar/Diary

[Romain Francoise]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> I think it hides the actual problem.
> A `save-excursion' around `with-current-buffer' is just very weird.

Yup.

> What happens if you revert your patch and apply the one below instead?

My bug is gone, indeed.

I've reverted my change, please install this better patch instead.

Thanks,

-- 
Romain Francoise <romain@orebokech.com> | I just thought I'd go out
it's a miracle -- http://orebokech.com/ | with a little bit more style.

Re: Recent changes to Calendar/Diary

[Stefan Monnier]

>> I think it hides the actual problem.
>> A `save-excursion' around `with-current-buffer' is just very weird.

> Yup.

>> What happens if you revert your patch and apply the one below instead?

> My bug is gone, indeed.

> I've reverted my change, please install this better patch instead.

Done, thank you,


        Stefan