>From 7c655b0f0363134f750bae25f45198b713f851b7 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Tue, 26 Feb 2019 16:13:23 +0000 Subject: [PATCH 3/3] Do not set indent-line-function in text-mode * lisp/textmodes/text-mode.el (text-mode): Remove redundant setting of indent-line-function to indent-relative, which is its default value. * doc/lispref/modes.texi (Example Major Modes): Adapt docs accordingly. --- doc/lispref/modes.texi | 7 +------ lisp/textmodes/text-mode.el | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 44efff416e..08d96e6a65 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1270,15 +1270,10 @@ Example Major Modes @end group @group (setq-local text-mode-variant t) - (setq-local require-final-newline mode-require-final-newline) - (setq-local indent-line-function #'indent-relative)) + (setq-local require-final-newline mode-require-final-newline)) @end group @end smallexample -@noindent -(The last line is redundant nowadays, since @code{indent-relative} is -the default value, and we'll delete it in a future version.) - @cindex @file{lisp-mode.el} The three Lisp modes (Lisp mode, Emacs Lisp mode, and Lisp Interaction mode) have more features than Text mode and the code is correspondingly diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 8dcc4e3696..9f3cdf46e0 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -106,8 +106,7 @@ text-mode \\{text-mode-map} Turning on Text mode runs the normal hook `text-mode-hook'." (setq-local text-mode-variant t) - (setq-local require-final-newline mode-require-final-newline) - (setq-local indent-line-function #'indent-relative)) + (setq-local require-final-newline mode-require-final-newline)) (define-derived-mode paragraph-indent-text-mode text-mode "Parindent" "Major mode for editing text, with leading spaces starting a paragraph. -- 2.20.1