| commit | e0f18aa07fb900c1bb0fe25386336fd6a73c9b0d | |
| author | Glenn Morris <rgm@gnu.org> | |
| Wed, 14 Mar 2018 01:13:26 +0000 (13 18:13 -0700) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Wed, 14 Mar 2018 01:13:26 +0000 (13 18:13 -0700) | ||
| tree | 893b95bcdf8d4a0b1e105c45b1aaf1d7b5e31a32 | treesnapshot (tar.gz zip) |
| parent | ae80854e9a9f8f6733870b5b5a88467867dceb6c | commitdiff |
| parent | 675edecf6102a20b3482544315c654fde4b6236e | commitdiff |
Merge from origin/emacs-26
675edec (origin/emacs-26) Fix some allout.el aliases
b2c069a * lisp/progmodes/ada-mode.el (ada-clean-buffer-before-saving)...
2f5420c Doc fixes re obsolete items
9edf82a Replace an obsolete alias in tpu-mapper
a643792 Doc fixes re obsolete items
3060fb8 Minor changes in mule.texi
3e39897 Avoid assertion violation under visual-order-cursor-movement
e4b73ab Stop mentioning options.el in doc
05669f0 ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last...
758597f * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation.
62f0a2b * lisp/minibuffer.el (completion-cycle-threshold): Doc fix.
761845c Fix last change in Xref documentation
5186675 More changes in the Emacs manual
b1aaa72 Improve documentation of Xref
Conflicts:
lisp/w32-fns.el
675edec (origin/emacs-26) Fix some allout.el aliases
b2c069a * lisp/progmodes/ada-mode.el (ada-clean-buffer-before-saving)...
2f5420c Doc fixes re obsolete items
9edf82a Replace an obsolete alias in tpu-mapper
a643792 Doc fixes re obsolete items
3060fb8 Minor changes in mule.texi
3e39897 Avoid assertion violation under visual-order-cursor-movement
e4b73ab Stop mentioning options.el in doc
05669f0 ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last...
758597f * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation.
62f0a2b * lisp/minibuffer.el (completion-cycle-threshold): Doc fix.
761845c Fix last change in Xref documentation
5186675 More changes in the Emacs manual
b1aaa72 Improve documentation of Xref
Conflicts:
lisp/w32-fns.el