From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 24 May 1998 16:58:32 +0000 (+0000)
Subject: (lisp-indent-error-function): New variable.
X-Git-Tag: emacs-20.3~865
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf92b5a4d6bb8743d515ea557d3306a5b7eaf6cc;p=emacs.git

(lisp-indent-error-function): New variable.
(common-lisp-indent-function): Bind lisp-indent-error-function.
(lisp-indent-report-bad-format): Use lisp-indent-error-function.
---

diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 54f13239b18..4bcc7111f0d 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -79,6 +79,8 @@ by `lisp-body-indent'."
   :group 'lisp-indent)
 
 
+(defvar lisp-indent-error-function)
+
 ;;;###autoload
 (defun common-lisp-indent-function (indent-point state)
   (let ((normal-indent (current-column)))
@@ -188,13 +190,15 @@ by `lisp-body-indent'."
                                            ;; other body form
                                            normal-indent))))
                   ((symbolp method)
-                   (setq calculated (funcall method
-                                             path state indent-point
-                                             sexp-column normal-indent)))
+		   (let ((lisp-indent-error-function function))
+		     (setq calculated (funcall method
+					       path state indent-point
+					       sexp-column normal-indent))))
                   (t
-                   (setq calculated (lisp-indent-259
-                                      method path state indent-point
-                                      sexp-column normal-indent)))))
+		   (let ((lisp-indent-error-function function))
+		     (setq calculated (lisp-indent-259
+				       method path state indent-point
+				       sexp-column normal-indent))))))
           (goto-char containing-sexp)
           (setq last-point containing-sexp)
           (if (not calculated)
@@ -208,7 +212,7 @@ by `lisp-body-indent'."
 (defun lisp-indent-report-bad-format (m)
   (error "%s has a badly-formed %s property: %s"
          ;; Love those free variable references!!
-         function 'common-lisp-indent-function m))
+         lisp-indent-error-function 'common-lisp-indent-function m))
 
 ;; Blame the crufty control structure on dynamic scoping
 ;;  -- not on me!