(pages-copy-header-and-position): Call end-of-line, not forward-line.

[bpt/emacs.git] / lisp / simple.el

diff --git a/lisp/simple.el b/lisp/simple.el
index 2cb169e..8555773 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -332,7 +332,11 @@ and the greater of them is not at the start of a line."
                (setq done (+ 40 done)))
              (while (re-search-forward "[\n\C-m]" nil t 1)
                (setq done (+ 1 done)))
-             done)
+             (goto-char (point-max))
+             (if (and (/= start end)
+                      (not (bolp)))
+                 (1+ done)
+               done))
          (- (buffer-size) (forward-line (buffer-size))))))))
 
 (defun what-cursor-position ()
@@ -420,18 +424,15 @@ to get different commands to edit and resubmit."
                 "Redo: " (prin1-to-string elt) read-expression-map t
                 (cons 'command-history arg)))
 
-;;;  read-from-minibuffer handles the adding of what is read to the history
-;;;  variable.
-;;;
-;;;      ;; If command was added to command-history as a string,
-;;;      ;; get rid of that.  We want only evallable expressions there.
-;;;      (if (stringp (car command-history))
-;;;          (setq command-history (cdr command-history)))
-;;;
-;;;      ;; If command to be redone does not match front of history,
-;;;      ;; add it to the history.
-;;;      (or (equal newcmd (car command-history))
-;;;          (setq command-history (cons newcmd command-history)))
+         ;; If command was added to command-history as a string,
+         ;; get rid of that.  We want only evallable expressions there.
+         (if (stringp (car command-history))
+             (setq command-history (cdr command-history)))
+
+         ;; If command to be redone does not match front of history,
+         ;; add it to the history.
+         (or (equal newcmd (car command-history))
+             (setq command-history (cons newcmd command-history)))
          (eval newcmd))
       (ding))))
 \f