aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2005-04-08 23:10:24 +0000
committerLuc Teirlinck2005-04-08 23:10:24 +0000
commita64dc1a44c395c179b44d8b4f2ffa79cf7dd1ab5 (patch)
treef16aec41c65c4cb9b146dacd5ee9b2e165b0907d
parente790a4a3f15e4b74d93937ef9a8dd581cb5e07df (diff)
downloademacs-a64dc1a44c395c179b44d8b4f2ffa79cf7dd1ab5.tar.gz
emacs-a64dc1a44c395c179b44d8b4f2ffa79cf7dd1ab5.zip
(defun-prompt-regexp, parens-require-spaces, buffer-end, end-of-defun)
(insert-parentheses): Doc fixes.
-rw-r--r--lisp/emacs-lisp/lisp.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index d0a2fdc01da..f9442bc0084 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -31,18 +31,16 @@
31 31
32;; Note that this variable is used by non-lisp modes too. 32;; Note that this variable is used by non-lisp modes too.
33(defcustom defun-prompt-regexp nil 33(defcustom defun-prompt-regexp nil
34 "*If non-nil, a regexp to ignore before the character that starts a defun. 34 "*If non-nil, a regexp to ignore before a defun.
35This is only necessary if the opening paren or brace is not in column 0. 35This is only necessary if the opening paren or brace is not in column 0.
36See function `beginning-of-defun'. 36See function `beginning-of-defun'."
37
38Setting this variable automatically makes it local to the current buffer."
39 :type '(choice (const nil) 37 :type '(choice (const nil)
40 regexp) 38 regexp)
41 :group 'lisp) 39 :group 'lisp)
42(make-variable-buffer-local 'defun-prompt-regexp) 40(make-variable-buffer-local 'defun-prompt-regexp)
43 41
44(defcustom parens-require-spaces t 42(defcustom parens-require-spaces t
45 "Non-nil means `insert-parentheses' should insert whitespace as needed." 43 "If non-nil, `insert-parentheses' inserts whitespace as needed."
46 :type 'boolean 44 :type 'boolean
47 :group 'lisp) 45 :group 'lisp)
48 46
@@ -74,7 +72,7 @@ move forward across N balanced expressions."
74The place mark goes is the same place \\[forward-sexp] would 72The place mark goes is the same place \\[forward-sexp] would
75move to with the same argument. 73move to with the same argument.
76Interactively, if this command is repeated 74Interactively, if this command is repeated
77or (in Transient Mark mode) if the mark is active, 75or (in Transient Mark mode) if the mark is active,
78it marks the next ARG sexps after the ones already marked." 76it marks the next ARG sexps after the ones already marked."
79 (interactive "P\np") 77 (interactive "P\np")
80 (cond ((and allow-extend 78 (cond ((and allow-extend
@@ -233,13 +231,14 @@ recipe (see `end-of-defun'). Major modes can define this if the
233normal method is not appropriate.") 231normal method is not appropriate.")
234 232
235(defun buffer-end (arg) 233(defun buffer-end (arg)
236 "Return the \"far end\" position of the buffer, moving in direction ARG. 234 "Return the \"far end\" position of the buffer, in direction ARG.
237If ARG is positive, that's the end of the buffer. 235If ARG is positive, that's the end of the buffer.
238Otherwise, that's the beginning of the buffer." 236Otherwise, that's the beginning of the buffer."
239 (if (> arg 0) (point-max) (point-min))) 237 (if (> arg 0) (point-max) (point-min)))
240 238
241(defun end-of-defun (&optional arg) 239(defun end-of-defun (&optional arg)
242 "Move forward to next end of defun. With argument, do it that many times. 240 "Move forward to next end of defun.
241With argument, do it that many times.
243Negative argument -N means move back to Nth preceding end of defun. 242Negative argument -N means move back to Nth preceding end of defun.
244 243
245An end of a defun occurs right after the close-parenthesis that 244An end of a defun occurs right after the close-parenthesis that
@@ -299,7 +298,7 @@ is called as a function to find the defun's end."
299The defun marked is the one that contains point or follows point. 298The defun marked is the one that contains point or follows point.
300 299
301Interactively, if this command is repeated 300Interactively, if this command is repeated
302or (in Transient Mark mode) if the mark is active, 301or (in Transient Mark mode) if the mark is active,
303it marks the next defun after the ones already marked." 302it marks the next defun after the ones already marked."
304 (interactive "p") 303 (interactive "p")
305 (cond ((and allow-extend 304 (cond ((and allow-extend
@@ -424,7 +423,8 @@ character is inserted ARG times."
424 (prefix-numeric-value arg)))) 423 (prefix-numeric-value arg))))
425 424
426(defun insert-parentheses (&optional arg) 425(defun insert-parentheses (&optional arg)
427 "Enclose following ARG sexps in parentheses. Leave point after open-paren. 426 "Enclose following ARG sexps in parentheses.
427Leave point after open-paren.
428A negative ARG encloses the preceding ARG sexps instead. 428A negative ARG encloses the preceding ARG sexps instead.
429No argument is equivalent to zero: just insert `()' and leave point between. 429No argument is equivalent to zero: just insert `()' and leave point between.
430If `parens-require-spaces' is non-nil, this command also inserts a space 430If `parens-require-spaces' is non-nil, this command also inserts a space