Mercurial > emacs

--- a/man/widget.texi	Wed Jan 05 23:22:55 2000 +0000
+++ b/man/widget.texi	Wed Jan 05 23:24:32 2000 +0000
@@ -19,8 +19,6 @@
 @comment  node-name,  next,  previous,  up
 @top The Emacs Widget Library

-Version: 1.9914
-
 @menu
 * Introduction::
 * User Interface::
@@ -468,7 +466,7 @@
 @code{:sample-face}.

 @item %v
-This will be replaces with the buffer representation of the widgets
+This will be replaced with the buffer representation of the widget's
 value.  What this is depends on the widget type.

 @item %d
@@ -562,8 +560,8 @@

 @item :validate
 A function which takes a widget as an argument, and return nil if the
-widgets current value is valid for the widget.  Otherwise, it should
-return the widget containing the invalid data, and set that widgets
+widget's current value is valid for the widget.  Otherwise it should
+return the widget containing the invalid data, and set that widget's
 @code{:error} property to a string explaining the error.

 The following predefined function can be used:
@@ -679,7 +677,7 @@
 TYPE ::= (info-link [KEYWORD ARGUMENT]...  ADDRESS)
 @end example

-When this link is invoked, the build-in info browser is started on
+When this link is invoked, the built-in info browser is started on
 @var{address}.

 @node  push-button, editable-field, info-link, Basic Types
@@ -766,10 +764,10 @@
 TYPE ::= (menu-choice [KEYWORD ARGUMENT]... TYPE ... )
 @end example

-The @var{type} arguments represents each possible choice.  The widgets
-value of will be the value of the chosen @var{type} argument.  This
-widget will match any value that matches at least one of the specified
-@var{type} arguments.
+The @var{type} argument represents each possible choice.  The widget's
+value will be that of the chosen @var{type} argument.  This widget will
+match any value matching at least one of the specified @var{type}
+arguments.

 @table @code
 @item :void
@@ -801,10 +799,10 @@
 TYPE ::= (radio-button-choice [KEYWORD ARGUMENT]...  TYPE ... )
 @end example

-The @var{type} arguments represents each possible choice.  The widgets
-value of will be the value of the chosen @var{type} argument.  This
-widget will match any value that matches at least one of the specified
-@var{type} arguments.
+The @var{type} argument represents each possible choice.  The widget's
+value will be that of the chosen @var{type} argument.  This widget will
+match any value matching at least one of the specified @var{type}
+arguments.

 The following extra properties are recognized.

@@ -891,8 +889,8 @@
 TYPE ::= (toggle [KEYWORD ARGUMENT]...)
 @end example

-The widget has two possible states, `on' and `off', which corresponds to
-a @code{t} or @code{nil} value.
+The widget has two possible states, `on' and `off', which correspond to
+a @code{t} or @code{nil} value respectively.

 The following extra properties are recognized.

@@ -932,10 +930,10 @@
 TYPE ::= (checklist [KEYWORD ARGUMENT]...  TYPE ... )
 @end example

-The @var{type} arguments represents each checklist item.  The widgets
-value of will be a list containing the value of each ticked @var{type}
-argument.  The checklist widget will match a list whose elements all
-matches at least one of the specified @var{type} arguments.
+The @var{type} arguments represents each checklist item.  The widget's
+value will be a list containing the values of all ticked @var{type}
+arguments.  The checklist widget will match a list whose elements all
+match at least one of the specified @var{type} arguments.

 The following extra properties are recognized.

@@ -953,11 +951,11 @@
 @end table

 @item :greedy
-Usually, a checklist will only match if the items are in the exact
+Usually a checklist will only match if the items are in the exact
 sequence given in the specification.  By setting @code{:greedy} to
 non-nil, it will allow the items to come in any sequence.  However, if
 you extract the value they will be in the sequence given in the
-checklist. I.e. the original sequence is forgotten.
+checklist.  I.e. the original sequence is forgotten.

 @item button-args
 A list of keywords to pass to the checkboxes.  Useful for setting
@@ -1238,13 +1236,13 @@
 @samp{(file t)} or @code{(file string string)}.

 This concept of inline is probably hard to understand.  It was certainly
-hard to implement so instead of confuse you more by trying to explain it
-here, I'll just suggest you meditate over it for a while.
+hard to implement so instead of confusing you more by trying to explain
+it here, I'll just suggest you meditate over it for a while.

 @deffn Widget choice
-Allows you to edit a sexp which may have one of fixed set of types.  It
-is currently implemented with the @code{choice-menu} basic widget, and
-has a similar syntax.
+Allows you to edit a sexp which may have one of a fixed set of types.
+It is currently implemented with the @code{choice-menu} basic widget,
+and has a similar syntax.
 @end deffn

 @deffn Widget set
@@ -1328,9 +1326,9 @@
 (widget-apply @var{widget} :activate)
 @end lisp

-A widget is inactive if itself, or any of its ancestors (found by
-following the @code{:parent} link) have been deactivated.  To make sure
-a widget is really active, you must therefore activate both itself, and
+A widget is inactive if it, or any of its ancestors (found by
+following the @code{:parent} link), have been deactivated.  To make sure
+a widget is really active, you must therefore activate both it and
 all its ancestors.

 @lisp
@@ -1340,12 +1338,12 @@
 @end lisp

 You can check if a widget has been made inactive by examining the value
-of @code{:inactive} keyword.  If this is non-nil, the widget itself has
-been deactivated.  This is different from using the @code{:active}
-keyword, in that the later tell you if the widget @strong{or} any of its
-ancestors have been deactivated.   Do not attempt to set the
+of the @code{:inactive} keyword.  If this is non-nil, the widget itself
+has been deactivated.  This is different from using the @code{:active}
+keyword, in that the latter tells you if the widget @strong{or} any of
+its ancestors have been deactivated.  Do not attempt to set the
 @code{:inactive} keyword directly.  Use the @code{:activate}
-@code{:deactivated} keywords instead.
+@code{:deactivate} keywords instead.


 @node Defining New Widgets, Widget Browser, Widget Properties, Top
@@ -1354,7 +1352,7 @@

 You can define specialized widgets with @code{define-widget}.  It allows
 you to create a shorthand for more complex widgets, including specifying
-component widgets and default new default values for the keyword
+component widgets and new default values for the keyword
 arguments.

 @defun widget-define name class doc &rest args
@@ -1382,8 +1380,8 @@

 @end defun

-Using @code{widget-define} does just store the definition of the widget
-type in the @code{widget-type} property of @var{name}, which is what
+Using @code{widget-define} just stores the definition of the widget type
+in the @code{widget-type} property of @var{name}, which is what
 @code{widget-create} uses.

 If you just want to specify defaults for keywords with no complex
@@ -1396,7 +1394,7 @@
 Function to convert a widget type before creating a widget of that
 type.  It takes a widget type as an argument, and returns the converted
 widget type.  When a widget is created, this function is called for the
-widget type and all the widgets parent types, most derived first.
+widget type and all the widget's parent types, most derived first.

 The following predefined functions can be used here:

@@ -1424,8 +1422,8 @@

 @item :create
 Function to create a widget from scratch.  The function takes one
-argument, a widget type, and create a widget of that type, insert it in
-the buffer, and return a widget object.
+argument, a widget type, and creates a widget of that type, inserts it
+in the buffer, and returns a widget object.

 @item :delete
 Function to delete a widget.  The function takes one argument, a widget,
@@ -1433,14 +1431,14 @@

 @item :value-create
 Function to expand the @samp{%v} escape in the format string.  It will
-be called with the widget as its argument.  Should
-insert a representation of the widgets value in the buffer.
+be called with the widget as its argument and should insert a
+representation of the widget's value in the buffer.

 @item :value-delete
-Should remove the representation of the widgets value from the buffer.
+Should remove the representation of the widget's value from the buffer.
 It will be called with the widget as its argument.  It doesn't have to
 remove the text, but it should release markers and delete nested widgets
-if such has been used.
+if such have been used.

 The following predefined function can be used here:

@@ -1483,7 +1481,7 @@
 take four arguments, @var{widget}, @var{prompt}, @var{value}, and
 @var{unbound} and should return a value for widget entered by the user.
 @var{prompt} is the prompt to use.  @var{value} is the default value to
-use, unless @var{unbound} is non-nil in which case there are no default
+use, unless @var{unbound} is non-nil, in which case there is no default
 value.  The function should read the value using the method most natural
 for this widget, and does not have to check that it matches.
 @end table