Cleanup for new else/comment handling.

3 files changed, 13 insertions, 12 deletions

diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index a675c8bb3a0..c274696f933 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.64 2007/11/15 23:23:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.65 2007/11/16 01:11:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -461,7 +461,7 @@ UtfToLocal(const unsigned char *utf, unsigned char *iso,
 				code = p->code;
 			}
 		}
-		else	/*  no cmap or no remaining data */
+		else	/* no cmap or no remaining data */
 		{
 			p = bsearch(&iutf, map, size1,
 						sizeof(pg_utf_to_local), compare1);
diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c
index aebb8f893bd..37ba85e1fb3 100644
--- a/src/bin/psql/mbprint.c
+++ b/src/bin/psql/mbprint.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.27 2007/11/15 23:23:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.28 2007/11/16 01:11:04 momjian Exp $
  *
  * XXX this file does not really belong in psql/.  Perhaps move to libpq?
  * It also seems that the mbvalidate function is redundant with existing
@@ -246,7 +246,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width,
 				linewidth += 4;
 				format_size += 4;
 			}
-			else	/*  Output it as-is */
+			else	/* Output it as-is */
 			{
 				linewidth += w;
 				format_size += 1;
@@ -257,7 +257,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, int *result_width,
 			linewidth += 6;		/* \u0000 */
 			format_size += 6;
 		}
-		else	/*  All other chars */
+		else	/* All other chars */
 		{
 			linewidth += w;
 			format_size += chlen;
@@ -321,7 +321,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
 				linewidth += 4;
 				ptr += 4;
 			}
-			else	/*  Output it as-is */
+			else	/* Output it as-is */
 			{
 				linewidth += w;
 				*ptr++ = *pwcs;
@@ -343,7 +343,7 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
 			ptr += 6;
 			linewidth += 6;
 		}
-		else	/*  All other chars */
+		else	/* All other chars */
 		{
 			int			i;
 
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 8f6473f9493..310b78c6bd3 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.94 2007/11/15 23:23:44 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.95 2007/11/16 01:11:04 momjian Exp $
 
 # Known bugs:
 #
@@ -46,9 +46,10 @@ do
 # 'else' followed by a single-line comment, followed by
 # a brace on the next line confuses BSD indent, so we push
 # the comment down to the next line, then later pull it
-# back up again.
+# back up again.  Add space before PGMV or indent will add
+# it for us.
 	sed 's;\([} 	]\)else[ 	]*\(/\*\)\(.*\*/\)[ 	]*$;\1else\
-    \2PGINDENT_MOVED\3;g' |
+    \2 PGMV\3;g' |
 
 # Indent multi-line after-'else' comment so BSD indent will move it properly.
 # We already moved down single-line comments above.  Check for '*' to make
@@ -2243,10 +2244,10 @@ do
 		{
 			if (NR != 1)
 			{
-				if ($0 ~ "/\*PGINDENT_MOVED")
+				if ($0 ~ "/\* PGMV")
 				{
 					# remove tag
-					sub("PGINDENT_MOVED", "", $0);
+					sub(" PGMV", "", $0);
 					# remove leading whitespace
 					sub("^[ 	]*", "", $0);
 					# add comment with single tab prefix