auto upstream

24 files changed, 187 insertions, 66 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd2186fcfb2..18c11debf0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,47 @@
+2013-02-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-handle-start-file-process): Rewrite.
+
+        * net/tramp-compat.el (top): Declare `remote-file-name-inhibit-cache'
+        only if it doesn't exist.
+
+        * net/tramp-sh.el (tramp-sh-handle-start-file-process): Set
+        process marker.
+
+2013-02-12  Tassilo Horn  <tsdh@gnu.org>
+
+        * doc-view.el (doc-view-odf->pdf-converter-soffice): Use separate
+        UserInstallation when calling soffice to work around LibreOffice
+        bug 37531.
+
+2013-02-12  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (basic-save-buffer):
+        Offer to create a non-existing directory.  (Bug#3016)
+
+        * calc/calc-graph.el (calc-graph-show-dumb):
+        * calendar/calendar.el (calendar-mode-map):
+        * cus-edit.el (custom-mode-map):
+        * ehelp.el (electric-help-map):
+        * emulation/vip.el (vip-mode-map):
+        * epa.el (epa-key-list-mode-map):
+        * info.el (Info-mode-map):
+        * mail/rmail.el (rmail-mode-map):
+        * mail/rmailsum.el (rmail-summary-mode-map):
+        * man.el (Man-mode-map):
+        * net/newst-plainview.el (newsticker-mode-map):
+        * progmodes/cpp.el (cpp-edit-mode-map):
+        * progmodes/grep.el (grep-mode-map):
+        * progmodes/idlw-help.el (idlwave-help-mode-map):
+        * simple.el (special-mode-map):
+        * startup.el (splash-screen-keymap):
+        * view.el (view-mode-map):
+        Make S-SPC scroll in the opposite sense to SPC.  (Bug#2145)
+
 2013-02-11  Elias Pipping  <pipping@lavabit.com>
 
         * doc-view.el (doc-view-current-cache-dir): Beware % escapes
-        (bug#13689).
+        (bug#13679).
 
 2013-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index 4376e21b4ca..c84c7fdf949 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -948,6 +948,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
           (setq calc-dumb-map (make-sparse-keymap))
           (define-key calc-dumb-map "\n" 'scroll-up-command)
           (define-key calc-dumb-map " " 'scroll-up-command)
+          (define-key calc-dump-map [?\S-\ ] 'scroll-down-command)
           (define-key calc-dumb-map "\177" 'scroll-down-command)
           (define-key calc-dumb-map "<" 'scroll-left)
           (define-key calc-dumb-map ">" 'scroll-right)
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 74d3ce80338..20a8684e387 100644
--- 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)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 6d1ebe5a962..d19e2ded00c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -443,6 +443,7 @@
     (define-key map [remap self-insert-command] 'Custom-no-edit)
     (define-key map "\^m" 'Custom-newline)
     (define-key map " " 'scroll-up-command)
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map "\177" 'scroll-down-command)
     (define-key map "\C-c\C-c" 'Custom-set)
     (define-key map "\C-x\C-s" 'Custom-save)
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index edd59a7b518..dcc28a52322 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -939,10 +939,21 @@ is named like ODF with the extension turned to pdf."
   "Convert ODF to PDF asynchronously and call CALLBACK when finished.
 The converted PDF is put into the current cache directory, and it
 is named like ODF with the extension turned to pdf."
-  (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program
-                          (list "--headless" "--convert-to" "pdf"
-                                "--outdir" (doc-view-current-cache-dir) odf)
-                          callback))
+  ;; FIXME: soffice doesn't work when there's another running
+  ;; LibreOffice instance, in which case it returns success without
+  ;; actually doing anything.  See LibreOffice bug
+  ;; https://bugs.freedesktop.org/show_bug.cgi?id=37531.  A workaround
+  ;; is to start soffice with a separate UserInstallation directory.
+  (let ((tmp-user-install-dir (make-temp-file "libreoffice-docview" t)))
+    (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program
+                            (list
+                             (concat "-env:UserInstallation=file://"
+                                     tmp-user-install-dir)
+                             "--headless" "--convert-to" "pdf"
+                             "--outdir" (doc-view-current-cache-dir) odf)
+                            (lambda ()
+                              (delete-directory tmp-user-install-dir t)
+                              (funcall callback)))))
 
 (defun doc-view-pdf/ps->png (pdf-ps png)
   ;; FIXME: Fix name and docstring to account for djvu&tiff.
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 416666f918c..88fc87b5b7a 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -80,6 +80,7 @@
     (define-key map (char-to-string help-char) 'electric-help-help)
     (define-key map "?" 'electric-help-help)
     (define-key map " " 'scroll-up)
+    (define-key map [?\S-\ ] 'scroll-down)
     (define-key map "\^?" 'scroll-down)
     (define-key map "." 'beginning-of-buffer)
     (define-key map "<" 'beginning-of-buffer)
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 4e6749d9cfb..e086f26e8ab 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -183,6 +183,7 @@ If nil then it is bound to `delete-backward-char'."
     (define-key map "\C-z" 'vip-change-mode-to-emacs)
     (define-key map "\e" 'vip-ESC)
 
+    (define-key map [?\S-\ ] 'vip-scroll-back)
     (define-key map " " 'vip-scroll)
     (define-key map "!" 'vip-command-argument)
     (define-key map "\"" 'vip-command-argument)
diff --git a/lisp/epa.el b/lisp/epa.el
index 61a1378aa22..852d10b1cf7 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -169,6 +169,7 @@ You should bind this variable with `let', but do not set it globally.")
     (define-key keymap "n" 'next-line)
     (define-key keymap "p" 'previous-line)
     (define-key keymap " " 'scroll-up-command)
+    (define-key keymap [?\S-\ ] 'scroll-down-command)
     (define-key keymap [delete] 'scroll-down-command)
     (define-key keymap "q" 'epa-exit-buffer)
     (define-key keymap [menu-bar epa-key-list-mode] (cons "Keys" menu-map))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index cc7624dee03..3245c31384a 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-12  Aidan Gauland  <aidalgol@no8wireless.co.nz>
+
+        * erc-match.el (erc-match-message):
+        Don't truncate action messages.  (Bug#13689)
+
 2013-02-09  Eli Zaretskii  <eliz@gnu.org>
 
         * erc-dcc.el (erc-dcc-get-file): Don't reference buffer-file-type.
diff --git a/lisp/files.el b/lisp/files.el
index 890834d4af0..f9ed65b8ac0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4563,28 +4563,39 @@ Before and after saving the buffer, this function runs
                  (not (file-exists-p buffer-file-name))))
         (let ((recent-save (recent-auto-save-p))
               setmodes)
-          ;; If buffer has no file name, ask user for one.
-          (or buffer-file-name
-              (let ((filename
-                     (expand-file-name
-                      (read-file-name "File to save in: "
-                                      nil (expand-file-name (buffer-name))))))
-                (if (file-exists-p filename)
-                    (if (file-directory-p filename)
-                        ;; Signal an error if the user specified the name of an
-                        ;; existing directory.
-                        (error "%s is a directory" filename)
-                      (unless (y-or-n-p (format "File `%s' exists; overwrite? "
-                                                filename))
-                        (error "Canceled")))
-                  ;; Signal an error if the specified name refers to a
-                  ;; non-existing directory.
-                  (let ((dir (file-name-directory filename)))
-                    (unless (file-directory-p dir)
-                      (if (file-exists-p dir)
-                          (error "%s is not a directory" dir)
-                        (error "%s: no such directory" dir)))))
-                (set-visited-file-name filename)))
+          (if buffer-file-name
+              (let ((dir (file-name-directory
+                          (expand-file-name buffer-file-name))))
+                (unless (file-exists-p dir)
+                  (if (y-or-n-p
+                       (format "Directory `%s' does not exist; create? " dir))
+                      (make-directory dir t)
+                    (error "Canceled"))))
+            ;; If buffer has no file name, ask user for one.
+            (let ((filename
+                   (expand-file-name
+                    (read-file-name "File to save in: "
+                                    nil (expand-file-name (buffer-name))))))
+              (if (file-exists-p filename)
+                  (if (file-directory-p filename)
+                      ;; Signal an error if the user specified the name of an
+                      ;; existing directory.
+                      (error "%s is a directory" filename)
+                    (unless (y-or-n-p (format "File `%s' exists; overwrite? "
+                                              filename))
+                      (error "Canceled")))
+                ;; Signal an error if the specified name refers to a
+                ;; non-existing directory.
+                (let ((dir (file-name-directory filename)))
+                  (unless (file-directory-p dir)
+                    (if (file-exists-p dir)
+                        (error "%s is not a directory" dir)
+                      (if (y-or-n-p
+                           (format "Directory `%s' does not exist; create? "
+                                   dir))
+                          (make-directory dir t)
+                        (error "Canceled"))))))
+              (set-visited-file-name filename)))
           (or (verify-visited-file-modtime (current-buffer))
               (not (file-exists-p buffer-file-name))
               (yes-or-no-p
diff --git a/lisp/info.el b/lisp/info.el
index c276420fb7d..a6db9f3f4dc 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3874,6 +3874,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
     (suppress-keymap map)
     (define-key map "." 'beginning-of-buffer)
     (define-key map " " 'Info-scroll-up)
+    (define-key map [?\S-\ ] 'Info-scroll-down)
     (define-key map "\C-m" 'Info-follow-nearest-node)
     (define-key map "\t" 'Info-next-reference)
     (define-key map "\e\t" 'Info-prev-reference)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 96d341c30d2..02703026e84 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1085,6 +1085,7 @@ The buffer is expected to be narrowed to just the header of the message."
     (define-key map "<"      'rmail-first-message)
     (define-key map ">"      'rmail-last-message)
     (define-key map " "      'scroll-up-command)
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map "\177"   'scroll-down-command)
     (define-key map "?"      'describe-mode)
     (define-key map "\C-c\C-s\C-d" 'rmail-sort-by-date)
@@ -4751,7 +4752,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order.
 
 ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
 ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "341825201e892b8fc875c1ae49ffd560")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "119ce8b431f01e7f54bb6fa99603b3d9")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 5b906719c39..13cd7c3f05e 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -118,6 +118,7 @@ Setting this option to nil might speed up the generation of summaries."
     (define-key map "<"      'rmail-summary-first-message)
     (define-key map ">"      'rmail-summary-last-message)
     (define-key map " "      'rmail-summary-scroll-msg-up)
+    (define-key map [?\S-\ ] 'rmail-summary-scroll-msg-down)
     (define-key map "\177"   'rmail-summary-scroll-msg-down)
     (define-key map "?"      'describe-mode)
     (define-key map "\C-c\C-n" 'rmail-summary-next-same-subject)
diff --git a/lisp/man.el b/lisp/man.el
index 93a67128de4..04abc3d4d88 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -426,6 +426,7 @@ Otherwise, the value is whatever the function
     (suppress-keymap map)
     (set-keymap-parent map button-buffer-map)
 
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map " "    'scroll-up-command)
     (define-key map "\177" 'scroll-down-command)
     (define-key map "n"    'Man-next-section)
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 2eb04787bea..c7a3a107078 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -5,7 +5,7 @@
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-plainview.el
 ;; URL:         http://www.nongnu.org/newsticker
-;; Time-stamp:  "13. Mai 2011, 19:28:34 (ulf)"
+;; Time-stamp:  "Mon 11-Feb-2013 20:27:11 gm on skiddaw"
 ;; Package:     newsticker
 
 ;; ======================================================================
@@ -405,6 +405,7 @@ images."
     (define-key map "sx" 'newsticker-show-extra)
     (define-key map "hx" 'newsticker-hide-extra)
 
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map " "  'scroll-up-command)
     (define-key map "q"  'newsticker-close-buffer)
     (define-key map "p"  'newsticker-previous-item)
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 17802d39fa4..0974c62c56e 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -902,42 +902,76 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
 (defun tramp-adb-handle-start-file-process (name buffer program &rest args)
   "Like `start-file-process' for Tramp files."
   (with-parsed-tramp-file-name default-directory nil
-    ;; When PROGRAM is nil, we just provide a tty.
+    ;; When PROGRAM is nil, we should provide a tty.  This is not
+    ;; possible here.
+    (unless (stringp program)
+      (tramp-error v 'file-error "PROGRAM must be a string"))
+
     (let ((command
-           (when (stringp program)
-             (format "cd %s; %s"
-                     (tramp-shell-quote-argument localname)
-                     (mapconcat 'tramp-shell-quote-argument
-                                (cons program args) " "))))
+           (format "cd %s; %s"
+                   (tramp-shell-quote-argument localname)
+                   (mapconcat 'tramp-shell-quote-argument
+                              (cons program args) " ")))
           (tramp-process-connection-type
            (or (null program) tramp-process-connection-type))
+          (bmp (and (buffer-live-p buffer) (buffer-modified-p buffer)))
           (name1 name)
           (i 0))
-      (unwind-protect
-          (save-excursion
-            (save-restriction
-              (while (get-process name1)
-                ;; NAME must be unique as process name.
-                (setq i (1+ i)
-                      name1 (format "%s<%d>" name i)))
-              (setq name name1)
-              ;; Set the new process properties.
-              (tramp-set-connection-property v "process-name" name)
-              (when command
-                (let* ((host (tramp-file-name-host v))
-                       (devices (mapcar 'cadr (tramp-adb-parse-device-names nil)))
-                       (args (if (> (length host) 0)
-                                 (list "-s" host "shell" command)
-                               (list "shell" command)))
-                       (p (apply 'start-process (tramp-get-connection-name v) buffer
-                                 (tramp-adb-program) args)))
-                  ;; Set sentinel and query flag for this process.
-                  (tramp-set-connection-property p "vector" v)
-                  (set-process-sentinel p 'tramp-process-sentinel)
-                  (tramp-compat-set-process-query-on-exit-flag p t)
-                  ;; Return process.
-                  p))))
-        (tramp-set-connection-property v "process-name" nil)))))
+
+      (unless buffer
+        ;; BUFFER can be nil.  We use a temporary buffer.
+        (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
+      (while (get-process name1)
+        ;; NAME must be unique as process name.
+        (setq i (1+ i)
+              name1 (format "%s<%d>" name i)))
+      (setq name name1)
+      ;; Set the new process properties.
+      (tramp-set-connection-property v "process-name" name)
+      (tramp-set-connection-property v "process-buffer" buffer)
+
+      (with-current-buffer (tramp-get-connection-buffer v)
+        (unwind-protect
+            ;; We catch this event.  Otherwise, `start-process' could
+            ;; be called on the local host.
+            (save-excursion
+              (save-restriction
+                ;; Activate narrowing in order to save BUFFER
+                ;; contents.  Clear also the modification time;
+                ;; otherwise we might be interrupted by
+                ;; `verify-visited-file-modtime'.
+                (let ((buffer-undo-list t)
+                      (buffer-read-only nil)
+                      (mark (point)))
+                  (clear-visited-file-modtime)
+                  (narrow-to-region (point-max) (point-max))
+                  ;; We call `tramp-adb-maybe-open-connection', in
+                  ;; order to cleanup the prompt afterwards.
+                  (tramp-adb-maybe-open-connection v)
+                  (widen)
+                  (delete-region mark (point))
+                  (narrow-to-region (point-max) (point-max))
+                  ;; Send the command.
+                  (let ((tramp-adb-prompt (regexp-quote command)))
+                    (tramp-adb-send-command v command))
+                  (let ((p (tramp-get-connection-process v)))
+                    ;; Set query flag and process marker for this
+                    ;; process.  We ignore errors, because the process
+                    ;; could have finished already.
+                    (ignore-errors
+                      (tramp-compat-set-process-query-on-exit-flag p t)
+                      (set-marker (process-mark p) (point)))
+                    ;; Return process.
+                    p))))
+
+          ;; Save exit.
+          (if (string-match tramp-temp-buffer-name (buffer-name))
+              (ignore-errors
+                (set-process-buffer (tramp-get-connection-process v) nil)
+                (kill-buffer (current-buffer)))
+            (set-buffer-modified-p bmp))
+          (tramp-set-connection-property v "process-name" nil)
+          (tramp-set-connection-property v "process-buffer" nil))))))
 
 ;; Helper functions.
 
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 00ef43b1a66..12510bf7fab 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -96,7 +96,8 @@
   ;; `remote-file-name-inhibit-cache' has been introduced with Emacs 24.1.
   ;; Besides `t', `nil', and integer, we use also timestamps (as
   ;; returned by `current-time') internally.
-  (defvar remote-file-name-inhibit-cache nil)
+  (unless (boundp 'remote-file-name-inhibit-cache)
+    (defvar remote-file-name-inhibit-cache nil))
 
   ;; For not existing functions, or functions with a changed argument
   ;; list, there are compiler warnings.  We want to avoid them in
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index bfa145ac780..0c2a0aa385a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2856,10 +2856,12 @@ the result will be a local, non-Tramp, filename."
                          v 'file-error
                          "pty association is not supported for `%s'" name))))
                   (let ((p (tramp-get-connection-process v)))
-                    ;; Set query flag for this process.  We ignore errors,
-                    ;; because the process could have finished already.
+                    ;; Set query flag and process marker for this
+                    ;; process.  We ignore errors, because the process
+                    ;; could have finished already.
                     (ignore-errors
-                      (tramp-compat-set-process-query-on-exit-flag p t))
+                      (tramp-compat-set-process-query-on-exit-flag p t)
+                      (set-marker (process-mark p) (point)))
                     ;; Return process.
                     p))))
 
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index 340b97e80bd..674d98b8dc3 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -420,6 +420,7 @@ A prefix arg suppresses display of that buffer."
     (define-key map [ down-mouse-2 ] 'cpp-push-button)
     (define-key map [ mouse-2 ] 'ignore)
     (define-key map " " 'scroll-up-command)
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map "\C-?" 'scroll-down-command)
     (define-key map [ delete ] 'scroll-down)
     (define-key map "\C-c\C-c" 'cpp-edit-apply)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index d8c39f2ddef..1e152c6d751 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -246,6 +246,7 @@ See `compilation-error-screen-columns'"
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map compilation-minor-mode-map)
     (define-key map " " 'scroll-up-command)
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map "\^?" 'scroll-down-command)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
 
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 0e44e5366ca..749b0b65576 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -227,6 +227,7 @@ support."
                              (interactive "p")
                              (scroll-up arg)))
     (define-key map " " 'scroll-up-command)
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map [delete] 'scroll-down-command)
     (define-key map "h" 'idlwave-help-find-header)
     (define-key map "H" 'idlwave-help-find-first-header)
diff --git a/lisp/simple.el b/lisp/simple.el
index 9587d3c006c..849f7dac55c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -358,6 +358,7 @@ Other major modes are defined by comparison with this one."
     (suppress-keymap map)
     (define-key map "q" 'quit-window)
     (define-key map " " 'scroll-up-command)
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map "\C-?" 'scroll-down-command)
     (define-key map "?" 'describe-mode)
     (define-key map "h" 'describe-mode)
diff --git a/lisp/startup.el b/lisp/startup.el
index 741c5aa9b46..ad31a7a2a45 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1466,6 +1466,7 @@ Each element in the list should be a list of strings or pairs
     (suppress-keymap map)
     (set-keymap-parent map button-buffer-map)
     (define-key map "\C-?" 'scroll-down-command)
+    (define-key map [?\S-\ ] 'scroll-down-command)
     (define-key map " " 'scroll-up-command)
     (define-key map "q" 'exit-splash-screen)
     map)
diff --git a/lisp/view.el b/lisp/view.el
index 2717c915c71..f9326399a26 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -199,6 +199,7 @@ This is local in each buffer, once it is used.")
     (define-key map "\C-?" 'View-scroll-page-backward)
     ;; (define-key map "f" 'View-scroll-page-forward)
     (define-key map " " 'View-scroll-page-forward)
+    (define-key map [?\S-\ ]  'View-scroll-page-backward)
     (define-key map "o" 'View-scroll-to-buffer-end)
     (define-key map ">" 'end-of-buffer)
     (define-key map "<" 'beginning-of-buffer)
@@ -407,8 +408,8 @@ Digits	provide prefix arguments.
 \\[View-scroll-to-buffer-end]   scroll so that buffer end is at last line of window.
 SPC     scroll forward \"page size\" lines.
           With prefix scroll forward prefix lines.
-DEL     scroll backward \"page size\" lines.
-          With prefix scroll backward prefix lines.
+DEL, S-SPC  scroll backward \"page size\" lines.
+              With prefix scroll backward prefix lines.
 \\[View-scroll-page-forward-set-page-size]      like  \\[View-scroll-page-forward]  but with prefix sets \"page size\" to prefix.
 \\[View-scroll-page-backward-set-page-size]     like  \\[View-scroll-page-backward]  but with prefix sets \"page size\" to prefix.
 \\[View-scroll-half-page-forward]       scroll forward \"half page size\" lines.  With prefix, sets