cfengine.el improvement

[Dave Love]

This allows repeated C-M-e, C-M-a to make progress.  I hope there
wasn't a good reason not to do it initially...

2004-04-26  Dave Love  <address@hidden>

        * progmodes/cfengine.el (cfengine-end-of-defun)
        (cfengine-beginning-of-defun): Modified to ensure progress through
        file.

--- cfengine.el.~1.3.~  Wed Mar 24 12:50:53 2004
+++ cfengine.el Mon Apr 26 19:25:01 2004
@@ -102,7 +102,8 @@
 (defun cfengine-beginning-of-defun ()
   "`beginning-of-defun' function for Cfengine mode.
 Treats actions as defuns."
-  (end-of-line)
+  (unless (<= (current-column) (current-indentation))
+    (end-of-line))
   (if (re-search-backward "^[[:alpha:]]+: *$" nil t)
       (beginning-of-line)
     (goto-char (point-min)))
@@ -113,7 +114,7 @@
 Treats actions as defuns."
   (end-of-line)
   (if (re-search-forward "^[[:alpha:]]+: *$" nil t)
-      (progn (forward-line -1) (end-of-line))
+      (beginning-of-line)
     (goto-char (point-max)))
   t)