From: Lars Ingebrigtsen Date: Sat, 18 Feb 2012 13:12:22 +0000 (+0100) Subject: merge from no gnus X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=dbe766e74ab0e0764730d3560b372e3d14b6393c merge from no gnus --- dbe766e74ab0e0764730d3560b372e3d14b6393c diff --cc lisp/ChangeLog index 70438d600,4e2174255..ca8d0a624 --- 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 + + * 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 + + * 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 + + * shr.el (shr-rescale-image): Undo previous change; see + . + +2012-02-15 Lars Magne Ingebrigtsen + + * gnus.el: Ma Gnus v0.3 is released. + +2012-02-15 Lars Ingebrigtsen + + * gnus-sum.el (gnus-summary-local-variables): Make + `gnus-newsgroup-unexist' into a local variable. + +2012-02-14 Teodor Zlatanov + + * 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 + + * 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 + + * 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 ++ ++ * shr.el (shr-image-fetched): Make sure we really kill the right ++ buffer. ++ ++2012-02-16 Leo Liu ++ ++ * gnus-start.el (gnus-1): Avoid duplicate entries. ++ 2012-02-15 Lars Ingebrigtsen * shr.el (shr-remove-trailing-whitespace): Really delete the padding on diff --cc lisp/shr.el index 35c7c44df,dd0f1599c..bdb2f4efa --- 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 e3075fb90,69ecc39e6..c64d0c61c --- 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 + + * gnus.texi (Various Summary Stuff): Remove mention of + `gnus-propagate-marks'. + +2012-02-15 Lars Ingebrigtsen + + * gnus.texi: Remove mentions of nnml/nnfolder/nntp backend marks, which + no longer exist. + +2012-02-08 Katsumi Yamaoka + + * gnus.texi (Archived Messages): Document gnus-gcc-self-resent-messages. + +2012-02-06 Lars Ingebrigtsen + + * message.texi (Mail Variables): Mention the optional user parameter + for X-Message-SMTP-Method. + +2012-02-02 Lars Ingebrigtsen + + * gnus.texi (Posting Styles): Mention X-Message-SMTP-Method. + + * message.texi (Mail Variables): Document X-Message-SMTP-Method. + +2012-01-31 Lars Ingebrigtsen + + * gnus.texi (Key Index): Change encoding to utf-8. + ++2012-02-17 Glenn Morris ++ ++ * gnus.texi (Posting Styles): Fix cross-refs to other manual. ++ 2012-02-13 Lars Ingebrigtsen * gnus.texi (Customizing the IMAP Connection): Mention