diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-03-27 06:19:47 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-03-27 06:19:47 +0000 |
| commit | 566f5ae682c23d64d78b5942cef6398fd54ee1f9 (patch) | |
| tree | 3ef371001de970551b8968dbccee0557378f1e83 | |
| parent | 78d2cbe156de083987ff590d6cd83cb667e07c75 (diff) | |
| download | emacs-566f5ae682c23d64d78b5942cef6398fd54ee1f9.tar.gz | |
(diary-mark-entries-1): Fix position offsets in non-gregorian case.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 13 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f297ef1798a..5fab3c006b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -20,6 +20,7 @@ (diary-display-no-entries): New function. (simple-diary-display, fancy-diary-display): Use it. (fancy-diary-display): Doc fix. Remove unneeded local entry-list. + (diary-mark-entries-1): Fix position offsets in non-gregorian case. 2008-03-26 Jay Belanger <jay.p.belanger@gmail.com> diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 8a7fca4834c..139074916b4 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1108,24 +1108,21 @@ function that converts absolute dates to dates of the appropriate type. " (day "[0-9]+\\|\\*") (year "[0-9]+\\|\\*") (case-fold-search t) - ;; FIXME is this the right reason for 1 versus 2? - ;; Should docs of symbols say must be single character? - (inc (if symbol 2 1)) marks) (dolist (date-form diary-date-forms) (if (eq (car date-form) 'backup) ; ignore 'backup directive (setq date-form (cdr date-form))) (let* ((l (length date-form)) (d-name-pos (- l (length (memq 'dayname date-form)))) - (d-name-pos (if (/= l d-name-pos) (+ inc d-name-pos))) + (d-name-pos (if (/= l d-name-pos) (1+ d-name-pos))) (m-name-pos (- l (length (memq 'monthname date-form)))) - (m-name-pos (if (/= l m-name-pos) (+ inc m-name-pos))) + (m-name-pos (if (/= l m-name-pos) (1+ m-name-pos))) (d-pos (- l (length (memq 'day date-form)))) - (d-pos (if (/= l d-pos) (+ inc d-pos))) + (d-pos (if (/= l d-pos) (1+ d-pos))) (m-pos (- l (length (memq 'month date-form)))) - (m-pos (if (/= l m-pos) (+ inc m-pos))) + (m-pos (if (/= l m-pos) (1+ m-pos))) (y-pos (- l (length (memq 'year date-form)))) - (y-pos (if (/= l y-pos) (+ inc y-pos))) + (y-pos (if (/= l y-pos) (1+ y-pos))) (regexp (format "^%s\\(%s\\)" (if symbol (regexp-quote symbol) "") (mapconcat 'eval date-form "\\)\\(")))) |