diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-04-11 21:02:38 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-04-11 21:02:38 -0700 |
| commit | c0749a51330a59450298108cec49cef04cdb9377 (patch) | |
| tree | 6c71cd8180c1fe7bd64988febc16ec99f42eff48 /lisp/calendar/cal-hebrew.el | |
| parent | f5b06c3546138ce5181ff6efd211dfe2516edcaa (diff) | |
| download | emacs-c0749a51330a59450298108cec49cef04cdb9377.tar.gz | |
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]
Diffstat (limited to 'lisp/calendar/cal-hebrew.el')
| -rw-r--r-- | lisp/calendar/cal-hebrew.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index e5373a28756..44c3e62a7c2 100644 --- a/lisp/calendar/cal-hebrew.el +++ b/lisp/calendar/cal-hebrew.el @@ -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) |