Fix picture-mode C-c C-d binding

* lisp/textmodes/picture.el (picture-delete-char): Newalias.
(picture-mode-map): Use it.
(picture-mode): Doc fix.
* admin/FOR-RELEASE: Related markup.

Fixes: debbugs:10860

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 7ad484a535e892cdac0e661b1bf350ff54f11e0a..f34903bb8b377fa0bfa72eef1d092a36156b7339 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -159,7 +159,7 @@ msdog-xtra.texi
 mule.texi         
 m-x.texi          cyd
 package.texi      cyd
-picture-xtra.texi rgm  (see bug#10860)
+picture-xtra.texi rgm
 programs.texi     cyd
 regs.texi         cyd
 rmail.texi        rgm

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af4d233e2d61405d00099f8ad5049bae78f77b2e..a8ab7162618d2fd76758ea1468505a03557e0931 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-21  Glenn Morris  <rgm@gnu.org>
+
+       * textmodes/picture.el (picture-delete-char): Newalias.
+       (picture-mode-map): Use it.  (Bug#10860)
+       (picture-mode): Doc fix.
+
 2012-02-21  Juanma Barranquero  <lekktu@gmail.com>
 
        * newcomment.el (uncomment-region-default): Remove unused binding.

diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 911defd8dba185b7c8e973aa910e873b9d73c34e..9e8cbb216d11e865bdc11825ecdf33fdd8c4338b 100644 (file)
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -604,6 +604,8 @@ Leaves the region surrounding the rectangle."
 \f
 ;; Picture Keymap, entry and exit points.
 
+(defalias 'picture-delete-char 'delete-char)
+
 (defvar picture-mode-map nil)
 
 (defun picture-substitute (oldfun newfun)
@@ -633,7 +635,7 @@ Leaves the region surrounding the rectangle."
       (picture-substitute 'move-end-of-line 'picture-end-of-line)
       (picture-substitute 'mouse-set-point 'picture-mouse-set-point)
 
-      (define-key picture-mode-map "\C-c\C-d" 'delete-char)
+      (define-key picture-mode-map "\C-c\C-d" 'picture-delete-char)
       (define-key picture-mode-map "\e\t" 'picture-toggle-tab-state)
       (define-key picture-mode-map "\t" 'picture-tab)
       (define-key picture-mode-map "\e\t" 'picture-tab-search)
@@ -722,7 +724,7 @@ You can edit tabular text with these commands:
 
 You can manipulate text with these commands:
  Clear ARG columns after point without moving:    \\[picture-clear-column]
- Delete char at point:                            \\[delete-char]
+ Delete char at point:                            \\[picture-delete-char]
  Clear ARG columns backward:                      \\[picture-backward-clear-column]
  Clear ARG lines, advancing over them:            \\[picture-clear-line]
   (the cleared text is saved in the kill ring)