aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-02-28 15:00:12 -0500
committerGlenn Morris2014-02-28 15:00:12 -0500
commitb70257b07ea6053bce27b20ad0bda50f547bd393 (patch)
tree7ed7ba11a82ca63703a804de0bfd2aec69a4a115
parent6f8761491462538b620af5af94277998d9bfc5e4 (diff)
downloademacs-b70257b07ea6053bce27b20ad0bda50f547bd393.tar.gz
emacs-b70257b07ea6053bce27b20ad0bda50f547bd393.zip
Tweak earlier shr.el change
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/shr.el2
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8150de7bba2..d8dda13d346 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -21,9 +21,8 @@
21 21
222014-02-28 Ivan Kanis <ivan@kanis.fr> 222014-02-28 Ivan Kanis <ivan@kanis.fr>
23 23
24 * net/shr.el (shr-put-image): Add custom variable 24 * net/shr.el (shr-image-animate): New option.
25 `shr-image-animate' to turn off image animation. It is so slow it 25 (shr-put-image): Respect shr-image-animate.
26 will render emacs unusable.
27 26
282014-02-28 Michael Albinus <michael.albinus@gmx.de> 272014-02-28 Michael Albinus <michael.albinus@gmx.de>
29 28
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index c7f8c0f50fc..4801aca2fcc 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -101,7 +101,7 @@ Alternative suggestions are:
101 :type 'function) 101 :type 'function)
102 102
103(defcustom shr-image-animate t 103(defcustom shr-image-animate t
104 "If non nil image will be animated." 104 "Non nil means that images that can be animated will be."
105 :version "24.4" 105 :version "24.4"
106 :group 'shr 106 :group 'shr
107 :type 'boolean) 107 :type 'boolean)