diff options
| author | Glenn Morris | 2013-09-17 21:53:05 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-09-17 21:53:05 -0700 |
| commit | 986ed13557e677f6438c130061afeaaa120ae393 (patch) | |
| tree | b48ae1a9fe6867fe1ab80baade6f542eabb97d39 | |
| parent | ffb82dbda37f51c7a997fee74646e94647effad5 (diff) | |
| download | emacs-986ed13557e677f6438c130061afeaaa120ae393.tar.gz emacs-986ed13557e677f6438c130061afeaaa120ae393.zip | |
* net/shr.el (image-size, image-animate): Declare.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/shr.el | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3de40545779..1cb9f9e8aea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -33,6 +33,8 @@ | |||
| 33 | 33 | ||
| 34 | * net/gnutls.el (gnutls-log-level): Declare. | 34 | * net/gnutls.el (gnutls-log-level): Declare. |
| 35 | 35 | ||
| 36 | * net/shr.el (image-size, image-animate): Declare. | ||
| 37 | |||
| 36 | * simple.el (font-info): Declare. | 38 | * simple.el (font-info): Declare. |
| 37 | 39 | ||
| 38 | * subr.el (x-popup-dialog): Declare. | 40 | * subr.el (x-popup-dialog): Declare. |
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 9cac618b159..b742172be46 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -732,6 +732,10 @@ If EXTERNAL, browse the URL using `shr-external-browser'." | |||
| 732 | (setq payload (base64-decode-string payload))) | 732 | (setq payload (base64-decode-string payload))) |
| 733 | payload))) | 733 | payload))) |
| 734 | 734 | ||
| 735 | ;; Behind display-graphic-p test. | ||
| 736 | (declare-function image-size "image.c" (spec &optional pixels frame)) | ||
| 737 | (declare-function image-animate "image" (image &optional index limit)) | ||
| 738 | |||
| 735 | (defun shr-put-image (spec alt &optional flags) | 739 | (defun shr-put-image (spec alt &optional flags) |
| 736 | "Insert image SPEC with a string ALT. Return image. | 740 | "Insert image SPEC with a string ALT. Return image. |
| 737 | SPEC is either an image data blob, or a list where the first | 741 | SPEC is either an image data blob, or a list where the first |