diff options
| author | Glenn Morris | 2012-09-05 00:05:56 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-09-05 00:05:56 -0700 |
| commit | 7e570fbf3ef8ccd31df2651f5d2775c5697d5950 (patch) | |
| tree | 2a722a870a0240ded0b1fcffb34f52a1d7d668e3 /lisp/textmodes | |
| parent | 1a1ecd2b14f38fcd995516a71b49c8810eac5828 (diff) | |
| parent | f1220388bca64f31182daacfb2eefcc8053af11a (diff) | |
| download | emacs-7e570fbf3ef8ccd31df2651f5d2775c5697d5950.tar.gz emacs-7e570fbf3ef8ccd31df2651f5d2775c5697d5950.zip | |
Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/picture.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 24a4ac1b033..e663c1b45f4 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el | |||
| @@ -612,13 +612,15 @@ Leaves the region surrounding the rectangle." | |||
| 612 | (define-key map [remap self-insert-command] 'picture-self-insert) | 612 | (define-key map [remap self-insert-command] 'picture-self-insert) |
| 613 | (define-key map [remap self-insert-command] 'picture-self-insert) | 613 | (define-key map [remap self-insert-command] 'picture-self-insert) |
| 614 | (define-key map [remap completion-separator-self-insert-command] | 614 | (define-key map [remap completion-separator-self-insert-command] |
| 615 | 'picture-self-insert) | 615 | 'picture-self-insert) |
| 616 | (define-key map [remap completion-separator-self-insert-autofilling] | 616 | (define-key map [remap completion-separator-self-insert-autofilling] |
| 617 | 'picture-self-insert) | 617 | 'picture-self-insert) |
| 618 | (define-key map [remap forward-char] 'picture-forward-column) | 618 | (define-key map [remap forward-char] 'picture-forward-column) |
| 619 | (define-key map [remap right-char] 'picture-forward-column) | ||
| 619 | (define-key map [remap backward-char] 'picture-backward-column) | 620 | (define-key map [remap backward-char] 'picture-backward-column) |
| 621 | (define-key map [remap left-char] 'picture-backward-column) | ||
| 620 | (define-key map [remap delete-char] 'picture-clear-column) | 622 | (define-key map [remap delete-char] 'picture-clear-column) |
| 621 | ;; There are two possibilities for what is normally on DEL. | 623 | ;; There are two possibilities for what is normally on DEL. |
| 622 | (define-key map [remap backward-delete-char-untabify] | 624 | (define-key map [remap backward-delete-char-untabify] |
| 623 | 'picture-backward-clear-column) | 625 | 'picture-backward-clear-column) |
| 624 | (define-key map [remap delete-backward-char] 'picture-backward-clear-column) | 626 | (define-key map [remap delete-backward-char] 'picture-backward-clear-column) |