X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/94ed5167557112fb00eeca05e62589db744206de..223b3f0d845a6a85124c004e6fe03b4bdc4f1e17:/lisp/image.el diff --git a/lisp/image.el b/lisp/image.el index 0c62088ca5..4ee22b580e 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -34,7 +34,7 @@ (defconst image-type-header-regexps `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm) - ("\\`P[1-6]\\\(?:\ + ("\\`P[1-6]\\(?:\ \\(?:\\(?:#[^\r\n]*[\r\n]\\)?[[:space:]]\\)+\ \\(?:\\(?:#[^\r\n]*[\r\n]\\)?[0-9]\\)+\ \\)\\{2\\}" . pbm) @@ -154,7 +154,7 @@ compatibility with versions of Emacs that lack the variable (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\")) (image-load-path (cons (car load-path) - (when (boundp 'image-load-path) + (when (boundp \\='image-load-path) image-load-path)))) (mh-tool-bar-folder-buttons-init))" (unless library (error "No library specified")) @@ -735,7 +735,7 @@ for the animation speed. A negative value means to animate in reverse." ;; Subtract off the time we took to load the image from the ;; stated delay time. (delay (max (+ (* (or (cdr animation) image-default-frame-delay) - (/ 1 (abs speed))) + (/ 1.0 (abs speed))) time (- (float-time))) image-minimum-frame-delay)) done)