(scheme-let-indent): New arg NORMAL-INDENT.

(scheme-indent-function): Pass normal-indent as 3rd arg
when calling an indentation function.

diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index c9f9b4cdb0c53271c2853c6e710a637546176774..0487db7de2bde013484bb99b82772a621605835a 100644 (file)
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -356,7 +356,7 @@ if that value is non-nil and inserts the value of
               (lisp-indent-specform method state
                                     indent-point normal-indent))
              (method
-               (funcall method state indent-point)))))))
+               (funcall method state indent-point normal-indent)))))))
 
 \f
 ;;; Let is different in Scheme
@@ -378,11 +378,11 @@ if that value is non-nil and inserts the value of
 ;;      (scheme-indent-specform 2 state indent-point)
 ;;      (scheme-indent-specform 1 state indent-point)))
 
-(defun scheme-let-indent (state indent-point)
+(defun scheme-let-indent (state indent-point normal-indent)
   (skip-chars-forward " \t")
   (if (looking-at "[-a-zA-Z0-9+*/?!@$%^&_:~]")
-      (lisp-indent-specform 2 state indent-point (current-column))
-      (lisp-indent-specform 1 state indent-point (current-column))))
+      (lisp-indent-specform 2 state indent-point normal-indent)
+    (lisp-indent-specform 1 state indent-point normal-indent)))
 
 ;; (put 'begin 'scheme-indent-function 0), say, causes begin to be indented
 ;; like defun if the first form is placed on the next line, otherwise