diff options
| author | Teodor Zlatanov | 2011-05-05 22:12:41 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2011-05-05 22:12:41 +0000 |
| commit | df26ce09c49ebae2d3ade84c8e653f3a97cdb473 (patch) | |
| tree | 7bfae69a716136d5d124fadc0d17ec22d343d444 | |
| parent | db7a0b4f1d883f537c669c09f651350b0ef0d3cf (diff) | |
| download | emacs-df26ce09c49ebae2d3ade84c8e653f3a97cdb473.tar.gz emacs-df26ce09c49ebae2d3ade84c8e653f3a97cdb473.zip | |
shr.el (shr-urlify, shr-link): Still broken but at least doesn't error out because the face is not a list.
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2e8df577f61..a0dab93bca0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-05-05 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * shr.el (shr-urlify, shr-link): Still broken but at least doesn't | ||
| 4 | error out because the face is not a list. | ||
| 5 | |||
| 1 | 2011-05-05 Glenn Morris <rgm@gnu.org> | 6 | 2011-05-05 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * gnus-start.el (gnus-propagate-marks): Declare. | 8 | * gnus-start.el (gnus-propagate-marks): Declare. |
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index d865b2d6087..d8f33c830c7 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el | |||
| @@ -94,7 +94,7 @@ cid: URL as the argument.") | |||
| 94 | (defface shr-link '((t (:underline t) | 94 | (defface shr-link '((t (:underline t) |
| 95 | (:foreground "yellow") | 95 | (:foreground "yellow") |
| 96 | (:background "black"))) | 96 | (:background "black"))) |
| 97 | "Font for <s> elements." | 97 | "Font for link elements." |
| 98 | :group 'shr) | 98 | :group 'shr) |
| 99 | 99 | ||
| 100 | ;;; Internal variables. | 100 | ;;; Internal variables. |
| @@ -597,7 +597,7 @@ START, and END. Note that START and END should be merkers." | |||
| 597 | :help-echo (if title (format "%s (%s)" url title) url) | 597 | :help-echo (if title (format "%s (%s)" url title) url) |
| 598 | :keymap shr-map | 598 | :keymap shr-map |
| 599 | url) | 599 | url) |
| 600 | (put-text-property start (point) 'face 'shr-link) | 600 | (put-text-property start (point) 'face '(shr-link)) |
| 601 | (put-text-property start (point) 'shr-url url)) | 601 | (put-text-property start (point) 'shr-url url)) |
| 602 | 602 | ||
| 603 | (defun shr-encode-url (url) | 603 | (defun shr-encode-url (url) |