From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 22:23:10 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2681
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8986f1674c2338761a30bfe0b8ee353d0cd6778e;p=emacs.git

Merge from origin/emacs-25

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
---

8986f1674c2338761a30bfe0b8ee353d0cd6778e