[gnus git] branch master updated: m0-3-17-gdbe766e =5= merge from no gnus ; Be more defensive about killing the correct buffer ; gnus.texi (Posting Styles): Fix cross-refs to other manual ; gnus-start.el (gnus-1): Avoid duplicate entries ; shr.el (shr-rescale-image): Undo previous change; see <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
Lars Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via dbe766e74ab0e0764730d3560b372e3d14b6393c (commit)
via 6bfa8135c0c34c187080add1f7f1e01fae2b4eed (commit)
via b1573a5a75b24fd5831e1f556b1a20b2260340ef (commit)
via 65d7f5e5ad3708684dd19a170958f599acdd6dca (commit)
via c65f964d37feb0a2b8a30040a59a3da6d853d236 (commit)
from f603f1b9ecfb136fd3f7cb43a732482e06be5561 (commit)
- Log -----------------------------------------------------------------
commit dbe766e74ab0e0764730d3560b372e3d14b6393c
Merge: f603f1b 6bfa813
Author: Lars Ingebrigtsen <[email protected]>
Date: Sat Feb 18 14:12:22 2012 +0100
merge from no gnus
diff --cc lisp/ChangeLog
index 70438d6,4e21742..ca8d0a6
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -2,84 -7,6 +7,93 @@@
* gnus-start.el (gnus-1): Avoid duplicate entries.
+2012-02-16 Lars Ingebrigtsen <[email protected]>
+
+ * mm-decode.el (mm-dissect-singlepart): Guess what the type of
+ application/octet-stream parts really is.
+
+ * gnus-sum.el (gnus-propagate-marks): Remove.
+
+2012-02-15 Lars Ingebrigtsen <[email protected]>
+
+ * imap.el: Remove.
+
+ * nntp.el (nntp-coding-system-for-read): Remove.
+ (nntp-coding-system-for-write): Ditto.
+ (nntp-open-connection): Just use `binary' directly.
+
+ * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
+ Gnus 0.3.
+
+2012-02-15 Paul Eggert <[email protected]>
+
+ * shr.el (shr-rescale-image): Undo previous change; see
+ <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+
+2012-02-15 Lars Magne Ingebrigtsen <[email protected]>
+
+ * gnus.el: Ma Gnus v0.3 is released.
+
+2012-02-15 Lars Ingebrigtsen <[email protected]>
+
+ * gnus-sum.el (gnus-summary-local-variables): Make
+ `gnus-newsgroup-unexist' into a local variable.
+
+2012-02-14 Teodor Zlatanov <[email protected]>
+
+ * registry.el (registry-usage-test, registry-persistence-test): Move to
+ tests/gnustest-registry.el.
+ (registry-make-testable-db, registry-match-test)
+ (registry-instantiation-test): Move to tests/gnustest-registry.el.
+
+ * gnus-registry.el (gnus-registry-misc-test)
+ (gnus-registry-usage-test): Move to tests/gnustest-registry.el.
+
+ * tests/gnustest-registry.el: New file with the registry and
+ gnus-registry ERT tests.
+
+2012-02-13 Katsumi Yamaoka <[email protected]>
+
+ * gnus-msg.el (gnus-summary-resend-message): Make
+ gnus-summary-resend-message-insert-gcc be last item in
+ message-header-setup-hook.
+
+2012-02-13 Lars Ingebrigtsen <[email protected]>
+
+ * nnfolder.el (nnfolder-marks-directory, nnfolder-marks-is-evil)
+ (nnfolder-marks, nnfolder-marks-file-suffix, nnfolder-marks-modtime):
+ Remove.
+ (nnfolder-open-server): Don't use marks.
+ (nnfolder-request-delete-group): Ditto.
+ (nnfolder-request-rename-group): Ditto.
+ (nnfolder-request-set-mark, nnfolder-request-marks)
+ (nnfolder-group-marks-pathname, nnfolder-marks-changed-p)
+ (nnfolder-save-marks, nnfolder-open-marks): Remove.
+
+ * nnml.el (nnml-marks-is-evil, nnml-marks-file-name, nnml-marks)
+ (nnml-marks-modtime): Remove.
+ (nnml-request-delete-group): Don't use marks.
+ (nnml-request-rename-group): Ditto.
+ (nnml-request-set-mark, nnml-request-marks, nnml-marks-changed-p)
+ (nnml-save-marks, nnml-open-marks): Remove.
+
+ * nntp.el (nntp-marks-is-evil, nntp-marks-file-name, nntp-marks)
+ (nntp-marks-modtime, nntp-marks-directory, nntp-request-set-mark)
+ (nntp-request-marks, nntp-marks-directory, nntp-marks-changed-p)
+ (nntp-save-marks, nntp-open-marks, nntp-possibly-create-directory)
+ (nntp-server-to-method-cache): Remove.
+
+ * shr.el (shr-rescale-image): Fix wrong merge.
+
++2012-02-18 Lars Ingebrigtsen <[email protected]>
++
++ * shr.el (shr-image-fetched): Make sure we really kill the right
++ buffer.
++
++2012-02-16 Leo Liu <[email protected]>
++
++ * gnus-start.el (gnus-1): Avoid duplicate entries.
++
2012-02-15 Lars Ingebrigtsen <[email protected]>
* shr.el (shr-remove-trailing-whitespace): Really delete the padding on
diff --cc lisp/shr.el
index 35c7c44,dd0f159..bdb2f4e
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@@ -558,42 -523,28 +558,43 @@@ size, and full-buffer size.
(expand-file-name (file-name-nondirectory url)
directory)))))
-(defun shr-image-fetched (status buffer start end)
+(defun shr-image-fetched (status buffer start end &optional flags)
- (when (and (buffer-name buffer)
- (not (plist-get status :error)))
- (url-store-in-cache (current-buffer))
- (when (or (search-forward "\n\n" nil t)
- (search-forward "\r\n\r\n" nil t))
- (let ((data (buffer-substring (point) (point-max))))
- (with-current-buffer buffer
- (save-excursion
- (let ((alt (buffer-substring start end))
- (properties (text-properties-at start))
- (inhibit-read-only t))
- (delete-region start end)
- (goto-char start)
- (funcall shr-put-image-function data alt flags)
- (while properties
- (let ((type (pop properties))
- (value (pop properties)))
- (unless (memq type '(display image-size))
- (put-text-property start (point) type value))))))))))
- (kill-buffer (current-buffer)))
+ (let ((image-buffer (current-buffer)))
+ (when (and (buffer-name buffer)
+ (not (plist-get status :error)))
+ (url-store-in-cache image-buffer)
+ (when (or (search-forward "\n\n" nil t)
+ (search-forward "\r\n\r\n" nil t))
+ (let ((data (buffer-substring (point) (point-max))))
+ (with-current-buffer buffer
+ (save-excursion
+ (let ((alt (buffer-substring start end))
++ (properties (text-properties-at start))
+ (inhibit-read-only t))
+ (delete-region start end)
+ (goto-char start)
- (funcall shr-put-image-function data alt)))))))
++ (funcall shr-put-image-function data alt flags)
++ (while properties
++ (let ((type (pop properties))
++ (value (pop properties)))
++ (unless (memq type '(display image-size))
++ (put-text-property start (point) type value))))))))))
+ (kill-buffer image-buffer)))
-(defun shr-put-image (data alt)
+(defun shr-put-image (data alt &optional flags)
"Put image DATA with a string ALT. Return image."
(if (display-graphic-p)
- (let ((image (ignore-errors
- (shr-rescale-image data))))
+ (let* ((size (cdr (assq 'size flags)))
+ (start (point))
+ (image (cond
+ ((eq size 'original)
+ (create-image data nil t :ascent 100))
+ ((eq size 'full)
+ (ignore-errors
+ (shr-rescale-image data t)))
+ (t
+ (ignore-errors
+ (shr-rescale-image data))))))
(when image
;; When inserting big-ish pictures, put them at the
;; beginning of the line.
@@@ -612,9 -557,7 +613,13 @@@
image)
(insert alt)))
++<<<<<<< HEAD
+(defun shr-rescale-image (data &optional force)
+ "Rescale DATA, if too big, to fit the current buffer.
+If FORCE, rescale the image anyway."
++=======
+ (defun shr-rescale-image (data)
++>>>>>>> origin/no-gnus
(let ((image (create-image data nil t :ascent 100)))
(if (or (not (fboundp 'imagemagick-types))
(not (get-buffer-window (current-buffer))))
diff --cc texi/ChangeLog
index e3075fb,69ecc39..c64d0c6
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@@ -2,35 -2,6 +2,39 @@@
* gnus.texi (Posting Styles): Fix cross-refs to other manual.
+2012-02-16 Lars Ingebrigtsen <[email protected]>
+
+ * gnus.texi (Various Summary Stuff): Remove mention of
+ `gnus-propagate-marks'.
+
+2012-02-15 Lars Ingebrigtsen <[email protected]>
+
+ * gnus.texi: Remove mentions of nnml/nnfolder/nntp backend marks, which
+ no longer exist.
+
+2012-02-08 Katsumi Yamaoka <[email protected]>
+
+ * gnus.texi (Archived Messages): Document gnus-gcc-self-resent-messages.
+
+2012-02-06 Lars Ingebrigtsen <[email protected]>
+
+ * message.texi (Mail Variables): Mention the optional user parameter
+ for X-Message-SMTP-Method.
+
+2012-02-02 Lars Ingebrigtsen <[email protected]>
+
+ * gnus.texi (Posting Styles): Mention X-Message-SMTP-Method.
+
+ * message.texi (Mail Variables): Document X-Message-SMTP-Method.
+
+2012-01-31 Lars Ingebrigtsen <[email protected]>
+
+ * gnus.texi (Key Index): Change encoding to utf-8.
+
++2012-02-17 Glenn Morris <[email protected]>
++
++ * gnus.texi (Posting Styles): Fix cross-refs to other manual.
++
2012-02-13 Lars Ingebrigtsen <[email protected]>
* gnus.texi (Customizing the IMAP Connection): Mention
-----------------------------------------------------------------------
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 | 19 +++++++++++++++++++
lisp/shr.el | 45 +++++++++++++++++++++++++--------------------
texi/ChangeLog | 4 ++++
3 files changed, 48 insertions(+), 20 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