[Emacs-diffs] Changes to emacs/lisp/progmodes/ada-mode.el

[Richard M. Stallman]

Index: emacs/lisp/progmodes/ada-mode.el
diff -u emacs/lisp/progmodes/ada-mode.el:1.44 
emacs/lisp/progmodes/ada-mode.el:1.45
--- emacs/lisp/progmodes/ada-mode.el:1.44       Tue Nov 13 09:22:55 2001
+++ emacs/lisp/progmodes/ada-mode.el    Tue Nov 13 22:49:57 2001
@@ -7,7 +7,7 @@
 ;;      Markus Heritsch <address@hidden>
 ;;      Emmanuel Briot  <address@hidden>
 ;; Maintainer: Emmanuel Briot <address@hidden>
-;; Ada Core Technologies's version:   $Revision: 1.44 $
+;; Ada Core Technologies's version:   $Revision: 1.45 $
 ;; Keywords: languages ada
 
 ;; This file is part of GNU Emacs.
@@ -283,8 +283,8 @@
 
 (defcustom ada-fill-comment-prefix "--  "
   "*Text inserted in the first columns when filling a comment paragraph.
-Note: if you modify this variable, you will have to restart the `ada-mode' to
-reread this variable."
+Note: if you modify this variable, you will have to invoke `ada-mode'
+again to take account of the new value."
   :type 'string :group 'ada)
 
 (defcustom ada-fill-comment-postfix " --"
@@ -4149,16 +4149,13 @@
     (goto-char opos)
 
     ;;  Find beginning of paragraph
-    (back-to-indentation)
-    (while (and (not (bobp)) (looking-at "--[ \t]*[^ \t\n]"))
-      (forward-line -1)
-      (back-to-indentation))
-
-    ;;  We want one line to above the first one, unless we are at the beginning
-    ;;  of the buffer
-    (unless (bobp)
-      (forward-line 1))
     (beginning-of-line)
+    (while (and (not (bobp)) (looking-at "[ \t]*--[ \t]*[^ \t\n]"))
+      (forward-line -1))
+    ;;  If we found a paragraph-separating line,
+    ;;  don't actually include it in the paragraph.
+    (unless (looking-at "[ \t]*--[ \t]*[^ \t\n]")
+      (forward-line 1))
     (setq from (point-marker))
 
     ;;  Calculate the indentation we will need for the paragraph