* lisp/indent.el (indent-according-to-mode): Apply syntax-propertize.

(indent-region): Use indent-according-to-mode.
* test/indent/octave.m: Remove one more `fixindent'.  Use `end'.

4 files changed, 13 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3c89717837..0914fa82d87 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent.el (indent-according-to-mode): Apply syntax-propertize.
+        (indent-region): Use indent-according-to-mode.
+
 2010-09-18  Eli Zaretskii  <eliz@gnu.org>
 
         * fringe.el (fringe-mode): Doc fix.
diff --git a/lisp/indent.el b/lisp/indent.el
index 7116b705aff..e57d6068ef5 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -68,6 +68,7 @@ The buffer-local variable `indent-line-function' determines how to do this,
 but the functions `indent-relative' and `indent-relative-maybe' are
 special; we don't actually use them here."
   (interactive)
+  (syntax-propertize (line-end-position))
   (if (memq indent-line-function
             '(indent-relative indent-relative-maybe))
       ;; These functions are used for tabbing, but can't be used for
@@ -418,7 +419,7 @@ column to indent to; if it is nil, use one of the three methods above."
             (goto-char start)
             (while (< (point) end)
               (or (and (bolp) (eolp))
-                  (funcall indent-line-function))
+                  (indent-according-to-mode))
               (forward-line 1))
             (move-marker end nil))))
     (setq column (prefix-numeric-value column))
diff --git a/test/ChangeLog b/test/ChangeLog
index 12238560dc9..0f4d4d044a6 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent/octave.m: Remove one more `fixindent'.  Use `end'.
+
 2010-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * indent/octave.m: Remove some `fixindent' not needed any more.
diff --git a/test/indent/octave.m b/test/indent/octave.m
index 61db73b91e8..dc6f8448152 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -6,7 +6,7 @@ function res = tcomp (fn)
          
   if nargin ~= 1
     print_usage()
-  endif
+  end
 
   data = dlmread(fn, 3, 0);
 
@@ -1412,7 +1412,7 @@ function create_pkgadddel (desc, packdir, nm, global_install)
     for i = 1:length (lst)
       nam = fullfile (packdir, "inst", lst(i).name);
       fwrite (instfid, extract_pkg (nam, ['^[#%][#%]* *' nm ': *(.*)$']));
-    endfor                                   # fixindent
+    endfor
 
     ## Search all C++ source files for PKG commands.
     lst = dir (fullfile (packdir, "src", "*.cc"));