[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110993: * lisp/progmodes/octave-mod.el (octave-mark-block): Move out of tokens and

[Stefan Monnier]

------------------------------------------------------------
revno: 110993
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12785
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-12-05 00:30:58 -0500
message:
  * lisp/progmodes/octave-mod.el (octave-mark-block): Move out of tokens and
  fix open-paren-like token test.
modified:
  lisp/ChangeLog
  lisp/progmodes/octave-mod.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-04 18:08:01 +0000
+++ b/lisp/ChangeLog    2012-12-05 05:30:58 +0000
@@ -1,3 +1,8 @@
+2012-12-05  Stefan Monnier  <address@hidden>
+
+       * progmodes/octave-mod.el (octave-mark-block): Move out of tokens and
+       fix open-paren-like token test (bug#12785).
+
 2012-12-04  Glenn Morris  <address@hidden>
 
        * mail/rmailsum.el (rmail-new-summary): Tweak for

=== modified file 'lisp/progmodes/octave-mod.el'
--- a/lisp/progmodes/octave-mod.el      2012-09-17 05:41:04 +0000
+++ b/lisp/progmodes/octave-mod.el      2012-12-05 05:30:58 +0000
@@ -794,11 +794,14 @@
   "Put point at the beginning of this Octave block, mark at the end.
 The block marked is the one that contains point or follows point."
   (interactive)
+  (if (and (looking-at "\\sw\\|\\s_")
+           (looking-back "\\sw\\|\\s_" (1- (point))))
+      (skip-syntax-forward "w_"))
   (unless (or (looking-at "\\s(")
               (save-excursion
                 (let* ((token (funcall smie-forward-token-function))
                        (level (assoc token smie-grammar)))
-                  (and level (null (cadr level))))))
+                  (and level (not (numberp (cadr level)))))))
     (backward-up-list 1))
   (mark-sexp))