diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-02-25 22:53:18 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-02-25 22:53:18 +0000 |
| commit | 504621b9835f537161464bb88113fd9bfaf22de8 (patch) | |
| tree | 14feb080efd91b5f9aae71a4fe1f73cc3f416888 /lisp/emerge.el | |
| parent | 59115a2281bfb5f5065997f2f39fcfa669c5076d (diff) | |
| download | emacs-504621b9835f537161464bb88113fd9bfaf22de8.tar.gz | |
(emerge-combine-versions-template): Make the
generated comments on the #else and #endif follow the GNU standards.
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 |