diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 22:55:31 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 23:07:16 -0800 |
| commit | 0cce3623b169732a51f055a86fc926313b11a5ee (patch) | |
| tree | 17154977d6e77f604ede0b82f89b2aeb6925310a /lisp/calendar/diary-lib.el | |
| parent | 9875d23d86c0668b1e697b67a394560d66c7826d (diff) | |
| parent | 6b765b8facbdbb03f28028007885236601652515 (diff) | |
| download | emacs-0cce3623b169732a51f055a86fc926313b11a5ee.tar.gz | |
Merge branch 'emacs-24'.
Diffstat (limited to 'lisp/calendar/diary-lib.el')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 39ba6f4617e..43f2ea48932 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1586,8 +1586,7 @@ COLOR is passed to `calendar-mark-visible-date' as MARK." (setq date (calendar-gregorian-from-absolute (funcall toabs (list month day y))))) (calendar-mark-visible-date date color))))) - (calendar-mark-complex month day year - 'calendar-bahai-from-absolute color)))) + (calendar-mark-complex month day year fromabs color)))) (defun diary-entry-time (s) |