aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-06-13 15:37:52 -0400
committerGlenn Morris2014-06-13 15:37:52 -0400
commit5fd71fed68c5f15effda5da2ca0d0404ffd41093 (patch)
tree79131c26c8896dabc2c60463551f2ef1bb940612
parentbad55057faa9d5ec8b8a765a7d7cc5d8a68f9663 (diff)
downloademacs-5fd71fed68c5f15effda5da2ca0d0404ffd41093.tar.gz
emacs-5fd71fed68c5f15effda5da2ca0d0404ffd41093.zip
Remove pointless code in calendar-generate-window
* lisp/calendar/calendar.el (calendar-generate-window): Remove pointless call to font-lock-fontify-buffer.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/calendar.el5
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8fc42e92eb..0d4bfe84ac2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-06-13 Glenn Morris <rgm@gnu.org>
2
3 * calendar/calendar.el (calendar-generate-window):
4 Remove pointless call to font-lock-fontify-buffer.
5
12014-06-13 Matthias Meulien <orontee@gmail.com> 62014-06-13 Matthias Meulien <orontee@gmail.com>
2 7
3 * simple.el (completion-list-mode-map): Navigate with tab and backtab 8 * simple.el (completion-list-mode-map): Navigate with tab and backtab
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index b4418c4efaa..581dd3437d9 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1,7 +1,6 @@
1;;; calendar.el --- calendar functions 1;;; calendar.el --- calendar functions
2 2
3;; Copyright (C) 1988-1995, 1997, 2000-2014 Free Software Foundation, 3;; Copyright (C) 1988-1995, 1997, 2000-2014 Free Software Foundation, Inc.
4;; Inc.
5 4
6;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 5;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
7;; Maintainer: Glenn Morris <rgm@gnu.org> 6;; Maintainer: Glenn Morris <rgm@gnu.org>
@@ -1474,8 +1473,6 @@ Optional integers MON and YR are used instead of today's date."
1474 ;; combined don't fit height to that of its buffer. 1473 ;; combined don't fit height to that of its buffer.
1475 (set-window-vscroll nil 0)) 1474 (set-window-vscroll nil 0))
1476 (sit-for 0)) 1475 (sit-for 0))
1477 (and (bound-and-true-p font-lock-mode)
1478 (font-lock-fontify-buffer)) ;FIXME: Why?
1479 (and calendar-mark-holidays-flag 1476 (and calendar-mark-holidays-flag
1480 ;; (calendar-date-is-valid-p today) ; useful for BC dates 1477 ;; (calendar-date-is-valid-p today) ; useful for BC dates
1481 (calendar-mark-holidays) 1478 (calendar-mark-holidays)