summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-05-24 16:58:32 +0000
committerRichard M. Stallman <rms@gnu.org>1998-05-24 16:58:32 +0000
commitbf92b5a4d6bb8743d515ea557d3306a5b7eaf6cc (patch)
tree93473b617973c56d08e9a9a307d5077d46dbb5ab /lisp/emacs-lisp
parent20a6d217c3da9e09f4866ca0fca80117d1d91c6c (diff)
downloademacs-bf92b5a4d6bb8743d515ea557d3306a5b7eaf6cc.tar.gz
emacs-bf92b5a4d6bb8743d515ea557d3306a5b7eaf6cc.tar.bz2
emacs-bf92b5a4d6bb8743d515ea557d3306a5b7eaf6cc.zip
(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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-indent.el18
1 files changed, 11 insertions, 7 deletions
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!