diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-02 11:59:46 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-02 11:59:46 -0800 |
| commit | 762ea10d7ff483d3528c2c85b42596178ccc2a34 (patch) | |
| tree | 00154b726c2bd73c85d47f89a2912bd2ff389b92 /lisp/vc/diff-mode.el | |
| parent | e943b9b514fcc82a47364a35e4af9f46e30e7346 (diff) | |
| parent | 0213c8bf472b196d995d92a52b44458ac8226e42 (diff) | |
| download | emacs-762ea10d7ff483d3528c2c85b42596178ccc2a34.tar.gz emacs-762ea10d7ff483d3528c2c85b42596178ccc2a34.tar.bz2 emacs-762ea10d7ff483d3528c2c85b42596178ccc2a34.zip | |
Merge from origin/emacs-26
0213c8b (origin/emacs-26) mwheel minor consistency fix
82f12b2 * src/window.c (Frecenter): Improve commentary.
04da8f4 Fix downloading non-text files in EWW
832b9ec ; Spelling fixes
dd88499 ; Spelling fixes
3968f72 Rename some mwheel options, for consistency
d6e78de * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete...
5fe0387 Improve the Emacs manual
56ab8e3 * lisp/dired-aux.el (dired-do-create-files): Doc fix. (Bug#3...
Conflicts:
etc/NEWS
lisp/mwheel.el
Diffstat (limited to 'lisp/vc/diff-mode.el')
0 files changed, 0 insertions, 0 deletions