Tweak octave continuation indentation

* lisp/progmodes/octave.el (octave-smie-rules): Further tweak
continuation indentation (bug#17955).

2 files changed, 50 insertions, 1 deletions

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 5d877fc6ba3..aff3066c698 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -461,7 +461,7 @@ Non-nil means always go to the next Octave code line after sending."
        ;; For (invalid) code between switch and case.
        ;; (if (smie-rule-parent-p "switch") 4)
        nil))
-    ('(:after . "=") octave-block-offset)))
+    ('(:after . "=") (smie-rule-parent octave-block-offset))))
 
 (defun octave-indent-comment ()
   "A function for `smie-indent-functions' (which see)."
diff --git a/test/lisp/progmodes/octave-tests.el b/test/lisp/progmodes/octave-tests.el
new file mode 100644
index 00000000000..e28fe73b836
--- /dev/null
+++ b/test/lisp/progmodes/octave-tests.el
@@ -0,0 +1,49 @@
+;;; octave-tests.el --- Test suite for octave.el  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'octave)
+
+(defun octave-test--indent (string)
+  (with-temp-buffer
+    (octave-mode)
+    (insert string)
+    (indent-region (point-min) (point-max))
+    (buffer-string)))
+
+(ert-deftest octave-tests--continuation-indentation ()
+  (should
+   (equal (octave-test--indent "a = b + a * \\
+c;
+")
+          "a = b + a * \\
+	c;
+"))
+  (should (equal (octave-test--indent "a = \\
+b;
+")
+                 "a = \\
+  b;
+")))
+
+;;; octave-tests.el ends here