Add new node "Image Mode" to Emacs Manual.

* doc/emacs/dired.texi (Image-Dired): Add xref to "Image Mode".

* doc/emacs/emacs.texi (Top): Add new node "Image Mode" to menu.

* doc/emacs/files.texi (Files): Add new node "Image Mode" to menu.
(File Conveniences): Split part of node to new node "Image Mode".

* doc/emacs/frames.texi (Mouse Commands): Add xref to "Image Mode".

* doc/emacs/misc.texi (Embedded WebKit Widgets): Rename xref from
"File Conveniences" to "Image Mode".

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index fba4389094f579438b44a14279b6ad77be68b795..d51441418036653b46274a81c7f52bf54d938568 100644 (file)
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1416,7 +1416,8 @@ C-c}.
 
   Image-Dired is a facility for browsing image files.  It provides viewing
 the images either as thumbnails or in full size, either inside Emacs
-or through an external viewer.
+or through an external viewer.  This is different from Image mode
+(@pxref{Image Mode}) for visiting an image file in the Emacs buffer.
 
 @kindex C-t d @r{(Image-Dired)}
 @findex image-dired-display-thumbs

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 6ef4ca63ae7040276dde2f4e381cd12a40b5c31e..60f2be9a5136b9c792c3f6c80e2bd30361aad843 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -455,7 +455,8 @@ File Handling
 * Remote Files::        Accessing files on other machines.
 * Quoted File Names::   Quoting special characters in file names.
 * File Name Cache::     Completion against a list of files you often use.
-* File Conveniences::   Convenience Features for Finding Files.
+* File Conveniences::   Convenience features for finding files.
+* Image Mode::          Viewing image files.
 * Filesets::            Handling sets of files.
 
 Saving Files

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index a89b16b3f6d41a37f3a08310962a435dd64801e0..7d57555ce3385f7820c5151962bec4dfeb2e4203 100644 (file)
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -38,7 +38,8 @@ on file directories.
 * Remote Files::        Accessing files on other machines.
 * Quoted File Names::   Quoting special characters in file names.
 * File Name Cache::     Completion against a list of files you often use.
-* File Conveniences::   Convenience Features for Finding Files.
+* File Conveniences::   Convenience features for finding files.
+* Image Mode::          Viewing image files.
 * Filesets::            Handling sets of files.
 @end menu
 
@@ -2088,8 +2089,7 @@ of the cache with the @code{file-cache-display} command.
 @section Convenience Features for Finding Files
 
   In this section, we introduce some convenient facilities for finding
-recently-opened files, reading file names from a buffer, and viewing
-image files.
+recently-opened files, reading file names from a buffer.
 
 @findex recentf-mode
 @vindex recentf-mode
@@ -2108,6 +2108,9 @@ point.  Partial Completion mode offers other features extending
 @code{find-file}, which can be used with @code{ffap}.
 @xref{Completion Options}.
 
+@node Image Mode
+@section Viewing Image Files
+
 @findex image-mode
 @findex image-toggle-display
 @findex image-next-file

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 7a583b96bbd4c7bf308b825172391de69a686aee..94218424d37b3555160d5c370d15257ba66622c4 100644 (file)
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -227,8 +227,9 @@ left.  If you'd like to reverse the direction of horizontal scrolling,
 customize the variable @code{mouse-wheel-flip-direction} to a
 non-@code{nil} value.
 
-When the mouse pointer is over an image, scrolling the mouse wheel
-with the @key{Ctrl} modifier scales the image under the mouse pointer.
+When the mouse pointer is over an image in Image mode, @pxref{Image Mode},
+scrolling the mouse wheel with the @key{Ctrl} modifier scales the image
+under the mouse pointer.
 
 
 @node Word and Line Mouse

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 294430aa183891f0932e9f396dd378e4e1158ae3..a15aa17a66f7427cd8485e06b0b3b5dadadf3c21 100644 (file)
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2883,7 +2883,7 @@ if there is an active region (@pxref{Mark}), the default URL comes
 from the region instead, after removing any whitespace from it.  The
 command then creates a new buffer with the embedded browser showing
 the specified URL.  The buffer is put in the Xwidget-WebKit mode
-(similar to Image mode, @pxref{File Conveniences}), which provides
+(similar to Image mode, @pxref{Image Mode}), which provides
 one-key commands for scrolling the widget, changing its size, and
 reloading it.  Type @w{@kbd{C-h b}} in that buffer to see the key
 bindings.

diff --git a/etc/NEWS b/etc/NEWS
index 4485bf916501523c098b9a313af897e0cbdef1b5..def1bce29aae5fe8112a8adc88ee4a41036961af 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3515,6 +3515,10 @@ functions.
 *** 'image-mode' now uses this library to automatically rotate images
 according to the orientation in the Exif data, if any.
 
+*** In 'image-mode' the image is resized automatically to fit in window.
+The image will resize upon first display and whenever the window's
+dimensions change.
+
 ---
 *** New library image-converter.
 If you need to view exotic image formats for which Emacs doesn't have