Merge from trunk after a lot of time.

[gnu-emacs] / lisp / textmodes / picture.el

diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 24a4ac1b033c3a8333da151791de9c225cdb406f..21c86dd38f351db6616f88bc8e2967f6178d527d 100644 (file)
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -1,6 +1,6 @@
 ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model
 
-;; Copyright (C) 1985, 1994, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -612,13 +612,15 @@ Leaves the region surrounding the rectangle."
     (define-key map [remap self-insert-command] 'picture-self-insert)
     (define-key map [remap self-insert-command] 'picture-self-insert)
     (define-key map [remap completion-separator-self-insert-command]
-      'picture-self-insert)
+                         'picture-self-insert)
     (define-key map [remap completion-separator-self-insert-autofilling]
-      'picture-self-insert)
+                         'picture-self-insert)
     (define-key map [remap forward-char] 'picture-forward-column)
+    (define-key map [remap right-char] 'picture-forward-column)
     (define-key map [remap backward-char] 'picture-backward-column)
+    (define-key map [remap left-char] 'picture-backward-column)
     (define-key map [remap delete-char] 'picture-clear-column)
-    ;; There are two possibilities for what is normally on DEL.
+      ;; There are two possibilities for what is normally on DEL.
     (define-key map [remap backward-delete-char-untabify]
       'picture-backward-clear-column)
     (define-key map [remap delete-backward-char] 'picture-backward-clear-column)