[Emacs-diffs] /srv/bzr/emacs/trunk r107366: Fix picture-mode C-c C-d binding

[Glenn Morris]

------------------------------------------------------------
revno: 107366
fixes bug(s): http://debbugs.gnu.org/10860
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-21 09:09:19 -0800
message:
  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.
modified:
  admin/FOR-RELEASE
  lisp/ChangeLog
  lisp/textmodes/picture.el

=== modified file 'admin/FOR-RELEASE'
--- a/admin/FOR-RELEASE 2012-02-21 13:24:48 +0000
+++ b/admin/FOR-RELEASE 2012-02-21 17:09:19 +0000
@@ -159,7 +159,7 @@
 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-21 14:48:13 +0000
+++ b/lisp/ChangeLog    2012-02-21 17:09:19 +0000
@@ -1,3 +1,9 @@
+2012-02-21  Glenn Morris  <address@hidden>
+
+       * textmodes/picture.el (picture-delete-char): Newalias.
+       (picture-mode-map): Use it.  (Bug#10860)
+       (picture-mode): Doc fix.
+
 2012-02-21  Juanma Barranquero  <address@hidden>
 
        * newcomment.el (uncomment-region-default): Remove unused binding.

=== modified file 'lisp/textmodes/picture.el'
--- a/lisp/textmodes/picture.el 2012-02-21 08:28:18 +0000
+++ b/lisp/textmodes/picture.el 2012-02-21 17:09:19 +0000
@@ -604,6 +604,8 @@
 
 ;; 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 @@
       (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 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)