diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-11-10 00:21:06 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-11-10 00:21:06 -0800 |
| commit | 6d2a1e35669ce4e2442f1df065ed77f833af532c (patch) | |
| tree | 14234e4eccc5f3284abc05fc9b301b633f727a36 | |
| parent | c026460bc47f9c3be3fc27efb014c39d782a955e (diff) | |
| download | emacs-6d2a1e35669ce4e2442f1df065ed77f833af532c.tar.gz emacs-6d2a1e35669ce4e2442f1df065ed77f833af532c.tar.bz2 emacs-6d2a1e35669ce4e2442f1df065ed77f833af532c.zip | |
* lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9187e1f451b..dce85ead9c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-11-10 Glenn Morris <rgm@gnu.org> + * progmodes/octave-mod.el (octave-mark-block): Update for smie change. + * emulation/edt.el (edt-with-position): New macro. (edt-find-forward, edt-find-backward, edt-find-next-forward) (edt-find-next-backward, edt-sentence-forward, edt-sentence-backward) diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 2402540bfb6..8551e09e058 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -1,7 +1,7 @@ ;;; octave-mod.el --- editing Octave source files under Emacs -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> ;; Author: John Eaton <jwe@octave.org> @@ -829,7 +829,7 @@ The block marked is the one that contains point or follows point." (unless (or (looking-at "\\s(") (save-excursion (let* ((token (funcall smie-forward-token-function)) - (level (assoc token smie-op-levels))) + (level (assoc token smie-grammar))) (and level (null (cadr level)))))) (backward-up-list 1)) (mark-sexp)) @@ -1228,5 +1228,4 @@ code line." (provide 'octave-mod) -;; arch-tag: 05f1ce09-be87-4c00-803e-4919ffa26c23 ;;; octave-mod.el ends here |