Change scroll-up/down bindings to Emacs 24's scroll-*-command.

[gnu-emacs] / lisp / progmodes / cpp.el

diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index d7b8b0e8748cb9073e0dff82a8c7e3d24b803d32..e5bfda54728ea80edcb827332bcbfc7f94548a6b 100644 (file)
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -308,7 +308,6 @@ A prefix arg suppresses display of that buffer."
   ;; Pop top of cpp-state-stack and create overlay.
   (let ((entry (assoc (nth 1 (car cpp-state-stack)) cpp-edit-list))
        (branch (nth 0 (car cpp-state-stack)))
-       (begin (nth 2 (car cpp-state-stack)))
        (end (nth 3 (car cpp-state-stack))))
     (setq cpp-state-stack (cdr cpp-state-stack))
     (if entry
@@ -398,7 +397,7 @@ A prefix arg suppresses display of that buffer."
   (overlay-put overlay 'insert-in-front-hooks '(cpp-grow-overlay))
   (overlay-put overlay 'insert-behind-hooks '(cpp-grow-overlay)))
 
-(defun cpp-signal-read-only (overlay after start end &optional len)
+(defun cpp-signal-read-only (overlay after start end &optional _len)
   ;; Only allow deleting the whole overlay.
   ;; Trying to change a read-only overlay.
   (if (and (not after)
@@ -406,7 +405,7 @@ A prefix arg suppresses display of that buffer."
               (> (overlay-end overlay) end)))
       (error "This text is read only")))
 
-(defun cpp-grow-overlay (overlay after start end &optional len)
+(defun cpp-grow-overlay (overlay after start end &optional _len)
   ;; Make OVERLAY grow to contain range START to END.
   (if after
       (move-overlay overlay
@@ -420,8 +419,8 @@ A prefix arg suppresses display of that buffer."
     (suppress-keymap map)
     (define-key map [ down-mouse-2 ] 'cpp-push-button)
     (define-key map [ mouse-2 ] 'ignore)
-    (define-key map " " 'scroll-up)
-    (define-key map "\C-?" 'scroll-down)
+    (define-key map " " 'scroll-up-command)
+    (define-key map "\C-?" 'scroll-down-command)
     (define-key map [ delete ] 'scroll-down)
     (define-key map "\C-c\C-c" 'cpp-edit-apply)
     (define-key map "a" 'cpp-edit-apply)