diff options
| author | Leo Liu | 2014-11-23 15:51:24 +0800 |
|---|---|---|
| committer | Leo Liu | 2014-11-23 15:51:24 +0800 |
| commit | b7b18c73f98aa429151f8dafc949774d1eb8807b (patch) | |
| tree | f9ca98f1a51148ef879b94f992abf261bdd3ddd3 | |
| parent | 00981cbdfff391d858d262083d24b685217a8353 (diff) | |
| download | emacs-b7b18c73f98aa429151f8dafc949774d1eb8807b.tar.gz emacs-b7b18c73f98aa429151f8dafc949774d1eb8807b.zip | |
Fix calendar-mark-1
* calendar/diary-lib.el (calendar-mark-1): Fix thinko.
| -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 @@ | |||
| 1 | 2014-11-23 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * calendar/diary-lib.el (calendar-mark-1): Fix thinko. | ||
| 4 | |||
| 1 | 2014-11-22 Fabián Ezequiel Gallina <fgallina@gnu.org> | 5 | 2014-11-22 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 6 | ||
| 3 | Set PYTHONUNBUFFERED on shell startup. | 7 | 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." | |||
| 1668 | (setq date (calendar-gregorian-from-absolute | 1668 | (setq date (calendar-gregorian-from-absolute |
| 1669 | (funcall toabs (list month day y))))) | 1669 | (funcall toabs (list month day y))))) |
| 1670 | (calendar-mark-visible-date date color))))) | 1670 | (calendar-mark-visible-date date color))))) |
| 1671 | (calendar-mark-complex month day year | 1671 | (calendar-mark-complex month day year fromabs color)))) |
| 1672 | 'calendar-bahai-from-absolute color)))) | ||
| 1673 | 1672 | ||
| 1674 | 1673 | ||
| 1675 | (defun diary-entry-time (s) | 1674 | (defun diary-entry-time (s) |