summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp-mode.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-02-04 11:40:12 +0000
committerAndrea Corallo <akrl@sdf.org>2020-02-04 15:11:20 +0100
commit15aedf3e3d7814aff980098f9290396222c0ff8d (patch)
tree1a3b1287cc72b7ecb2703761ad03dfc75f4dbe2e /lisp/emacs-lisp/lisp-mode.el
parentea56b58098d78b242bc0c51cf1d8b1d21962c130 (diff)
parentb641c178ce3d022a9fca1d44ecb60f3878a989bd (diff)
downloademacs-15aedf3e3d7814aff980098f9290396222c0ff8d.tar.gz
emacs-15aedf3e3d7814aff980098f9290396222c0ff8d.tar.bz2
emacs-15aedf3e3d7814aff980098f9290396222c0ff8d.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index fbbd389bf96..f66122d6d72 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -747,6 +747,7 @@ Blank lines separate paragraphs. Semicolons start comments.
Note that `run-lisp' may be used either to start an inferior Lisp job
or to switch back to an existing one."
(lisp-mode-variables nil t)
+ (setq-local lisp-indent-function 'common-lisp-indent-function)
(setq-local find-tag-default-function 'lisp-find-tag-default)
(setq-local comment-start-skip
"\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")