diff options
| author | Stefan Monnier | 2014-01-12 18:34:33 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-01-12 18:34:33 -0500 |
| commit | 6137cb82dbe1c5c438df6e8ae95533ebced9ff35 (patch) | |
| tree | edc70077b572fb23444db71159b65c35779f08a7 | |
| parent | 1a0778b078b9ffaa68e1ae0d4b26de147872b421 (diff) | |
| download | emacs-6137cb82dbe1c5c438df6e8ae95533ebced9ff35.tar.gz emacs-6137cb82dbe1c5c438df6e8ae95533ebced9ff35.zip | |
* lisp/net/shr.el (shr-render-region): Autoload.
| -rw-r--r-- | lisp/ChangeLog | 21 | ||||
| -rw-r--r-- | lisp/net/shr.el | 1 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d113d60af83..5f1f38a950b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * net/shr.el (shr-render-region): Autoload. | ||
| 4 | |||
| 1 | 2014-01-12 Xue Fuqiao <xfq.free@gmail.com> | 5 | 2014-01-12 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 6 | ||
| 3 | * net/eww.el (eww-download-directory): Rename from | 7 | * net/eww.el (eww-download-directory): Rename from |
| @@ -31,22 +35,20 @@ | |||
| 31 | (eldoc-mode): Restrict eldoc-message-commands to editing commands | 35 | (eldoc-mode): Restrict eldoc-message-commands to editing commands |
| 32 | if eldoc-print-after-edit is set. (Bug#16346) | 36 | if eldoc-print-after-edit is set. (Bug#16346) |
| 33 | 37 | ||
| 34 | * progmodes/octave.el (octave-mode-menu): Adapt to change in | 38 | * progmodes/octave.el (octave-mode-menu): Adapt to change in eldoc. |
| 35 | eldoc. | ||
| 36 | 39 | ||
| 37 | 2014-01-11 Eric S. Raymond <esr@thyrsus.com> | 40 | 2014-01-11 Eric S. Raymond <esr@thyrsus.com> |
| 38 | 41 | ||
| 39 | * version.el (emacs-repository-get-version): Enhance so the | 42 | * version.el (emacs-repository-get-version): Enhance so the |
| 40 | function works correctly in either a Bazaar or Git repo. The | 43 | function works correctly in either a Bazaar or Git repo. |
| 41 | Bazaar case can be discarded after the repo transition. | ||
| 42 | 44 | ||
| 43 | * play/meese.el: It's 2014 and Ed Meese is justly forgotten. Goes | 45 | * play/meese.el: It's 2014 and Ed Meese is justly forgotten. |
| 44 | with removal of the joke manpages from /etc. | 46 | Goes with removal of the joke manpages from /etc. |
| 45 | 47 | ||
| 46 | 2014-01-10 K. Handa <handa@gnu.org> | 48 | 2014-01-10 K. Handa <handa@gnu.org> |
| 47 | 49 | ||
| 48 | * mail/rmail.el (rmail-get-coding-system): Check | 50 | * mail/rmail.el (rmail-get-coding-system): |
| 49 | rmail-get-coding-function before "funcall"ing it. | 51 | Check rmail-get-coding-function before "funcall"ing it. |
| 50 | 52 | ||
| 51 | 2014-01-10 Glenn Morris <rgm@gnu.org> | 53 | 2014-01-10 Glenn Morris <rgm@gnu.org> |
| 52 | 54 | ||
| @@ -69,8 +71,7 @@ | |||
| 69 | 71 | ||
| 70 | 2014-01-10 Chong Yidong <cyd@gnu.org> | 72 | 2014-01-10 Chong Yidong <cyd@gnu.org> |
| 71 | 73 | ||
| 72 | * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is | 74 | * progmodes/octave.el (octave-mode-menu): Don't assume eldoc is loaded. |
| 73 | loaded. | ||
| 74 | 75 | ||
| 75 | 2014-01-10 Anders Lindgren <andlind@gmail.com> | 76 | 2014-01-10 Anders Lindgren <andlind@gmail.com> |
| 76 | 77 | ||
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 32715b18397..7ef49eaf2d4 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -169,6 +169,7 @@ cid: URL as the argument.") | |||
| 169 | (libxml-parse-html-region (point-min) (point-max)))) | 169 | (libxml-parse-html-region (point-min) (point-max)))) |
| 170 | (goto-char (point-min))) | 170 | (goto-char (point-min))) |
| 171 | 171 | ||
| 172 | ;;;###autoload | ||
| 172 | (defun shr-render-region (begin end &optional buffer) | 173 | (defun shr-render-region (begin end &optional buffer) |
| 173 | "Display the HTML rendering of the region between BEGIN and END." | 174 | "Display the HTML rendering of the region between BEGIN and END." |
| 174 | (interactive "r") | 175 | (interactive "r") |