Synch with Emacs trunk.

2010-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 * gnus-uu.el, imap.el, nndoc.el, nnrss.el, rfc2047.el, utf7.el: Replace
 Lisp calls to delete-backward-char by calls to delete-char.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8fee12..ebc1d94 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * gnus-uu.el, imap.el, nndoc.el, nnrss.el, rfc2047.el, utf7.el: Replace
+       Lisp calls to delete-backward-char by calls to delete-char.
+
 2010-05-20  Kevin Ryde  <user42@zip.com.au>
 
        * gnus-start.el (gnus-level-unsubscribed): Doc fix.  (Bug#6206)

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 3cce1e6..86cd78c 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1488,7 +1488,7 @@ When called interactively, prompt for REGEXP."
       (when gnus-uu-kill-carriage-return
        (save-excursion
          (while (search-forward "\r" nil t)
-           (delete-backward-char 1))))
+           (delete-char -1))))
 
       (while (or (re-search-forward gnus-uu-begin-string nil t)
                 (re-search-forward gnus-uu-body-line nil t))

diff --git a/lisp/imap.el b/lisp/imap.el
index 9f1afc5..f9c89cd 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -2095,7 +2095,7 @@ Return nil if no complete line has arrived."
        (while (setq end (imap-find-next-line))
          (save-restriction
            (narrow-to-region (point-min) end)
-           (delete-backward-char (length imap-server-eol))
+           (delete-char (- (length imap-server-eol)))
            (goto-char (point-min))
            (unwind-protect
                (cond ((eq imap-state 'initial)

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 981570c..375e300 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -741,7 +741,7 @@ from the document.")
        (setq p (1+ (nth 3 blk)))))
     (goto-char begin)
     (while (re-search-forward "\r$" nil t)
-      (delete-backward-char 1))
+      (delete-char -1))
     (when head
       (goto-char begin)
       (when (search-forward "\n\n" nil t)

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 08b6219..db1df33 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -682,7 +682,7 @@ which RSS 2.0 allows."
       (rfc2047-encode-region (point-min) (point-max)))
     (goto-char (point-min))
     (while (search-forward "\n" nil t)
-      (delete-backward-char 1))
+      (delete-char -1))
     (buffer-string)))
 
 ;;; Snarf functions

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index e13dffc..840b02a 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -427,7 +427,7 @@ Dynamically bind `rfc2047-encoding-type' to change that."
                      ;; since encoded words can't occur in quotes.
                      (progn
                        (goto-char end)
-                       (delete-backward-char 1)
+                       (delete-char -1)
                        (goto-char start)
                        (delete-char 1)
                        (when last-encoded
@@ -897,7 +897,7 @@ them.")
                  (goto-char beg)
                  (while (search-forward "\\" nil 'move)
                    (unless (memq (char-after) '(?\"))
-                     (delete-backward-char 1))
+                     (delete-char -1))
                    (forward-char)))
                (forward-char))
            (error

diff --git a/lisp/utf7.el b/lisp/utf7.el
index ebf01d1..ec8111f 100644 (file)
--- a/lisp/utf7.el
+++ b/lisp/utf7.el
@@ -112,7 +112,7 @@ Use IMAP modification if FOR-IMAP is non-nil."
                 (skip-chars-forward not-direct-encoding-chars)))
            (if (and (= fc esc-char)
                     (= run-length 1))  ; Lone esc-char?
-               (delete-backward-char 1) ; Now there's one too many
+               (delete-char -1)        ; Now there's one too many
              (utf7-fragment-encode p (point) for-imap))
            (insert "-")))))))
 
@@ -153,7 +153,7 @@ Use IMAP modification if FOR-IMAP is non-nil."
              (save-excursion
                (utf7-fragment-decode p (point) for-imap)
                (goto-char p)
-               (delete-backward-char 1)))))))))
+               (delete-char -1)))))))))
 
 (defun utf7-fragment-decode (start end &optional for-imap)
   "Decode base64 encoded fragment from START to END of UTF-7 text in buffer.