[Emacs-diffs] trunk r117204: Fix bug #17560 with backward-incompatible API change in rmail-delete-*.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117204
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17560
author: Ken Olum <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2014-05-30 12:33:43 +0300
message:
  Fix bug #17560 with backward-incompatible API change in rmail-delete-*.
  
   lisp/mail/rmail.el (rmail-delete-forward, rmail-delete-backward): The
   argument COUNT is now optional, to be more backward-compatible.
   Doc fix.
  
   etc/NEWS: Document the API change.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mail/rmail.el             rmail.el-20091113204419-o5vbwnq5f7feedwu-8812

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-05-29 03:45:29 +0000
+++ b/etc/NEWS  2014-05-30 09:33:43 +0000
@@ -146,6 +146,9 @@
 
 ** You can access the slots of structures using `cl-struct-slot-value'.
 
+** Functions `rmail-delete-forward' and `rmail-delete-backward' take an
+optional repeat-count argument.
+
 
 * Changes in Emacs 24.5 on Non-Free Operating Systems
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-29 22:51:47 +0000
+++ b/lisp/ChangeLog    2014-05-30 09:33:43 +0000
@@ -1,3 +1,9 @@
+2014-05-30    Ken Olum  <address@hidden>  (tiny change)
+
+       * mail/rmail.el (rmail-delete-forward, rmail-delete-backward): The
+       argument COUNT is now optional, to be more backward-compatible.
+       Doc fix.  (Bug#17560)
+
 2014-05-29  Reuben Thomas  <address@hidden>
 
        * whitespace.el (whitespace-report-region): Simplify

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2014-05-29 03:45:29 +0000
+++ b/lisp/mail/rmail.el        2014-05-30 09:33:43 +0000
@@ -3476,11 +3476,12 @@
 (defun rmail-delete-forward (&optional 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;
+Optional argument COUNT (interactively, prefix argument) is a repeat count;
 negative argument means move backwards instead of forwards.
 
 Returns t if a new message is displayed after the delete, or nil otherwise."
   (interactive "p")
+  (if (not count) (setq count 1))
   (let (value backward)
     (if (< count 0)
        (setq count (- count) backward t))
@@ -3495,15 +3496,16 @@
     (rmail-maybe-display-summary)
     value))
 
-(defun rmail-delete-backward (count)
+(defun rmail-delete-backward (&optional count)
   "Delete this message and move to previous nondeleted one.
 Deleted messages stay in the file until the \\[rmail-expunge] command is given.
-A prefix argument is a repeat count;
+Optional argument COUNT (interactively, prefix argument) is a repeat count;
 negative argument means move forwards instead of backwards.
 
 Returns t if a new message is displayed after the delete, or nil otherwise."
 
   (interactive "p")
+  (if (not count) (setq count 1))
   (rmail-delete-forward (- count)))
 
 ;; Expunging.