procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lisp/simple.el: Avoid warning about `delete-backward-char'.

Browse source
This commit is contained in:
Juanma Barranquero 2011-03-22 16:15:21 +01:00
parent 247c22e185
commit 0b1596c6ad
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-03-22 Juanma Barranquero <lekktu@gmail.com>
* 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.

18
lisp/simple.el
View file

@ -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.