Mercurial > emacs
annotate BUGS @ 93956:bfc762f0b49c
* vc-hooks.el (vc-state): Add new state `conflict'.
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.
* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.
* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 10 Apr 2008 07:32:25 +0000 |
parents | 8ce686bd7f4f |
children | fb8bf24d2eb9 |
rev | line source |
---|---|
25856 | 1 If you think you may have found a bug in GNU Emacs, please |
2 read the Bugs section of the Emacs manual for advice on | |
3 (1) how to tell when to report a bug, and | |
4 (2) how to write a useful bug report and what information | |
5 it needs to have. | |
6 | |
7 There are three ways to read the Bugs section. | |
8 | |
9 (1) In a printed copy of the Emacs manual. | |
10 You can order one from the Free Software Foundation; | |
11 see the file etc/ORDERS. But if you don't have a copy on | |
12 hand and you think you have found a bug, you shouldn't wait | |
13 to get a printed manual; you should read the section right away | |
14 as described below. | |
15 | |
16 (2) With Info. Start Emacs, do C-h i to enter Info, | |
17 then m Emacs RET to get to the Emacs manual, then m Bugs RET | |
18 to get to the section on bugs. Or use standalone Info in | |
19 a like manner. (Standalone Info is part of the Texinfo distribution, | |
20 not part of the Emacs distribution.) | |
21 | |
22 (3) By hand. Do | |
23 cat info/emacs* | more "+/^File: emacs, Node: Bugs," | |
24 | |
55212
8ce686bd7f4f
Update key binding for viewing PROBLEMS.
Richard M. Stallman <rms@gnu.org>
parents:
34822
diff
changeset
|
25 Please first check the file etc/PROBLEMS (e.g. with C-h C-e in Emacs) to |
34822 | 26 make sure it isn't a known issue. |