Commit 3d992aa0 authored by Chong Yidong's avatar Chong Yidong
Browse files

More updates to Maintaining chapter of Emacs manual.

* files.texi (Misc File Ops): Mention vc-delete-file.

* maintaining.texi (Tags): Mention Semantic.
(Create Tags Table, Etags Regexps): Copyedits.
(Find Tag): Mention minibuffer completion.
(List Tags): Mention completion-at-point.  Completion is actually
available in M-x list-tags.

* programs.texi (Symbol Completion): Mention completion-at-point
explicitly.

* vc1-xtra.texi (VC Delete/Rename): Rename from Renaming and VC.
Document vc-delete-file.
parent 2170cb53
......@@ -153,7 +153,7 @@ indent.texi cyd
killing.texi cyd
kmacro.texi cyd
macos.texi
maintaining.texi
maintaining.texi cyd
major.texi
mark.texi cyd
mini.texi
......@@ -172,8 +172,8 @@ search.texi cyd
sending.texi
text.texi cyd
trouble.texi
vc-xtra.texi
vc1-xtra.texi
vc-xtra.texi cyd
vc1-xtra.texi cyd
windows.texi cyd
xresources.texi
......
2011-12-25 Chong Yidong <cyd@gnu.org>
* maintaining.texi (Tags): Mention Semantic.
(Create Tags Table, Etags Regexps): Copyedits.
(Find Tag): Mention minibuffer completion.
(List Tags): Mention completion-at-point. Completion is actually
available in M-x list-tags.
* vc1-xtra.texi (VC Delete/Rename): Rename from Renaming and VC.
Document vc-delete-file.
* files.texi (Misc File Ops): Mention vc-delete-file.
* programs.texi (Symbol Completion): Mention completion-at-point
explicitly.
2011-12-22 Chong Yidong <cyd@gnu.org>
* maintaining.texi (Change Log Commands): Don't specially mention
......
......@@ -782,9 +782,8 @@ Multiple Branches of a File
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.
* Revision Tags:: Symbolic names for revisions.
* 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
......
......@@ -1485,6 +1485,12 @@ argument to @kbd{M-x delete-file} or @kbd{M-x delete-directory} makes
them delete outright, instead of using the Trash, regardless of
@code{delete-by-moving-to-trash}.
@ifnottex
If a file is under version control (@pxref{Version Control}), you
should delete it using @kbd{M-x vc-delete-file} instead of @kbd{M-x
delete-file}. @xref{VC Delete/Rename}.
@end ifnottex
@findex copy-file
@cindex copying files
@kbd{M-x copy-file} reads the file @var{old} and writes a new file
......@@ -1514,10 +1520,9 @@ applies to all the remaining commands in this section. All of them
ask for confirmation when the new file name already exists, too.
@ifnottex
Note that if a file is under version control (@pxref{Version
Control}), you normally ought to rename it via the version control
system instead, using @kbd{M-x vc-rename-file}. @xref{Renaming and
VC}.
If a file is under version control (@pxref{Version Control}), you
should rename it using @kbd{M-x vc-rename-file} instead of @kbd{M-x
rename-file}. @xref{VC Delete/Rename}.
@end ifnottex
@findex add-name-to-file
......
This diff is collapsed.
......@@ -1291,18 +1291,18 @@ for switching graphical windows, so you should type @kbd{C-M-i} or
@kbd{@key{ESC} @key{TAB}} instead.
@cindex tags-based completion
In-buffer symbol completion generates its completion list in a
number of different ways. If Semantic mode is enabled, Emacs tries to
use the Semantic parser data for completion (@pxref{Semantic}). If
Semantic mode is not enabled or it fails at performing completion,
Emacs normally tries to complete using a tags table (@pxref{Tags}).
@findex completion-at-point
@cindex Lisp symbol completion
@cindex completion (Lisp symbols)
In Emacs Lisp mode, completion is performed using the function,
variable, and property names defined in the current Emacs session. If
there is an open parenthesis immediately before the beginning of the
partial symbol, only symbols with function definitions are considered.
In most programming language modes, @kbd{C-M-i} (or
@kbd{M-@key{TAB}}) invokes the command @code{completion-at-point},
which generates its completion list in a flexible way. If Semantic
mode is enabled, it tries to use the Semantic parser data for
completion (@pxref{Semantic}). If Semantic mode is not enabled or
fails at performing completion, it tries to complete using the
selected tags table (@pxref{Tags}). If in Emacs Lisp mode, it
performs completion using the function, variable, or property names
defined in the current Emacs session.
In all other respects, in-buffer symbol completion behaves like
minibuffer completion. For instance, if Emacs cannot complete to a
......
......@@ -12,8 +12,7 @@
@menu
* 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.
@end menu
......@@ -104,33 +103,48 @@ same author at nearly the same time. If the log entries for several
such files all have the same text, it coalesces them into a single
entry.
@node Renaming and VC
@subsubsection Renaming VC Work Files and Master Files
@node VC Delete/Rename
@subsubsection Deleting and Renaming Version-Controlled Files
@cindex renaming version-controlled files
@table @kbd
@item M-x vc-delete-file
Prompt for a file name, delete the file from the working tree, and
schedule the deletion for committing.
@item M-x vc-rename-file
Prompt for two file names, @var{VAR} and @var{OLD}, and rename them in
the version-controlled working tree.
Prompt for two file names, @var{VAR} and @var{OLD}, rename them in the
working tree, and schedule the renaming for committing.
@end table
@findex vc-rename-file
If you wish to rename a registered file in a version-controlled
working tree, use the command @kbd{M-x vc-rename-file}. This prompts
for two arguments: the file you wish to rename, followed by the new
name; then it performs the renaming through the version control
system.
@findex vc-delete-file
If you wish to delete a version-controlled file, use the command
@kbd{M-x vc-delete-file}. This prompts for the file name, and deletes
it via the version control system. The file is removed from the
working tree, and in the VC Directory buffer
@iftex
(@pxref{VC Directory Mode}),
@end iftex
@ifnottex
(@pxref{VC Directory Mode}),
@end ifnottex
it is displayed with the @samp{removed} status. When you commit it,
the deletion takes effect in the repository.
On modern version control systems that have built-in support for
renaming, the renaming operation takes effect immediately in the
@findex vc-rename-file
To rename a version-controlled file, type @kbd{M-x vc-rename-file}.
This prompts for two arguments: the name of the file you wish to
rename, and the new name; then it performs the renaming via the
version control system. The renaming takes effect immediately in the
working tree, and takes effect in the repository when you commit the
renamed file. The renamed file retains the full change history of the
original file.
renamed file.
On CVS and older version control systems, the @code{vc-rename-file}
command actually works by creating a copy of the old file under the
new name, registering it, and deleting the old file. In this case,
the change history is not preserved.
On modern version control systems that have built-in support for
renaming, the renamed file retains the full change history of the
original file. On CVS and older version control systems, the
@code{vc-rename-file} command actually works by creating a copy of the
old file under the new name, registering it, and deleting the old
file. In this case, the change history is not preserved.
@node Revision Tags
@subsubsection Revision Tags
......
......@@ -97,10 +97,10 @@ and also when HOME is set to C:\ by default.
** Completion
*** shell-mode uses pcomplete rules, with the standard completion UI.
+++
*** Many packages have been changed to use `completion-at-point'
rather than their own completion code.
+++
*** `completion-at-point' now handles tags and semantic completion.
---
*** Completion in a non-minibuffer now tries to detect the end of completion
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment