comparison lisp/simple.el @ 110133:0dcf6ddbe02b

merge changes in emacs-23 branch
author Kenichi Handa <handa@m17n.org>
date Wed, 01 Sep 2010 16:13:21 +0900
parents 280c8ae2476d b2115e1dafc0
children aaa259d70304
comparison
equal deleted inserted replaced
110090:9f2296908370 110133:0dcf6ddbe02b
802 (progn 802 (progn
803 (skip-chars-forward " \t") 803 (skip-chars-forward " \t")
804 (constrain-to-field nil orig-pos t))))) 804 (constrain-to-field nil orig-pos t)))))
805 805
806 (defun beginning-of-buffer (&optional arg) 806 (defun beginning-of-buffer (&optional arg)
807 "Move point to the beginning of the buffer; leave mark at previous position. 807 "Move point to the beginning of the buffer.
808 With \\[universal-argument] prefix, do not set mark at previous position.
809 With numeric arg N, put point N/10 of the way from the beginning. 808 With numeric arg N, put point N/10 of the way from the beginning.
810 809 If the buffer is narrowed, this command uses the beginning of the
811 If the buffer is narrowed, this command uses the beginning and size 810 accessible part of the buffer.
812 of the accessible part of the buffer. 811
812 If Transient Mark mode is disabled, leave mark at previous
813 position, unless a \\[universal-argument] prefix is supplied.
813 814
814 Don't use this command in Lisp programs! 815 Don't use this command in Lisp programs!
815 \(goto-char (point-min)) is faster and avoids clobbering the mark." 816 \(goto-char (point-min)) is faster."
816 (interactive "^P") 817 (interactive "^P")
817 (or (consp arg) 818 (or (consp arg)
818 (region-active-p) 819 (region-active-p)
819 (push-mark)) 820 (push-mark))
820 (let ((size (- (point-max) (point-min)))) 821 (let ((size (- (point-max) (point-min))))
827 (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) 828 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
828 (point-min)))) 829 (point-min))))
829 (if (and arg (not (consp arg))) (forward-line 1))) 830 (if (and arg (not (consp arg))) (forward-line 1)))
830 831
831 (defun end-of-buffer (&optional arg) 832 (defun end-of-buffer (&optional arg)
832 "Move point to the end of the buffer; leave mark at previous position. 833 "Move point to the end of the buffer.
833 With \\[universal-argument] prefix, do not set mark at previous position.
834 With numeric arg N, put point N/10 of the way from the end. 834 With numeric arg N, put point N/10 of the way from the end.
835 835 If the buffer is narrowed, this command uses the end of the
836 If the buffer is narrowed, this command uses the beginning and size 836 accessible part of the buffer.
837 of the accessible part of the buffer. 837
838 If Transient Mark mode is disabled, leave mark at previous
839 position, unless a \\[universal-argument] prefix is supplied.
838 840
839 Don't use this command in Lisp programs! 841 Don't use this command in Lisp programs!
840 \(goto-char (point-max)) is faster and avoids clobbering the mark." 842 \(goto-char (point-max)) is faster."
841 (interactive "^P") 843 (interactive "^P")
842 (or (consp arg) (region-active-p) (push-mark)) 844 (or (consp arg) (region-active-p) (push-mark))
843 (let ((size (- (point-max) (point-min)))) 845 (let ((size (- (point-max) (point-min))))
844 (goto-char (if (and arg (not (consp arg))) 846 (goto-char (if (and arg (not (consp arg)))
845 (- (point-max) 847 (- (point-max)