[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105887: * lisp/textmodes/picture.el:
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105887: * lisp/textmodes/picture.el: Make motion commands obey shift-select-mode. |
Date: |
Fri, 23 Sep 2011 10:47:01 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105887
author: Peter J. Weisberg <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-23 10:47:01 -0400
message:
* lisp/textmodes/picture.el: Make motion commands obey shift-select-mode.
(picture-newline): Use forward-line so as to ignore fields.
modified:
lisp/ChangeLog
lisp/textmodes/picture.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-09-23 14:32:36 +0000
+++ b/lisp/ChangeLog 2011-09-23 14:47:01 +0000
@@ -1,3 +1,8 @@
+2011-09-23 Peter J. Weisberg <address@hidden>
+
+ * textmodes/picture.el: Make motion commands obey shift-select-mode.
+ (picture-newline): Use forward-line so as to ignore fields.
+
2011-09-23 Stefan Monnier <address@hidden>
* subr.el (with-wrapper-hook): Fix edebug spec.
@@ -9,8 +14,8 @@
2011-09-23 Michael Albinus <address@hidden>
- * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): Fix
- nasty bug using wrong cached values.
+ * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
+ Fix nasty bug using wrong cached values.
2011-09-23 Alan Mackenzie <address@hidden>
@@ -75,8 +80,8 @@
2011-09-21 Martin Rudalics <address@hidden>
- * window.el (set-window-buffer-start-and-point): Call
- set-window-start with NOFORCE argument t. Suggested by Thierry
+ * window.el (set-window-buffer-start-and-point):
+ Call set-window-start with NOFORCE argument t. Suggested by Thierry
Volpiatto <address@hidden>.
(quit-window): Reword doc-string. Handle new format of
quit-restore parameter. Don't delete window if it has a
=== modified file 'lisp/textmodes/picture.el'
--- a/lisp/textmodes/picture.el 2011-01-25 04:08:28 +0000
+++ b/lisp/textmodes/picture.el 2011-09-23 14:47:01 +0000
@@ -83,7 +83,7 @@
"Position point at the beginning of the line.
With ARG not nil, move forward ARG - 1 lines first.
If scan reaches end of buffer, stop there without error."
- (interactive "P")
+ (interactive "^P")
(if arg (forward-line (1- (prefix-numeric-value arg))))
(beginning-of-line)
(setq picture-desired-column 0))
@@ -92,7 +92,7 @@
"Position point after last non-blank character on current line.
With ARG not nil, move forward ARG - 1 lines first.
If scan reaches end of buffer, stop there without error."
- (interactive "P")
+ (interactive "^P")
(if arg (forward-line (1- (prefix-numeric-value arg))))
(beginning-of-line)
(skip-chars-backward " \t" (prog1 (point) (end-of-line)))
@@ -101,7 +101,7 @@
(defun picture-forward-column (arg &optional interactive)
"Move cursor right, making whitespace if necessary.
With argument, move that many columns."
- (interactive "p\nd")
+ (interactive "^p\nd")
(let (deactivate-mark)
(picture-update-desired-column interactive)
(setq picture-desired-column (max 0 (+ picture-desired-column arg)))
@@ -115,14 +115,14 @@
(defun picture-backward-column (arg &optional interactive)
"Move cursor left, making whitespace if necessary.
With argument, move that many columns."
- (interactive "p\nd")
+ (interactive "^p\nd")
(picture-update-desired-column interactive)
(picture-forward-column (- arg)))
(defun picture-move-down (arg)
"Move vertically down, making whitespace if necessary.
With argument, move that many lines."
- (interactive "p")
+ (interactive "^p")
(let (deactivate-mark)
(picture-update-desired-column nil)
(picture-newline arg)
@@ -139,7 +139,7 @@
(defun picture-move-up (arg)
"Move vertically up, making whitespace if necessary.
With argument, move that many lines."
- (interactive "p")
+ (interactive "^p")
(picture-update-desired-column nil)
(picture-move-down (- arg)))
@@ -212,7 +212,7 @@
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."
- (interactive "p")
+ (interactive "^p")
(picture-move-down (* arg picture-vertical-step))
(picture-forward-column (* arg picture-horizontal-step)))
@@ -221,7 +221,7 @@
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."
- (interactive "p")
+ (interactive "^p")
(picture-motion (- arg)))
(defun picture-mouse-set-point (event)
@@ -323,13 +323,14 @@
"Move to the beginning of the following line.
With argument, moves that many lines (up, if negative argument);
always moves to the beginning of a line."
- (interactive "p")
- (if (< arg 0)
- (forward-line arg)
- (while (> arg 0)
- (end-of-line)
- (if (eobp) (newline) (forward-char 1))
- (setq arg (1- arg)))))
+ (interactive "^p")
+ (let ((start (point))
+ (lines-left (forward-line arg)))
+ (if (and (eobp)
+ (> (point) start))
+ (newline))
+ (if (> lines-left 0)
+ (newline lines-left))))
(defun picture-open-line (arg)
"Insert an empty line after the current line.
@@ -438,7 +439,7 @@
line. The character must be preceded by whitespace.
\"interesting characters\" are defined by variable `picture-tab-chars'.
If no such character is found, move to beginning of line."
- (interactive "P")
+ (interactive "^P")
(let ((target (current-column)))
(save-excursion
(if (and (not arg)
@@ -464,7 +465,7 @@
With prefix arg, overwrite the traversed text with spaces. The tab stop
list can be changed by \\[picture-set-tab-stops] and \\[edit-tab-stops].
See also documentation for variable `picture-tab-chars'."
- (interactive "P")
+ (interactive "^P")
(let* ((opoint (point)))
(move-to-tab-stop)
(if arg
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105887: * lisp/textmodes/picture.el: Make motion commands obey shift-select-mode.,
Stefan Monnier <=