* 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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3c897178377a5c61c26e4a183b8a30dafd5b49e..0914fa82d8778291f6ec82f2847b8c85cb186ec6 100644 (file)
--- 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 7116b705affb75ee39748f9c3c35f17d6868276c..e57d6068ef568721353f305f02b2ec150055abce 100644 (file)
--- 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 12238560dc9d5cf115c911634403d7f2527208ca..0f4d4d044a686deba12e299eb4f5c5a4e7a63d25 100644 (file)
--- 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 61db73b91e8d5d918eb812286d946afdf3c4df50..dc6f84481525564c5fed425a9f49175c08561ca2 100644 (file)
--- 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"));