diff options
| author | Glenn Morris | 2012-08-20 21:10:27 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-08-20 21:10:27 -0400 |
| commit | 6d74698e4bc745cf2f5e985b482371ab4a7c49e7 (patch) | |
| tree | 2bc2b2fa6bd41c2830b9e7f7f57a991a533e0b2b | |
| parent | 64cde19918824433ac8b0d753ff94cc7bfc36118 (diff) | |
| download | emacs-6d74698e4bc745cf2f5e985b482371ab4a7c49e7.tar.gz emacs-6d74698e4bc745cf2f5e985b482371ab4a7c49e7.zip | |
cal-tex small fix
* lisp/calendar/cal-tex.el (cal-tex-cursor-week-iso)
(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
(cal-tex-cursor-filofax-daily): Correct start date for diary entries.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/calendar/cal-tex.el | 20 |
2 files changed, 10 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b9a95ef352..b3efc458149 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-08-21 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar/cal-tex.el (cal-tex-cursor-week-iso) | ||
| 4 | (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week) | ||
| 5 | (cal-tex-cursor-filofax-daily): Correct start date for diary entries. | ||
| 6 | |||
| 1 | 2012-08-21 Juri Linkov <juri@jurta.org> | 7 | 2012-08-21 Juri Linkov <juri@jurta.org> |
| 2 | 8 | ||
| 3 | * info.el (Info-file-attributes): New variable. | 9 | * info.el (Info-file-attributes): New variable. |
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index c8c80370dfa..3063c657b93 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el | |||
| @@ -816,10 +816,7 @@ position to use instead of point." | |||
| 816 | (holidays (if cal-tex-holidays | 816 | (holidays (if cal-tex-holidays |
| 817 | (holiday-in-range d1 d2))) | 817 | (holiday-in-range d1 d2))) |
| 818 | (diary-list (if cal-tex-diary | 818 | (diary-list (if cal-tex-diary |
| 819 | (cal-tex-list-diary-entries | 819 | (cal-tex-list-diary-entries d1 d2))) |
| 820 | ;; FIXME d1? | ||
| 821 | (calendar-absolute-from-gregorian (list month 1 year)) | ||
| 822 | d2))) | ||
| 823 | s) | 820 | s) |
| 824 | (cal-tex-preamble "11pt") | 821 | (cal-tex-preamble "11pt") |
| 825 | (cal-tex-cmd "\\textwidth 6.5in") | 822 | (cal-tex-cmd "\\textwidth 6.5in") |
| @@ -1194,10 +1191,7 @@ Optional EVENT indicates a buffer position to use instead of point." | |||
| 1194 | (holidays (if cal-tex-holidays | 1191 | (holidays (if cal-tex-holidays |
| 1195 | (holiday-in-range d1 d2))) | 1192 | (holiday-in-range d1 d2))) |
| 1196 | (diary-list (if cal-tex-diary | 1193 | (diary-list (if cal-tex-diary |
| 1197 | (cal-tex-list-diary-entries | 1194 | (cal-tex-list-diary-entries d1 d2)))) |
| 1198 | ;; FIXME d1? | ||
| 1199 | (calendar-absolute-from-gregorian (list month 1 year)) | ||
| 1200 | d2)))) | ||
| 1201 | (cal-tex-preamble "twoside") | 1195 | (cal-tex-preamble "twoside") |
| 1202 | (cal-tex-cmd "\\textwidth 3.25in") | 1196 | (cal-tex-cmd "\\textwidth 3.25in") |
| 1203 | (cal-tex-cmd "\\textheight 6.5in") | 1197 | (cal-tex-cmd "\\textheight 6.5in") |
| @@ -1291,10 +1285,7 @@ Optional EVENT indicates a buffer position to use instead of point." | |||
| 1291 | (holidays (if cal-tex-holidays | 1285 | (holidays (if cal-tex-holidays |
| 1292 | (holiday-in-range d1 d2))) | 1286 | (holiday-in-range d1 d2))) |
| 1293 | (diary-list (if cal-tex-diary | 1287 | (diary-list (if cal-tex-diary |
| 1294 | (cal-tex-list-diary-entries | 1288 | (cal-tex-list-diary-entries d1 d2)))) |
| 1295 | ;; FIXME d1? | ||
| 1296 | (calendar-absolute-from-gregorian (list month 1 year)) | ||
| 1297 | d2)))) | ||
| 1298 | (cal-tex-preamble "twoside") | 1289 | (cal-tex-preamble "twoside") |
| 1299 | (cal-tex-cmd "\\textwidth 3.25in") | 1290 | (cal-tex-cmd "\\textwidth 3.25in") |
| 1300 | (cal-tex-cmd "\\textheight 6.5in") | 1291 | (cal-tex-cmd "\\textheight 6.5in") |
| @@ -1434,10 +1425,7 @@ Optional EVENT indicates a buffer position to use instead of point." | |||
| 1434 | (holidays (if cal-tex-holidays | 1425 | (holidays (if cal-tex-holidays |
| 1435 | (holiday-in-range d1 d2))) | 1426 | (holiday-in-range d1 d2))) |
| 1436 | (diary-list (if cal-tex-diary | 1427 | (diary-list (if cal-tex-diary |
| 1437 | (cal-tex-list-diary-entries | 1428 | (cal-tex-list-diary-entries d1 d2)))) |
| 1438 | ;; FIXME d1? | ||
| 1439 | (calendar-absolute-from-gregorian (list month 1 year)) | ||
| 1440 | d2)))) | ||
| 1441 | (cal-tex-preamble "twoside") | 1429 | (cal-tex-preamble "twoside") |
| 1442 | (cal-tex-cmd "\\textwidth 3.25in") | 1430 | (cal-tex-cmd "\\textwidth 3.25in") |
| 1443 | (cal-tex-cmd "\\textheight 6.5in") | 1431 | (cal-tex-cmd "\\textheight 6.5in") |