Merge from mainline.

[gnu-emacs] / etc / NEWS

diff --git a/etc/NEWS b/etc/NEWS
index 521741100f1a45ae901383010300c82f8e08c8b0..6b7fd303dded34f3a29c7dd954915ef73ef18d80 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -349,6 +349,7 @@ between applications.
 
 *** To return to the previous behavior, do the following:
 
+**** Change `select-active-regions' to nil.
 **** Change `mouse-drag-copy-region' to t.
 **** Change `x-select-enable-primary' to t (on X only).
 **** Change `x-select-enable-clipboard' to nil.
@@ -773,6 +774,12 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 \f
 * Lisp changes in Emacs 24.1
 
+** `open-network-stream' can now be used to open an encrypted stream.
+It now accepts an optional `:type' parameter for initiating a TLS
+connection, directly or via STARTTLS.  To do STARTTLS, additional
+parameters (`:end-of-command', `:success', `:capabilities-command')
+must also be supplied.
+
 ** Code can now use lexical scoping by default instead of dynamic scoping.
 The `lexical-binding' variable lets code use lexical scoping for local
 variables.  It is typically set via file-local variables, in which case it