From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Olum Newsgroups: gmane.emacs.bugs Subject: bug#17560: 24.4.50; wrong type argument if rmail-delete-after-output set Date: Fri, 23 May 2014 14:48:25 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1400870964 25074 80.91.229.3 (23 May 2014 18:49:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 23 May 2014 18:49:24 +0000 (UTC) Cc: 17560@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 23 20:49:17 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WnuWr-0000PJ-6k for geb-bug-gnu-emacs@m.gmane.org; Fri, 23 May 2014 20:49:17 +0200 Original-Received: from localhost ([::1]:45209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnuWq-00083Q-Fe for geb-bug-gnu-emacs@m.gmane.org; Fri, 23 May 2014 14:49:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnuWi-00082M-LA for bug-gnu-emacs@gnu.org; Fri, 23 May 2014 14:49:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnuWd-0006Se-2O for bug-gnu-emacs@gnu.org; Fri, 23 May 2014 14:49:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnuWc-0006Sa-Vf for bug-gnu-emacs@gnu.org; Fri, 23 May 2014 14:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WnuWc-0007j7-Ak for bug-gnu-emacs@gnu.org; Fri, 23 May 2014 14:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ken Olum Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 23 May 2014 18:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17560 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17560-submit@debbugs.gnu.org id=B17560.140087090929643 (code B ref 17560); Fri, 23 May 2014 18:49:02 +0000 Original-Received: (at 17560) by debbugs.gnu.org; 23 May 2014 18:48:29 +0000 Original-Received: from localhost ([127.0.0.1]:58180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WnuW4-0007i2-Cd for submit@debbugs.gnu.org; Fri, 23 May 2014 14:48:28 -0400 Original-Received: from cosmos.phy.tufts.edu ([130.64.83.16]:43553) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WnuW1-0007ht-Uv for 17560@debbugs.gnu.org; Fri, 23 May 2014 14:48:26 -0400 Original-Received: from kdo by cosmos.phy.tufts.edu ([local]:local) with local id 1WnuW1-0005FS-D4 - Using Exim-4.80.1 (MandrivaLinux) MTA (return-path ); Fri, 23 May 2014 14:48:25 -0400 In-Reply-To: <83k39cl7kj.fsf@gnu.org> (message from Eli Zaretskii on Fri, 23 May 2014 20:37:48 +0300) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:89414 Archived-At: --=-=-= Content-Type: text/plain OK. Here is a patch, including NEWS and ChangeLog entries. I made the argument to rmail-delete-forward not optional, and fixed callers. Ken --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=rmail-delete.patch === modified file 'etc/NEWS' --- etc/NEWS 2014-05-17 08:11:31 +0000 +++ etc/NEWS 2014-05-23 18:14:27 +0000 @@ -130,6 +130,9 @@ ** You can access the slots of structures using `cl-struct-slot-value'. +** Functions `rmail-delete-forward' and `rmail-delete-backward' take a +repeat-count argument. + * Changes in Emacs 24.5 on Non-Free Operating Systems === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-05-23 15:54:44 +0000 +++ lisp/ChangeLog 2014-05-23 18:26:24 +0000 @@ -1,3 +1,12 @@ +2014-05-23 Ken Olum + + * mail/rmail.el: (rmail-delete-forward) make `count' arg not optional. + (rmail-auto-file): + * mail/rmailout.el: (rmail-output, rmail-output-as-seen) + (rmail-output-body-to-file): + * mail/rmailout.el: (undigestify-rmail-message): + Supply `count' arg to rmail-delete-forward. + 2014-05-23 Stefan Monnier * minibuffer.el (completion--sreverse): Remove. === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2014-05-05 01:08:54 +0000 +++ lisp/mail/rmail.el 2014-05-23 18:22:56 +0000 @@ -3078,7 +3078,7 @@ ;; If there are no directives left, then it was a complete match. (if (null directive-loop) (if (null folder) - (rmail-delete-forward) + (rmail-delete-forward 1) (if (string= "/dev/null" folder) (rmail-delete-message) (rmail-output folder 1) @@ -3474,7 +3474,7 @@ (rmail-summary-mark-undeleted msg)))))) (rmail-maybe-display-summary))) -(defun rmail-delete-forward (&optional count) +(defun rmail-delete-forward (count) "Delete this message and move to next nondeleted one. Deleted messages stay in the file until the \\[rmail-expunge] command is given. A prefix argument is a repeat count; === modified file 'lisp/mail/rmailout.el' --- lisp/mail/rmailout.el 2014-02-10 01:34:22 +0000 +++ lisp/mail/rmailout.el 2014-05-23 18:03:25 +0000 @@ -514,7 +514,7 @@ (setq count (1- count)) (let ((next-message-p (if rmail-delete-after-output - (rmail-delete-forward) + (rmail-delete-forward 1) (if (> count 0) (rmail-next-undeleted-message 1)))) (num-appended (- orig-count count))) @@ -581,7 +581,7 @@ (setq count (1- count)) (let ((next-message-p (if rmail-delete-after-output - (rmail-delete-forward) + (rmail-delete-forward 1) (if (> count 0) (rmail-next-undeleted-message 1)))) (num-appended (- orig-count count))) @@ -630,6 +630,6 @@ (error "Operation aborted")) (write-region (point) (point-max) file-name)) (if rmail-delete-after-output - (rmail-delete-forward))) + (rmail-delete-forward 1))) ;;; rmailout.el ends here === modified file 'lisp/mail/undigest.el' --- lisp/mail/undigest.el 2014-02-10 01:34:22 +0000 +++ lisp/mail/undigest.el 2014-05-23 18:02:49 +0000 @@ -217,7 +217,7 @@ (rmail-set-message-counters) (set-buffer-modified-p t) (rmail-show-message current) - (rmail-delete-forward) + (rmail-delete-forward 1) (if (rmail-summary-exists) (rmail-select-summary (rmail-update-summary)))) (when error --=-=-=--