From: Lars Ingebrigtsen Date: Thu, 2 Sep 2021 06:41:30 +0000 (+0200) Subject: Revert "Tweak sh-script-mode indentation further" X-Git-Tag: emacs-28.0.90~1230 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f143260d04614ab45fe3fe505f1f2b7af2326294;p=emacs.git Revert "Tweak sh-script-mode indentation further" This reverts commit 6392bc37ab3b7eb83465d9b2248d21173373ae73. The changes led to errors throughout (bug#50320). --- diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 7507579d16d..201d1fd1647 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1775,7 +1775,7 @@ Does not preserve point." (goto-char p) nil)))) (while - (progn (skip-syntax-backward ".w_'()") + (progn (skip-syntax-backward ".w_'") (or (not (zerop (skip-syntax-backward "\\"))) (when (eq ?\\ (char-before (1- (point)))) (let ((p (point))) diff --git a/test/lisp/progmodes/sh-script-tests.el b/test/lisp/progmodes/sh-script-tests.el index 82c2d5168ce..5bdce6260ae 100644 --- a/test/lisp/progmodes/sh-script-tests.el +++ b/test/lisp/progmodes/sh-script-tests.el @@ -35,17 +35,6 @@ (should (equal (buffer-substring-no-properties (point-min) (point-max)) "relative-path/to/configure --prefix=$prefix\\ - --with-x"))) - (with-temp-buffer - (insert "${path_to_root}/configure --prefix=$prefix\\ - --with-x") - (shell-script-mode) - (goto-char (point-min)) - (forward-line 1) - (indent-for-tab-command) - (should (equal - (buffer-substring-no-properties (point-min) (point-max)) - "${path_to_root}/configure --prefix=$prefix\\ - --with-x")))) + --with-x")))) ;;; sh-script-tests.el ends here