master 56783e605c 3/5: Make indented-text-mode alias obsolete

[Stefan Kangas]

branch: master
commit 56783e605c847c5af57fd6382157f75dd6b14e6f
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Make indented-text-mode alias obsolete
    
    * lisp/textmodes/text-mode.el (indented-text-mode): Make compat
    alias obsolete.
    * lisp/allout.el (allout-use-hanging-indents):
    * lisp/emulation/viper.el (viper-vi-state-mode-list):
    * lisp/textmodes/remember.el (remember-mode):
    * lisp/textmodes/text-mode.el (text-mode-map):
    * lisp/vc/ediff-util.el (ediff-choose-syntax-table): Don't mention or
    use above obsolete alias.
---
 lisp/allout.el              | 5 ++---
 lisp/emulation/viper.el     | 2 +-
 lisp/textmodes/remember.el  | 2 +-
 lisp/textmodes/text-mode.el | 8 ++++----
 lisp/vc/ediff-util.el       | 5 ++---
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lisp/allout.el b/lisp/allout.el
index e07bac4ef9..7421a03738 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -394,9 +394,8 @@ else allout's special hanging-indent maintaining auto-fill 
function,
 ;;;_  = allout-use-hanging-indents
 (defcustom allout-use-hanging-indents t
   "If non-nil, topic body text auto-indent defaults to indent of the header.
-Ie, it is indented to be just past the header prefix.  This is
-relevant mostly for use with `indented-text-mode', or other situations
-where auto-fill occurs."
+I.e., it is indented to be just past the header prefix.  This is
+relevant mostly for situations where auto-fill occurs."
   :type 'boolean
   :group 'allout)
 (make-variable-buffer-local 'allout-use-hanging-indents)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 4c2ee1ce23..d1634c64ad 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -379,7 +379,7 @@ widget."
     flora-mode
     sql-mode
 
-    text-mode indented-text-mode
+    text-mode
     tex-mode latex-mode bibtex-mode
     ps-mode
 
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 9ec7517418..c7a9f20ea2 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -556,7 +556,7 @@ If this is nil, then `diary-file' will be used instead."
     map)
   "Keymap used in `remember-mode'.")
 
-(define-derived-mode remember-mode indented-text-mode "Remember"
+(define-derived-mode remember-mode text-mode "Remember"
   "Major mode for output from \\[remember].
 This buffer is used to collect data that you want to remember.
 \\<remember-mode-map>
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 076f8dd98f..2275ab2a3c 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -72,8 +72,8 @@
     (define-key map "\e\t" #'ispell-complete-word)
     map)
   "Keymap for `text-mode'.
-Many other modes, such as `mail-mode', `outline-mode' and `indented-text-mode',
-inherit all the commands defined in this map.")
+Many other modes, such as `mail-mode' and `outline-mode', inherit
+all the commands defined in this map.")
 
 (easy-menu-define text-mode-menu text-mode-map
   "Menu for `text-mode'."
@@ -164,8 +164,6 @@ Turning on Paragraph-Indent minor mode runs the normal hook
     (remove-function (local 'indent-line-function)
                      #'indent-to-left-margin)))
 
-(defalias 'indented-text-mode #'text-mode)
-
 ;; This can be made a no-op once all modes that use text-mode-hook
 ;; are "derived" from text-mode.  (As of 2015/04, and probably well before,
 ;; the only one I can find that doesn't so derive is rmail-edit-mode.)
@@ -245,6 +243,8 @@ The argument NLINES says how many lines to center."
           (setq nlines (1+ nlines))
           (forward-line -1)))))
 
+(define-obsolete-function-alias 'indented-text-mode #'text-mode "29.1")
+
 (provide 'text-mode)
 
 ;;; text-mode.el ends here
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 3641b75251..1bfab508f8 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -4011,9 +4011,8 @@ Mail anyway? (y or n) ")
 (defun ediff-choose-syntax-table ()
   (setq ediff-syntax-table
        (ediff-with-current-buffer ediff-buffer-A
-         (if (not (memq major-mode
-                        '(fundamental-mode text-mode indented-text-mode)))
-             (syntax-table))))
+          (unless (memq major-mode '(fundamental-mode text-mode))
+            (syntax-table))))
   (if (not ediff-syntax-table)
       (setq ediff-syntax-table
            (ediff-with-current-buffer ediff-buffer-B