Mercurial > emacs
comparison lisp/ChangeLog @ 29578:cf89b9b2ef40
*** empty log message ***
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 12 Jun 2000 04:53:34 +0000 |
parents | a68f208f3dba |
children | f1e8c1d079fd |
comparison
equal
deleted
inserted
replaced
29577:ce3a0229bee7 | 29578:cf89b9b2ef40 |
---|---|
1 2000-06-12 Stefan Monnier <monnier@cs.yale.edu> | |
2 | |
3 * pcvs.el (cvs-parse-process): Don't blindly refresh all cookies. | |
4 (cvs-cleanup-removed): New function. | |
5 (cvs-cleanup-functions): New var. | |
6 (cvs-cleanup-collection): Use cvs-cleanup-functions to allow the user | |
7 some flexibility in specifying additional entries to auto-cleanup. | |
8 (cvs-quickdir): New function. | |
9 (cvs-mode-insert): Use cvs-fileinfo-from-entries. | |
10 (cvs-mode-imerge): Use smerge-ediff rather than vc-resolve-conflicts. | |
11 (cvs-mode-find-file): Check that we are on a filename or dirname | |
12 when invoked through a mouse-click. | |
13 (cvs-full-path): Remove. | |
14 (cvs-dired-action): Re-introduced. | |
15 (cvs-dired-noselect): Use it. | |
16 (vc-post-command-functions): use this new hook if available. | |
17 | |
18 * pcvs-info.el (cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars. | |
19 (cvs-status-map): Don't inherit from cvs-mode-map anymore. | |
20 (cvs-filename-map, cvs-dirname-map): Remove. | |
21 (cvs-default-action): Remove. | |
22 (cvs-add-face): Use `keymap' rather than `local-map' property, and only | |
23 if the arg is really a keymap. | |
24 (cvs-fileinfo-pp): Don't use any special map for file and dir names. | |
25 Don't hardcode the mapping from state (aka type) to face, but check | |
26 the var cvs-fi-<type>-face instead. | |
27 (cvs-fileinfo-from-entries): New function. | |
28 | |
29 * pcvs-defs.el (cvs-default-ignore-marks, cvs-diff-ignore-marks): | |
30 Docstring fix. | |
31 (cvs-find-file-and-jump): Change default to be safer. | |
32 (cvs-mode-diff-map): Define it as a function as well. | |
33 (cvs-mode-map): Refer to the function variant of cvs-mode-diff-map. | |
34 Bind mouse-2 in this global map rather than with text-properties. | |
35 | |
36 * pcvs-parse.el (cvs-parse-table): Look for conflict markers in the | |
37 file to resolve the ambiguity between C(conflict) and C(need-merge). | |
38 | |
1 2000-06-12 Kenichi Handa <handa@etl.go.jp> | 39 2000-06-12 Kenichi Handa <handa@etl.go.jp> |
2 | 40 |
3 * international/mule.el (set-buffer-file-coding-system): If | 41 * international/mule.el (set-buffer-file-coding-system): If |
4 CODING-SYSTEM is nil, set buffer-file-coding-system to nil | 42 CODING-SYSTEM is nil, set buffer-file-coding-system to nil |
5 unconditionally. | 43 unconditionally. |