summaryrefslogtreecommitdiff
path: root/lisp/gnus/ecomplete.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2010-10-12 22:18:24 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-10-12 22:18:24 +0000
commitab67634f9dff508ec35159fc72d64c917c106305 (patch)
tree16500dd2b09647d1a33067ae81b33239c67dec8b /lisp/gnus/ecomplete.el
parentfe239e8e52c9aa8e0e23790b4a7a12a5da49625a (diff)
downloademacs-ab67634f9dff508ec35159fc72d64c917c106305.tar.gz
Merge changes made in Gnus trunk.
gnus-gravatar.el (gnus-art): Required. shr.el (shr-tag-img): Add align attribute support for <img>. gnus-gravatar.el (gnus-gravatar-insert): Check if buffer is alive. shr.el (shr-tag-img): Encode URL properly when retrieving. shr.el (shr-get-image-data): Encode URL properly when fetching from cache. shr.el (shr-tag-img): Use aligned-to spaces to align correctly images. nnimap.el (nnimap-request-rename-group): Unselect by selecting a mailbox that doesn't exist. rfc2231.el (rfc2231-parse-string): Ignore repeated parts. gnus-gravatar.el (gnus-gravatar-too-ugly): Don't test if gnus-article-x-face-too-ugly is bound.
Diffstat (limited to 'lisp/gnus/ecomplete.el')
-rw-r--r--lisp/gnus/ecomplete.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index 1e9769f757d..33d2ddd6a71 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -147,7 +147,7 @@
(save-restriction
(narrow-to-region (point) (point-at-eol))
(while (not (eobp))
- ;; Put the 'region face on any charactes on this line that
+ ;; Put the 'region face on any characters on this line that
;; aren't already highlighted.
(unless (get-text-property (point) 'face)
(put-text-property (point) (1+ (point)) 'face 'highlight))