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

[Luc Teirlinck]

Index: emacs/lisp/emacs-lisp/lisp.el
diff -c emacs/lisp/emacs-lisp/lisp.el:1.63 emacs/lisp/emacs-lisp/lisp.el:1.64
*** emacs/lisp/emacs-lisp/lisp.el:1.63  Sun Feb  6 10:40:20 2005
--- emacs/lisp/emacs-lisp/lisp.el       Fri Apr  8 23:10:24 2005
***************
*** 31,48 ****
  
  ;; Note that this variable is used by non-lisp modes too.
  (defcustom defun-prompt-regexp nil
!   "*If non-nil, a regexp to ignore before the character that starts a defun.
  This is only necessary if the opening paren or brace is not in column 0.
! See function `beginning-of-defun'.
! 
! Setting this variable automatically makes it local to the current buffer."
    :type '(choice (const nil)
                 regexp)
    :group 'lisp)
  (make-variable-buffer-local 'defun-prompt-regexp)
  
  (defcustom parens-require-spaces t
!   "Non-nil means `insert-parentheses' should insert whitespace as needed."
    :type 'boolean
    :group 'lisp)
  
--- 31,46 ----
  
  ;; Note that this variable is used by non-lisp modes too.
  (defcustom defun-prompt-regexp nil
!   "*If non-nil, a regexp to ignore before a defun.
  This is only necessary if the opening paren or brace is not in column 0.
! See function `beginning-of-defun'."
    :type '(choice (const nil)
                 regexp)
    :group 'lisp)
  (make-variable-buffer-local 'defun-prompt-regexp)
  
  (defcustom parens-require-spaces t
!   "If non-nil, `insert-parentheses' inserts whitespace as needed."
    :type 'boolean
    :group 'lisp)
  
***************
*** 74,80 ****
  The place mark goes is the same place \\[forward-sexp] would
  move to with the same argument.
  Interactively, if this command is repeated
! or (in Transient Mark mode) if the mark is active, 
  it marks the next ARG sexps after the ones already marked."
    (interactive "P\np")
    (cond ((and allow-extend
--- 72,78 ----
  The place mark goes is the same place \\[forward-sexp] would
  move to with the same argument.
  Interactively, if this command is repeated
! or (in Transient Mark mode) if the mark is active,
  it marks the next ARG sexps after the ones already marked."
    (interactive "P\np")
    (cond ((and allow-extend
***************
*** 233,245 ****
  normal method is not appropriate.")
  
  (defun buffer-end (arg)
!   "Return the \"far end\" position of the buffer, moving in direction ARG.
  If ARG is positive, that's the end of the buffer.
  Otherwise, that's the beginning of the buffer."
    (if (> arg 0) (point-max) (point-min)))
  
  (defun end-of-defun (&optional arg)
!   "Move forward to next end of defun.  With argument, do it that many times.
  Negative argument -N means move back to Nth preceding end of defun.
  
  An end of a defun occurs right after the close-parenthesis that
--- 231,244 ----
  normal method is not appropriate.")
  
  (defun buffer-end (arg)
!   "Return the \"far end\" position of the buffer, in direction ARG.
  If ARG is positive, that's the end of the buffer.
  Otherwise, that's the beginning of the buffer."
    (if (> arg 0) (point-max) (point-min)))
  
  (defun end-of-defun (&optional arg)
!   "Move forward to next end of defun.
! With argument, do it that many times.
  Negative argument -N means move back to Nth preceding end of defun.
  
  An end of a defun occurs right after the close-parenthesis that
***************
*** 299,305 ****
  The defun marked is the one that contains point or follows point.
  
  Interactively, if this command is repeated
! or (in Transient Mark mode) if the mark is active, 
  it marks the next defun after the ones already marked."
    (interactive "p")
    (cond ((and allow-extend
--- 298,304 ----
  The defun marked is the one that contains point or follows point.
  
  Interactively, if this command is repeated
! or (in Transient Mark mode) if the mark is active,
  it marks the next defun after the ones already marked."
    (interactive "p")
    (cond ((and allow-extend
***************
*** 424,430 ****
                   (prefix-numeric-value arg))))
  
  (defun insert-parentheses (&optional arg)
!   "Enclose following ARG sexps in parentheses.  Leave point after open-paren.
  A negative ARG encloses the preceding ARG sexps instead.
  No argument is equivalent to zero: just insert `()' and leave point between.
  If `parens-require-spaces' is non-nil, this command also inserts a space
--- 423,430 ----
                   (prefix-numeric-value arg))))
  
  (defun insert-parentheses (&optional arg)
!   "Enclose following ARG sexps in parentheses.
! Leave point after open-paren.
  A negative ARG encloses the preceding ARG sexps instead.
  No argument is equivalent to zero: just insert `()' and leave point between.
  If `parens-require-spaces' is non-nil, this command also inserts a space