Commit c0749a51 authored by Glenn Morris's avatar Glenn Morris
Browse files

cal-hebrew fix for diary-hebrew-rosh-hodesh.

* lisp/calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh):
Don't try to cons a mark onto an empty element.

Recipe showing the problem:
~/diary:
&%%(diary-rosh-hodesh)
&%%(diary-parasha)

emacs -Q --eval "(progn (add-hook 'diary-nongregorian-listing-hook
   'diary-hebrew-list-entries) (setq cal-tex-diary t))" -f calendar

Move to Jan 2011, press `t m', latex the generated file.

[Port to 23.4]
parent f5b06c35
2011-04-12 Glenn Morris <rgm@gnu.org>
* calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh):
Don't try to cons a mark onto an empty element.
2011-04-11 Leo Liu <sdl.web@gmail.com>
* ido.el (ido-buffer-internal): Allow method 'kill for virtual
......
......@@ -954,16 +954,17 @@ use when highlighting the day in the calendar."
(format "%s (second day)" this-month)
this-month))))
(if (= (% d 7) 6) ; Saturday--check for Shabbat Mevarchim
(cons mark
(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
(cons mark
(format "Mevarchim Rosh Hodesh %s (%s)"
(aref h-month-names
(if (= h-month
(calendar-hebrew-last-month-of-year
h-year))
0 h-month))
(aref calendar-day-name-array (- 29 h-day))))
((and (< h-day 30) (> h-day 22) (= 30 last-day))
(aref calendar-day-name-array (- 29 h-day)))))
((and (< h-day 30) (> h-day 22) (= 30 last-day))
(cons mark
(format "Mevarchim Rosh Hodesh %s (%s-%s)"
(aref h-month-names h-month)
(if (= h-day 29)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment