Commit 5319014e authored by Chong Yidong's avatar Chong Yidong

Updates for Display chapter of Lisp manual.

* doc/lispref/display.texi (Image Formats): Add imagemagick type.
(Image Descriptors): Mention how they are used.
(ImageMagick Images): Clarify role of imagemagick-register-types.
(Character Display): Don't mention glyph tables.
(Display Tables): Use make-glyph-code in example.
(Glyphs): Avoid "simple glyph code" terminology.  Note that glyph
tables are semi-obsolete.  De-document create-glyph.
(Glyphless Chars): Note that display tables override this.
(Bidirectional Display): Copyedits.  Introduce "bidirectional
reordering" terminology, and use it.

* doc/emacs/files.texi (File Conveniences): Clarify Imagemagick discussion.

* lisp/image.el (imagemagick-types-inhibit)
(imagemagick-register-types): Doc fix.
parent dc178345
......@@ -191,7 +191,7 @@ compile.texi cyd
control.texi cyd
customize.texi cyd
debugging.texi cyd
display.texi
display.texi cyd
edebug.texi
elisp.texi
errors.texi rgm
......
2012-03-30 Chong Yidong <cyd@gnu.org>
* files.texi (File Conveniences): Clarify Imagemagick discussion.
2012-03-22 Glenn Morris <rgm@gnu.org>
* dired.texi (Operating on Files): Fix dired-recursive-copies default.
......
......@@ -1911,27 +1911,35 @@ point. Partial Completion mode offers other features extending
@cindex images, viewing
@cindex image animation
@cindex animated images
Visiting image files automatically selects Image mode. This major
mode allows you to toggle between displaying the file as an image in
the Emacs buffer, and displaying its underlying text representation,
using the command @kbd{C-c C-c} (@code{image-toggle-display}). This
works only when Emacs can display the specific image type@footnote{If
your Emacs was compiled with ImageMagick support, then after using
@code{imagemagick-register-types}, you can view in Image mode any
image type that ImageMagick supports; @pxref{ImageMagick Images,,,
elisp, The Emacs Lisp Reference Manual}}. If the displayed image is wider
Visiting image files automatically selects Image mode. In this
major mode, you can type @kbd{C-c C-c} (@code{image-toggle-display})
to toggle between displaying the file as an image in the Emacs buffer,
and displaying its underlying text (or raw byte) representation.
Displaying the file as an image works only if Emacs is compiled with
support for displaying such images. If the displayed image is wider
or taller than the frame, the usual point motion keys (@kbd{C-f},
@kbd{C-p}, and so forth) cause different parts of the image to be
displayed. If the image can be animated, then the command @kbd{RET}
(@code{image-toggle-animation}), will start (or stop) animating it.
displayed. If the image can be animated, the command @kbd{RET}
(@code{image-toggle-animation}) starts or stops the animation.
Animation plays once, unless the option @code{image-animate-loop} is
non-@code{nil}. Currently, Emacs only supports animated GIF files
(@pxref{Animated Images,,, elisp, The Emacs Lisp Reference Manual}).
non-@code{nil}. Currently, Emacs only supports animation in GIF
files.
@cindex ImageMagick support
If your Emacs was compiled with ImageMagick support, it is possible
to view a much wider variety of image types in Image mode, by
rendering the images via ImageMagick. However, this feature is
currently disabled by default. To enable it, add the following line
to your init file:
@example
(imagemagick-register-types)
@end example
@findex thumbs-mode
@findex mode, thumbs
See also the Image-Dired package (@pxref{Image-Dired}) for viewing
images as thumbnails.
The Image-Dired package can also be used to view images as
thumbnails. @xref{Image-Dired}.
@node Filesets
@section Filesets
......
2012-03-30 Chong Yidong <cyd@gnu.org>
* display.texi (Image Formats): Add imagemagick type.
(Image Descriptors): Mention how they are used.
(ImageMagick Images): Clarify role of imagemagick-register-types.
(Character Display): Don't mention glyph tables.
(Display Tables): Use make-glyph-code in example.
(Glyphs): Avoid "simple glyph code" terminology. Note that glyph
tables are semi-obsolete. De-document create-glyph.
(Glyphless Chars): Note that display tables override this.
(Bidirectional Display): Copyedits. Introduce "bidirectional
reordering" terminology, and use it.
2012-03-30 Glenn Morris <rgm@gnu.org>
* edebug.texi (Jumping): Give name of `i' binding.
......
This diff is collapsed.
2012-03-30 Chong Yidong <cyd@gnu.org>
* image.el (imagemagick-types-inhibit)
(imagemagick-register-types): Doc fix.
2012-03-30 Agustín Martín Domingo <agustin.martin@hispalinux.es>
* ispell.el (ispell-get-extended-character-mode): Disable
......
......@@ -686,14 +686,13 @@ The minimum delay between successive frames is 0.01s."
(defcustom imagemagick-types-inhibit
'(C HTML HTM TXT PDF)
"ImageMagick types that Emacs should not use ImageMagick to handle.
This should be a list of symbols, each of which has the same
name as one of the format tags used internally by ImageMagick;
see `imagemagick-types'. Entries in this list are excluded from
being registered by `imagemagick-register-types', so if you change
this variable you must do so before you call that function.
If Emacs is compiled without ImageMagick, this variable has no effect."
"ImageMagick types that should not be visited in Image mode.
This should be a list of symbols, each of which should be one of
the ImageMagick types listed in `imagemagick-types'. These image
types are not registered by `imagemagick-register-types'.
If Emacs is compiled without ImageMagick support, this variable
has no effect."
:type '(choice (const :tag "Let ImageMagick handle all types it can" nil)
(repeat symbol))
;; Ideally, would have a :set function that checks if we already did
......@@ -704,10 +703,13 @@ If Emacs is compiled without ImageMagick, this variable has no effect."
;;;###autoload
(defun imagemagick-register-types ()
"Register file types that can be handled by ImageMagick.
This adds the file types returned by `imagemagick-types'
\(excluding the ones in `imagemagick-types-inhibit') to
`auto-mode-alist' and `image-type-file-name-regexps', so that
Emacs visits them in Image mode.
This registers the ImageMagick types listed in `imagemagick-types',
excluding those listed in `imagemagick-types-inhibit'.
Registered image types are added to `auto-mode-alist', so that
Emacs visits them in Image mode. They are also added to
`image-type-file-name-regexps', so that the `image-type' function
recognizes these files as having image type `imagemagick'.
If Emacs is compiled without ImageMagick support, do nothing."
(when (fboundp 'imagemagick-types)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment