Mercurial > emacs
comparison lisp/emerge.el @ 14668:a281f3b85f32
(emerge-combine-versions-template): Make the
generated comments on the #else and #endif follow the GNU standards.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 25 Feb 1996 22:53:18 +0000 |
parents | 7669c19beda8 |
children | dd08f1c1f488 |
comparison
equal
deleted
inserted
replaced
14667:3de266c52c9a | 14668:a281f3b85f32 |
---|---|
266 | 266 |
267 (defvar emerge-temp-file-mode 384 ; u=rw only | 267 (defvar emerge-temp-file-mode 384 ; u=rw only |
268 "*Mode for Emerge temporary files.") | 268 "*Mode for Emerge temporary files.") |
269 | 269 |
270 (defvar emerge-combine-versions-template | 270 (defvar emerge-combine-versions-template |
271 "#ifdef NEW\n%b#else /* NEW */\n%a#endif /* NEW */\n" | 271 "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n" |
272 "*Template for `emerge-combine-versions' to combine the two versions. | 272 "*Template for `emerge-combine-versions' to combine the two versions. |
273 The template is inserted as a string, with the following interpolations: | 273 The template is inserted as a string, with the following interpolations: |
274 %a the A version of the difference | 274 %a the A version of the difference |
275 %b the B version of the difference | 275 %b the B version of the difference |
276 %% the character `%' | 276 %% the character `%' |