From 4855897e98686e83242570f3076a3f2b4da77b0c Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 1 Jul 2002 07:47:22 +0000 Subject: [PATCH] (picture-forward-column) (picture-move-down): Never deactivate the mark. --- lisp/textmodes/picture.el | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 393e5883538..e3a5a89f079 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -104,14 +104,15 @@ If scan reaches end of buffer, stop there without error." "Move cursor right, making whitespace if necessary. With argument, move that many columns." (interactive "p\nd") - (picture-update-desired-column interactive) - (setq picture-desired-column (max 0 (+ picture-desired-column arg))) - (let ((current-column (move-to-column picture-desired-column t))) - (if (and (> current-column picture-desired-column) - (< arg 0)) - ;; It seems that we have just tried to move to the right - ;; column of a multi-column character. - (forward-char -1)))) + (let (deactivate-mark) + (picture-update-desired-column interactive) + (setq picture-desired-column (max 0 (+ picture-desired-column arg))) + (let ((current-column (move-to-column picture-desired-column t))) + (if (and (> current-column picture-desired-column) + (< arg 0)) + ;; It seems that we have just tried to move to the right + ;; column of a multi-column character. + (forward-char -1))))) (defun picture-backward-column (arg &optional interactive) "Move cursor left, making whitespace if necessary. @@ -124,11 +125,12 @@ With argument, move that many columns." "Move vertically down, making whitespace if necessary. With argument, move that many lines." (interactive "p") - (picture-update-desired-column nil) - (picture-newline arg) - (let ((current-column (move-to-column picture-desired-column t))) - (if (> current-column picture-desired-column) - (forward-char -1)))) + (let (deactivate-mark) + (picture-update-desired-column nil) + (picture-newline arg) + (let ((current-column (move-to-column picture-desired-column t))) + (if (> current-column picture-desired-column) + (forward-char -1))))) (defvar picture-vertical-step 0 "Amount to move vertically after text character in Picture mode.") -- 2.39.2