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

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.562 emacs/lisp/simple.el:1.563
*** emacs/lisp/simple.el:1.562  Mon Aug 12 21:48:42 2002
--- emacs/lisp/simple.el        Sun Sep  1 09:29:34 2002
***************
*** 2093,2101 ****
                     (forward-visible-line (prefix-numeric-value arg))
                   (if (eobp)
                       (signal 'end-of-buffer nil))
!                  (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp)))
!                      (forward-visible-line 1)
!                    (end-of-visible-line)))
                 (point))))
  
  (defun forward-visible-line (arg)
--- 2093,2107 ----
                     (forward-visible-line (prefix-numeric-value arg))
                   (if (eobp)
                       (signal 'end-of-buffer nil))
!                  (let ((end
!                         (save-excursion
!                           (end-of-visible-line) (point))))
!                    (if (or (save-excursion
!                              (skip-chars-forward " \t" end)
!                              (= (point) end))
!                            (and kill-whole-line (bolp)))
!                        (forward-visible-line 1)
!                      (goto-char end))))
                 (point))))
  
  (defun forward-visible-line (arg)
***************
*** 2157,2168 ****
    ;; skip all characters with that same `invisible' property value,
    ;; then find the next newline.
    (while (and (not (eobp))
!             (let ((prop
!                    (get-char-property (point) 'invisible)))
!               (if (eq buffer-invisibility-spec t)
!                   prop
!                 (or (memq prop buffer-invisibility-spec)
!                     (assq prop buffer-invisibility-spec)))))
      (if (get-text-property (point) 'invisible)
        (goto-char (next-single-property-change (point) 'invisible))
        (goto-char (next-overlay-change (point))))
--- 2163,2177 ----
    ;; skip all characters with that same `invisible' property value,
    ;; then find the next newline.
    (while (and (not (eobp))
!             (save-excursion
!               (skip-chars-forward "^\n")
!               (let ((prop
!                      (get-char-property (point) 'invisible)))
!                 (if (eq buffer-invisibility-spec t)
!                     prop
!                   (or (memq prop buffer-invisibility-spec)
!                       (assq prop buffer-invisibility-spec))))))
!     (skip-chars-forward "^\n")
      (if (get-text-property (point) 'invisible)
        (goto-char (next-single-property-change (point) 'invisible))
        (goto-char (next-overlay-change (point))))
***************
*** 3932,3938 ****
                (save-excursion
                  (set-buffer mainbuf)
                  (goto-char (point-max))
!                 (skip-chars-backward (format "^%c" directory-sep-char))
                  (- (point) (minibuffer-prompt-end))))
        ;; Otherwise, in minibuffer, the whole input is being completed.
        (save-match-data
--- 3941,3947 ----
                (save-excursion
                  (set-buffer mainbuf)
                  (goto-char (point-max))
!                 (skip-chars-backward "^/")
                  (- (point) (minibuffer-prompt-end))))
        ;; Otherwise, in minibuffer, the whole input is being completed.
        (save-match-data