[Emacs-diffs] Changes to emacs/lisp/textmodes/picture.el

[Richard M. Stallman]

Index: emacs/lisp/textmodes/picture.el
diff -c emacs/lisp/textmodes/picture.el:1.39 
emacs/lisp/textmodes/picture.el:1.40
*** emacs/lisp/textmodes/picture.el:1.39        Thu Mar 14 03:57:36 2002
--- emacs/lisp/textmodes/picture.el     Mon Jul  1 03:47:22 2002
***************
*** 104,117 ****
    "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))))
  
  (defun picture-backward-column (arg &optional interactive)
    "Move cursor left, making whitespace if necessary.
--- 104,118 ----
    "Move cursor right, making whitespace if necessary.
  With argument, move that many columns."
    (interactive "p\nd")
!   (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,134 ****
    "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))))
  
  (defvar picture-vertical-step 0
    "Amount to move vertically after text character in Picture mode.")
--- 125,136 ----
    "Move vertically down, making whitespace if necessary.
  With argument, move that many lines."
    (interactive "p")
!   (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.")