mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Restore compatibility with Texinfo 4.13
* doc/emacs/vc1-xtra.texi (Other Working Trees): Remove @indentedblock; after reading the node twice I could not understand why the paragraphs so formatted must have been thus. * doc/misc/cl.texi (Derived types): Rename node to Derived Types, and insert the same into the menu.
This commit is contained in:
parent
63ea5e5b3a
commit
1d8b75f4b8
2 changed files with 3 additions and 4 deletions
|
|
@ -387,7 +387,6 @@ revisions or branches (@pxref{Branches}) checked out simultaneously, in
|
|||
different working trees, but with all revision history, branches, tags
|
||||
and other metadata shared.
|
||||
|
||||
@indentedblock
|
||||
Suppose your project has a trunk where you're developing the new version
|
||||
3 of your software, and a stable release branch from which you make
|
||||
point releases of version 2. Someone sends you a patch fixing a bug
|
||||
|
|
@ -406,7 +405,6 @@ use @kbd{C-x v m} (@pxref{Merging}) to merge the branch you have checked
|
|||
out in the other working tree. Now your version of the trunk has all of
|
||||
version 2's fixes merged into it, but you haven't pushed it yet because
|
||||
you're still refactoring. You'll use @kbd{C-x v P} later.
|
||||
@end indentedblock
|
||||
|
||||
Ordinary VC commands like @kbd{C-x v v} (@pxref{Basic VC Editing}) and
|
||||
@kbd{C-x v d} (@pxref{VC Directory Mode}) don't work any differently
|
||||
|
|
|
|||
|
|
@ -796,6 +796,7 @@ facts are true or false.
|
|||
|
||||
@menu
|
||||
* Type Predicates:: @code{cl-typep}, @code{cl-deftype}, and @code{cl-coerce}.
|
||||
* Derived Types:: @code{cl-deftype}.
|
||||
* Equality Predicates:: @code{cl-equalp}.
|
||||
@end menu
|
||||
|
||||
|
|
@ -888,8 +889,8 @@ floats. In all other circumstances, @code{cl-coerce} signals an
|
|||
error.
|
||||
@end defun
|
||||
|
||||
@node Derived types
|
||||
@subsection Derived types
|
||||
@node Derived Types
|
||||
@subsection Derived Types
|
||||
|
||||
@defmac cl-deftype name arglist [docstring] [decls] forms@dots{}
|
||||
This macro defines a new type called @var{name}.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue