aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/calendar.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e5fd5be1c..f78e5a277b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-06 Glenn Morris <[email protected]>
+
+ * calendar/calendar.el (calendar-mode):
+ Locally set scroll-margin to 0. (Bug#10379)
+
2012-01-06 Ulrich Mueller <[email protected]>
* play/doctor.el (doctor-death): Escape "," characters. (Bug#10370)
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 6b20b014e1..905600cfb7 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1730,6 +1730,7 @@ For a complete description, see the info node `Calendar/Diary'.
(setq buffer-read-only t
buffer-undo-list t
indent-tabs-mode nil)
+ (set (make-local-variable 'scroll-margin) 0) ; bug#10379
(calendar-update-mode-line)
(make-local-variable 'calendar-mark-ring)
(make-local-variable 'displayed-month) ; month in middle of window