(lisp-indent-function): Look for either

lisp-indent-hook or lisp-indent-function property.

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)