mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/image.el: Use lexical-binding

Browse source 
(image-scaling-factor, imagemagick-types-inhibit)
(imagemagick-enabled-types): Remove redundant :group.
(image--get-image): Apply de-Morgan and use car-safe.
(image-compute-scaling-factor): Use the argument.
This commit is contained in:
Stefan Monnier 2016-05-23 15:12:24 -04:00
parent d5f42ab6f0
commit 5e17f50911
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lisp/image.el
View file

@ -1,4 +1,4 @@
;;; image.el --- image API ;;; image.el --- image API -*- lexical-binding:t -*-
;; Copyright (C) 1998-2016 Free Software Foundation, Inc. ;; Copyright (C) 1998-2016 Free Software Foundation, Inc.
@ -123,7 +123,7 @@ value is used as a list of directories to search.
Subdirectories are not automatically included in the search." Subdirectories are not automatically included in the search."
:type '(repeat (choice directory variable)) :type '(repeat (choice directory variable))
:initialize 'custom-initialize-delay) :initialize #'custom-initialize-delay)
(defcustom image-scaling-factor 'auto (defcustom image-scaling-factor 'auto
"When displaying images, apply this scaling factor before displaying. "When displaying images, apply this scaling factor before displaying.
@ -135,7 +135,6 @@ size), or the symbol `auto', which will compute a scaling factor
based on the font pixel size." based on the font pixel size."
:type '(choice number :type '(choice number
(const :tag "Automatically compute" auto)) (const :tag "Automatically compute" auto))
:group 'image
:version "25.2") :version "25.2")
;; Map put into text properties on images. ;; Map put into text properties on images.
@ -460,9 +459,8 @@ If VALUE is nil, PROPERTY is removed from IMAGE."
(defun image-compute-scaling-factor (scaling) (defun image-compute-scaling-factor (scaling)
(cond (cond
((numberp image-scaling-factor) ((numberp scaling) scaling)
image-scaling-factor) ((eq scaling 'auto)
((eq image-scaling-factor 'auto)
(let ((width (/ (float (window-width nil t)) (window-width)))) (let ((width (/ (float (window-width nil t)) (window-width))))
;; If we assume that a typical character is 10 pixels in width, ;; If we assume that a typical character is 10 pixels in width,
;; then we should scale all images according to how wide they ;; then we should scale all images according to how wide they
@ -471,7 +469,7 @@ If VALUE is nil, PROPERTY is removed from IMAGE."
1 1
(/ (float width) 10)))) (/ (float width) 10))))
(t (t
(error "Invalid scaling factor %s" image-scaling-factor)))) (error "Invalid scaling factor %s" scaling))))
;;;###autoload ;;;###autoload
(defun put-image (image pos &optional string area) (defun put-image (image pos &optional string area)
@ -728,7 +726,7 @@ number, play until that number of seconds has elapsed."
(if (setq timer (image-animate-timer image)) (if (setq timer (image-animate-timer image))
(cancel-timer timer)) (cancel-timer timer))
(plist-put (cdr image) :animate-buffer (current-buffer)) (plist-put (cdr image) :animate-buffer (current-buffer))
(run-with-timer 0.2 nil 'image-animate-timeout (run-with-timer 0.2 nil #'image-animate-timeout
image (or index 0) (car animation) image (or index 0) (car animation)
0 limit (+ (float-time) 0.2))))) 0 limit (+ (float-time) 0.2)))))
@ -739,7 +737,7 @@ number, play until that number of seconds has elapsed."
(while tail (while tail
(setq timer (car tail) (setq timer (car tail)
tail (cdr tail)) tail (cdr tail))
(if (and (eq (timer--function timer) 'image-animate-timeout) (if (and (eq (timer--function timer) #'image-animate-timeout)
(eq (car-safe (timer--args timer)) image)) (eq (car-safe (timer--args timer)) image))
(setq tail nil) (setq tail nil)
(setq timer nil))) (setq timer nil)))
@ -819,7 +817,7 @@ for the animation speed. A negative value means to animate in reverse."
(if (numberp limit) (if (numberp limit)
(setq done (>= time-elapsed limit))) (setq done (>= time-elapsed limit)))
(unless done (unless done
(run-with-timer delay nil 'image-animate-timeout (run-with-timer delay nil #'image-animate-timeout
image n count time-elapsed limit image n count time-elapsed limit
(+ (float-time) delay)))))) (+ (float-time) delay))))))
@ -907,12 +905,11 @@ has no effect."
:type '(choice (const :tag "Support all ImageMagick types" nil) :type '(choice (const :tag "Support all ImageMagick types" nil)
(const :tag "Disable all ImageMagick types" t) (const :tag "Disable all ImageMagick types" t)
(repeat symbol)) (repeat symbol))
:initialize 'custom-initialize-default :initialize #'custom-initialize-default
:set (lambda (symbol value) :set (lambda (symbol value)
(set-default symbol value) (set-default symbol value)
(imagemagick-register-types)) (imagemagick-register-types))
:version "24.3" :version "24.3")
:group 'image)
(defcustom imagemagick-enabled-types (defcustom imagemagick-enabled-types
'(3FR ART ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW '(3FR ART ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW
@ -945,12 +942,11 @@ has no effect."
(repeat :tag "List of types" (repeat :tag "List of types"
(choice (symbol :tag "type") (choice (symbol :tag "type")
(regexp :tag "regexp")))) (regexp :tag "regexp"))))
:initialize 'custom-initialize-default :initialize #'custom-initialize-default
:set (lambda (symbol value) :set (lambda (symbol value)
(set-default symbol value) (set-default symbol value)
(imagemagick-register-types)) (imagemagick-register-types))
:version "24.3" :version "24.3")
:group 'image)
(imagemagick-register-types) (imagemagick-register-types)
@ -974,8 +970,7 @@ default is 20%."
(defun image--get-image () (defun image--get-image ()
(let ((image (get-text-property (point) 'display))) (let ((image (get-text-property (point) 'display)))
(when (or (not (consp image)) (unless (eq (car-safe image) 'image)
(not (eq (car image) 'image)))
(error "No image under point")) (error "No image under point"))
image)) image))