diff options
| author | Gnus developers <ding@gnus.org> | 2010-10-11 22:27:28 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-11 22:27:28 +0000 |
| commit | 6b7df8d3dd960dc4d62ffa4eabcdb37043a1c9e2 (patch) | |
| tree | 65d7c544f56420899df91da947a68e6f7e325e38 /lisp/gnus/nnimap.el | |
| parent | 6ec07c5ad9aa8b9292025e0f9ed820b678852896 (diff) | |
| download | emacs-6b7df8d3dd960dc4d62ffa4eabcdb37043a1c9e2.tar.gz | |
Merge changes made in Gnus trunk.
shr.el (shr-tag-hr): Use shr-hr-line to specify which character to use to display hr lines.
shr.el (shr-max-columns): Do not change state to nil if we just inserting spaces.
sieve-manage.el (sieve-manage-open): Allow port names as well as port numbers.
shr.el (shr-current-column, shr-find-fill-point): New functions; start thinking about breaking CJVK text.
nnimap.el (nnimap-transform-split-mail): Not all articles have bodies. Protect against this.
shr.el (shr-insert): Fix up the white space only regexp.
nnimap.el (nnimap-request-rename-group): Select group read-only before renaming it.
Diffstat (limited to 'lisp/gnus/nnimap.el')
| -rw-r--r-- | lisp/gnus/nnimap.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 73b7fbdb733..4c05fb47a40 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -667,6 +667,9 @@ textual parts.") (deffoo nnimap-request-rename-group (group new-name &optional server) (when (nnimap-possibly-change-group nil server) (with-current-buffer (nnimap-buffer) + ;; Make sure we don't have this group open read/write. + (nnimap-command "EXAMINE %S" (utf7-encode group 7)) + (setf (nnimap-group nnimap-object) nil) (car (nnimap-command "RENAME %S %S" (utf7-encode group t) (utf7-encode new-name t)))))) @@ -1627,8 +1630,10 @@ textual parts.") (forward-char (1+ bytes)) (setq bytes (nnimap-get-length)) (delete-region (line-beginning-position) (line-end-position)) - (forward-char (1+ bytes)) - (delete-region (line-beginning-position) (line-end-position)))))) + ;; There's a body; skip past that. + (when bytes + (forward-char (1+ bytes)) + (delete-region (line-beginning-position) (line-end-position))))))) (defun nnimap-dummy-active-number (group &optional server) 1) |