[gnus git] branch master updated: m0-1-96-g86089ad =2= Merge remote-tracking branch 'origin/no-gnus' ; Inhibit cookies when fetching pictures

       via  86089ad3ebb9713c72ac8a8993d2c3915713d813 (commit)
       via  283e76bd2d5af17da11a4f5da4443962eab7ae53 (commit)
      from  6c131a3af3eb29c1139390ba2cb598a88f6077bc (commit)


- Log -----------------------------------------------------------------
commit 86089ad3ebb9713c72ac8a8993d2c3915713d813
Merge: 6c131a3 283e76b
Author: Lars Ingebrigtsen <[email protected]>
Date:   Wed Feb 8 01:09:38 2012 +0100

    Merge remote-tracking branch 'origin/no-gnus'

diff --cc lisp/ChangeLog
index e7fcc60,8482dc2..3bdb9f3
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,27 -1,9 +1,33 @@@
 +2012-02-07  Lars Ingebrigtsen  <[email protected]>
 +
 +	* gnus-compat.el: Make `help-function-arglist' be compatible on Emacs
 +	23.1.
 +
 +2012-02-07  Katsumi Yamaoka  <[email protected]>
 +
 +	* gnus-sum.el (gnus-summary-show-thread): Revert last two changes.
 +
 +2012-02-07  Lars Ingebrigtsen  <[email protected]>
 +
 +	* message.el (smtpmail-smtp-user): Silence compiler warning.
 +
 +2012-02-06  Lars Ingebrigtsen  <[email protected]>
 +
 +	* message.el (message-multi-smtp-send-mail): Also allow specifying the
 +	SMTP user name.
 +
 +2012-02-06  Katsumi Yamaoka  <[email protected]>
 +
 +	* gnus-sum.el (gnus-summary-show-thread):
 +	next-single-char-property-change may return nil in XEmacs.
 +	(gnus-summary-article-map): Fix typo.
 +
+ 2012-02-08  Lars Ingebrigtsen  <[email protected]>
+ 
+ 	* shr.el: Inhibit getting and sending cookies when fetching pictures.
+ 
+ 	* gnus-html.el (gnus-html-schedule-image-fetching): Ditto.
+ 
  2012-02-07  Lars Ingebrigtsen  <[email protected]>
  
  	* shr.el (shr-remove-trailing-whitespace): Don't strip whitespace from
diff --cc lisp/shr.el
index 9381eb5,386c9c6..236c198
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@@ -232,42 -232,8 +233,42 @@@ the URL of the image to the kill buffe
        (message "Inserting %s..." url)
        (url-retrieve url 'shr-image-fetched
  		    (list (current-buffer) (1- (point)) (point-marker))
- 		    t))))
+ 		    t t))))
  
 +(defun shr-zoom-image ()
 +  "Toggle the image size.
 +The size will be rotated between the default size, the original
 +size, and full-buffer size."
 +  (interactive)
 +  (let ((url (get-text-property (point) 'image-url))
 +	(size (get-text-property (point) 'image-size))
 +	(buffer-read-only nil))
 +    (if (not url)
 +	(message "No image under point")
 +      ;; Delete the old picture.
 +      (while (get-text-property (point) 'image-url)
 +	(forward-char -1))
 +      (forward-char 1)
 +      (let ((start (point)))
 +	(while (get-text-property (point) 'image-url)
 +	  (forward-char 1))
 +	(forward-char -1)
 +	(put-text-property start (point) 'display nil)
 +	(when (> (- (point) start) 2)
 +	  (delete-region start (1- (point)))))
 +      (message "Inserting %s..." url)
 +      (url-retrieve url 'shr-image-fetched
 +		    (list (current-buffer) (1- (point)) (point-marker)
 +			  (list (cons 'size
 +				      (cond ((or (eq size 'default)
 +						 (null size))
 +					     'original)
 +					    ((eq size 'original)
 +					     'full)
 +					    ((eq size 'full)
 +					     'default)))))
 +		    t))))
 +
  ;;; Utility functions.
  
  (defun shr-transform-dom (dom)

-----------------------------------------------------------------------
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    |    6 ++++++
 lisp/gnus-html.el |    2 +-
 lisp/shr.el       |   17 ++++++++---------
 3 files changed, 15 insertions(+), 10 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