Merge from origin/emacs-25

[gnu-emacs] / etc / NEWS

diff --git a/etc/NEWS b/etc/NEWS
index bc3e49097b633d1d52bafa70175259f05bcece9d..9e000be4a7a1df109cedcc0866fcb74c9917dc03 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -709,10 +709,6 @@ item as before.
 
 ** Search and Replace
 
-+++
-*** New user option `search-default-mode'
-specifies the default mode for I-search.
-
 +++
 *** `isearch' and `query-replace' can now perform character folding in matches.
 Isearch does that by default, while `query-replace' will do that if
@@ -728,6 +724,18 @@ and ”), and the letter a will match all of its accented cousins, even
 those composed of multiple characters, as well as many other symbols
 like ℀, ℁, ⒜, and ⓐ.
 
+Character folding is enabled by customizing `search-default-mode' to
+the value `character-fold-to-regexp'.  If you want to turn character
+folding off, customize the value of `search-default-mode' to the `nil'
+value.  You can also toggle character folding in the middle of a
+search by typing `M-s ''.
+
++++
+*** New user option `search-default-mode'.
+This option specifies the default mode for Isearch.  The default
+value, `character-fold-to-regexp' specifies that Isearch should fold
+characters when searching.
+
 +++
 *** New function `character-fold-to-regexp' can be used
 by searching commands to produce a regexp matching anything that
@@ -1423,7 +1431,9 @@ few or no entries have changed.
 minibuffer instead of a graphical dialog, depending on whether the gpg
 command is called from Emacs (i.e., INSIDE_EMACS environment variable
 is set).  This feature requires newer versions of GnuPG (2.1.5 or
-later) and Pinentry (0.9.5 or later).
+later) and Pinentry (0.9.5 or later).  To use this feature, add
+"allow-emacs-pinentry" to "~/.gnupg/gpg-agent.conf" and reload the
+configuration with "gpgconf --reload gpg-agent".
 
 +++
 ** cl-generic.el provides CLOS-style multiple-dispatch generic functions.