# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 739782005 0
# Node ID 45169f86d3a4840e67ef4a6a2f4937619dc7155f
# Parent  6ac165163a9be61b5e861ad2c54f34612775c121
(lisp-indent-function): Look for either
lisp-indent-hook or lisp-indent-function property.

diff -r 6ac165163a9b -r 45169f86d3a4 lisp/emacs-lisp/lisp-mode.el
--- a/lisp/emacs-lisp/lisp-mode.el	Fri Jun 11 06:49:23 1993 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Fri Jun 11 07:00:05 1993 +0000
@@ -414,7 +414,8 @@
       (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)