From f9a998c365893585a8b33fba9a00320348c0b34b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 21 Feb 2012 00:28:18 -0800 Subject: [PATCH] Checked picture-xtra.texi * doc/emacs/picture-xtra.texi (Basic Picture): C-a does get remapped. * lisp/textmodes/picture.el (picture-motion, picture-motion-reverse) (picture-self-insert, picture-tab-chars): Doc fix. (picture-mode-map): Fix C-a, C-e. * admin/FOR-RELEASE: Related markup. --- admin/FOR-RELEASE | 2 +- doc/emacs/ChangeLog | 2 ++ doc/emacs/picture-xtra.texi | 7 ++++--- lisp/ChangeLog | 6 ++++++ lisp/textmodes/picture.el | 18 ++++++++++-------- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 6db804b6a1f..d1150b6d60b 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -161,7 +161,7 @@ msdog-xtra.texi mule.texi m-x.texi cyd package.texi cyd -picture-xtra.texi +picture-xtra.texi rgm (see bug#10860) programs.texi cyd regs.texi cyd rmail.texi rgm diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 747db511782..6f2e87ac36d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,7 @@ 2012-02-21 Glenn Morris + * picture-xtra.texi (Basic Picture): C-a does get remapped. + * ack.texi (Acknowledgments): Small changes, including resorting, and removal of things no longer distributed. diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index 629baaf9c52..5a10bf2c31c 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -78,9 +78,10 @@ column, converting a tab to multiple spaces if necessary. @kbd{C-n} and @code{picture-move-up}, which can either insert spaces or convert tabs as necessary to make sure that point stays in exactly the same column. @kbd{C-e} runs @code{picture-end-of-line}, which moves to after the last -nonblank character on the line. There is no need to change @kbd{C-a}, -as the choice of screen model does not affect beginnings of -lines. +nonblank character on the line. @kbd{C-a} runs +@code{picture-beginning-of-line}. (The choice of screen model does not +affect beginnings of lines; the only extra thing this command does is +update the current picture column to 0.) @findex picture-newline Insertion of text is adapted to the quarter-plane screen model diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1512024695c..5cb9afc1311 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-02-21 Glenn Morris + + * textmodes/picture.el (picture-motion, picture-motion-reverse) + (picture-self-insert, picture-tab-chars): Doc fix. + (picture-mode-map): Fix C-a, C-e. + 2012-02-20 Glenn Morris * emacs-lisp/authors.el (authors-aliases): Add another entry. diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 577e12b9b40..911defd8dba 100644 --- 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-2012 Free Software Foundation, Inc. ;; Author: K. Shane Hartman ;; Maintainer: FSF @@ -211,7 +211,7 @@ The mode line is updated to reflect the current direction." "Move point in direction of current picture motion in Picture mode. With ARG do it that many times. Useful for delineating rectangles in conjunction with diagonal picture motion. -Do \\[command-apropos] picture-movement to see commands which control motion." +Use \"\\[command-apropos] picture-movement\" to see commands which control motion." (interactive "^p") (picture-move-down (* arg picture-vertical-step)) (picture-forward-column (* arg picture-horizontal-step))) @@ -220,7 +220,7 @@ Do \\[command-apropos] picture-movement to see commands which control motion." "Move point in direction opposite of current picture motion in Picture mode. With ARG do it that many times. Useful for delineating rectangles in conjunction with diagonal picture motion. -Do \\[command-apropos] picture-movement to see commands which control motion." +Use \"\\[command-apropos] picture-movement\" to see commands which control motion." (interactive "^p") (picture-motion (- arg))) @@ -280,7 +280,7 @@ Do \\[command-apropos] picture-movement to see commands which control motion." "Insert this character in place of character previously at the cursor. The cursor then moves in the direction you previously specified with the commands `picture-movement-right', `picture-movement-up', etc. -Do \\[command-apropos] `picture-movement' to see those commands." +Use \"\\[command-apropos] picture-movement\" to see those commands." (interactive "p") (picture-update-desired-column (not (eq this-command last-command))) (picture-insert last-command-event arg)) ; Always a character in this case. @@ -378,8 +378,10 @@ With positive argument insert that many lines." (defcustom picture-tab-chars "!-~" "A character set which controls behavior of commands. -\\[picture-set-tab-stops] and \\[picture-tab-search]. It is NOT a -regular expression, any regexp special characters will be quoted. +\\[picture-set-tab-stops] and \\[picture-tab-search]. +The syntax for this variable is like the syntax used inside of `[...]' +in a regular expression--but without the `[' and the `]'. +It is NOT a regular expression, any regexp special characters will be quoted. It defines a set of \"interesting characters\" to look for when setting \(or searching for) tab stops, initially \"!-~\" (all printing characters). For example, suppose that you are editing a table which is formatted thus: @@ -627,8 +629,8 @@ Leaves the region surrounding the rectangle." (picture-substitute 'newline-and-indent 'picture-duplicate-line) (picture-substitute 'next-line 'picture-move-down) (picture-substitute 'previous-line 'picture-move-up) - (picture-substitute 'beginning-of-line 'picture-beginning-of-line) - (picture-substitute 'end-of-line 'picture-end-of-line) + (picture-substitute 'move-beginning-of-line 'picture-beginning-of-line) + (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) -- 2.39.2