Mercurial > emacs

--- a/lispref/commands.texi	Mon Nov 01 15:42:30 1999 +0000
+++ b/lispref/commands.texi	Mon Nov 01 15:52:18 1999 +0000
@@ -524,7 +524,7 @@
 supply if the command inquires which events were used to invoke it.
 @end defun

-@defun command-execute command &optional record-flag keys
+@defun command-execute command &optional record-flag keys special
 @cindex keyboard macro execution
 This function executes @var{command}.  The argument @var{command} must
 satisfy the @code{commandp} predicate; i.e., it must be an interactively
@@ -542,6 +542,10 @@

 The argument @var{keys}, if given, specifies the sequence of events to
 supply if the command inquires which events were used to invoke it.
+
+The argument @var{special}, if given, means to ignore the prefix
+argument and not clear it.  This is used for executing special events
+(@pxref{Special Events}).
 @end defun

 @deffn Command execute-extended-command prefix-argument
@@ -1112,9 +1116,10 @@

 If the position is on a mode line or the vertical line separating
 @var{window} from its neighbor to the right, then @var{buffer-pos} is
-the symbol @code{mode-line} or @code{vertical-line}.  For the mode line,
-@var{y} does not have meaningful data.  For the vertical line, @var{x}
-does not have meaningful data.
+the symbol @code{mode-line}, @code{header-line}, or
+@code{vertical-line}.  For the mode line, @var{y} does not have
+meaningful data.  For the vertical line, @var{x} does not have
+meaningful data.

 In one special case, @var{buffer-pos} is a list containing a symbol (one
 of the symbols listed above) instead of just the symbol.  This happens
--- a/lispref/errors.texi	Mon Nov 01 15:42:30 1999 +0000
+++ b/lispref/errors.texi	Mon Nov 01 15:52:18 1999 +0000
@@ -54,6 +54,10 @@
 @code{"Buffer is read-only"}@*
 @xref{Read Only Buffers}.

+@item coding-system-error
+@code{"Invalid coding system"}@*
+@xref{Coding Systems}.
+
 @item cyclic-function-indirection
 @code{"Symbol's chain of function indirections\@* contains a loop"}@*
 @xref{Function Indirection}.
@@ -91,6 +95,11 @@
 This is a subcategory of @code{file-error}.@*
 @xref{Modification Time}.

+@item ftp-error
+This is a subcategory of @code{file-error}, which results from problems
+in accessing a remote file using ftp.@*
+@xref{Remote Files,,, emacs, The Emacs Manual}.
+
 @item invalid-function
 @code{"Invalid function"}@*
 @xref{Classifying Lists}.
@@ -128,6 +137,10 @@
 may not be changed.@*
 @xref{Constant Variables, , Variables that Never Change}.

+@item text-read-only
+@code{"Text is read-only"}@*
+@xref{Special Properties}.
+
 @item undefined-color
 @code{"Undefined color"}@*
 @xref{Color Names}.
--- a/lispref/intro.texi	Mon Nov 01 15:42:30 1999 +0000
+++ b/lispref/intro.texi	Mon Nov 01 15:52:18 1999 +0000
@@ -650,8 +650,7 @@
 (such as the buffer @samp{*scratch*}), the printed text is inserted into
 the buffer.  If you execute the example by other means (such as by
 evaluating the function @code{eval-region}), the printed text is
-displayed in the echo area.  You should be aware that text displayed in
-the echo area is truncated to a single line.
+displayed in the echo area.

   Examples in this manual indicate printed text with @samp{@print{}},
 irrespective of where that text goes.  The value returned by evaluating
--- a/lispref/os.texi	Mon Nov 01 15:42:30 1999 +0000
+++ b/lispref/os.texi	Mon Nov 01 15:52:18 1999 +0000
@@ -1077,13 +1077,15 @@

 The characters @samp{E} and @samp{O} act as modifiers when used between
 @samp{%} and one of the letters in the table above.  @samp{E} specifies
-using the locale's ``alternative'' version of a format, as specified by
-POSIX.  @samp{E} is allowed in @samp{%Ec}, @samp{%EC}, @samp{%Ex},
-@samp{%EX}, @samp{%Ey}, and @samp{%EY}.
+using the current locale's ``alternative'' version of the date and time.
+In a Japanese locale, for example, @code{%Ex} might yield a date format
+based on the Japanese Emperors' reigns.  @samp{E} is allowed in
+@samp{%Ec}, @samp{%EC}, @samp{%Ex}, @samp{%EX}, @samp{%Ey}, and
+@samp{%EY}.

-@samp{O} means to use the current locale's number symbols to format each
-number, instead of the ordinary @sc{ascii} digits.  It is allowed with
-most letters.
+@samp{O} means to use the current locale's ``alternative''
+representation of numbers, instead of the ordinary decimal digits.  This
+is allowed with most letters, all the ones that output numbers.

 If @var{universal} is non-@code{nil}, that means to describe the time as
 Universal Time; @code{nil} means describe it using what Emacs believes
--- a/lispref/searching.texi	Mon Nov 01 15:42:30 1999 +0000
+++ b/lispref/searching.texi	Mon Nov 01 15:52:18 1999 +0000
@@ -963,7 +963,7 @@
 This function is a synonym of @code{how-many}.
 @end deffn

-@deffn Command list-matching-lines regexp nlines
+@deffn Command list-matching-lines regexp &optional nlines
 This function is a synonym of @code{occur}.
 Show all lines following point containing a match for @var{regexp}.
 Display each line with @var{nlines} lines before and after,
@@ -1213,7 +1213,7 @@
 matching.
 @end defun

-@defun match-string-no-properties count
+@defun match-string-no-properties count &optional in-string
 This function is like @code{match-string} except that the result
 has no text properties.
 @end defun
--- a/lispref/syntax.texi	Mon Nov 01 15:42:30 1999 +0000
+++ b/lispref/syntax.texi	Mon Nov 01 15:52:18 1999 +0000
@@ -289,18 +289,19 @@
 @cindex syntax flags

   In addition to the classes, entries for characters in a syntax table
-can specify flags.  There are six possible flags, represented by the
-characters @samp{1}, @samp{2}, @samp{3}, @samp{4}, @samp{b} and
-@samp{p}.
+can specify flags.  There are seven possible flags, represented by the
+characters @samp{1}, @samp{2}, @samp{3}, @samp{4}, @samp{b}, @samp{n},
+and @samp{p}.

-  All the flags except @samp{p} are used to describe multi-character
-comment delimiters.  The digit flags indicate that a character can
-@emph{also} be part of a comment sequence, in addition to the syntactic
-properties associated with its character class.  The flags are
-independent of the class and each other for the sake of characters such
-as @samp{*} in C mode, which is a punctuation character, @emph{and} the
-second character of a start-of-comment sequence (@samp{/*}), @emph{and}
-the first character of an end-of-comment sequence (@samp{*/}).
+  All the flags except @samp{n} and @samp{p} are used to describe
+multi-character comment delimiters.  The digit flags indicate that a
+character can @emph{also} be part of a comment sequence, in addition to
+the syntactic properties associated with its character class.  The flags
+are independent of the class and each other for the sake of characters
+such as @samp{*} in C mode, which is a punctuation character, @emph{and}
+the second character of a start-of-comment sequence (@samp{/*}),
+@emph{and} the first character of an end-of-comment sequence
+(@samp{*/}).

   Here is a table of the possible flags for a character @var{c},
 and what they mean:
@@ -372,6 +373,12 @@
 @end table

 @item
+@samp{n} on a comment delimiter character specifies
+that this kind of comment can be nested.  For a two-character
+comment delimiter, @samp{n} on either character makes it
+nestable.
+
+@item
 @c Emacs 19 feature
 @samp{p} identifies an additional ``prefix character'' for Lisp syntax.
 These characters are treated as whitespace when they appear between
@@ -638,7 +645,9 @@

 @item
 @cindex inside comment
-@code{t} if inside a comment (of either style).
+@code{t} if inside a comment (of either style),
+or the comment nesting level if inside a kind of comment
+that can be nested.

 @item
 @cindex quote character
@@ -837,16 +846,19 @@
 @tab
 @samp{1} @ @  @code{(lsh 1 16)}
 @tab
-@samp{3} @ @  @code{(lsh 1 18)}
+@samp{4} @ @  @code{(lsh 1 19)}
 @tab
-@samp{p} @ @  @code{(lsh 1 20)}
+@samp{b} @ @  @code{(lsh 1 21)}
 @item
 @tab
 @samp{2} @ @  @code{(lsh 1 17)}
 @tab
-@samp{4} @ @  @code{(lsh 1 19)}
+@samp{p} @ @  @code{(lsh 1 20)}
 @tab
-@samp{b} @ @  @code{(lsh 1 21)}
+@samp{n} @ @  @code{(lsh 1 22)}
+@item
+@tab
+@samp{3} @ @  @code{(lsh 1 18)}
 @end multitable

 @node Categories