Don't mess with lisp-mode-variables

* doc/lispref/modes.texi (Example Major Modes): Update example to
match reality.

* lisp/chistory.el (command-history-mode): Revert previous change.

* lisp/help-fns.el (describe-variable): Revert previous change.

* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables): Rvert previous change.
(lisp-data-mode): Use full form of lisp-mode-variables for clarity.
(lisp-mode): Simplify.

* lisp/emacs-lisp/pp.el (pp-to-string): Revert previous change.

* lisp/progmodes/elisp-mode.el (emacs-lisp-mode): Case sensitive
font-lock keywords.

* lisp/progmodes/inf-lisp.el (inferior-lisp-mode): Revert previous
change.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index df7458c3fbc264782cd61fc83aaac7d7c41b3cf3..6dd1e8a427fbb575922a0a87caa658e693d5f499 100644 (file)
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1352,20 +1352,12 @@ illustrate how these modes are written.
 @end smallexample
 
   The three modes for Lisp share much of their code.  For instance,
-each calls the following function to set various variables:
-
-@smallexample
-@group
-(defun lisp-mode-variables ()
-  "Common initialization routine for lisp modes."
-  (setq-local paragraph-ignore-fill-prefix t)
-  @dots{}
-@end group
-@end smallexample
+Lisp mode and Emacs Lisp mode inherit from Lisp Data mode and Lisp
+Interaction Mode inherits from Emacs Lisp mode.
 
 @noindent
-Amongst other things, this function sets up the @code{comment-start}
-variable to handle Lisp comments:
+Amongst other things, Lisp Data mode calls a function to setds up the
+@code{comment-start} variable to handle Lisp comments:
 
 @smallexample
 @group
@@ -1425,7 +1417,6 @@ Note that `run-lisp' may be used either to start an inferior Lisp job
 or to switch back to an existing one."
 @end group
 @group
-  (lisp-mode-variables)
   (setq-local find-tag-default-function 'lisp-find-tag-default)
   (setq-local comment-start-skip
               "\\(\\(^\\|[^\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *")

diff --git a/lisp/chistory.el b/lisp/chistory.el
index 485515d07bbc62ae74cf3bf6d9ff6e0eea741a3f..c9aa927b94f4863497115ace268de18fce450609 100644 (file)
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -139,7 +139,7 @@ The buffer is left in Command History mode."
 
 Keybindings:
 \\{command-history-mode-map}"
-  (lisp-mode-variables)
+  (lisp-mode-variables nil)
   (set (make-local-variable 'revert-buffer-function) 'command-history-revert)
   (set-syntax-table emacs-lisp-mode-syntax-table))
 

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 13263f2fb509527fc6d7a0296a29ff8a8bffa2a2..30cf7d72c3ec60684dd9b37ced855c0f2f7aebf8 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -611,10 +611,17 @@ Value for `adaptive-fill-function'."
   ;; a single docstring.  Let's fix it here.
   (if (looking-at "\\s-+\"[^\n\"]+\"\\s-*$") ""))
 
-(defun lisp-mode-variables (&rest ignored)
+;; Maybe this should be discouraged/obsoleted and users should be
+;; encouraged to use `lisp-data-mode` instead.
+(defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive
+                                      elisp)
   "Common initialization routine for lisp modes.
-Any number of parameters is accepted and ignored."
-  (set-syntax-table lisp-mode-syntax-table)
+The LISP-SYNTAX argument is used by code in inf-lisp.el and is
+\(uselessly) passed from pp.el, chistory.el, gnus-kill.el and
+score-mode.el.  KEYWORDS-CASE-INSENSITIVE non-nil means that for
+font-lock keywords will not be case sensitive."
+  (when lisp-syntax
+    (set-syntax-table lisp-mode-syntax-table))
   (setq-local paragraph-ignore-fill-prefix t)
   (setq-local fill-paragraph-function 'lisp-fill-paragraph)
   (setq-local adaptive-fill-function #'lisp-adaptive-fill)
@@ -638,11 +645,17 @@ Any number of parameters is accepted and ignored."
   (setq-local multibyte-syntax-as-symbol t)
   ;; (setq-local syntax-begin-function 'beginning-of-defun)  ;;Bug#16247.
   (setq font-lock-defaults
-       (list nil nil nil nil nil
-              '(font-lock-mark-block-function . mark-defun)
-              '(font-lock-extra-managed-props help-echo)
-              '(font-lock-syntactic-face-function
-                . lisp-font-lock-syntactic-face-function)))
+       `(,(if elisp '(lisp-el-font-lock-keywords
+                       lisp-el-font-lock-keywords-1
+                       lisp-el-font-lock-keywords-2)
+             '(lisp-cl-font-lock-keywords
+               lisp-cl-font-lock-keywords-1
+               lisp-cl-font-lock-keywords-2))
+         nil ,keywords-case-insensitive nil nil
+         (font-lock-mark-block-function . mark-defun)
+          (font-lock-extra-managed-props help-echo)
+         (font-lock-syntactic-face-function
+          . lisp-font-lock-syntactic-face-function)))
   (setq-local prettify-symbols-alist lisp-prettify-symbols-alist)
   (setq-local electric-pair-skip-whitespace 'chomp)
   (setq-local electric-pair-open-newline-between-pairs nil))
@@ -651,7 +664,7 @@ Any number of parameters is accepted and ignored."
 (define-derived-mode lisp-data-mode prog-mode "Lisp-Data"
   "Major mode for buffers holding data written in Lisp syntax."
   :group 'lisp
-  (lisp-mode-variables)
+  (lisp-mode-variables t t nil)
   (setq-local electric-quote-string t)
   (setq imenu-case-fold-search nil))
 
@@ -743,11 +756,6 @@ Blank lines separate paragraphs.  Semicolons start comments.
 \\{lisp-mode-map}
 Note that `run-lisp' may be used either to start an inferior Lisp job
 or to switch back to an existing one."
-  (setf
-   (nth 0 font-lock-defaults) '(lisp-cl-font-lock-keywords
-                                lisp-cl-font-lock-keywords-1
-                                lisp-cl-font-lock-keywords-2)
-   (nth 2 font-lock-defaults) 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

diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 4d8bf52934f7c75d8c13423bfd6e1902db593e70..3df7b0e368e3628b76a5e93a38457d0d73757120 100644 (file)
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -42,7 +42,7 @@
 OBJECT can be any Lisp object.  Quoting characters are used as needed
 to make output that `read' can handle, whenever this is possible."
   (with-temp-buffer
-    (lisp-mode-variables)
+    (lisp-mode-variables nil)
     (set-syntax-table emacs-lisp-mode-syntax-table)
     (let ((print-escape-newlines pp-escape-newlines)
           (print-quoted t))

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index dbf2cb807b87d1f33d274e3b42834781031d0b32..0a99b8d6a3608643e54b0385ecf22195334fd55d 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1000,7 +1000,7 @@ it is displayed along with the global value."
                    (terpri)
                     (let ((buf (current-buffer)))
                       (with-temp-buffer
-                        (lisp-mode-variables)
+                        (lisp-mode-variables nil)
                         (set-syntax-table emacs-lisp-mode-syntax-table)
                         (insert print-rep)
                         (pp-buffer)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 2f231781ba1ebed7ebd9683e843055135b550586..b737134f90c5451109e9f8c47718bdc81504b03c 100644 (file)
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -272,7 +272,7 @@ Blank lines separate paragraphs.  Semicolons start comments.
           '(lisp-el-font-lock-keywords
             lisp-el-font-lock-keywords-1
             lisp-el-font-lock-keywords-2))
-  (set-syntax-table emacs-lisp-mode-syntax-table)
+  (setf (nth 2 font-lock-defaults) nil)
   (add-hook 'after-load-functions #'elisp--font-lock-flush-elisp-buffers)
   (if (boundp 'electric-pair-text-pairs)
       (setq-local electric-pair-text-pairs

diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index fca803be18abfa560278a2c6f9b3db0113ee3e54..9f34a377f4a036c2a48c1cd6ef4b0746e2903f9b 100644 (file)
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -274,7 +274,7 @@ If you accidentally suspend your process, use \\[comint-continue-subjob]
 to continue it."
   (setq comint-prompt-regexp inferior-lisp-prompt)
   (setq mode-line-process '(":%s"))
-  (lisp-mode-variables)
+  (lisp-mode-variables t)
   (setq comint-get-old-input (function lisp-get-old-input))
   (setq comint-input-filter (function lisp-input-filter)))