Remove unused user options in sh-script.el

* lisp/progmodes/sh-script.el (sh-indent-comment)
(sh-first-lines-indent, sh-indent-for-else): Remove variables that
are no longer obeyed.
(sh-var-list): Likewise.  (Bug#78592)

(cherry picked from commit 32d911cddfd6ccdf288247a5d7eaf3d9a977b87c)

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index aa55bb1fb7d008eb3359b6edaad3a71d6c36e3c6..9a599dbf04240a29a75ceb97d0d3ccb7d522177a 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1162,17 +1162,6 @@ are conflicts."
          (const :tag "Always"  t))
   :group 'sh-indentation)
 
-(defcustom sh-first-lines-indent 0
-  "The indentation of the first non-blank non-comment line.
-Usually 0 meaning first column.
-Can be set to a number, or to nil which means leave it as is."
-  :type '(choice
-         (const :tag "Leave as is"     nil)
-         (integer :tag "Column number"
-                  :menu-tag "Indent to this col (0 means first col)" ))
-  :group 'sh-indentation)
-
-
 (defcustom sh-basic-offset 4
   "The default indentation increment.
 This value is used for the `+' and `-' symbols in an indentation variable."
@@ -1180,21 +1169,6 @@ This value is used for the `+' and `-' symbols in an indentation variable."
   :safe #'integerp
   :group 'sh-indentation)
 
-(defcustom sh-indent-comment t
-  "How a comment line is to be indented.
-nil means leave it as it is;
-t  means indent it as a normal line, aligning it to previous non-blank
-   non-comment line;
-a number means align to that column, e.g. 0 means first column."
-  :type '(choice
-         (const :tag "Leave as is." nil)
-         (const :tag "Indent as a normal line."  t)
-         (integer :menu-tag "Indent to this col (0 means first col)."
-                  :tag "Indent to column number.") )
-  :version "24.3"
-  :group 'sh-indentation)
-
-
 (defvar sh-debug nil
   "Enable lots of debug messages - if function `sh-debug' is enabled.")
 
@@ -1220,16 +1194,6 @@ a number means align to that column, e.g. 0 means first column."
     (const :tag "/ " :value /
           :menu-tag "/   Indent left  half sh-basic-offset")))
 
-(defcustom sh-indent-for-else 0
-  "How much to indent an `else' relative to its `if'.  Usually 0."
-  :type `(choice
-         (integer :menu-tag "A number (positive=>indent right)"
-                  :tag "A number")
-         (const :tag "--") ;; separator!
-         ,@ sh-symbol-list
-         )
-  :group 'sh-indentation)
-
 (defconst sh-number-or-symbol-list
   (append '((integer :menu-tag "A number (positive=>indent right)"
                     :tag "A number")
@@ -1380,19 +1344,17 @@ punctuation characters like `-'."
 
 (defconst sh-var-list
   '(
-    sh-basic-offset sh-first-lines-indent sh-indent-after-case
+    sh-basic-offset sh-indent-after-case
     sh-indent-after-do sh-indent-after-done
     sh-indent-after-else
     sh-indent-after-if
     sh-indent-after-loop-construct
     sh-indent-after-open
-    sh-indent-comment
     sh-indent-for-case-alt
     sh-indent-for-case-label
     sh-indent-for-continuation
     sh-indent-for-do
     sh-indent-for-done
-    sh-indent-for-else
     sh-indent-for-fi
     sh-indent-for-then
     )