From 504621b9835f537161464bb88113fd9bfaf22de8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 25 Feb 1996 22:53:18 +0000 Subject: [PATCH] (emerge-combine-versions-template): Make the generated comments on the #else and #endif follow the GNU standards. --- lisp/emerge.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emerge.el b/lisp/emerge.el index e161364ee58..f842ce6f3ac 100644 --- 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 -- 2.39.2