Merge from origin/emacs-25

[gnu-emacs] / etc / NEWS

diff --git a/etc/NEWS b/etc/NEWS
index d6ffb3879bcae9517924efef21979b28e90a5709..717c6bc89ab086664a4bc88a3a002197b64cb0ee 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -816,6 +816,10 @@ at BOL or EOL, or in whitespace there.  To enable these, customize,
 respectively, `show-paren-when-point-inside-paren' or
 `show-paren-when-point-in-periphery'.
 
+---
+** If gpg2 exists on the system, it is now used as the default value
+of `epg-gpg-program' (instead of gpg).
+
 ** Lisp mode
 
 ---