From 6e50ef5ff55a58815346806e847ebc20c05a29a1 Mon Sep 17 00:00:00 2001 From: kaoru Date: Tue, 24 Aug 2010 00:20:50 +0000 Subject: [PATCH] * acap.el (acap-arrival-filter): Use (delete-char (- X)) instead of (delete-backward-char X) that deletes region in Emacs 24. See delete-active-region described in NEWS. * elmo-imap4.el (elmo-imap4-arrival-filter): Ditto. * elmo-util.el (elmo-get-file-string): Ditto. * utf7.el (utf7-encode-internal, utf7-decode-internal): Ditto. --- elmo/ChangeLog | 9 +++++++++ elmo/acap.el | 2 +- elmo/elmo-imap4.el | 2 +- elmo/elmo-util.el | 2 +- elmo/utf7.el | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 90dd1ad..da8918d 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,12 @@ +2010-08-24 TAKAHASHI Kaoru + + * acap.el (acap-arrival-filter): Use (delete-char (- X)) instead of + (delete-backward-char X) that deletes region in Emacs 24. + See delete-active-region described in NEWS. + * elmo-imap4.el (elmo-imap4-arrival-filter): Ditto. + * elmo-util.el (elmo-get-file-string): Ditto. + * utf7.el (utf7-encode-internal, utf7-decode-internal): Ditto. + 2010-08-09 David Maus * elmo.el (elmo-folder-open-internal-p): New luna method. diff --git a/elmo/acap.el b/elmo/acap.el index c2ad7e3..a21501f 100644 --- a/elmo/acap.el +++ b/elmo/acap.el @@ -587,7 +587,7 @@ ENTRIES is a store-entry list." (while (setq end (acap-find-next-line)) (save-restriction (narrow-to-region (point-min) end) - (delete-backward-char (length acap-server-eol)) + (delete-char (- (length acap-server-eol))) (goto-char (point-min)) (unwind-protect (cond ((or (eq acap-state 'auth) diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index a526fe4..9e15e29 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -1314,7 +1314,7 @@ Return nil if no complete line has arrived." (while (setq end (elmo-imap4-find-next-line)) (save-restriction (narrow-to-region (point-min) end) - (delete-backward-char (length elmo-imap4-server-eol)) + (delete-char (- (length elmo-imap4-server-eol))) (goto-char (point-min)) (unwind-protect (case elmo-imap4-status diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el index af9664f..ed5377a 100644 --- a/elmo/elmo-util.el +++ b/elmo/elmo-util.el @@ -508,7 +508,7 @@ Return value is a cons cell of (STRUCTURE . REST)" (> (buffer-size) 0) (= (char-after (1- (point-max))) ?\n)) (goto-char (point-max)) - (delete-backward-char 1)) + (delete-char -1)) (buffer-string))))) (defun elmo-save-string (string filename) diff --git a/elmo/utf7.el b/elmo/utf7.el index 30fdb74..dd38408 100644 --- a/elmo/utf7.el +++ b/elmo/utf7.el @@ -136,7 +136,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 "-"))))))) @@ -185,7 +185,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. -- 1.7.10.4