(emerge-combine-versions-template): Make the

generated comments on the #else and #endif follow the GNU standards.

diff --git a/lisp/emerge.el b/lisp/emerge.el
index e161364ee585dbde79ed0683b74010162c78a1ea..f842ce6f3ac658ca4893f58410c82cb17be48e5e 100644 (file)
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -268,7 +268,7 @@ Do not start with `~/' or `~user-name/'.")
   "*Mode for Emerge temporary files.")
 
 (defvar emerge-combine-versions-template
-  "#ifdef NEW\n%b#else /* NEW */\n%a#endif /* NEW */\n"
+  "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
   "*Template for `emerge-combine-versions' to combine the two versions.
 The template is inserted as a string, with the following interpolations:
        %a      the A version of the difference