aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-11-10 00:21:06 -0800
committerGlenn Morris2010-11-10 00:21:06 -0800
commit6d2a1e35669ce4e2442f1df065ed77f833af532c (patch)
tree14234e4eccc5f3284abc05fc9b301b633f727a36
parentc026460bc47f9c3be3fc27efb014c39d782a955e (diff)
downloademacs-6d2a1e35669ce4e2442f1df065ed77f833af532c.tar.gz
emacs-6d2a1e35669ce4e2442f1df065ed77f833af532c.zip
* lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/octave-mod.el7
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 @@
12010-11-10 Glenn Morris <rgm@gnu.org> 12010-11-10 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/octave-mod.el (octave-mark-block): Update for smie change.
4
3 * emulation/edt.el (edt-with-position): New macro. 5 * emulation/edt.el (edt-with-position): New macro.
4 (edt-find-forward, edt-find-backward, edt-find-next-forward) 6 (edt-find-forward, edt-find-backward, edt-find-next-forward)
5 (edt-find-next-backward, edt-sentence-forward, edt-sentence-backward) 7 (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 @@
1;;; octave-mod.el --- editing Octave source files under Emacs 1;;; octave-mod.el --- editing Octave source files under Emacs
2 2
3;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 3;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4;; Free Software Foundation, Inc. 4;; 2009, 2010 Free Software Foundation, Inc.
5 5
6;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> 6;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
7;; Author: John Eaton <jwe@octave.org> 7;; Author: John Eaton <jwe@octave.org>
@@ -829,7 +829,7 @@ The block marked is the one that contains point or follows point."
829 (unless (or (looking-at "\\s(") 829 (unless (or (looking-at "\\s(")
830 (save-excursion 830 (save-excursion
831 (let* ((token (funcall smie-forward-token-function)) 831 (let* ((token (funcall smie-forward-token-function))
832 (level (assoc token smie-op-levels))) 832 (level (assoc token smie-grammar)))
833 (and level (null (cadr level)))))) 833 (and level (null (cadr level))))))
834 (backward-up-list 1)) 834 (backward-up-list 1))
835 (mark-sexp)) 835 (mark-sexp))
@@ -1228,5 +1228,4 @@ code line."
1228 1228
1229(provide 'octave-mod) 1229(provide 'octave-mod)
1230 1230
1231;; arch-tag: 05f1ce09-be87-4c00-803e-4919ffa26c23
1232;;; octave-mod.el ends here 1231;;; octave-mod.el ends here