diff options
| author | Glenn Morris | 2013-06-18 00:10:56 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-06-18 00:10:56 -0700 |
| commit | 0143b8a3b1b32510d7eec398aa4a3d02c02cba61 (patch) | |
| tree | 1100b9058e32867babec348d23276a7550931193 | |
| parent | f2f426ca48ece2c3275545f11b32a3ed2e0bdde5 (diff) | |
| download | emacs-0143b8a3b1b32510d7eec398aa4a3d02c02cba61.tar.gz emacs-0143b8a3b1b32510d7eec398aa4a3d02c02cba61.zip | |
* lisp/gnus/shr.el (libxml-parse-html-region): Declare.
(shr-render-buffer): Explicit error if no libxml2 support.
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 53db82cd5b3..7184d3e71b3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-06-18 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * shr.el (libxml-parse-html-region): Declare. | ||
| 4 | (shr-render-buffer): Explicit error if no libxml2 support. | ||
| 5 | |||
| 1 | 2013-06-17 Teodor Zlatanov <tzz@lifelogs.com> | 6 | 2013-06-17 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 7 | ||
| 3 | * auth-source.el (auth-source-current-line): New function. | 8 | * auth-source.el (auth-source-current-line): New function. |
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 2d0c9107fd6..06abde9e381 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el | |||
| @@ -142,10 +142,14 @@ cid: URL as the argument.") | |||
| 142 | map)) | 142 | map)) |
| 143 | 143 | ||
| 144 | ;; Public functions and commands. | 144 | ;; Public functions and commands. |
| 145 | (declare-function libxml-parse-html-region "xml.c" | ||
| 146 | (start end &optional base-url)) | ||
| 145 | 147 | ||
| 146 | (defun shr-render-buffer (buffer) | 148 | (defun shr-render-buffer (buffer) |
| 147 | "Display the HTML rendering of the current buffer." | 149 | "Display the HTML rendering of the current buffer." |
| 148 | (interactive (list (current-buffer))) | 150 | (interactive (list (current-buffer))) |
| 151 | (or (fboundp 'libxml-parse-html-region) | ||
| 152 | (error "This function requires Emacs to be compiled with libxml2")) | ||
| 149 | (pop-to-buffer "*html*") | 153 | (pop-to-buffer "*html*") |
| 150 | (erase-buffer) | 154 | (erase-buffer) |
| 151 | (shr-insert-document | 155 | (shr-insert-document |