diff options
Diffstat (limited to 'doc/emacs/emacs.texi')
| -rw-r--r-- | doc/emacs/emacs.texi | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index aca3735ff03..7f703fbaad0 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -602,11 +602,8 @@ Editing Text-based Tables * Table Recognition:: How to activate and deactivate tables. * Cell Commands:: Cell-oriented commands in a table. * Cell Justification:: Justifying cell contents. -* Row Commands:: Manipulating rows of table cell. -* Column Commands:: Manipulating columns of table cell. -* Fixed Width Mode:: Fixing cell width. +* Table Rows and Columns:: Inserting and deleting rows and columns. * Table Conversion:: Converting between plain text and tables. -* Measuring Tables:: Analyzing table dimension. * Table Misc:: Table miscellany. Editing Programs @@ -702,7 +699,7 @@ Compiling and Testing Programs * Executing Lisp:: Various modes for editing Lisp programs, with different facilities for running the Lisp programs. -* Lisp Libraries:: Creating Lisp programs to run in Emacs. +* Lisp Libraries:: How Lisp programs are loaded into Emacs. * Lisp Eval:: Executing a single Lisp expression in Emacs. * Lisp Interaction:: Executing Lisp in an Emacs buffer. * External Lisp:: Communicating through Emacs with a separate Lisp. @@ -725,8 +722,7 @@ GDB Graphical Interface * Breakpoints Buffer:: A breakpoint control panel. * Threads Buffer:: Displays your threads. * Stack Buffer:: Select a frame from the call stack. -* Other GDB Buffers:: Input/output, locals, registers, - assembler, threads and memory buffers. +* Other GDB Buffers:: Other buffers for controlling the GDB state. * Watch Expressions:: Monitor variable values in the speedbar. * Multithreaded Debugging:: Debugging programs with several threads. @@ -745,15 +741,16 @@ Version Control * VC Mode Line:: How the mode line shows version control status. * Basic VC Editing:: How to edit a file under version control. * Log Buffer:: Features available in log entry buffers. +* Registering:: Putting a file under version control. * Old Revisions:: Examining and comparing old versions. -* Secondary VC Commands:: The commands used a little less frequently. +* VC Change Log:: Viewing the VC Change Log. +* VC Undo:: Canceling changes before or after committing. * VC Directory Mode:: Listing files managed by version control. * Branches:: Multiple lines of development. -* Remote Repositories:: Efficient access to remote CVS servers. * Revision Tags:: Symbolic names for revisions. * Miscellaneous VC:: Various other commands and features of VC. * Customizing VC:: Variables that change VC's behavior. - + Introduction to Version Control * Why Version Control?:: Understanding the problems it addresses. @@ -770,12 +767,6 @@ Basic Editing under Version Control * VC With A Locking VCS:: RCS in its default mode, SCCS, and optionally CVS. * Advanced C-x v v:: Advanced features available with a prefix argument. -The Secondary Commands of VC - -* Registering:: Putting a file under version control. -* VC Change Log:: Viewing the VC Change Log. -* VC Undo:: Canceling changes before or after check-in. - VC Directory Mode * VC Directory Buffer:: What the buffer looks like and means. @@ -784,26 +775,15 @@ VC Directory Mode Multiple Branches of a File * Switching Branches:: How to get to another existing branch. -* Creating Branches:: How to start a new branch. +* VC Pull:: Updating a branch from another branch. * Merging:: Transferring changes between branches. -* Multi-User Branching:: Multiple users working at multiple branches - in parallel. - -Remote Repositories - -* Version Backups:: Keeping local copies of repository versions. -* Local Version Control:: Using another version system for local editing. - -Revision Tags - -* Making Revision Tags:: The tag facilities. -* Revision Tag Caveats:: Things to be careful of when using tags. +* Creating Branches:: How to start a new branch. Miscellaneous Commands and Features of VC * Change Logs and VC:: Generating a change log file from log entries. -* Renaming and VC:: A command to rename both the source and master - file correctly. +* VC Delete/Rename:: Deleting and renaming version-controlled files. +* Revision Tags:: Symbolic names for revisions. * Version Headers:: Inserting version control headers into working files. Customizing VC |