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

[Richard M. Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.616 emacs/lisp/simple.el:1.617
*** emacs/lisp/simple.el:1.616  Fri Jul 25 08:18:04 2003
--- emacs/lisp/simple.el        Sat Aug 16 20:15:53 2003
***************
*** 352,367 ****
        (insert-and-inherit char)
        (setq arg (1- arg)))))
  
! (defun forward-to-indentation (arg)
    "Move forward ARG lines and position at first nonblank character."
    (interactive "p")
!   (forward-line arg)
    (skip-chars-forward " \t"))
  
! (defun backward-to-indentation (arg)
    "Move backward ARG lines and position at first nonblank character."
    (interactive "p")
!   (forward-line (- arg))
    (skip-chars-forward " \t"))
  
  (defun back-to-indentation ()
--- 352,367 ----
        (insert-and-inherit char)
        (setq arg (1- arg)))))
  
! (defun forward-to-indentation (&optional arg)
    "Move forward ARG lines and position at first nonblank character."
    (interactive "p")
!   (forward-line (or arg 1))
    (skip-chars-forward " \t"))
  
! (defun backward-to-indentation (&optional arg)
    "Move backward ARG lines and position at first nonblank character."
    (interactive "p")
!   (forward-line (- (or arg 1)))
    (skip-chars-forward " \t"))
  
  (defun back-to-indentation ()
***************
*** 661,668 ****
  
    (let ((print-length eval-expression-print-length)
        (print-level eval-expression-print-level))
!     (prin1 (car values)
!          (if eval-expression-insert-value (current-buffer) t))))
  
  (defun edit-and-eval-command (prompt command)
    "Prompting with PROMPT, let user edit COMMAND and eval result.
--- 661,670 ----
  
    (let ((print-length eval-expression-print-length)
        (print-level eval-expression-print-level))
!     (if eval-expression-insert-value
!       (with-no-warnings
!        (eval-last-sexp-print-value (car values)))
!       (prin1 (car values) t))))
  
  (defun edit-and-eval-command (prompt command)
    "Prompting with PROMPT, let user edit COMMAND and eval result.
***************
*** 2697,2703 ****
  using `forward-line' instead.  It is usually easier to use
  and more reliable (no dependence on goal column, etc.)."
    (interactive "p")
!   (unless arg (setq arg 1))
    (if (and next-line-add-newlines (= arg 1))
        (if (save-excursion (end-of-line) (eobp))
          ;; When adding a newline, don't expand an abbrev.
--- 2699,2705 ----
  using `forward-line' instead.  It is usually easier to use
  and more reliable (no dependence on goal column, etc.)."
    (interactive "p")
!   (or arg (setq arg 1))
    (if (and next-line-add-newlines (= arg 1))
        (if (save-excursion (end-of-line) (eobp))
          ;; When adding a newline, don't expand an abbrev.
***************
*** 2729,2735 ****
  `forward-line' with a negative argument instead.  It is usually easier
  to use and more reliable (no dependence on goal column, etc.)."
    (interactive "p")
!   (unless arg (setq arg 1))
    (if (interactive-p)
        (condition-case nil
          (line-move (- arg))
--- 2731,2737 ----
  `forward-line' with a negative argument instead.  It is usually easier
  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))
***************
*** 3109,3119 ****
       (goto-char (car pos1))
       (insert word2))))
  
! (defun backward-word (arg)
    "Move backward until encountering the beginning of a word.
  With argument, do this that many times."
    (interactive "p")
!   (forward-word (- arg)))
  
  (defun mark-word (arg)
    "Set mark arg words away from point.
--- 3111,3121 ----
       (goto-char (car pos1))
       (insert word2))))
  
! (defun backward-word (&optional arg)
    "Move backward until encountering the beginning of a word.
  With argument, do this that many times."
    (interactive "p")
!   (forward-word (- (or arg 1))))
  
  (defun mark-word (arg)
    "Set mark arg words away from point.