]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Tue, 9 Oct 2018 20:12:56 +0000 (13:12 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 9 Oct 2018 20:12:56 +0000 (13:12 -0700)
14c032d Avoid assertion violations in nonsensical calls to 'signal'
b99192f * lisp/simple.el (transient-mark-mode): Correct documentation...
7e42294 Update the locale and language database
8c53d9f Fix a typo in a doc string.
79bda3b Make nneething allow CRLF-encoded files (bug#32940)

1  2 
lisp/gnus/nneething.el
lisp/international/mule-cmds.el
lisp/simple.el
lisp/window.el
src/eval.c

Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/window.el
Simple merge
diff --cc src/eval.c
Simple merge