diff options
| author | Dmitry Gutov | 2015-04-14 05:03:32 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2015-04-14 05:06:49 +0300 |
| commit | a9ccfaefc1ca8fa5b0177101984f64b3b186339b (patch) | |
| tree | 70c652aeeb0b392d25702a1d75c531f449ed347e /etc | |
| parent | e192281baae377a8702f3c048fce988d63ccfc1a (diff) | |
| download | emacs-a9ccfaefc1ca8fa5b0177101984f64b3b186339b.tar.gz emacs-a9ccfaefc1ca8fa5b0177101984f64b3b186339b.zip | |
Change diff-switches default to `-u'
Fixes: debbugs:20290
* doc/emacs/files.texi (Comparing Files): Document the new default
value of `diff-switches'.
* doc/emacs/trouble.texi (Sending Patches): Document the preference
for unified diff format. Escape the plus in the suggested `-F' regexp
value.
* lisp/vc/diff.el (diff-switches): Change the default to `-u'.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -690,6 +690,10 @@ now match multibyte characters using Unicode character properties. | |||
| 690 | If you want the old behavior where they matched any character with | 690 | If you want the old behavior where they matched any character with |
| 691 | word syntax, use `\sw' instead. | 691 | word syntax, use `\sw' instead. |
| 692 | 692 | ||
| 693 | +++ | ||
| 694 | ** The `diff' command uses the unified format now. To restore the old | ||
| 695 | behavior, set `diff-switches' to `-c'. | ||
| 696 | |||
| 693 | 697 | ||
| 694 | * Lisp Changes in Emacs 25.1 | 698 | * Lisp Changes in Emacs 25.1 |
| 695 | 699 | ||