[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103892: cal-hebrew fix for diary-heb
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103892: cal-hebrew fix for diary-hebrew-rosh-hodesh. |
Date: |
Mon, 11 Apr 2011 21:02:38 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 103892
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-04-11 21:02:38 -0700
message:
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]
modified:
lisp/ChangeLog
lisp/calendar/cal-hebrew.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-04-11 03:44:54 +0000
+++ b/lisp/ChangeLog 2011-04-12 04:02:38 +0000
@@ -1,3 +1,8 @@
+2011-04-12 Glenn Morris <address@hidden>
+
+ * calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh):
+ Don't try to cons a mark onto an empty element.
+
2011-04-11 Leo Liu <address@hidden>
* ido.el (ido-buffer-internal): Allow method 'kill for virtual
=== modified file 'lisp/calendar/cal-hebrew.el'
--- a/lisp/calendar/cal-hebrew.el 2011-03-07 07:48:32 +0000
+++ b/lisp/calendar/cal-hebrew.el 2011-04-12 04:02:38 +0000
@@ -954,16 +954,17 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103892: cal-hebrew fix for diary-hebrew-rosh-hodesh.,
Glenn Morris <=