comparison lisp/simple.el @ 83256:389421e988c2

Merged from [e-mail]--gnu-2005 (patch 17-26, 107-116) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-107 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-108 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-109 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-110 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-111 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-112 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-113 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-114 <no summary provided> * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-115 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-116 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-17 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-18 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-19 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-20 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-21 More work on moving images to etc/images * [e-mail]--gnu-2005/gnus--rel--5.10--patch-22 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-23 Fix errors with image-file installation * [e-mail]--gnu-2005/gnus--rel--5.10--patch-24 etc/Makefile.in (install): Put gnus-tut.txt in the right place. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-25 etc/Makefile.in (install, uninstall): Fix installed image dirs. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-26 etc/Makefile.in (install): Create $(etcdir)/images/gnus dir. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-296

83255:9684495d72bc

      (if (save-excursion (end-of-line) (eobp))
	  ;; When adding a newline, don't expand an abbrev.
	  (let ((abbrev-mode nil))
	    (end-of-line)
	    (insert "\n"))
	(line-move arg))
    (if (interactive-p)
	(condition-case nil
	    (line-move arg)
	  ((beginning-of-buffer end-of-buffer) (ding)))
      (line-move arg)))
  nil)

(defun previous-line (&optional arg)
  "Move cursor vertically up ARG lines.
If there is no character in the target line exactly over the current column,

to use and more reliable (no dependence on goal column, etc.)."
  (interactive "p")
  (or arg (setq arg 1))
  (if (interactive-p)
      (condition-case nil
	  (line-move (- arg))
	((beginning-of-buffer end-of-buffer) (ding)))
    (line-move (- arg)))
  nil)

(defcustom track-eol nil
  "*Non-nil means vertical motion starting at end of line keeps to ends of lines.
This means moving to the end of each line moved onto.

	prop
      (or (memq prop buffer-invisibility-spec)
	  (assq prop buffer-invisibility-spec)))))

;; Perform vertical scrolling of tall images if necessary.
(defun line-move (arg &optional noerror to-end)
  (if auto-window-vscroll
      (let ((forward (> arg 0))
	    (part (nth 2 (pos-visible-in-window-p (point) nil t))))
	(if (and (consp part)
		 (> (setq part (if forward (cdr part) (car part))) 0))
	    (set-window-vscroll nil

				       (- (window-vscroll nil t)
					  (min part
					       (* (frame-char-height) (- arg))))))
				t)
	  (set-window-vscroll nil 0)
	  (line-move-1 arg noerror to-end)))
    (line-move-1 arg noerror to-end)))

;; This is the guts of next-line and previous-line.
;; Arg says how many lines to move.
;; The value is t if we can move the specified number of lines.

83256:389421e988c2

      (if (save-excursion (end-of-line) (eobp))
	  ;; When adding a newline, don't expand an abbrev.
	  (let ((abbrev-mode nil))
	    (end-of-line)
	    (insert "\n"))
	(line-move arg nil nil t))
    (if (interactive-p)
	(condition-case nil
	    (line-move arg nil nil t)
	  ((beginning-of-buffer end-of-buffer) (ding)))
      (line-move arg nil nil t)))
  nil)

(defun previous-line (&optional arg)
  "Move cursor vertically up ARG lines.
If there is no character in the target line exactly over the current column,

to use and more reliable (no dependence on goal column, etc.)."
  (interactive "p")
  (or arg (setq arg 1))
  (if (interactive-p)
      (condition-case nil
	  (line-move (- arg) nil nil t)
	((beginning-of-buffer end-of-buffer) (ding)))
    (line-move (- arg) nil nil t))
  nil)

(defcustom track-eol nil
  "*Non-nil means vertical motion starting at end of line keeps to ends of lines.
This means moving to the end of each line moved onto.

	prop
      (or (memq prop buffer-invisibility-spec)
	  (assq prop buffer-invisibility-spec)))))

;; Perform vertical scrolling of tall images if necessary.
(defun line-move (arg &optional noerror to-end try-vscroll)
  (if (and auto-window-vscroll try-vscroll)
      (let ((forward (> arg 0))
	    (part (nth 2 (pos-visible-in-window-p (point) nil t))))
	(if (and (consp part)
		 (> (setq part (if forward (cdr part) (car part))) 0))
	    (set-window-vscroll nil

				       (- (window-vscroll nil t)
					  (min part
					       (* (frame-char-height) (- arg))))))
				t)
	  (set-window-vscroll nil 0)
	  (when (line-move-1 arg noerror to-end)
	    (sit-for 0)
	    (if (and (not forward)
		     (setq part (nth 2 (pos-visible-in-window-p
					(line-beginning-position) nil t)))
		     (> (cdr part) 0))
		(set-window-vscroll nil (cdr part) t))
	    t)))
    (line-move-1 arg noerror to-end)))

;; This is the guts of next-line and previous-line.
;; Arg says how many lines to move.
;; The value is t if we can move the specified number of lines.