diff options
| author | Gnus developers <ding@gnus.org> | 2012-12-25 22:12:59 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-12-25 22:12:59 +0000 |
| commit | cc21c2356dbbf361a288cdb061f2f708b5392b93 (patch) | |
| tree | 390ffda804c01eacd9bf770e323adf4b8d0e0f32 /lisp/gnus/gnus-spec.el | |
| parent | f1665bdc87db38350a9fb0b497d2b14afbfa7140 (diff) | |
| download | emacs-cc21c2356dbbf361a288cdb061f2f708b5392b93.tar.gz | |
Merge changes made in Gnus master
2012-12-25 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-set-global-variables): Don't copy over the summary
buffer to the article buffer here, because that clobbers multiple
article buffers.
* gnus-art.el (gnus-article-setup-buffer): Make sure that the article
buffer always points to the right summary buffer.
2012-12-25 John Wiegley <jwiegley@gmail.com>
* auth-source.el (auth-source-netrc-parse): Allow using "password" as
the password (bug#12097).
2012-12-25 Lars Ingebrigtsen <larsi@gnus.org>
* shr.el (shr-tag-a): Don't tagify <A> elements that don't have HREFs
(bug#13263).
* gnus-salt.el (gnus-highlight-selected-tree): Check whether the Tree
buffer exists before using it (bug#12475).
* gnus-agent.el (gnus-agent-fetch-articles): Don't fetch articles from
offline groups (bug#11937).
* message.el (message-yank-original): When using customize to set the
value of `message-cite-style', the variable it set to a symbol that's
the name of the variable, which must then be dereferenced (bug#12616).
2012-09-13 Wolfgang Jenkner <wjenkner@inode.at>
* lisp/gnus-spec.el (gnus-face-face-function): Initialize the value of
the `face' property with a list whose car is the face specified in the
format string and whose cdr is (nil).
* lisp/gnus-util.el
(gnus-put-text-property-excluding-characters-with-faces): Change
accordingly.
(gnus-get-text-property-excluding-characters-with-faces): New function.
* lisp/gnus-sum.el (gnus-summary-highlight-line):
* lisp/gnus-salt.el (gnus-tree-highlight-node):
* lisp/gnus-group.el (gnus-group-highlight-line): Use it.
Diffstat (limited to 'lisp/gnus/gnus-spec.el')
| -rw-r--r-- | lisp/gnus/gnus-spec.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el index f40177d5c60..22d4627bf28 100644 --- a/lisp/gnus/gnus-spec.el +++ b/lisp/gnus/gnus-spec.el @@ -265,7 +265,14 @@ Return a list of updated types." (defun gnus-face-face-function (form type) `(gnus-add-text-properties (point) (progn ,@form (point)) - '(gnus-face t face ,(symbol-value (intern (format "gnus-face-%d" type)))))) + (cons 'face + (cons + ;; Delay consing the value of the `face' property until + ;; `gnus-add-text-properties' runs, since it will be modified + ;; by `gnus-put-text-property-excluding-characters-with-faces'. + (list ',(symbol-value (intern (format "gnus-face-%d" type))) nil) + ;; Redundant now, but still convenient. + '(gnus-face t))))) (defun gnus-balloon-face-function (form type) `(gnus-put-text-property |