[gnus git] branch master updated: =3= (gnus-article-read-summary-keys): Don't call disabled commands. ; (gnus-gravatar-insert): Use blank space from the current buffer to avoid breaking text properties. ; (gnus-gravatar-insert): Don't move point around in the article buffer.

Lars Magne Ingebrigtsen <[email protected]>
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  b4659d852e19f41d56a05b996a760b2c9251275f (commit)
       via  64f94d120c610aaef8096142787ff52f7bf16b48 (commit)
       via  21c7e9fc74c279fc60c5d236ec5d8bc21adbca52 (commit)
      from  4a3c4e96ab1e0f5f52d6814728b479ea987293df (commit)


- Log -----------------------------------------------------------------
commit b4659d852e19f41d56a05b996a760b2c9251275f
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Jan 23 17:22:57 2011 -0800

    (gnus-article-read-summary-keys): Don't call disabled commands.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3322519..b4a1382 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-24  Lars Ingebrigtsen  <[email protected]>
 
+	* gnus-art.el (gnus-article-read-summary-keys): Don't call disabled
+	commands.
+
 	* gnus-gravatar.el (gnus-gravatar-insert): Don't move point around
 	in the article buffer.
 	(gnus-gravatar-insert): Use blank space from the current buffer to
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 430590d..06817e9 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6432,6 +6432,8 @@ not have a face in `gnus-article-boring-faces'."
 	    (ding)
 	  (unless (member keys nosave-in-article)
 	    (set-buffer gnus-article-current-summary))
+	  (when (get func 'disabled)
+	    (error "Function %s disabled" func))
 	  (call-interactively func)
 	  (setq new-sum-point (point)))
 	(when (member keys nosave-but-article)
@@ -6460,8 +6462,11 @@ not have a face in `gnus-article-boring-faces'."
 		 (select-window win))))
 	(setq in-buffer (current-buffer))
 	;; We disable the pick minor mode commands.
-	(if (and (setq func (let (gnus-pick-mode)
+	(setq func (let (gnus-pick-mode)
 			      (key-binding keys t)))
+	(when (get func 'disabled)
+	  (error "Function %s disabled" func))
+	(if (and func
 		 (functionp func)
 		 (condition-case code
 		     (progn

commit 64f94d120c610aaef8096142787ff52f7bf16b48
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Jan 23 16:58:58 2011 -0800

    (gnus-gravatar-insert): Use blank space from the current buffer to avoid breaking text properties.
    
    This makes X-Sent updating work again.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0831d6..3322519 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* gnus-gravatar.el (gnus-gravatar-insert): Don't move point around
 	in the article buffer.
+	(gnus-gravatar-insert): Use blank space from the current buffer to
+	avoid breaking text properties.  This makes X-Sent updating work again.
 
 	* gravatar.el (gravatar-retrieve): Be silent when retrieving.
 
diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el
index 5be838b..ae17d5b 100644
--- a/lisp/gnus-gravatar.el
+++ b/lisp/gnus-gravatar.el
@@ -113,7 +113,7 @@ Set image category to CATEGORY."
 		  (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)))))))

commit 21c7e9fc74c279fc60c5d236ec5d8bc21adbca52
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Jan 23 16:56:55 2011 -0800

    (gnus-gravatar-insert): Don't move point around in the article buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad2726f..f0831d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-24  Lars Ingebrigtsen  <[email protected]>
 
+	* gnus-gravatar.el (gnus-gravatar-insert): Don't move point around
+	in the article buffer.
+
 	* gravatar.el (gravatar-retrieve): Be silent when retrieving.
 
 2011-01-23  Lars Ingebrigtsen  <[email protected]>
diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el
index 53d1310..5be838b 100644
--- a/lisp/gnus-gravatar.el
+++ b/lisp/gnus-gravatar.el
@@ -80,7 +80,13 @@ 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)
-    (gnus-with-article-headers
+    (with-current-buffer gnus-article-buffer
+      (let ((mark (point-marker))
+	    (inhibit-read-only t)
+	    (inhibit-point-motion-hooks t)
+	    (case-fold-search t))
+	(save-restriction
+	  (article-narrow-to-head)
       ;; The buffer can be gone at this time
       (when (buffer-live-p (current-buffer))
         (gnus-article-goto-header header)
@@ -110,7 +116,8 @@ Set image category to CATEGORY."
                 (gnus-put-image gravatar nil category)
                 (put-text-property point (point) 'gnus-gravatar address)
                 (gnus-add-wash-type category)
-                (gnus-add-image category gravatar)))))))))
+		    (gnus-add-image category gravatar)))))))
+	(goto-char (marker-position mark))))))
 
 ;;;###autoload
 (defun gnus-treat-from-gravatar (&optional force)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog        |    8 +++++
 lisp/gnus-art.el      |    9 +++++-
 lisp/gnus-gravatar.el |   69 +++++++++++++++++++++++++++----------------------
 3 files changed, 53 insertions(+), 33 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.