aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/progmodes/sh-script.el10
1 files changed, 0 insertions, 10 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index d467ed7074f..1ab26a0195b 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1660,15 +1660,9 @@ region, clear header."
1660 (eq -1 (% (save-excursion (skip-chars-backward "\\\\")) 2))) 1660 (eq -1 (% (save-excursion (skip-chars-backward "\\\\")) 2)))
1661 1661
1662;; Indentation stuff. 1662;; Indentation stuff.
1663(defun sh-must-be-shell-mode ()
1664 "Signal an error if not in Shell-script mode."
1665 (unless (derived-mode-p 'sh-mode)
1666 (error "This buffer is not in Shell-script mode")))
1667
1668(defun sh-must-support-indent () 1663(defun sh-must-support-indent ()
1669 "*Signal an error if the shell type for this buffer is not supported. 1664 "*Signal an error if the shell type for this buffer is not supported.
1670Also, the buffer must be in Shell-script mode." 1665Also, the buffer must be in Shell-script mode."
1671 (sh-must-be-shell-mode)
1672 (unless sh-indent-supported-here 1666 (unless sh-indent-supported-here
1673 (error "This buffer's shell does not support indentation through Emacs"))) 1667 (error "This buffer's shell does not support indentation through Emacs")))
1674 1668
@@ -1680,7 +1674,6 @@ variable `sh-make-vars-local' has been set to nil.
1680To revert all these variables to the global values, use 1674To revert all these variables to the global values, use
1681command `sh-reset-indent-vars-to-global-values'." 1675command `sh-reset-indent-vars-to-global-values'."
1682 (interactive) 1676 (interactive)
1683 (sh-must-be-shell-mode)
1684 (mapcar 'make-local-variable sh-var-list) 1677 (mapcar 'make-local-variable sh-var-list)
1685 (message "Indentation variable are now local.")) 1678 (message "Indentation variable are now local."))
1686 1679
@@ -1688,7 +1681,6 @@ command `sh-reset-indent-vars-to-global-values'."
1688 "Reset local indentation variables to the global values. 1681 "Reset local indentation variables to the global values.
1689Then, if variable `sh-make-vars-local' is non-nil, make them local." 1682Then, if variable `sh-make-vars-local' is non-nil, make them local."
1690 (interactive) 1683 (interactive)
1691 (sh-must-be-shell-mode)
1692 (mapcar 'kill-local-variable sh-var-list) 1684 (mapcar 'kill-local-variable sh-var-list)
1693 (if sh-make-vars-local 1685 (if sh-make-vars-local
1694 (mapcar 'make-local-variable sh-var-list))) 1686 (mapcar 'make-local-variable sh-var-list)))
@@ -2147,7 +2139,6 @@ If INFO is supplied it is used, else it is calculated."
2147 "Back to end of previous non-comment non-empty line. 2139 "Back to end of previous non-comment non-empty line.
2148Go to beginning of logical line unless END is non-nil, in which case 2140Go to beginning of logical line unless END is non-nil, in which case
2149we go to the end of the previous line and do not check for continuations." 2141we go to the end of the previous line and do not check for continuations."
2150 (sh-must-be-shell-mode)
2151 (save-excursion 2142 (save-excursion
2152 (beginning-of-line) 2143 (beginning-of-line)
2153 (forward-comment (- (point-max))) 2144 (forward-comment (- (point-max)))
@@ -2478,7 +2469,6 @@ If INFO is supplied it is used, else it is calculated from current line."
2478(defun sh-indent-line () 2469(defun sh-indent-line ()
2479 "Indent the current line." 2470 "Indent the current line."
2480 (interactive) 2471 (interactive)
2481 (sh-must-be-shell-mode)
2482 (let ((indent (sh-calculate-indent)) shift-amt beg end 2472 (let ((indent (sh-calculate-indent)) shift-amt beg end
2483 (pos (- (point-max) (point)))) 2473 (pos (- (point-max) (point))))
2484 (when indent 2474 (when indent