aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-03 00:17:05 -0800
committerGlenn Morris2012-02-03 00:17:05 -0800
commit4f5a10efb39a2eea53a00d06e273cd46ffb32bd5 (patch)
tree0191d068bc9ecee8efa13ea78e2261955b4947ec
parent4dee2deae3bc60bad29a8e46d42650b79ac0df63 (diff)
downloademacs-4f5a10efb39a2eea53a00d06e273cd46ffb32bd5.tar.gz
emacs-4f5a10efb39a2eea53a00d06e273cd46ffb32bd5.zip
Small display.texi fix
* doc/lispref/display.texi (Image Formats): Remove oddly specific information on versions of image libraries.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/display.texi10
2 files changed, 9 insertions, 6 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b441248858e..acd57db238a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12012-02-03 Glenn Morris <rgm@gnu.org>
2
3 * display.texi (Image Formats): Remove oddly specific information
4 on versions of image libraries.
5
12012-02-02 Glenn Morris <rgm@gnu.org> 62012-02-02 Glenn Morris <rgm@gnu.org>
2 7
3 * processes.texi (Synchronous Processes): 8 * processes.texi (Synchronous Processes):
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index a351dbfb407..6b0535ea553 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4151,12 +4151,10 @@ names for these dynamic libraries (though it is not possible to add
4151new image formats). Note that image types @code{pbm} and @code{xbm} 4151new image formats). Note that image types @code{pbm} and @code{xbm}
4152do not depend on external libraries and are always available in Emacs. 4152do not depend on external libraries and are always available in Emacs.
4153 4153
4154 The supported image formats include XBM, XPM (this requires the 4154 The supported image formats (and the necessary library files)
4155libraries @code{libXpm} version 3.4k and @code{libz}), GIF (requiring 4155include XBM, XPM (@code{libXpm} and @code{libz}), GIF (@code{libgif}
4156@code{libungif} 4.1.0), PostScript, PBM, JPEG (requiring the 4156or @code{libungif}), PostScript, PBM, JPEG (@code{libjpeg}), TIFF
4157@code{libjpeg} library version v6a), TIFF (requiring @code{libtiff} 4157(@code{libtiff}), PNG (@code{libpng}), and SVG (@code{librsvg}).
4158v3.4), PNG (requiring @code{libpng} 1.0.2), and SVG (requiring
4159@code{librsvg} 2.0.0).
4160 4158
4161 You specify one of these formats with an image type symbol. The image 4159 You specify one of these formats with an image type symbol. The image
4162type symbols are @code{xbm}, @code{xpm}, @code{gif}, @code{postscript}, 4160type symbols are @code{xbm}, @code{xpm}, @code{gif}, @code{postscript},