Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org

[gnu-emacs] / lisp / calendar / calendar.el

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 74d3ce803380e8fe7579d053ee1d122c296b9949..20a8684e38718b29562472abd9e411d086593180 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1635,6 +1635,7 @@ line."
     (define-key map "S"   'calendar-sunrise-sunset)
     (define-key map "M"   'calendar-lunar-phases)
     (define-key map " "   'scroll-other-window)
+    (define-key map [?\S-\ ] 'scroll-other-window-down)
     (define-key map "\d"  'scroll-other-window-down)
     (define-key map "\C-c\C-l" 'calendar-redraw)
     (define-key map "."   'calendar-goto-today)