mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

* image-mode.el (image-display-size): Doc fix (Bug#7820).

Browse Source
This commit is contained in:
Chong Yidong 2011-01-28 14:13:01 -05:00
parent 2e804fc7e7
commit 2f224f0b1a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2011-01-28 Chong Yidong <cyd@stupidchicken.com>
* image-mode.el (image-display-size): Doc fix (Bug#7820).
2011-01-27 Sam Steingold <sds@gnu.org>
* midnight.el (clean-buffer-list-kill-never-buffer-names): Remove

17
lisp/image-mode.el
View File

@ -118,13 +118,16 @@ A winprops object has the shape (WINDOW . ALIST)."
(declare-function image-size "image.c" (spec &optional pixels frame))
(defun image-display-size (spec &optional pixels frame)
"Wrapper around `image-size', to handle slice display properties.
If SPEC is an image display property, call `image-size' with the
given arguments.
If SPEC is a list of properties containing `image' and `slice'
properties, calculate the display size from the slice property.
If SPEC contains `image' but not `slice', call `image-size' with
the specified image."
"Wrapper around `image-size', handling slice display properties.
Like `image-size', the return value is (WIDTH . HEIGHT).
WIDTH and HEIGHT are in canonical character units if PIXELS is
nil, and in pixel units if PIXELS is non-nil.
If SPEC is an image display property, this function is equivalent
to `image-size'. If SPEC is a list of properties containing
`image' and `slice' properties, return the display size taking
the slice property into account. If the list contains `image'
but not `slice', return the `image-size' of the specified image."
(if (eq (car spec) 'image)
(image-size spec pixels frame)
(let ((image (assoc 'image spec))