diff options
| author | Joakim Verona | 2011-06-30 01:23:11 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-06-30 01:23:11 +0200 |
| commit | 0349bc31b8abcd5c1a49c3f800e052b8581ef1d0 (patch) | |
| tree | 517e5037e0dbfa5c82dd1dd4189498759f72afa9 /etc | |
| parent | 9333b6a4d92243ebeee9c5fc3ae3f1ec1a47abc3 (diff) | |
| parent | ada35ec18a3429c0389fe1b77d7ae82b8a5715d6 (diff) | |
| download | emacs-0349bc31b8abcd5c1a49c3f800e052b8581ef1d0.tar.gz emacs-0349bc31b8abcd5c1a49c3f800e052b8581ef1d0.zip | |
merge from upstream
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 6 |
1 files changed, 6 insertions, 0 deletions
| @@ -787,6 +787,9 @@ the user for specifics, e.g. a merge source. | |||
| 787 | 787 | ||
| 788 | **** Currently supported for Bzr, Git, and Mercurial. | 788 | **** Currently supported for Bzr, Git, and Mercurial. |
| 789 | 789 | ||
| 790 | *** New option `vc-revert-show-diff' controls whether `vc-revert' | ||
| 791 | shows a diff while querying the user. It defaults to t. | ||
| 792 | |||
| 790 | *** Log entries in some Log View buffers can be toggled to display a | 793 | *** Log entries in some Log View buffers can be toggled to display a |
| 791 | longer description by typing RET (log-view-toggle-entry-display). | 794 | longer description by typing RET (log-view-toggle-entry-display). |
| 792 | In the Log View buffers made by `C-x v L' (vc-print-root-log), you can | 795 | In the Log View buffers made by `C-x v L' (vc-print-root-log), you can |
| @@ -802,6 +805,9 @@ of a file similar to `vc-diff', but using ediff backend. | |||
| 802 | 805 | ||
| 803 | ** Miscellaneous | 806 | ** Miscellaneous |
| 804 | 807 | ||
| 808 | +++ | ||
| 809 | *** f90.el has some support for Fortran 2008 syntax. | ||
| 810 | |||
| 805 | --- | 811 | --- |
| 806 | *** `copyright-fix-years' can optionally convert consecutive years to ranges. | 812 | *** `copyright-fix-years' can optionally convert consecutive years to ranges. |
| 807 | 813 | ||