diff options
| author | Lars Magne Ingebrigtsen | 2012-04-10 04:23:21 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2012-04-10 04:23:21 +0200 |
| commit | 74beb59f81f7e2a9e4ca0ab8aede53b405189507 (patch) | |
| tree | 03a62af7fc5dc7c155db1189d1f453cc3d7f2ed3 | |
| parent | 4bbc3323df984f9614960a066d99460be4a65b4a (diff) | |
| download | emacs-74beb59f81f7e2a9e4ca0ab8aede53b405189507.tar.gz emacs-74beb59f81f7e2a9e4ca0ab8aede53b405189507.zip | |
* simple.el (zap-to-char): Allow zapping using input methods.
Fixes: debbugs:1580
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/simple.el | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e3d7b3f492..6bf4056ba12 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * simple.el (zap-to-char): Allow zapping using input methods | ||
| 4 | (bug#1580). | ||
| 5 | |||
| 3 | * textmodes/fill.el (fill-region): Leave point and mark where they | 6 | * textmodes/fill.el (fill-region): Leave point and mark where they |
| 4 | were before filling (bug#5399). | 7 | were before filling (bug#5399). |
| 5 | 8 | ||
diff --git a/lisp/simple.el b/lisp/simple.el index 9fab1d6dd86..54005ebd2b3 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3487,14 +3487,14 @@ and KILLP is t if a prefix arg was specified." | |||
| 3487 | "Kill up to and including ARGth occurrence of CHAR. | 3487 | "Kill up to and including ARGth occurrence of CHAR. |
| 3488 | Case is ignored if `case-fold-search' is non-nil in the current buffer. | 3488 | Case is ignored if `case-fold-search' is non-nil in the current buffer. |
| 3489 | Goes backward if ARG is negative; error if CHAR not found." | 3489 | Goes backward if ARG is negative; error if CHAR not found." |
| 3490 | (interactive "p\ncZap to char: ") | 3490 | (interactive (list (prefix-numeric-value current-prefix-arg) |
| 3491 | (read-char "Zap to char: " t))) | ||
| 3491 | ;; Avoid "obsolete" warnings for translation-table-for-input. | 3492 | ;; Avoid "obsolete" warnings for translation-table-for-input. |
| 3492 | (with-no-warnings | 3493 | (with-no-warnings |
| 3493 | (if (char-table-p translation-table-for-input) | 3494 | (if (char-table-p translation-table-for-input) |
| 3494 | (setq char (or (aref translation-table-for-input char) char)))) | 3495 | (setq char (or (aref translation-table-for-input char) char)))) |
| 3495 | (kill-region (point) (progn | 3496 | (kill-region (point) (progn |
| 3496 | (search-forward (char-to-string char) nil nil arg) | 3497 | (search-forward (char-to-string char) nil nil arg) |
| 3497 | ; (goto-char (if (> arg 0) (1- (point)) (1+ (point)))) | ||
| 3498 | (point)))) | 3498 | (point)))) |
| 3499 | 3499 | ||
| 3500 | ;; kill-line and its subroutines. | 3500 | ;; kill-line and its subroutines. |