diff --git a/ada-wisi.el b/ada-wisi.el
--- a/ada-wisi.el
+++ b/ada-wisi.el
@@ -1308,34 +1308,12 @@
 	  ;;
 	  ;; Note that we must indent the prev and next lines, in case
 	  ;; they are not currently correct.
-	  (cond
-	   ((= 0 (% indent ada-indent))
-	    ;; this will handle comments at bob and eob, so we don't
-	    ;; need to worry about those positions in the next checks.
-	    indent)
-
-	   ((and (setq prev-indent
-		       (save-excursion (forward-line -1)(indent-according-to-mode)(current-indentation)))
-		 (= indent prev-indent))
-	    indent)
-
-	   ((and (setq next-indent
-		       ;; we use forward-comment here, instead of
-		       ;; forward-line, because consecutive comment
-		       ;; lines are indented to the current one, which
-		       ;; we don't know yet.
-		       (save-excursion (forward-comment (point-max))(indent-according-to-mode)(current-indentation)))
-		 (= indent next-indent))
-	    indent)
-
-	   (t
-	    (or
-	     prev-indent
+            ;; not forcing gnat style
+            (let ((prev-indent (save-excursion (forward-line -1)(indent-according-to-mode)(current-indentation)))
+                (next-indent (save-excursion (forward-comment (point-max))(indent-according-to-mode)(current-indentation))))
+              (if (< next-indent prev-indent)
 	     next-indent
-	     (floor indent ada-indent)))
-	   )
-
-	  ;; not forcing gnat style
+                indent))
 	  indent)))
 
       (t