diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9041f3d2725..ba5cdd81972 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-04  Robert Dewar  <dewar@adacore.com>
+
+	* sem_prag.adb, atree.ads, prj-env.adb, prj-env.ads: Minor reformatting.
+
 2011-11-04  Yannick Moy  <moy@adacore.com>
 
 	* atree.adb, atree.ads (Set_Original_Node): New set procedure.
diff --git a/gcc/ada/atree.ads b/gcc/ada/atree.ads
index b5bbff4d743..736f5ca6135 100644
--- a/gcc/ada/atree.ads
+++ b/gcc/ada/atree.ads
@@ -763,6 +763,11 @@ package Atree is
 
    procedure Set_Original_Node (N : Node_Id; Val : Node_Id);
    pragma Inline (Set_Original_Node);
+   --  Note that this routine is used only in very peculiar cases. In normal
+   --  cases, the Original_Node link is set by calls to Rewrite. We currently
+   --  use it in ASIS mode to manually set the link from pragma expressions
+   --  to their aspect original source expressions, so that the original source
+   --  expressions accessed by ASIS are also semantically analyzed.
 
    ------------------------------
    -- Entity Update Procedures --
diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb
index 2e6fe4a255c..898ba8dfa35 100644
--- a/gcc/ada/prj-env.adb
+++ b/gcc/ada/prj-env.adb
@@ -2062,8 +2062,10 @@ package body Prj.Env is
    -- Find_Name_In_Path --
    -----------------------
 
-   function Find_Name_In_Path (Self : Project_Search_Path;
-                               Path : String) return String_Access is
+   function Find_Name_In_Path
+     (Self : Project_Search_Path;
+      Path : String) return String_Access
+   is
       First  : Natural;
       Last   : Natural;
 
@@ -2081,8 +2083,7 @@ package body Prj.Env is
 
       else
          --  Because we don't want to resolve symbolic links, we cannot use
-         --  Locate_Regular_File. So, we try each possible path
-         --  successively.
+         --  Locate_Regular_File. So, we try each possible path successively.
 
          First := Self.Path'First;
          while First <= Self.Path'Last loop
@@ -2204,8 +2205,7 @@ package body Prj.Env is
 
          if Result = null then
             Result := Try_Path_Name
-              (Self,
-               Directory & Directory_Separator & File);
+                       (Self, Directory & Directory_Separator & File);
          end if;
       end if;
 
diff --git a/gcc/ada/prj-env.ads b/gcc/ada/prj-env.ads
index fd19a061a0f..79de6464a0a 100644
--- a/gcc/ada/prj-env.ads
+++ b/gcc/ada/prj-env.ads
@@ -212,8 +212,9 @@ package Prj.Env is
 
    generic
       with function Check_Filename (Name : String) return Boolean;
-   function Find_Name_In_Path (Self : Project_Search_Path;
-                               Path : String) return String_Access;
+   function Find_Name_In_Path
+     (Self : Project_Search_Path;
+      Path : String) return String_Access;
    --  Find a name in the project search path of Self. Check_Filename is
    --  the predicate to valid the search.  If Path is an absolute filename,
    --  simply calls the predicate with Path. Otherwise, calls the predicate
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index cf493795880..df897e62ab6 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -1215,7 +1215,8 @@ package body Sem_Prag is
 
       procedure Check_Arg_Is_Static_Expression
         (Arg : Node_Id;
-         Typ : Entity_Id := Empty) is
+         Typ : Entity_Id := Empty)
+      is
       begin
          Check_Expr_Is_Static_Expression (Get_Pragma_Arg (Arg), Typ);
       end Check_Arg_Is_Static_Expression;
@@ -1456,7 +1457,8 @@ package body Sem_Prag is
 
       procedure Check_Expr_Is_Static_Expression
         (Argx : Node_Id;
-         Typ  : Entity_Id := Empty) is
+         Typ  : Entity_Id := Empty)
+      is
       begin
          if Present (Typ) then
             Analyze_And_Resolve (Argx, Typ);
@@ -15140,7 +15142,6 @@ package body Sem_Prag is
       --  expressions (i.e. similar to a default expression).
 
       if Present (Arg_Req) then
-
          Preanalyze_Spec_Expression
            (Get_Pragma_Arg (Arg_Req), Standard_Boolean);
 
@@ -15156,7 +15157,6 @@ package body Sem_Prag is
       end if;
 
       if Present (Arg_Ens) then
-
          Preanalyze_Spec_Expression
            (Get_Pragma_Arg (Arg_Ens), Standard_Boolean);