From 5f8dc2cad61ead89f6623b30bef22a4deed30e81 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 21 Feb 2012 09:09:19 -0800 Subject: [PATCH] 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 --- admin/FOR-RELEASE | 2 +- lisp/ChangeLog | 6 ++++++ lisp/textmodes/picture.el | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 7ad484a535e..f34903bb8b3 100644 --- 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 af4d233e2d6..a8ab7162618 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-02-21 Glenn Morris + + * textmodes/picture.el (picture-delete-char): Newalias. + (picture-mode-map): Use it. (Bug#10860) + (picture-mode): Doc fix. + 2012-02-21 Juanma Barranquero * newcomment.el (uncomment-region-default): Remove unused binding. diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 911defd8dba..9e8cbb216d1 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -604,6 +604,8 @@ Leaves the region surrounding the rectangle." ;; 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) -- 2.39.2