From: Juanma Barranquero Date: Tue, 22 Mar 2011 15:15:21 +0000 (+0100) Subject: lisp/simple.el: Avoid warning about `delete-backward-char'. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~518 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b1596c6ad031990c4c73029d235840ad6cbb536;p=emacs.git lisp/simple.el: Avoid warning about `delete-backward-char'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2d2a21eaa4..c90d4e5e3ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-03-22 Juanma Barranquero + * simple.el (backward-delete-char-untabify): + Avoid warning about using `delete-backward-char'. + * image.el (image-type-file-name-regexps): Make it variable. `imagemagick-register-types' modifies it, and the user may want to add new extensions for known image types. diff --git a/lisp/simple.el b/lisp/simple.el index 7391ff82585..bd7d5da257e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3392,16 +3392,16 @@ and KILLP is t if a prefix arg was specified." (delete-char 1))) (forward-char -1) (setq count (1- count)))))) - (delete-backward-char - (let ((skip (cond ((eq backward-delete-char-untabify-method 'hungry) " \t") + (let* ((skip (cond ((eq backward-delete-char-untabify-method 'hungry) " \t") ((eq backward-delete-char-untabify-method 'all) - " \t\n\r")))) - (if skip - (let ((wh (- (point) (save-excursion (skip-chars-backward skip) - (point))))) - (+ arg (if (zerop wh) 0 (1- wh)))) - arg)) - killp)) + " \t\n\r"))) + (n (if skip + (let ((wh (- (point) (save-excursion (skip-chars-backward skip) + (point))))) + (+ arg (if (zerop wh) 0 (1- wh)))) + arg))) + ;; Avoid warning about delete-backward-char + (with-no-warnings (delete-backward-char n killp)))) (defun zap-to-char (arg char) "Kill up to and including ARGth occurrence of CHAR.