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

[Kim F . Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.649 emacs/lisp/simple.el:1.650
*** emacs/lisp/simple.el:1.649  Fri Jul  9 16:08:17 2004
--- emacs/lisp/simple.el        Fri Jul 16 10:42:00 2004
***************
*** 562,570 ****
         (skip-chars-forward " \t")
         (constrain-to-field nil orig-pos t)))))
  
  (defun beginning-of-buffer (&optional arg)
    "Move point to the beginning of the buffer; leave mark at previous position.
! With arg N, put point N/10 of the way from the beginning.
  
  If the buffer is narrowed, this command uses the beginning and size
  of the accessible part of the buffer.
--- 562,574 ----
         (skip-chars-forward " \t")
         (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.
! With \\[universal-argument] prefix, do not set mark at previous position.
! With numeric arg N, put point N/10 of the way from the beginning.
  
  If the buffer is narrowed, this command uses the beginning and size
  of the accessible part of the buffer.
***************
*** 572,580 ****
  Don't use this command in Lisp programs!
  \(goto-char (point-min)) is faster and avoids clobbering the mark."
    (interactive "P")
!   (push-mark)
    (let ((size (- (point-max) (point-min))))
!     (goto-char (if arg
                   (+ (point-min)
                      (if (> size 10000)
                          ;; Avoid overflow for large buffer sizes!
--- 576,585 ----
  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)
                      (if (> size 10000)
                          ;; Avoid overflow for large buffer sizes!
***************
*** 586,592 ****
  
  (defun end-of-buffer (&optional arg)
    "Move point to the end of the buffer; leave mark at previous position.
! With arg N, put point N/10 of the way from the end.
  
  If the buffer is narrowed, this command uses the beginning and size
  of the accessible part of the buffer.
--- 591,598 ----
  
  (defun end-of-buffer (&optional arg)
    "Move point to the end of the buffer; leave mark at previous position.
! With \\[universal-argument] prefix, do not set mark at previous position.
! With numeric arg N, put point N/10 of the way from the end.
  
  If the buffer is narrowed, this command uses the beginning and size
  of the accessible part of the buffer.
***************
*** 594,602 ****
  Don't use this command in Lisp programs!
  \(goto-char (point-max)) is faster and avoids clobbering the mark."
    (interactive "P")
!   (push-mark)
    (let ((size (- (point-max) (point-min))))
!     (goto-char (if arg
                   (- (point-max)
                      (if (> size 10000)
                          ;; Avoid overflow for large buffer sizes!
--- 600,609 ----
  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)
                      (if (> size 10000)
                          ;; Avoid overflow for large buffer sizes!