From af80ea2a205247c45473af81780826b4e2083929 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 29 Apr 2025 10:09:54 +0300 Subject: [PATCH] ; Improve obsolescence of 'text-mode-variant' * lisp/textmodes/text-mode.el (text-mode-variant): Improve obsolescence announcement text. * doc/lispref/modes.texi (Example Major Modes): Update example. (Bug#78125). (cherry picked from commit 9adb05422eaaa290a6a0542ba8862b806b34fe7c) --- doc/lispref/modes.texi | 3 --- lisp/textmodes/text-mode.el | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 844dcc0e79a..beb6732bdf2 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1474,9 +1474,6 @@ You can thus get the full benefit of adaptive filling (see the variable `adaptive-fill-mode'). \\@{text-mode-map@} Turning on Text mode runs the normal hook `text-mode-hook'." -@end group -@group - (setq-local text-mode-variant t) (setq-local require-final-newline mode-require-final-newline)) @end group @end smallexample diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el index 2d9bb9fb784..27a584a3709 100644 --- a/lisp/textmodes/text-mode.el +++ b/lisp/textmodes/text-mode.el @@ -40,7 +40,9 @@ (defvar text-mode-variant nil "Non-nil if this buffer's major mode is a variant of Text mode.") -(make-obsolete-variable 'text-mode-variant 'derived-mode-p "27.1") +(make-obsolete-variable 'text-mode-variant + "\ +Don't set it, and instead of testing its value use `derived-mode-p'." "27.1") ;; Actually defined in textconv.c. (defvar text-conversion-style) -- 2.39.5