diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-31 00:24:03 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-31 00:24:03 -0400 |
| commit | 40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch) | |
| tree | b56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /lisp/simple.el | |
| parent | f488fb6528738131ef41859e1f04125f2e50efce (diff) | |
| parent | 44f230aa043ebb222aa0876b44d70484d5dd38db (diff) | |
| download | emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz | |
Merge from trunk
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index e4c742b56f4..a414fc77a39 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3346,16 +3346,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. |