summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1993-06-11 07:00:05 +0000
committerRichard M. Stallman <rms@gnu.org>1993-06-11 07:00:05 +0000
commit2dab78028738c7c92c0b50c631a629e365efd5b1 (patch)
treeae4168e7c007a91ee4f67bc5807c6c0902b1922e /lisp/emacs-lisp/lisp-mode.el
parent34fc3882966bc79b3d75238515f639dae480e0e7 (diff)
downloademacs-2dab78028738c7c92c0b50c631a629e365efd5b1.tar.gz
emacs-2dab78028738c7c92c0b50c631a629e365efd5b1.tar.bz2
emacs-2dab78028738c7c92c0b50c631a629e365efd5b1.zip
(lisp-indent-function): Look for either
lisp-indent-hook or lisp-indent-function property.
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f7d29dff72c..f060563f175 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -414,7 +414,8 @@ of the start of the containing expression."
(let ((function (buffer-substring (point)
(progn (forward-sexp 1) (point))))
method)
- (setq method (get (intern-soft function) 'lisp-indent-function))
+ (setq method (or (get (intern-soft function) 'lisp-indent-function)
+ (get (intern-soft function) 'lisp-indent-hook)))
(cond ((or (eq method 'defun)
(and (null method)
(> (length function) 3)