; Merge from origin/emacs-25

[gnu-emacs] / etc / NEWS

diff --git a/etc/NEWS b/etc/NEWS
index f0a3bec4525c426bb51c23831e97bd6286eedaf5..cc99dbd1075ea59762304bbb3c36bd09814caf5f 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -402,6 +402,11 @@ default.
 unsaved customizations and prompts user to customize (if found).  It
 is intended for adding to 'kill-emacs-query-functions'.
 
++++
+** The old `C-x w' bindings in hi-lock-mode are officially deprecated
+in favor of the global `M-s h' bindings introduced in Emacs-23.1.
+They'll disappear soon.
+
 \f
 * Changes in Specialized Modes and Packages in Emacs 25.1
 
@@ -434,6 +439,20 @@ to version 206, you can do this with C-u C-u M-x desktop-save.
 It raises an error if a bookmark of that name already exists,
 unlike `bookmark-set' which silently updates an existing bookmark.
 
+** Gnus
+
++++
+*** New user options `mm-html-inhibit-images' and `mm-html-blocked-images'
+now control how mm-* functions fetch and display images in an HTML
+message.  Gnus still uses `gnus-inhibit-images' and `gnus-blocked-images'
+for that purpose, i.e., binds mm-html- variables with those gnus-
+variables, but other packages do not have to bind gnus- variables now.
+
+---
+*** `mm-inline-text-html-with-images' has been removed.
+Use `mm-html-inhibit-images' instead.  Note that the value is opposite
+in meaning.
+
 ** IMAP
 
 ---
@@ -809,11 +828,6 @@ In `visual-line-mode' it will look for the true beginning of a header
 while in non-`visual-line-mode' it will move the point to the indented
 header’s value.
 
-+++
-** Images are automatically scaled before displaying based on the
-`image-scaling-factor' variable (if Emacs supports scaling the images
-in question).
-
 +++
 ** In Show Paren Mode, a parenthesis can be highlighted when point
 stands inside it, and certain parens can be highlighted when point is
@@ -825,6 +839,18 @@ respectively, `show-paren-when-point-inside-paren' or
 ** If gpg2 exists on the system, it is now used as the default value
 of `epg-gpg-program' (instead of gpg).
 
+** Images
+
++++
+*** Images are automatically scaled before displaying based on the
+`image-scaling-factor' variable (if Emacs supports scaling the images
+in question).
+
+*** Images inserted with `insert-image' and related functions get a
+keymap put into the text properties (or overlays) that span the
+image.  This keymap binds keystrokes for manipulating size and
+rotation, as well as saving the image to a file.
+
 ** Lisp mode
 
 ---
@@ -1062,6 +1088,11 @@ comparing with the next window, customize the new option
 replace the face `compare-windows', which is now an obsolete alias for
 `compare-windows-added'.
 
+---
+*** The VC state indicator in the mode line now has different faces
+corresponding to each of the possible states.  See the `vc-faces'
+customization group.
+
 ---
 *** `log-edit-insert-changelog' converts "(tiny change)" to
 "Copyright-paperwork-exempt: yes".  Set `log-edit-rewrite-tiny-change'