* shr.el (shr-insert-table): Respect border-collapse: collapse.

[gnus] / lisp / gnus-gravatar.el

diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el
index 5be838b..33bcb6b 100644 (file)
--- a/lisp/gnus-gravatar.el
+++ b/lisp/gnus-gravatar.el
@@ -1,6 +1,6 @@
 ;;; gnus-gravatar.el --- Gnus Gravatar support
 
 ;;; gnus-gravatar.el --- Gnus Gravatar support
 

-;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2013 Free Software Foundation, Inc.

 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: news
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: news


@@ -35,13 +35,13 @@
 (defcustom gnus-gravatar-size nil
   "How big should gravatars be displayed.
 If nil, default to `gravatar-size'."
 (defcustom gnus-gravatar-size nil
   "How big should gravatars be displayed.
 If nil, default to `gravatar-size'."

-  :type 'integer
+  :type '(choice (const nil) integer)

   :version "24.1"
   :group 'gnus-gravatar)
 
 (defcustom gnus-gravatar-properties '(:ascent center :relief 1)
   "List of image properties applied to Gravatar images."
   :version "24.1"
   :group 'gnus-gravatar)
 
 (defcustom gnus-gravatar-properties '(:ascent center :relief 1)
   "List of image properties applied to Gravatar images."

-  :type 'list
+  :type 'sexp

   :version "24.1"
   :group 'gnus-gravatar)
 
   :version "24.1"
   :group 'gnus-gravatar)
 


@@ -80,9 +80,8 @@ If nil, default to `gravatar-size'."
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.
 Set image category to CATEGORY."
   (unless (eq gravatar 'error)
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.
 Set image category to CATEGORY."
   (unless (eq gravatar 'error)

-    (with-current-buffer gnus-article-buffer
+    (gnus-with-article-buffer

       (let ((mark (point-marker))
       (let ((mark (point-marker))

-           (inhibit-read-only t)

            (inhibit-point-motion-hooks t)
            (case-fold-search t))
        (save-restriction
            (inhibit-point-motion-hooks t)
            (case-fold-search t))
        (save-restriction


@@ -113,7 +112,7 @@ Set image category to CATEGORY."
                  (let ((point (point)))
                    (unless (featurep 'xemacs)
                      (setq gravatar (append gravatar gnus-gravatar-properties)))
                  (let ((point (point)))
                    (unless (featurep 'xemacs)
                      (setq gravatar (append gravatar gnus-gravatar-properties)))

-                   (gnus-put-image gravatar nil category)
+                   (gnus-put-image gravatar (buffer-substring (point) (1+ point)) category)

                    (put-text-property point (point) 'gnus-gravatar address)
                    (gnus-add-wash-type category)
                    (gnus-add-image category gravatar)))))))
                    (put-text-property point (point) 'gnus-gravatar address)
                    (gnus-add-wash-type category)
                    (gnus-add-image category gravatar)))))))