diff options
author | Leo Liu <sdl.web@gmail.com> | 2014-11-23 15:51:24 +0800 |
---|---|---|
committer | Leo Liu <sdl.web@gmail.com> | 2014-11-23 15:51:24 +0800 |
commit | b7b18c73f98aa429151f8dafc949774d1eb8807b (patch) | |
tree | f9ca98f1a51148ef879b94f992abf261bdd3ddd3 /lisp | |
parent | 00981cbdfff391d858d262083d24b685217a8353 (diff) | |
download | emacs-b7b18c73f98aa429151f8dafc949774d1eb8807b.tar.gz |
Fix calendar-mark-1
* calendar/diary-lib.el (calendar-mark-1): Fix thinko.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 4 | ||||
-rw-r--r-- | lisp/calendar/diary-lib.el | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e59c3910fd7..8ec822ff999 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-23 Leo Liu <sdl.web@gmail.com> + + * calendar/diary-lib.el (calendar-mark-1): Fix thinko. + 2014-11-22 Fabián Ezequiel Gallina <fgallina@gnu.org> Set PYTHONUNBUFFERED on shell startup. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 7b07f4f6814..128b6298068 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1668,8 +1668,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) |