Default lisp-mode to use Common Lisp indentation

* lisp/emacs-lisp/lisp-mode.el (lisp-mode): Use
common-lisp-indent-function instead of lisp-indent-function as
Common Lisp is the most common non-Emacs Lisp today (bug#10097).

diff --git a/etc/NEWS b/etc/NEWS
index 3147cf48faac817f4cc991c0dfb01383e477ca9d..a2919d8e5e2261380e10e94cdea87fc896223743 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -72,6 +72,11 @@ line numbers that were previously jumped to.
 ** The sb-image.el library is now marked obsolete.
 This file was a compatibility kludge which is no longer needed.
 
+---
+** 'lisp-mode' now uses 'common-lisp-indent-function'.
+To revert to the previous behaviour,
+(setq lisp-indent-function 'lisp-indent-function) from 'lisp-mode-hook'.
+
 ** Edebug
 
 +++

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index fbbd389bf96ac94902b581a784e740e106cec633..f66122d6d7242bde5147713d0e81f0a70dc44f1a 100644 (file)
--- 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]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")