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

[Juanma Barranquero]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.739 emacs/lisp/simple.el:1.740
*** emacs/lisp/simple.el:1.739  Wed Jul 13 13:45:30 2005
--- emacs/lisp/simple.el        Wed Jul 20 22:26:27 2005
***************
*** 74,80 ****
  ;;; next-error support framework
  
  (defgroup next-error nil
!   "next-error support framework."
    :group 'compilation
    :version "22.1")
  
--- 74,80 ----
  ;;; next-error support framework
  
  (defgroup next-error nil
!   "`next-error' support framework."
    :group 'compilation
    :version "22.1")
  
***************
*** 86,93 ****
  
  (defcustom next-error-highlight 0.1
    "*Highlighting of locations in selected source buffers.
! If number, highlight the locus in next-error face for given time in seconds.
! If t, use persistent overlays fontified in next-error face.
  If nil, don't highlight the locus in the source buffer.
  If `fringe-arrow', indicate the locus by the fringe arrow."
    :type '(choice (number :tag "Delay")
--- 86,93 ----
  
  (defcustom next-error-highlight 0.1
    "*Highlighting of locations in selected source buffers.
! If number, highlight the locus in `next-error' face for given time in seconds.
! If t, use persistent overlays fontified in `next-error' face.
  If nil, don't highlight the locus in the source buffer.
  If `fringe-arrow', indicate the locus by the fringe arrow."
    :type '(choice (number :tag "Delay")
***************
*** 99,106 ****
  
  (defcustom next-error-highlight-no-select 0.1
    "*Highlighting of locations in non-selected source buffers.
! If number, highlight the locus in next-error face for given time in seconds.
! If t, use persistent overlays fontified in next-error face.
  If nil, don't highlight the locus in the source buffer.
  If `fringe-arrow', indicate the locus by the fringe arrow."
    :type '(choice (number :tag "Delay")
--- 99,106 ----
  
  (defcustom next-error-highlight-no-select 0.1
    "*Highlighting of locations in non-selected source buffers.
! If number, highlight the locus in `next-error' face for given time in seconds.
! If t, use persistent overlays fontified in `next-error' face.
  If nil, don't highlight the locus in the source buffer.
  If `fringe-arrow', indicate the locus by the fringe arrow."
    :type '(choice (number :tag "Delay")
***************
*** 122,128 ****
  (add-to-list 'overlay-arrow-variable-list 'next-error-overlay-arrow-position)
  
  (defvar next-error-last-buffer nil
!   "The most recent next-error buffer.
  A buffer becomes most recent when its compilation, grep, or
  similar mode is started, or when it is used with \\[next-error]
  or \\[compile-goto-error].")
--- 122,128 ----
  (add-to-list 'overlay-arrow-variable-list 'next-error-overlay-arrow-position)
  
  (defvar next-error-last-buffer nil
!   "The most recent `next-error' buffer.
  A buffer becomes most recent when its compilation, grep, or
  similar mode is started, or when it is used with \\[next-error]
  or \\[compile-goto-error].")
***************
*** 143,149 ****
                               &optional avoid-current
                               extra-test-inclusive
                               extra-test-exclusive)
!   "Test if BUFFER is a next-error capable buffer.
  
  If AVOID-CURRENT is non-nil, treat the current buffer
  as an absolute last resort only.
--- 143,149 ----
                               &optional avoid-current
                               extra-test-inclusive
                               extra-test-exclusive)
!   "Test if BUFFER is a `next-error' capable buffer.
  
  If AVOID-CURRENT is non-nil, treat the current buffer
  as an absolute last resort only.
***************
*** 170,176 ****
  (defun next-error-find-buffer (&optional avoid-current
                                         extra-test-inclusive
                                         extra-test-exclusive)
!   "Return a next-error capable buffer.
  If AVOID-CURRENT is non-nil, treat the current buffer
  as an absolute last resort only.
  
--- 170,176 ----
  (defun next-error-find-buffer (&optional avoid-current
                                         extra-test-inclusive
                                         extra-test-exclusive)
!   "Return a `next-error' capable buffer.
  If AVOID-CURRENT is non-nil, treat the current buffer
  as an absolute last resort only.
  
***************
*** 223,229 ****
     (error "No next-error capable buffer found")))
  
  (defun next-error (&optional arg reset)
!   "Visit next next-error message and corresponding source code.
  
  If all the error messages parsed so far have been processed already,
  the message buffer is checked for new ones.
--- 223,229 ----
     (error "No next-error capable buffer found")))
  
  (defun next-error (&optional arg reset)
!   "Visit next `next-error' message and corresponding source code.
  
  If all the error messages parsed so far have been processed already,
  the message buffer is checked for new ones.
***************
*** 264,270 ****
  (defalias 'next-match 'next-error)
  
  (defun previous-error (&optional n)
!   "Visit previous next-error message and corresponding source code.
  
  Prefix arg N says how many error messages to move backwards (or
  forwards, if negative).
--- 264,270 ----
  (defalias 'next-match 'next-error)
  
  (defun previous-error (&optional n)
!   "Visit previous `next-error' message and corresponding source code.
  
  Prefix arg N says how many error messages to move backwards (or
  forwards, if negative).
***************
*** 282,288 ****
    (next-error n t))
  
  (defun next-error-no-select (&optional n)
!   "Move point to the next error in the next-error buffer and highlight match.
  Prefix arg N says how many error messages to move forwards (or
  backwards, if negative).
  Finds and highlights the source line like \\[next-error], but does not
--- 282,288 ----
    (next-error n t))
  
  (defun next-error-no-select (&optional n)
!   "Move point to the next error in the `next-error' buffer and highlight 
match.
  Prefix arg N says how many error messages to move forwards (or
  backwards, if negative).
  Finds and highlights the source line like \\[next-error], but does not
***************
*** 293,299 ****
    (pop-to-buffer next-error-last-buffer))
  
  (defun previous-error-no-select (&optional n)
!   "Move point to the previous error in the next-error buffer and highlight 
match.
  Prefix arg N says how many error messages to move backwards (or
  forwards, if negative).
  Finds and highlights the source line like \\[previous-error], but does not
--- 293,299 ----
    (pop-to-buffer next-error-last-buffer))
  
  (defun previous-error-no-select (&optional n)
!   "Move point to the previous error in the `next-error' buffer and highlight 
match.
  Prefix arg N says how many error messages to move backwards (or
  forwards, if negative).
  Finds and highlights the source line like \\[previous-error], but does not
***************
*** 426,433 ****
  
  (defun open-line (n)
    "Insert a newline and leave point before it.
! If there is a fill prefix and/or a left-margin, insert them on the new line
! if the line would have been blank.
  With arg N, insert N newlines."
    (interactive "*p")
    (let* ((do-fill-prefix (and fill-prefix (bolp)))
--- 426,433 ----
  
  (defun open-line (n)
    "Insert a newline and leave point before it.
! If there is a fill prefix and/or a `left-margin', insert them
! on the new line if the line would have been blank.
  With arg N, insert N newlines."
    (interactive "*p")
    (let* ((do-fill-prefix (and fill-prefix (bolp)))
***************
*** 449,455 ****
  (defun split-line (&optional arg)
    "Split current line, moving portion beyond point vertically down.
  If the current line starts with `fill-prefix', insert it on the new
! line as well.  With prefix ARG, don't insert fill-prefix on new line.
  
  When called from Lisp code, ARG may be a prefix string to copy."
    (interactive "*P")
--- 449,455 ----
  (defun split-line (&optional arg)
    "Split current line, moving portion beyond point vertically down.
  If the current line starts with `fill-prefix', insert it on the new
! line as well.  With prefix ARG, don't insert `fill-prefix' on new line.
  
  When called from Lisp code, ARG may be a prefix string to copy."
    (interactive "*P")
***************
*** 647,653 ****
            (save-excursion (forward-char -1)
                            (looking-at "$\\|\\s(\\|\\s'")))
        nil
!       (insert ?\ ))))
  
  (defun delete-horizontal-space (&optional backward-only)
    "Delete all spaces and tabs around point.
--- 647,653 ----
            (save-excursion (forward-char -1)
                            (looking-at "$\\|\\s(\\|\\s'")))
        nil
!       (insert ?\s))))
  
  (defun delete-horizontal-space (&optional backward-only)
    "Delete all spaces and tabs around point.
***************
*** 671,679 ****
      (skip-chars-backward " \t")
      (constrain-to-field nil orig-pos)
      (dotimes (i (or n 1))
!       (if (= (following-char) ?\ )
          (forward-char 1)
!       (insert ?\ )))
      (delete-region
       (point)
       (progn
--- 671,679 ----
      (skip-chars-backward " \t")
      (constrain-to-field nil orig-pos)
      (dotimes (i (or n 1))
!       (if (= (following-char) ?\s)
          (forward-char 1)
!       (insert ?\s)))
      (delete-region
       (point)
       (progn
***************
*** 1274,1280 ****
  ;; For compatibility with the old subr of the same name.
  (defun minibuffer-prompt-width ()
    "Return the display width of the minibuffer prompt.
! Return 0 if current buffer is not a mini-buffer."
    ;; Return the width of everything before the field at the end of
    ;; the buffer; this should be 0 for normal buffers.
    (1- (minibuffer-prompt-end)))
--- 1274,1280 ----
  ;; For compatibility with the old subr of the same name.
  (defun minibuffer-prompt-width ()
    "Return the display width of the minibuffer prompt.
! Return 0 if current buffer is not a minibuffer."
    ;; Return the width of everything before the field at the end of
    ;; the buffer; this should be 0 for normal buffers.
    (1- (minibuffer-prompt-end)))
***************
*** 2345,2351 ****
  
  When the yank handler has a non-nil PARAM element, the original STRING
  argument is not used by `insert-for-yank'.  However, since Lisp code
! may access and use elements from the kill-ring directly, the STRING
  argument should still be a \"useful\" string for such uses."
    (if (> (length string) 0)
        (if yank-handler
--- 2345,2351 ----
  
  When the yank handler has a non-nil PARAM element, the original STRING
  argument is not used by `insert-for-yank'.  However, since Lisp code
! may access and use elements from the kill ring directly, the STRING
  argument should still be a \"useful\" string for such uses."
    (if (> (length string) 0)
        (if yank-handler
***************
*** 2684,2690 ****
              (let ((col (current-column)))
                (forward-char -1)
                (setq col (- col (current-column)))
!               (insert-char ?\  col)
                (delete-char 1)))
          (forward-char -1)
          (setq count (1- count))))))
--- 2684,2690 ----
              (let ((col (current-column)))
                (forward-char -1)
                (setq col (- col (current-column)))
!               (insert-char ?\s col)
                (delete-char 1)))
          (forward-char -1)
          (setq count (1- count))))))
***************
*** 4075,4081 ****
        (setq arg (current-column)))
    (if (not (integerp arg))
        ;; Disallow missing argument; it's probably a typo for C-x C-f.
!       (error "Set-fill-column requires an explicit argument")
      (message "Fill column set to %d (was %d)" arg fill-column)
      (setq fill-column arg)))
  
--- 4075,4081 ----
        (setq arg (current-column)))
    (if (not (integerp arg))
        ;; Disallow missing argument; it's probably a typo for C-x C-f.
!       (error "set-fill-column requires an explicit argument")
      (message "Fill column set to %d (was %d)" arg fill-column)
      (setq fill-column arg)))
  
***************
*** 4155,4161 ****
  typing characters do.
  
  Note that binary overwrite mode is not its own minor mode; it is a
! specialization of overwrite-mode, entered by setting the
  `overwrite-mode' variable to `overwrite-mode-binary'."
    (interactive "P")
    (setq overwrite-mode
--- 4155,4161 ----
  typing characters do.
  
  Note that binary overwrite mode is not its own minor mode; it is a
! specialization of overwrite mode, entered by setting the
  `overwrite-mode' variable to `overwrite-mode-binary'."
    (interactive "P")
    (setq overwrite-mode
***************
*** 4999,5005 ****
       (define-key function-key-map (vector keypad) (vector normal))))
   '((kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4)
     (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9)
!    (kp-space ?\ )
     (kp-tab ?\t)
     (kp-enter ?\r)
     (kp-multiply ?*)
--- 4999,5005 ----
       (define-key function-key-map (vector keypad) (vector normal))))
   '((kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4)
     (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9)
!    (kp-space ?\s)
     (kp-tab ?\t)
     (kp-enter ?\r)
     (kp-multiply ?*)
***************
*** 5140,5146 ****
  DISPLAY-FLAG non-nil means show the new buffer with `pop-to-buffer'.
  This is always done when called interactively.
  
! Optional last arg NORECORD non-nil means do not put this buffer at the
  front of the list of recently selected ones."
    (interactive
     (progn
--- 5140,5146 ----
  DISPLAY-FLAG non-nil means show the new buffer with `pop-to-buffer'.
  This is always done when called interactively.
  
! Optional third arg NORECORD non-nil means do not put this buffer at the
  front of the list of recently selected ones."
    (interactive
     (progn