diff options
| author | Lars Magne Ingebrigtsen | 2014-11-13 23:06:05 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-11-13 23:06:05 +0100 |
| commit | 14b1c9d82d450431e42a76ce2f797ed57c50c8dc (patch) | |
| tree | 066fbe91fd28aa6968e586a90bdc8e3bf47aa101 | |
| parent | 790ad0171da998fc4cadbd99451d6ed3a27f1965 (diff) | |
| download | emacs-14b1c9d82d450431e42a76ce2f797ed57c50c8dc.tar.gz emacs-14b1c9d82d450431e42a76ce2f797ed57c50c8dc.zip | |
* net/shr.el (shr-inhibit-images): Add a doc string.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/shr.el | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index feff0279a86..5c0ec99f04f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * net/shr.el (shr-inhibit-images): Add a doc string. | ||
| 4 | |||
| 3 | * net/eww.el (eww-after-render-hook): New variable. | 5 | * net/eww.el (eww-after-render-hook): New variable. |
| 4 | (eww-render): Use it. | 6 | (eww-render): Use it. |
| 5 | 7 | ||
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index a4b004d7c1b..26fb6471104 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -123,13 +123,15 @@ cid: URL as the argument.") | |||
| 123 | "Font for link elements." | 123 | "Font for link elements." |
| 124 | :group 'shr) | 124 | :group 'shr) |
| 125 | 125 | ||
| 126 | (defvar shr-inhibit-images nil | ||
| 127 | "If non-nil, inhibit loading images.") | ||
| 128 | |||
| 126 | ;;; Internal variables. | 129 | ;;; Internal variables. |
| 127 | 130 | ||
| 128 | (defvar shr-folding-mode nil) | 131 | (defvar shr-folding-mode nil) |
| 129 | (defvar shr-state nil) | 132 | (defvar shr-state nil) |
| 130 | (defvar shr-start nil) | 133 | (defvar shr-start nil) |
| 131 | (defvar shr-indentation 0) | 134 | (defvar shr-indentation 0) |
| 132 | (defvar shr-inhibit-images nil) | ||
| 133 | (defvar shr-internal-width (or shr-width (1- (window-width)))) | 135 | (defvar shr-internal-width (or shr-width (1- (window-width)))) |
| 134 | (defvar shr-list-mode nil) | 136 | (defvar shr-list-mode nil) |
| 135 | (defvar shr-content-cache nil) | 137 | (defvar shr-content-cache nil) |