From: Glenn Morris Date: Wed, 10 Nov 2010 08:21:06 +0000 (-0800) Subject: * lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~313 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d2a1e35669ce4e2442f1df065ed77f833af532c;p=emacs.git * lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change. --- 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 + * 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 ;; Author: John Eaton @@ -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