summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog97
-rw-r--r--lisp/gnus/auth-source.el1
-rw-r--r--lisp/gnus/gnus-art.el4
-rw-r--r--lisp/gnus/gnus-async.el1
-rw-r--r--lisp/gnus/gnus-demon.el3
-rw-r--r--lisp/gnus/gnus-int.el2
-rw-r--r--lisp/gnus/gnus-msg.el2
-rw-r--r--lisp/gnus/gnus-picon.el1
-rw-r--r--lisp/gnus/gnus-registry.el2
-rw-r--r--lisp/gnus/gnus-start.el4
-rw-r--r--lisp/gnus/gnus-sum.el8
-rw-r--r--lisp/gnus/gravatar.el1
-rw-r--r--lisp/gnus/gssapi.el1
-rw-r--r--lisp/gnus/message.el1
-rw-r--r--lisp/gnus/mm-decode.el4
-rw-r--r--lisp/gnus/mml1991.el4
-rw-r--r--lisp/gnus/nnimap.el44
-rw-r--r--lisp/gnus/nnir.el8
-rw-r--r--lisp/gnus/nnml.el3
-rw-r--r--lisp/gnus/nntp.el9
-rw-r--r--lisp/gnus/shr.el32
-rw-r--r--lisp/gnus/sieve-manage.el1
22 files changed, 182 insertions, 51 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 38b9139b7dd..e58b6cc7773 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,93 @@
+2012-02-23 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * nntp.el (nntp-send-authinfo): Work for secure nntp entry in authinfo.
+
+2012-02-20 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * mm-decode.el (mm-shr): Remove "soft hyphens".
+
+ * nnimap.el (nnimap-request-list): Return the group names encoded as
+ utf8. Otherwise non-European group names don't work.
+ (nnimap-request-newgroups): Ditto.
+
+ * gnus-sum.el (gnus-summary-insert-old-articles): Fix the syntax for
+ the default in `read-string' (bug#10757).
+
+ * gnus-msg.el (gnus-group-post-news): Don't bug out on `C-u a' on
+ topics (bug#10843).
+
+ * nnimap.el (nnimap-log-command): Add the IMAP address to the log
+ buffer. Suggested by Herbert Valerio Riedel.
+ (nnimap-request-move-article): Delete the message from the correct IMAP
+ server.
+
+2012-02-19 Vida Gábor <vidagabor@gmail.com> (tiny change)
+
+ * gnus-demon.el (gnus-demon-init): Don't multiply time twice.
+ Reported by Peter Münster.
+
+2012-02-18 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * shr.el (shr-image-fetched): Make sure we really kill the right
+ buffer.
+
+2012-02-16 Leo Liu <sdl.web@gmail.com>
+
+ * gnus-start.el (gnus-1): Avoid duplicate entries.
+
+2012-02-15 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * shr.el (shr-remove-trailing-whitespace): Really delete the padding on
+ too-wide lines.
+
+2012-02-15 Paul Eggert <eggert@cs.ucla.edu>
+
+ * shr.el (shr-rescale-image): Undo previous change; see
+ <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+
+2012-02-13 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * nnimap.el (nnimap-record-commands): New variable.
+ (nnimap-log-command): Use it.
+ (nnimap-make-process-buffer): Add a space to the process buffer.
+ (nnimap-transform-headers): Don't bug out on header lines containing
+ stuff that look like IMAP length encodings.
+
+ * shr.el (shr-rescale-image): Allow viewing large images.
+
+2012-02-12 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * nnml.el (nnml-request-compact-group): Delete the marks file after
+ compaction (bug#10800).
+
+ * gnus-art.el (gnus-stop-downloads): Stop `url-queue' downloads on
+ group exit.
+
+ * nnimap.el (nnimap-parse-flags): Parse correctly when we have mixed
+ QRESYNC/FETCH output.
+
+2012-02-11 Glenn Morris <rgm@gnu.org>
+
+ * sieve-manage.el (sieve-manage-default-stream):
+ * shr.el (shr):
+ * nnir.el (nnir-ignored-newsgroups, nnir-summary-line-format)
+ (nnir-retrieve-headers-override-function)
+ (nnir-imap-default-search-key, nnir-notmuch-program)
+ (nnir-notmuch-additional-switches, nnir-notmuch-remove-prefix)
+ (nnir-method-default-engines):
+ * message.el (message-cite-reply-position):
+ * gssapi.el (gssapi-program):
+ * gravatar.el (gravatar):
+ * gnus-sum.el (gnus-refer-thread-use-nnir):
+ * gnus-registry.el (gnus-registry-unfollowed-addresses)
+ (gnus-registry-max-pruned-entries):
+ * gnus-picon.el (gnus-picon-inhibit-top-level-domains):
+ * gnus-int.el (gnus-after-set-mark-hook)
+ (gnus-before-update-mark-hook):
+ * gnus-async.el (gnus-async-post-fetch-function):
+ * auth-source.el (auth-source-cache-expiry):
+ Add missing :version tags to new defcustoms and defgroups.
+
2012-02-10 Lars Ingebrigtsen <larsi@gnus.org>
* message.el (message-default-send-mail-function): Made into own
@@ -44,7 +134,7 @@
have newlines within the strings, and where the UID comes after the
BODYSTRUCTURE element (bug#10537).
- * shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix
+ * shr-color.el (shr-color-set-minimum-interval): Rename to add prefix
(bug#10732).
* shr.el (shr-insert-document): Add doc string.
@@ -2008,11 +2098,6 @@
(gnus-registry--split-fancy-with-parent-internal): Fix splitting bugs
and provide better messaging.
-2011-04-06 David Engster <dengste@eml.cc>
-
- * Makefile.in (fail-on-warning): New rule to compile with warnings as
- errors.
-
2011-04-06 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-registry.el: Don't use ERT if it's not available. Load it
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 5e946372d04..80a3b91b60a 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -84,6 +84,7 @@
"How many seconds passwords are cached, or nil to disable
expiring. Overrides `password-cache-expiry' through a
let-binding."
+ :version "24.1"
:group 'auth-source
:type '(choice (const :tag "Never" nil)
(const :tag "All Day" 86400)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b282afd961c..048f8956567 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4582,6 +4582,10 @@ commands:
(when (eq (elt timer 5) 'image-animate-timeout)
(cancel-timer timer))))
+(defun gnus-stop-downloads ()
+ (when (boundp 'url-queue)
+ (set (intern "url-queue" obarray) nil)))
+
;; Set article window start at LINE, where LINE is the number of lines
;; from the head of the article.
(defun gnus-article-set-window-start (&optional line)
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 378b0e063cb..603952dd17b 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -74,6 +74,7 @@ It should return non-nil if the article is to be prefetched."
"Function called after an article has been prefetched.
The function will be called narrowed to the region of the article
that was fetched."
+ :version "24.1"
:group 'gnus-asynchronous
:type 'function)
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index c91c725658a..d0baf25d5d9 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -137,8 +137,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
;; (func nil number)
;; Only call when Emacs has been idle for `idle'
((and (null time) (numberp idle))
- (run-with-idle-timer (* idle gnus-demon-timestep) t
- 'gnus-demon-run-callback func))
+ (run-with-idle-timer idle t 'gnus-demon-run-callback func))
;; (func number any)
;; Call every `time'
((eq time-type 'integer)
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 20add470abe..8dc691ffe42 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -43,11 +43,13 @@
(defcustom gnus-after-set-mark-hook nil
"Hook called just after marks are set in a group."
+ :version "24.1"
:group 'gnus-start
:type 'hook)
(defcustom gnus-before-update-mark-hook nil
"Hook called just before marks are updated in a group."
+ :version "24.1"
:group 'gnus-start
:type 'hook)
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index f92dc5e91d0..bf75f94c195 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -640,7 +640,7 @@ a news."
(if (= 1 (prefix-numeric-value arg))
(gnus-group-completing-read "Newsgroup" nil
(gnus-read-active-file-p))
- (gnus-group-group-name))
+ (or (gnus-group-group-name) ""))
""))
;; make sure last viewed article doesn't affect posting styles:
(gnus-article-copy))
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 69b65dfcb03..2f347efe579 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -87,6 +87,7 @@ added right to the textual representation."
(defcustom gnus-picon-inhibit-top-level-domains t
"If non-nil, don't piconify top-level domains.
These are often not very interesting."
+ :version "24.1"
:type 'boolean
:group 'gnus-picon)
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 9df6dc4ab6f..f1618b376ef 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -142,6 +142,7 @@ display.")
The addresses are matched, they don't have to be fully qualified.
In the messages, these addresses can be the sender or the
recipients."
+ :version "24.1"
:group 'gnus-registry
:type '(repeat regexp))
@@ -243,6 +244,7 @@ the Bit Bucket."
(defcustom gnus-registry-max-pruned-entries nil
"Maximum number of pruned entries in the registry, nil for unlimited."
+ :version "24.1"
:group 'gnus-registry
:type '(radio (const :format "Unlimited " nil)
(integer :format "Maximum number: %v")))
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 9b1d5681e6c..bb7dd76d590 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -763,8 +763,8 @@ prompt the user for the name of an NNTP server to use."
;; Add "native" to gnus-predefined-server-alist just to have a
;; name for the native select method.
(when gnus-select-method
- (push (cons "native" gnus-select-method)
- gnus-predefined-server-alist))
+ (add-to-list 'gnus-predefined-server-alist
+ (cons "native" gnus-select-method)))
(if gnus-agent
(gnus-agentize))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 63482eea1c4..9770b8f9982 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -122,6 +122,7 @@ If t, fetch all the available old headers."
"*Use nnir to search an entire server when referring threads. A
nil value will only search for thread-related articles in the
current group."
+ :version "24.1"
:group 'gnus-thread
:type 'boolean)
@@ -7318,6 +7319,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
(when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer
(gnus-article-stop-animations)
+ (gnus-stop-downloads)
(mm-destroy-parts gnus-article-mime-handles)
;; Set it to nil for safety reason.
(setq gnus-article-mime-handle-alist nil)
@@ -9655,6 +9657,7 @@ C-u g', show the raw article."
(when (gnus-buffer-live-p gnus-article-buffer)
(with-current-buffer gnus-article-buffer
(gnus-article-stop-animations)
+ (gnus-stop-downloads)
(mm-destroy-parts gnus-article-mime-handles)
;; Set it to nil for safety reason.
(setq gnus-article-mime-handle-alist nil)
@@ -12857,9 +12860,8 @@ If ALL is a number, fetch this number of articles."
(if initial "max" "default")
len)
nil nil
- (if initial
- (cons (number-to-string initial)
- 0)))))
+ (and initial
+ (number-to-string initial)))))
(unless (string-match "^[ \t]*$" input)
(setq all (string-to-number input))
(if (< all len)
diff --git a/lisp/gnus/gravatar.el b/lisp/gnus/gravatar.el
index 75e74803743..a10ea21b96b 100644
--- a/lisp/gnus/gravatar.el
+++ b/lisp/gnus/gravatar.el
@@ -29,6 +29,7 @@
(defgroup gravatar nil
"Gravatar."
+ :version "24.1"
:group 'comm)
(defcustom gravatar-automatic-caching t
diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el
index 4bc93924723..ab8831dc49e 100644
--- a/lisp/gnus/gssapi.el
+++ b/lisp/gnus/gssapi.el
@@ -37,6 +37,7 @@
and %l with the user name. The program should accept commands on
stdin and return responses to stdout. Each entry in the list is
tried until a successful connection is made."
+ :version "24.1"
:group 'network
:type '(repeat string))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 2d8bb36f94a..4ce9279114b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1095,6 +1095,7 @@ probably want to set this variable only for specific groups,
e.g. using `gnus-posting-styles':
(eval (set (make-local-variable 'message-cite-reply-position) 'above))"
+ :version "24.1"
:type '(choice (const :tag "Reply inline" 'traditional)
(const :tag "Reply above" 'above)
(const :tag "Reply below" 'below))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index dd3eb6c9d96..09617384049 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1757,6 +1757,10 @@ If RECURSIVE, search recursively."
(string-to-number (match-string 2)))
mm-extra-numeric-entities)))
(replace-match (char-to-string char))))
+ ;; Remove "soft hyphens".
+ (goto-char (point-min))
+ (while (search-forward "­" nil t)
+ (replace-match "" t t))
(libxml-parse-html-region (point-min) (point-max))))
(mm-handle-set-undisplayer
handle
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index bc62e16edaf..97de6f0959b 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -1,10 +1,10 @@
;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
-;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
;; Author: Sascha Lüdecke <sascha@meta-x.de>,
;; Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
-;; Keywords PGP
+;; Keywords: PGP
;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index de4d248c624..f978b8c9906 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -201,7 +201,10 @@ textual parts.")
(while (re-search-forward
"[^]][ (]{\\([0-9]+\\)}\r?\n"
(save-excursion
- (or (re-search-forward "\\* [0-9]+ FETCH" nil t)
+ ;; Start of the header section.
+ (or (re-search-forward "] {[0-9]+}\r?\n" nil t)
+ ;; Start of the next FETCH.
+ (re-search-forward "\\* [0-9]+ FETCH" nil t)
(point-max)))
t)
(setq size (string-to-number (match-string 1)))
@@ -289,7 +292,7 @@ textual parts.")
(defun nnimap-make-process-buffer (buffer)
(with-current-buffer
- (generate-new-buffer (format "*nnimap %s %s %s*"
+ (generate-new-buffer (format " *nnimap %s %s %s*"
nnimap-address nnimap-server-port
(gnus-buffer-exists-p buffer)))
(mm-disable-multibyte)
@@ -865,6 +868,7 @@ textual parts.")
;; Move the article to a different method.
(let ((result (eval accept-form)))
(when result
+ (nnimap-possibly-change-group group server)
(nnimap-delete-article article)
result)))))))
@@ -1187,7 +1191,8 @@ textual parts.")
(dolist (response responses)
(let* ((sequence (car response))
(response (cadr response))
- (group (cadr (assoc sequence sequences))))
+ (group (cadr (assoc sequence sequences)))
+ (egroup (encode-coding-string group 'utf-8)))
(when (and group
(equal (caar response) "OK"))
(let ((uidnext (nnimap-find-parameter "UIDNEXT" response))
@@ -1199,15 +1204,14 @@ textual parts.")
(setq highest (1- (string-to-number (car uidnext)))))
(cond
((null highest)
- (insert (format "%S 0 1 y\n" (utf7-decode group t))))
+ (insert (format "%S 0 1 y\n" egroup)))
((zerop exists)
;; Empty group.
- (insert (format "%S %d %d y\n"
- (utf7-decode group t)
+ (insert (format "%S %d %d y\n" egroup
highest (1+ highest))))
(t
;; Return the widest possible range.
- (insert (format "%S %d 1 y\n" (utf7-decode group t)
+ (insert (format "%S %d 1 y\n" egroup
(or highest exists)))))))))
t)))))
@@ -1219,7 +1223,7 @@ textual parts.")
(nnimap-get-groups)))
(unless (assoc group nnimap-current-infos)
;; Insert dummy numbers here -- they don't matter.
- (insert (format "%S 0 1 y\n" (utf7-encode group)))))
+ (insert (format "%S 0 1 y\n" (encode-coding-string group 'utf-8)))))
t)))
(deffoo nnimap-retrieve-group-data-early (server infos)
@@ -1539,7 +1543,8 @@ textual parts.")
(defun nnimap-parse-flags (sequences)
(goto-char (point-min))
- ;; Change \Delete etc to %Delete, so that the reader can read it.
+ ;; Change \Delete etc to %Delete, so that the Emacs Lisp reader can
+ ;; read it.
(subst-char-in-region (point-min) (point-max)
?\\ ?% t)
;; Remove any MODSEQ entries in the buffer, because they may contain
@@ -1610,7 +1615,9 @@ textual parts.")
vanished highestmodseq)
articles)
groups)
- (goto-char end)
+ (if (eq flag-sequence 'qresync)
+ (goto-char end)
+ (setq end (point)))
(setq articles nil))))
groups))
@@ -1693,13 +1700,18 @@ textual parts.")
(nnimap-wait-for-response nnimap-sequence))
nnimap-sequence)
+(defvar nnimap-record-commands nil
+ "If non-nil, log commands to the \"*imap log*\" buffer.")
+
(defun nnimap-log-command (command)
- (with-current-buffer (get-buffer-create "*imap log*")
- (goto-char (point-max))
- (insert (format-time-string "%H:%M:%S") " "
- (if nnimap-inhibit-logging
- "(inhibited)\n"
- command)))
+ (when nnimap-record-commands
+ (with-current-buffer (get-buffer-create "*imap log*")
+ (goto-char (point-max))
+ (insert (format-time-string "%H:%M:%S")
+ " [" nnimap-address "] "
+ (if nnimap-inhibit-logging
+ "(inhibited)\n"
+ command))))
command)
(defun nnimap-command (&rest args)
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 1d4f1c25a09..d1ca0213ed9 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -310,6 +310,7 @@ is `(valuefunc member)'."
(defcustom nnir-ignored-newsgroups ""
"*A regexp to match newsgroups in the active file that should
be skipped when searching."
+ :version "24.1"
:type '(regexp)
:group 'nnir)
@@ -324,6 +325,7 @@ with three items unique to nnir summary buffers:
%g Article original short group name (string)
If nil this will use `gnus-summary-line-format'."
+ :version "24.1"
:type '(string)
:group 'nnir)
@@ -335,6 +337,7 @@ retrieved header format.
If this variable is nil, or if the provided function returns nil for a search
result, `gnus-retrieve-headers' will be called instead."
+ :version "24.1"
:type '(function)
:group 'nnir)
@@ -342,6 +345,7 @@ result, `gnus-retrieve-headers' will be called instead."
"*The default IMAP search key for an nnir search. Must be one of
the keys in `nnir-imap-search-arguments'. To use raw imap queries
by default set this to \"Imap\"."
+ :version "24.1"
:type `(choice ,@(mapcar (lambda (elem) (list 'const (car elem)))
nnir-imap-search-arguments))
:group 'nnir)
@@ -503,6 +507,7 @@ arrive at the correct group name, \"mail.misc\"."
(defcustom nnir-notmuch-program "notmuch"
"*Name of notmuch search executable."
+ :version "24.1"
:type '(string)
:group 'nnir)
@@ -513,6 +518,7 @@ Note that this should be a list. Ie, do NOT use the following:
(setq nnir-notmuch-additional-switches \"-i -w\") ; wrong
Instead, use this:
(setq nnir-notmuch-additional-switches '(\"-i\" \"-w\"))"
+ :version "24.1"
:type '(repeat (string))
:group 'nnir)
@@ -523,6 +529,7 @@ regular expression.
This variable is very similar to `nnir-namazu-remove-prefix', except
that it is for notmuch, not Namazu."
+ :version "24.1"
:type '(regexp)
:group 'nnir)
@@ -573,6 +580,7 @@ Add an entry here when adding a new search engine.")
'((nnimap . imap)
(nntp . gmane))
"*Alist of default search engines keyed by server method."
+ :version "24.1"
:type `(repeat (cons (choice (const nnimap) (const nttp) (const nnspool)
(const nneething) (const nndir) (const nnmbox)
(const nnml) (const nnmh) (const nndraft)
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index acb23ed1693..b8652600ae7 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1298,6 +1298,9 @@ Use the nov database for the current group if available."
(nnml-save-nov)
;; b/ Save the active file:
(nnmail-save-active nnml-group-alist nnml-active-file)
+ (let ((marks (nnml-group-pathname group nnml-marks-file-name server)))
+ (when (file-exists-p marks)
+ (delete-file marks)))
t)))))
(defun nnml-request-compact (&optional server)
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 98393a61764..621aece8920 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1252,10 +1252,11 @@ If SEND-IF-FORCE, only send authinfo to the server if the
(let* ((list (netrc-parse nntp-authinfo-file))
(alist (netrc-machine list nntp-address "nntp"))
(auth-info
- (nth 0 (auth-source-search :max 1
- :host (list nntp-address
- (nnoo-current-server 'nntp))
- :port '("119" "nntp"))))
+ (nth 0 (auth-source-search
+ :max 1
+ :host (list nntp-address (nnoo-current-server 'nntp))
+ :port `("119" "nntp" ,(format "%s" nntp-port-number)
+ "563" "nntps" "snews"))))
(auth-user (plist-get auth-info :user))
(auth-force (plist-get auth-info :force))
(auth-passwd (plist-get auth-info :secret))
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 386c9c62b67..dd0f1599c36 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -35,6 +35,7 @@
(defgroup shr nil
"Simple HTML Renderer"
+ :version "24.1"
:group 'mail)
(defcustom shr-max-image-proportion 0.9
@@ -159,7 +160,7 @@ DOM should be a parse tree as generated by
(goto-char start)
(while (not (eobp))
(end-of-line)
- (when (> (current-column) width)
+ (when (> (shr-previous-newline-padding-width (current-column)) width)
(dolist (overlay (overlays-at (point)))
(when (overlay-get overlay 'before-string)
(overlay-put overlay 'before-string nil))))
@@ -523,20 +524,21 @@ the URL of the image to the kill buffer instead."
directory)))))
(defun shr-image-fetched (status buffer start end)
- (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))
- (inhibit-read-only t))
- (delete-region start end)
- (goto-char start)
- (funcall shr-put-image-function data alt)))))))
- (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))
+ (inhibit-read-only t))
+ (delete-region start end)
+ (goto-char start)
+ (funcall shr-put-image-function data alt)))))))
+ (kill-buffer image-buffer)))
(defun shr-put-image (data alt)
"Put image DATA with a string ALT. Return image."
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 4712cab6bff..74bcbcc7899 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -157,6 +157,7 @@ for doing the actual authentication."
(defcustom sieve-manage-default-stream 'network
"Default stream type to use for `sieve-manage'.
Must be a name of a stream in `sieve-manage-stream-alist'."
+ :version "24.1"
:type 'symbol
:group 'sieve-manage)
View Lorry Controller Status