]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Tue, 10 Apr 2018 14:50:48 +0000 (07:50 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 10 Apr 2018 14:50:48 +0000 (07:50 -0700)
c267421 (tag: emacs-26.1-rc1, origin/emacs-26) ; * ChangeLog.3: Update.
aa77415 * etc/AUTHORS: Regenerate.
c8ffca5 * lisp/files.el (kept-new-versions): Improve documentation st...
3a798f6 Fix a minor mistake in the ELisp manual
6afa868 ; * src/dispextern.h (struct it): Fix a typo in a comment.
5659b2f * lisp/files.el (find-file-literally): Doc fix.
9b24a79 Fix typos in doc strings

1  2 
doc/lispref/files.texi
lisp/files.el
lisp/simple.el
src/dispextern.h

Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/simple.el
Simple merge
Simple merge