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

[Juri Linkov]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.669 emacs/lisp/simple.el:1.670
*** emacs/lisp/simple.el:1.669  Fri Dec  3 22:26:13 2004
--- emacs/lisp/simple.el        Mon Dec 13 03:08:52 2004
***************
*** 646,652 ****
         (constrain-to-field nil orig-pos t)))))
  
  (defvar inhibit-mark-movement nil
!   "If non-nil, \\[beginning-of-buffer] and \\[end-of-buffer] does not set the 
mark.")
  
  (defun beginning-of-buffer (&optional arg)
    "Move point to the beginning of the buffer; leave mark at previous position.
--- 646,653 ----
         (constrain-to-field nil orig-pos t)))))
  
  (defvar inhibit-mark-movement nil
!   "If non-nil, movement commands, such as \\[beginning-of-buffer], \
! do not set the mark.")
  
  (defun beginning-of-buffer (&optional arg)
    "Move point to the beginning of the buffer; leave mark at previous position.
***************
*** 659,666 ****
  Don't use this command in Lisp programs!
  \(goto-char (point-min)) is faster and avoids clobbering the mark."
    (interactive "P")
!   (unless (or inhibit-mark-movement (consp arg))
!     (push-mark))
    (let ((size (- (point-max) (point-min))))
      (goto-char (if (and arg (not (consp arg)))
                   (+ (point-min)
--- 660,669 ----
  Don't use this command in Lisp programs!
  \(goto-char (point-min)) is faster and avoids clobbering the mark."
    (interactive "P")
!   (or inhibit-mark-movement
!       (consp arg)
!       (and transient-mark-mode mark-active)
!       (push-mark))
    (let ((size (- (point-max) (point-min))))
      (goto-char (if (and arg (not (consp arg)))
                   (+ (point-min)
***************
*** 683,690 ****
  Don't use this command in Lisp programs!
  \(goto-char (point-max)) is faster and avoids clobbering the mark."
    (interactive "P")
!   (unless (or inhibit-mark-movement (consp arg))
!     (push-mark))
    (let ((size (- (point-max) (point-min))))
      (goto-char (if (and arg (not (consp arg)))
                   (- (point-max)
--- 686,695 ----
  Don't use this command in Lisp programs!
  \(goto-char (point-max)) is faster and avoids clobbering the mark."
    (interactive "P")
!   (or inhibit-mark-movement
!       (consp arg)
!       (and transient-mark-mode mark-active)
!       (push-mark))
    (let ((size (- (point-max) (point-min))))
      (goto-char (if (and arg (not (consp arg)))
                   (- (point-max)
***************
*** 2987,2997 ****
  Many commands change their behavior when Transient Mark mode is in effect
  and the mark is active, by acting on the region instead of their usual
  default part of the buffer's text.  Examples of such commands include
! \\[comment-dwim], \\[flush-lines], \\[ispell], \\[keep-lines],
! \\[query-replace], \\[query-replace-regexp], and \\[undo].  Invoke
! \\[apropos-documentation] and type \"transient\" or \"mark.*active\" at
! the prompt, to see the documentation of commands which are sensitive to
! the Transient Mark mode."
    :global t :group 'editing-basics :require nil)
  
  (defun pop-global-mark ()
--- 2992,3002 ----
  Many commands change their behavior when Transient Mark mode is in effect
  and the mark is active, by acting on the region instead of their usual
  default part of the buffer's text.  Examples of such commands include
! \\[comment-dwim], \\[flush-lines], \\[keep-lines], \
! \\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo].
! Invoke \\[apropos-documentation] and type \"transient\" or
! \"mark.*active\" at the prompt, to see the documentation of
! commands which are sensitive to the Transient Mark mode."
    :global t :group 'editing-basics :require nil)
  
  (defun pop-global-mark ()
***************
*** 3523,3534 ****
    (interactive "p")
    (forward-word (- (or arg 1))))
  
! (defun mark-word (arg)
!   "Set mark arg words away from point.
! If this command is repeated, it marks the next ARG words after the ones
! already marked."
!   (interactive "p")
!   (cond ((and (eq last-command this-command) (mark t))
         (set-mark
          (save-excursion
            (goto-char (mark))
--- 3528,3544 ----
    (interactive "p")
    (forward-word (- (or arg 1))))
  
! (defun mark-word (&optional arg)
!   "Set mark ARG words away from point.
! The place mark goes is the same place \\[forward-word] would
! move to with the same argument.
! If this command is repeated or mark is active in Transient Mark mode,
! it marks the next ARG words after the ones already marked."
!   (interactive "P")
!   (cond ((or (and (eq last-command this-command) (mark t))
!            (and transient-mark-mode mark-active))
!        (setq arg (if arg (prefix-numeric-value arg)
!                    (if (< (mark) (point)) -1 1)))
         (set-mark
          (save-excursion
            (goto-char (mark))
***************
*** 3537,3543 ****
        (t
         (push-mark
          (save-excursion
!           (forward-word arg)
            (point))
          nil t))))
  
--- 3547,3553 ----
        (t
         (push-mark
          (save-excursion
!           (forward-word (prefix-numeric-value arg))
            (point))
          nil t))))
  
***************
*** 4021,4028 ****
         (abort-recursive-edit))
        (current-prefix-arg
         nil)
!       ((and transient-mark-mode
!             mark-active)
         (deactivate-mark))
        ((> (recursion-depth) 0)
         (exit-recursive-edit))
--- 4031,4037 ----
         (abort-recursive-edit))
        (current-prefix-arg
         nil)
!       ((and transient-mark-mode mark-active)
         (deactivate-mark))
        ((> (recursion-depth) 0)
         (exit-recursive-edit))