* lisp/progmodes/octave.el (octave-smie-forward-token): Be more careful

about implicit semi-colons.

Fixes: debbugs:14218

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 676e4286395733d682cd80810e14ad43a257995f..a6eed51b9b5e1d6531f22aebaa850ec76c64f5ce 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/octave.el (octave-smie-forward-token): Be more careful
+       about implicit semi-colons (bug#14218).
+
 2013-05-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * frame.el (display-monitor-attributes-list)

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index ebefcef0c7133aac0d9c1a578eca8f6138722476..7e14e59af5f5c305f4334480d35f4e5946bdbd2a 100644 (file)
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -370,16 +370,18 @@ Non-nil means always go to the next Octave code line after sending."
     (goto-char (match-end 1))
     (forward-comment 1))
   (cond
-   ((and (looking-at "$\\|[%#]")
-         ;; Ignore it if it's within parentheses or if the newline does not end
-         ;; some preceding text.
-         (prog1 (and (not (smie-rule-bolp))
-                    (let ((ppss (syntax-ppss)))
-                      (not (and (nth 1 ppss)
-                                (eq ?\( (char-after (nth 1 ppss)))))))
-           (forward-comment (point-max))))
+   ((and (looking-at "[%#\n]")
+         (not (or (save-excursion (skip-chars-backward " \t")
+                                  ;; Only add implicit ; when needed.
+                                  (or (bolp) (eq (char-before ?\;))))
+                  ;; Ignore it if it's within parentheses.
+                  (let ((ppss (syntax-ppss)))
+                    (and (nth 1 ppss)
+                         (eq ?\( (char-after (nth 1 ppss))))))))
+    (if (eolp) (forward-char 1) (forward-comment 1))
     ;; Why bother distinguishing \n and ;?
     ";") ;;"\n"
+   ((progn (forward-comment (point-max)) nil))
    ((looking-at ";[ \t]*\\($\\|[%#]\\)")
     ;; Combine the ; with the subsequent \n.
     (goto-char (match-beginning 1))