From: yamaoka <yamaoka>
Date: Sun, 22 Aug 2004 22:51:35 +0000 (+0000)
Subject: Synch to No Gnus 200408222214.
X-Git-Tag: t-gnus-6_17_4-quimby-~797
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dfa95a508add539f84c9125f6f1c73501d36f860;p=elisp%2Fgnus.git-

Synch to No Gnus 200408222214.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee6ecfe..5d98437 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2004-08-22  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-mlspl.el (gnus-group-split-update): Fix docstring.
+
+2004-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* gnus-art.el: Use inhibit-read-only instead of buffer-read-only.
+	(gnus-narrow-to-page): Don't assume point-min == 1.
+	(gnus-article-edit-mode): Derive from message-mode.
+
+	* gnus-score.el (gnus-score-find-bnews): Simplify and don't assume
+	point-min == 1.
+
+	* imap.el (imap-parse-address-list, imap-parse-body-ext):
+	Disable incorrect use of `assert'.
+
+	* message.el (message-mode): Set comment-start-skip.
+
+
+2004-08-22  Sam Steingold  <sds@gnu.org>
+
+	* pop3.el (pop3-leave-mail-on-server): New user variable.
+	(pop3-movemail): Delete mail only when it is nil.
+
 2004-08-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* nntp.el (nntp-marks-is-evil): Fix typo in docstring.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index adefa7e..fd3ab99 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1593,7 +1593,7 @@ Initialized from `text-mode-syntax-table.")
   `(save-excursion
      (set-buffer gnus-article-buffer)
      (save-restriction
-       (let ((buffer-read-only nil)
+       (let ((inhibit-read-only t)
 	     (inhibit-point-motion-hooks t)
 	     (case-fold-search t))
 	 (article-narrow-to-head)
@@ -1605,7 +1605,7 @@ Initialized from `text-mode-syntax-table.")
 (defmacro gnus-with-article-buffer (&rest forms)
   `(save-excursion
      (set-buffer gnus-article-buffer)
-     (let ((buffer-read-only nil))
+     (let ((inhibit-read-only t))
        ,@forms)))
 
 (put 'gnus-with-article-buffer 'lisp-indent-function 0)
@@ -1775,7 +1775,7 @@ always hide."
 	     (not gnus-show-all-headers))
     (save-excursion
       (save-restriction
-	(let ((buffer-read-only nil)
+	(let ((inhibit-read-only t)
 	      (list gnus-boring-article-headers)
 	      (inhibit-point-motion-hooks t)
 	      elem)
@@ -1929,7 +1929,7 @@ always hide."
 (defun article-normalize-headers ()
   "Make all header lines 40 characters long."
   (interactive)
-  (let ((buffer-read-only nil)
+  (let ((inhibit-read-only t)
 	column)
     (save-excursion
       (save-restriction
@@ -1973,7 +1973,7 @@ FROM is a string of characters to translate from; to is a string of
 characters to translate to."
   (save-excursion
     (when (article-goto-body)
-      (let ((buffer-read-only nil)
+      (let ((inhibit-read-only t)
 	    (x (make-string 225 ?x))
 	    (i -1))
 	(while (< (incf i) (length x))
@@ -1989,7 +1989,7 @@ characters to translate to."
 MAP is an alist where the elements are on the form (\"from\" \"to\")."
   (save-excursion
     (when (article-goto-body)
-      (let ((buffer-read-only nil)
+      (let ((inhibit-read-only t)
 	    elem)
 	(while (setq elem (pop map))
 	  (save-excursion
@@ -2001,7 +2001,7 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
   (interactive)
   (save-excursion
     (when (article-goto-body)
-      (let ((buffer-read-only nil))
+      (let ((inhibit-read-only t))
 	(while (search-forward "\b" nil t)
 	  (let ((next (char-after))
 		start end previous)
@@ -2033,7 +2033,7 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
   (interactive)
   (save-excursion
     (when (article-goto-body)
-      (let ((buffer-read-only nil))
+      (let ((inhibit-read-only t))
 	(ansi-color-apply-on-region (point) (point-max))))))
 
 (defun gnus-article-treat-unfold-headers ()
@@ -2132,7 +2132,7 @@ unfolded."
   "Fill lines that are wider than the window width."
   (interactive)
   (save-excursion
-    (let ((buffer-read-only nil)
+    (let ((inhibit-read-only t)
 	  (width (window-width (get-buffer-window (current-buffer)))))
       (save-restriction
 	(article-goto-body)
@@ -2152,7 +2152,7 @@ unfolded."
   "Capitalize the first word in each sentence."
   (interactive)
   (save-excursion
-    (let ((buffer-read-only nil)
+    (let ((inhibit-read-only t)
 	  (paragraph-start "^[\n\^L]"))
       (article-goto-body)
       (while (not (eobp))
@@ -2163,7 +2163,7 @@ unfolded."
   "Remove trailing CRs and then translate remaining CRs into LFs."
   (interactive)
   (save-excursion
-    (let ((buffer-read-only nil))
+    (let ((inhibit-read-only t))
       (goto-char (point-min))
       (while (re-search-forward "\r+$" nil t)
 	(replace-match "" t t))
@@ -2175,7 +2175,7 @@ unfolded."
   "Remove all trailing blank lines from the article."
   (interactive)
   (save-excursion
-    (let ((buffer-read-only nil))
+    (let ((inhibit-read-only t))
       (goto-char (point-max))
       (delete-region
        (point)
@@ -2194,7 +2194,7 @@ unfolded."
 (defun article-display-face ()
   "Display any Face headers in the header."
   (interactive)
-  (let ((wash-face-p buffer-read-only))
+  (let ((wash-face-p (inhibit-read-only t)))
     (gnus-with-article-headers
       ;; When displaying parts, this function can be called several times on
       ;; the same article, without any intended toggle semantic (as typing `W
@@ -2234,7 +2234,7 @@ unfolded."
 (defun article-display-x-face (&optional force)
   "Look for an X-Face header and display it if present."
   (interactive (list 'force))
-  (let ((wash-face-p buffer-read-only))	;; When type `W f'
+  (let ((wash-face-p (inhibit-read-only t)))	;; When type `W f'
     (gnus-with-article-headers
       ;; Delete the old process, if any.
       (when (process-status "article-x-face")
@@ -2311,7 +2311,7 @@ unfolded."
 If PROMPT (the prefix), prompt for a coding system to use."
   (interactive "P")
   (let ((inhibit-point-motion-hooks t) (case-fold-search t)
-	buffer-read-only
+	(inhibit-read-only t)
 	(mail-parse-charset gnus-newsgroup-charset)
 	(mail-parse-ignored-charsets
 	 (save-excursion (condition-case nil
@@ -2354,16 +2354,16 @@ If PROMPT (the prefix), prompt for a coding system to use."
 
 (defun article-decode-encoded-words ()
   "Remove encoded-word encoding from headers."
-  (let (buffer-read-only)
-    (let ((charset (save-excursion
-		     (set-buffer gnus-summary-buffer)
-		     default-mime-charset)))
-      (mime-decode-header-in-buffer charset))))
+  (let ((charset (save-excursion
+		   (set-buffer gnus-summary-buffer)
+		   default-mime-charset))
+	(inhibit-read-only t))
+    (mime-decode-header-in-buffer charset)))
 
 (defun article-decode-group-name ()
   "Decode group names in `Newsgroups:'."
   (let ((inhibit-point-motion-hooks t)
-	buffer-read-only
+	(inhibit-read-only t)
 	(method (gnus-find-method-for-group gnus-newsgroup-name)))
     (when (and (or gnus-group-name-charset-method-alist
 		   gnus-group-name-charset-group-alist)
@@ -2407,7 +2407,7 @@ If PROMPT (the prefix), prompt for a coding system to use."
   (when gnus-use-idna
     (save-restriction
       (let ((inhibit-point-motion-hooks t)
-	    buffer-read-only)
+	    (inhibit-read-only t))
 	(article-narrow-to-head)
 	(goto-char (point-min))
 	(while (re-search-forward "@.*\\(xn--[-A-Za-z0-9.]*\\)[ \t\n\r,>]" nil t)
@@ -2428,7 +2428,7 @@ or not.
 If READ-CHARSET, ask for a coding system."
   (interactive (list 'force current-prefix-arg))
   (save-excursion
-    (let ((buffer-read-only nil) type charset)
+    (let ((inhibit-read-only t) type charset)
       (if (gnus-buffer-live-p gnus-original-article-buffer)
 	  (with-current-buffer gnus-original-article-buffer
 	    (setq type
@@ -2458,7 +2458,7 @@ If FORCE, decode the article whether it is marked as base64 not.
 If READ-CHARSET, ask for a coding system."
   (interactive (list 'force current-prefix-arg))
   (save-excursion
-    (let ((buffer-read-only nil) type charset)
+    (let ((inhibit-read-only t) type charset)
       (if (gnus-buffer-live-p gnus-original-article-buffer)
 	  (with-current-buffer gnus-original-article-buffer
 	    (setq type
@@ -2493,14 +2493,14 @@ If READ-CHARSET, ask for a coding system."
   (interactive)
   (require 'rfc1843)
   (save-excursion
-    (let ((buffer-read-only nil))
+    (let ((inhibit-read-only t))
       (rfc1843-decode-region (point-min) (point-max)))))
 
 (defun article-unsplit-urls ()
   "Remove the newlines that some other mailers insert into URLs."
   (interactive)
   (save-excursion
-    (let ((buffer-read-only nil))
+    (let ((inhibit-read-only t))
       (goto-char (point-min))
       (while (re-search-forward
 	      "^\\(\\(https?\\|ftp\\)://\\S-+\\) *\n\\(\\S-+\\)" nil t)
@@ -2514,7 +2514,7 @@ If READ-CHARSET, ask for a coding system."
 If READ-CHARSET, ask for a coding system."
   (interactive "P")
   (save-excursion
-    (let ((buffer-read-only nil)
+    (let ((inhibit-read-only t)
 	  charset)
       (when (gnus-buffer-live-p gnus-original-article-buffer)
 	(with-current-buffer gnus-original-article-buffer
@@ -2580,7 +2580,7 @@ The `gnus-list-identifiers' variable specifies what to do."
 	(regexp (if (consp gnus-list-identifiers)
 		    (mapconcat 'identity gnus-list-identifiers " *\\|")
 		  gnus-list-identifiers))
-	buffer-read-only)
+	(inhibit-read-only t))
     (when regexp
       (save-excursion
 	(save-restriction
@@ -2602,7 +2602,7 @@ always hide."
   (interactive (gnus-article-hidden-arg))
   (unless (gnus-article-check-hidden-text 'pem arg)
     (save-excursion
-      (let (buffer-read-only end)
+      (let ((inhibit-read-only t) end)
 	(goto-char (point-min))
 	;; Hide the horrendously ugly "header".
 	(when (and (search-forward
@@ -2659,7 +2659,7 @@ always hide."
     (save-restriction
       (let ((inhibit-point-motion-hooks t)
 	    (gnus-signature-limit nil)
-	    buffer-read-only)
+	    (inhibit-read-only t))
 	(article-goto-body)
 	(cond
 	 ((eq banner 'signature)
@@ -2703,7 +2703,7 @@ always hide."
 	    (article-goto-body))
 	(goto-char (point-min)))
       (unless (gnus-article-check-hidden-text 'signature arg)
-	(let ((buffer-read-only nil)
+	(let ((inhibit-read-only t)
 	      (button (point)))
 	  (while (setq button (text-property-any button (point-max)
 						 'gnus-callback
@@ -2733,7 +2733,7 @@ always hide."
   (interactive)
   (save-excursion
     (let ((inhibit-point-motion-hooks t)
-	  buffer-read-only)
+	  (inhibit-read-only t))
       (when (article-goto-body)
 	(while (and (not (eobp))
 		    (looking-at "[ \t]*$"))
@@ -2768,7 +2768,7 @@ Point is left at the beginning of the narrowed-to region."
   (interactive)
   (save-excursion
     (let ((inhibit-point-motion-hooks t)
-	  buffer-read-only)
+	  (inhibit-read-only t))
       ;; First make all blank lines empty.
       (article-goto-body)
       (while (re-search-forward "^[ \t]+$" nil t)
@@ -2787,7 +2787,7 @@ Point is left at the beginning of the narrowed-to region."
   (interactive)
   (save-excursion
     (let ((inhibit-point-motion-hooks t)
-	  buffer-read-only)
+	  (inhibit-read-only t))
       (article-goto-body)
       (while (re-search-forward "^[ \t]+" nil t)
 	(replace-match "" t t)))))
@@ -2797,7 +2797,7 @@ Point is left at the beginning of the narrowed-to region."
   (interactive)
   (save-excursion
     (let ((inhibit-point-motion-hooks t)
-	  buffer-read-only)
+	  (inhibit-read-only t))
       (article-goto-body)
       (while (re-search-forward "[ \t]+$" nil t)
 	(replace-match "" t t)))))
@@ -2814,7 +2814,7 @@ Point is left at the beginning of the narrowed-to region."
   (interactive)
   (save-excursion
     (let ((inhibit-point-motion-hooks t)
-	  buffer-read-only)
+	  (inhibit-read-only t))
       (article-goto-body)
       (while (re-search-forward "^[ \t]*\n" nil t)
 	(replace-match "" t t)))))
@@ -2903,7 +2903,7 @@ means show, 0 means toggle."
 (defun gnus-article-show-hidden-text (type &optional dummy)
   "Show all hidden text of type TYPE.
 Originally it is hide instead of DUMMY."
-  (let ((buffer-read-only nil)
+  (let ((inhibit-read-only t)
 	(inhibit-point-motion-hooks t))
     (gnus-remove-text-properties-when
      'article-type type
@@ -2967,7 +2967,7 @@ should replace the \"Date:\" one, or should be added below it."
 			   date)
 		  eface (get-text-property (1- (point-at-eol))
 					   'face)))
-	  (let ((buffer-read-only nil))
+	  (let ((inhibit-read-only t))
 	    ;; Delete any old X-Sent headers.
 	    (when (setq date-pos
 			(text-property-any (point-min) (point-max)
@@ -3196,7 +3196,7 @@ This format is defined by the `gnus-article-time-format' variable."
 ;;   (interactive)
 ;;   (save-excursion
 ;;     (widen)
-;;     (let ((buffer-read-only nil))
+;;     (let ((inhibit-read-only t))
 ;;       (gnus-article-unhide-text (point-min) (point-max))
 ;;       (gnus-remove-text-with-property 'gnus-prev)
 ;;       (gnus-remove-text-with-property 'gnus-next))))
@@ -3208,7 +3208,7 @@ This format is defined by the `gnus-article-time-format' variable."
     (save-restriction
       (widen)
       (article-narrow-to-head)
-      (let ((buffer-read-only nil))
+      (let ((inhibit-read-only t))
 	(gnus-article-unhide-text (point-min) (point-max))))))
 
 (defun article-remove-leading-whitespace ()
@@ -3216,7 +3216,7 @@ This format is defined by the `gnus-article-time-format' variable."
   (interactive)
   (save-excursion
     (save-restriction
-      (let ((buffer-read-only nil))
+      (let ((inhibit-read-only t))
 	(article-narrow-to-head)
 	(goto-char (point-min))
 	(while (re-search-forward "^[^ :]+: \\([ \t]+\\)" nil t)
@@ -3233,7 +3233,7 @@ This format is defined by the `gnus-article-time-format' variable."
 			  gnus-article-emphasis-alist)
 		      (error))
 		    gnus-emphasis-alist))
-	    (buffer-read-only nil)
+	    (inhibit-read-only t)
 	    (props (append '(article-type emphasis)
 			   gnus-hidden-properties))
 	    regexp elem beg invisible visible face)
@@ -3625,7 +3625,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
 			(mm-handle-multipart-ctl-parameter
 			 mm-security-handle 'gnus-info)))))
 	  (when info
-	    (let (buffer-read-only bface eface)
+	    (let ((inhibit-read-only t) bface eface)
 	      (save-restriction
 		(message-narrow-to-head)
 		(goto-char (point-max))
@@ -3667,7 +3667,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
     (require 'navi2ch-mona)
     (set-face-font (make-face 'gnus-mona-face) navi2ch-mona-font))
   (save-excursion
-    (let ((buffer-read-only nil))
+    (let ((inhibit-read-only t))
       (article-goto-body)
       (gnus-overlay-put
        (gnus-make-overlay (point) (point-max))
@@ -3957,7 +3957,7 @@ commands:
 (defun gnus-article-display-traditional-message ()
   "Article display method for traditional message."
   (set-buffer gnus-article-buffer)
-  (let (buffer-read-only)
+  (let ((inhibit-read-only t))
     (erase-buffer)
     (insert-buffer-substring gnus-original-article-buffer)))
 
@@ -4015,7 +4015,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 	(when (and (boundp 'transient-mark-mode)
 		   transient-mark-mode)
 	  (setq mark-active nil))
-	(if (not (setq result (let ((buffer-read-only nil))
+	(if (not (setq result (let ((inhibit-read-only t))
 				(gnus-request-article-this-buffer
 				 article group))))
 	    ;; There is no such article.
@@ -4175,7 +4175,8 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 (defun gnus-article-prepare-display ()
   "Make the current buffer look like a nice article."
   (let ((gnus-article-buffer (current-buffer))
-	buffer-read-only)
+	buffer-read-only
+	(inhibit-read-only t))
     (unless (eq major-mode 'gnus-article-mode)
       (gnus-article-mode))
     (setq buffer-read-only nil
@@ -4331,7 +4332,7 @@ General format specifiers can also be used.  See Info node
 	(mm-remove-parts handles)
 	(goto-char (point-min))
 	(or (search-forward "\n\n") (goto-char (point-max)))
-	(let (buffer-read-only)
+	(let ((inhibit-read-only t))
 	  (delete-region (point) (point-max))
 	  (mm-display-parts handles))))))
 
@@ -4608,7 +4609,7 @@ are decompressed."
   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
 	 contents charset
 	 (b (point))
-	 buffer-read-only)
+	 (inhibit-read-only t))
     (when handle
       (if (and (not arg) (mm-handle-undisplayer handle))
 	  (mm-remove-part handle)
@@ -4643,7 +4644,7 @@ specified charset."
   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
 	 contents charset
 	 (b (point))
-	 buffer-read-only)
+	 (inhibit-read-only t))
     (when handle
       (if (mm-handle-undisplayer handle)
 	  (mm-remove-part handle))
@@ -4682,7 +4683,7 @@ If no internal viewer is available, use an external viewer."
 	 (mail-parse-ignored-charsets
 	  (with-current-buffer gnus-summary-buffer
 	    gnus-newsgroup-ignored-charsets))
-	 buffer-read-only)
+	 (inhibit-read-only t))
     (when handle
       (if (mm-handle-undisplayer handle)
 	  (mm-remove-part handle)
@@ -4785,7 +4786,7 @@ N is the numerical prefix."
   "Display HANDLE and fix MIME button."
   (let ((id (get-text-property (point) 'gnus-part))
 	(point (point))
-	buffer-read-only)
+	(inhibit-read-only t))
     (forward-line 1)
     (prog1
 	(let ((window (selected-window))
@@ -4915,7 +4916,7 @@ N is the numerical prefix."
 			  (mm-dissect-buffer nil gnus-article-loose-mime)
 			  (and gnus-article-emulate-mime
 			       (mm-uu-dissect))))
-	     buffer-read-only handle name type b e display)
+	     (inhibit-read-only t) handle name type b e display)
 	(when (and (not ihandles)
 		   (not gnus-displaying-mime))
 	  ;; Top-level call; we clean up.
@@ -5108,7 +5109,7 @@ If displaying \"text/html\" is discouraged \(see
   (let* ((preferred (or preferred (mm-preferred-alternative handles)))
 	 (ihandles handles)
 	 (point (point))
-	 handle buffer-read-only from props begend not-pref)
+	 handle (inhibit-read-only t) from props begend not-pref)
     (save-window-excursion
       (save-restriction
 	(when ibegend
@@ -5313,7 +5314,7 @@ If given a numerical ARG, move forward ARG pages."
     (widen)
     ;; Remove any old next/prev buttons.
     (when (gnus-visual-p 'page-marker)
-      (let ((buffer-read-only nil))
+      (let ((inhibit-read-only t))
 	(gnus-remove-text-with-property 'gnus-prev)
 	(gnus-remove-text-with-property 'gnus-next)))
     (if
@@ -5333,7 +5334,7 @@ If given a numerical ARG, move forward ARG pages."
 	   (match-beginning 0)
 	 (point)))
       (when (and (gnus-visual-p 'page-marker)
-		 (not (= (point-min) 1)))
+		 (> (point-min) (save-restriction (widen) (point-min))))
 	(save-excursion
 	  (goto-char (point-min))
 	  (gnus-insert-prev-page-button)))
@@ -5790,7 +5791,7 @@ If given a prefix, show the hidden text instead."
 		  (backend (car (gnus-find-method-for-group
 				 gnus-newsgroup-name)))
 		  result
-		  (buffer-read-only nil))
+		  (inhibit-read-only t))
 	      (if (or (not (listp methods))
 		      (and (symbolp (car methods))
 			   (assq (car methods) nnoo-definition-alist)))
@@ -5842,7 +5843,7 @@ If given a prefix, show the hidden text instead."
 	    (buffer-disable-undo)
 	    (setq major-mode 'gnus-original-article-mode)
 	    (setq buffer-read-only t))
-	  (let (buffer-read-only)
+	  (let ((inhibit-read-only t))
 	    (erase-buffer)
 	    (insert-buffer-substring gnus-article-buffer))
 	  (setq gnus-original-article (cons group article)))
@@ -5946,7 +5947,7 @@ If given a prefix, show the hidden text instead."
     ["Body" message-goto-body t]
     ["Signature" message-goto-signature t]))
 
-(define-derived-mode gnus-article-edit-mode text-mode "Article Edit"
+(define-derived-mode gnus-article-edit-mode message-mode "Article Edit"
   "Major mode for editing articles.
 This is an extended text-mode.
 
@@ -6858,7 +6859,7 @@ It does this by highlighting everything after
   (interactive)
   (save-excursion
     (set-buffer gnus-article-buffer)
-    (let ((buffer-read-only nil)
+    (let ((inhibit-read-only t)
 	  (inhibit-point-motion-hooks t))
       (when (gnus-article-search-signature)
 	(gnus-article-add-button (match-beginning 0) (match-end 0)
@@ -7203,7 +7204,7 @@ specified by `gnus-button-alist'."
 
 (defun gnus-insert-prev-page-button ()
   (let ((b (point))
-	(buffer-read-only nil)
+	(inhibit-read-only t)
 	(situation (get-text-property (point-min) 'mime-view-situation)))
     (gnus-eval-format
      gnus-prev-page-line-format nil
@@ -7238,7 +7239,7 @@ specified by `gnus-button-alist'."
 
 (defun gnus-insert-next-page-button ()
   (let ((b (point))
-	(buffer-read-only nil)
+	(inhibit-read-only t)
 	(situation (get-text-property (point-min) 'mime-view-situation)))
     (gnus-eval-format gnus-next-page-line-format nil
 		      `(keymap ,gnus-next-page-map
@@ -7275,7 +7276,7 @@ specified by `gnus-button-alist'."
   "List of methods used to decode headers.
 
 This variable is a list of FUNCTION or (REGEXP . FUNCTION).  If item
-is FUNCTION, FUNCTION will be apply to all newsgroups.  If item is a
+is FUNCTION, FUNCTION will be applied to all newsgroups.  If item is a
 \(REGEXP . FUNCTION), FUNCTION will be only apply to the newsgroups
 whose names match REGEXP.
 
@@ -7432,7 +7433,7 @@ For example:
 	  (setq references
 		(or (mail-header-references gnus-current-headers) ""))
 	  (set-buffer gnus-article-buffer)
-	  (let* ((buffer-read-only nil)
+	  (let* ((inhibit-read-only t)
 		 (headers
 		  (mapcar (lambda (field)
 			    (and (save-restriction
@@ -7510,7 +7511,7 @@ For example:
 (defun gnus-mime-security-verify-or-decrypt (handle)
   (mm-remove-parts (cdr handle))
   (let ((region (mm-handle-multipart-ctl-parameter handle 'gnus-region))
-	point buffer-read-only)
+	point (inhibit-read-only t))
     (if region
 	(goto-char (car region)))
     (save-restriction
@@ -7540,7 +7541,7 @@ For example:
 		 (not (get-text-property (point) 'gnus-mime-details)))
 		(gnus-mime-security-button-line-format
 		 (get-text-property (point) 'gnus-line-format))
-		buffer-read-only)
+		(inhibit-read-only t))
 	    (forward-char -1)
 	    (while (eq (get-text-property (point) 'gnus-line-format)
 		       gnus-mime-security-button-line-format)
diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el
index f1f939e..a6232d3 100644
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -1,6 +1,6 @@
 ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
@@ -74,8 +74,9 @@ match any of the group-specified splitting rules.  See
 
 ;;;###autoload
 (defun gnus-group-split-update (&optional catch-all)
-  "Computes `nnmail-split-fancy' from group params and CATCH-ALL, by
-calling (gnus-group-split-fancy nil nil CATCH-ALL).
+  "Computes nnmail-split-fancy from group params and CATCH-ALL.
+It does this by calling by calling (gnus-group-split-fancy nil
+nil CATCH-ALL).
 
 If CATCH-ALL is nil, `gnus-group-split-default-catch-all-group' is used
 instead.  This variable is set by `gnus-group-split-setup'."
diff --git a/lisp/imap.el b/lisp/imap.el
index 5e53259..d71a114 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -2058,7 +2058,9 @@ Return nil if no complete line has arrived."
 	(when (eq (char-after) ?\))
 	  (imap-forward)
 	  (nreverse addresses)))
-    (assert (imap-parse-nil) t "In imap-parse-address-list")))
+    ;; With assert, the code might not be eval'd.
+    ;; (assert (imap-parse-nil) t "In imap-parse-address-list")
+    (imap-parse-nil)))
 
 ;;   mailbox         = "INBOX" / astring
 ;;                       ; INBOX is case-insensitive.  All case variants of
@@ -2623,7 +2625,9 @@ Return nil if no complete line has arrived."
 	      (imap-forward)
 	      (push (imap-parse-string-list) dsp)
 	      (imap-forward))
-	  (assert (imap-parse-nil) t "In imap-parse-body-ext"))
+	  ;; With assert, the code might not be eval'd.
+	  ;; (assert (imap-parse-nil) t "In imap-parse-body-ext")
+	  (imap-parse-nil))
 	(push (nreverse dsp) ext))
       (when (eq (char-after) ?\ ) ;; body-fld-lang
 	(imap-forward)
diff --git a/lisp/message.el b/lisp/message.el
index c6f2844..c8f9fad 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2692,7 +2692,11 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
 	(copy-sequence message-startup-parameter-alist))
   (message-setup-fill-variables)
   ;; Allow using comment commands to add/remove quoting.
-  (set (make-local-variable 'comment-start) message-yank-prefix)
+  ;; (set (make-local-variable 'comment-start) message-yank-prefix)
+  (when message-yank-prefix
+    (set (make-local-variable 'comment-start) message-yank-prefix)
+    (set (make-local-variable 'comment-start-skip)
+	 (concat "^" (regexp-quote message-yank-prefix) "[ \t]*")))
   (if (featurep 'xemacs)
       (message-setup-toolbar)
     (set (make-local-variable 'font-lock-defaults)
diff --git a/lisp/pop3.el b/lisp/pop3.el
index 9a184db..4dcfc65 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -1,6 +1,6 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
@@ -98,6 +98,9 @@
 Defaults to 'pass, for the standard USER/PASS authentication.  Other valid
 values are 'apop.")
 
+(defvar pop3-leave-mail-on-server nil
+  "*Non-nil if the mail is to be left on the POP server after fetching.")
+
 (defvar pop3-timestamp nil
   "Timestamp returned when initially connected to the POP server.
 Used for APOP authentication.")
diff --git a/texi/ChangeLog b/texi/ChangeLog
index dc720a4..a484325 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-22  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Mail Source Specifiers): Describe
+	`pop3-leave-mail-on-server'.
+
 2004-08-17  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* gnus.texi (IMAP): add comments about imaps synonym to imap in
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 43577c6..b776f5e 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -12879,6 +12879,8 @@ fetchmail %u@@%s -P %p %t
 
 @code{:program} と @code{:function} キーワードが指定されていないと、
 @code{pop3-movemail} が使用されます。
+@code{pop3-leave-mail-on-server} が非-@code{nil} だったら、メールは取得
+後でも POP サーバーに残されます。
 
 これはいくつかの例です。初期利用者名で、初期 @acronym{POP} サーバーから
 取得し、初期取得方法を使用します:
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 2f1a30a..bd8daa3 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -13637,7 +13637,9 @@ message retrieval.  The default is @code{nil}.
 @end table
 
 If the @code{:program} and @code{:function} keywords aren't specified,
-@code{pop3-movemail} will be used.
+@code{pop3-movemail} will be used.  If the
+@code{pop3-leave-mail-on-server} is non-@code{nil} the mail is to be
+left on the POP server after fetching.
 
 Here are some examples.  Fetch from the default @acronym{POP} server,
 using the default user name, and default fetcher: