]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9650e9 4feb962)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:10 +0000 (14:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:10 +0000 (14:23 -0800)
4feb962 * lisp/comint.el (comint-prompt-read-only): Clean tabs in docstring
cc419fb Don't inloop gnus-uu-mark-thread on the last thread
51c77a2 Display non-ASCII group names better in prompts
f93d669 Default to gpg2 instead of gpg

1  2 
etc/NEWS patch | diff1 | diff2 | blob | history
lisp/gnus/gnus-sum.el patch | diff1 | diff2 | blob | history

diff --cc etc/NEWS
Simple merge
diff --cc lisp/gnus/gnus-sum.el
Simple merge