aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2000-09-09 00:50:26 +0000
committerStefan Monnier2000-09-09 00:50:26 +0000
commit7f8b6551debdd35a316e4fe1caae843b0bc3a562 (patch)
treec97406f93fb262967386145de5bd2ae789a0a3e9
parente1d95cc47186c5244daf37fdcd131119e3b761c2 (diff)
downloademacs-7f8b6551debdd35a316e4fe1caae843b0bc3a562.tar.gz
emacs-7f8b6551debdd35a316e4fe1caae843b0bc3a562.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog209
-rw-r--r--src/ChangeLog4
2 files changed, 99 insertions, 114 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2fbd738ae20..dc48a10e64c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12000-09-08 Stefan Monnier <monnier@cs.yale.edu>
2
3 * vc-sccs.el (vc-sccs-register):
4 * vc-rcs.el (vc-rcs-register):
5 * vc-cvs.el (vc-cvs-register): Don't clear file's properties.
6 * vc.el (vc-register): Clear file's properties.
7
12000-09-08 Gerd Moellmann <gerd@gnu.org> 82000-09-08 Gerd Moellmann <gerd@gnu.org>
2 9
3 * faces.el (face-spec-set): Only face-spec-reset-face when 10 * faces.el (face-spec-set): Only face-spec-reset-face when
@@ -9,8 +16,8 @@
9 16
102000-09-07 Eli Zaretskii <eliz@is.elta.co.il> 172000-09-07 Eli Zaretskii <eliz@is.elta.co.il>
11 18
12 * international/titdic-cnv.el (quail-cxterm-package-ext-info): Fix 19 * international/titdic-cnv.el (quail-cxterm-package-ext-info):
13 doc strings of chinese-py-b5, chinese-py, and chinese-tonepy input 20 Fix doc strings of chinese-py-b5, chinese-py, and chinese-tonepy input
14 methods. 21 methods.
15 22
16 * menu-bar.el (read-mail-item-name): New function. 23 * menu-bar.el (read-mail-item-name): New function.
@@ -23,15 +30,14 @@
23 * diff-mode.el (diff-mouse-goto-source): New function. 30 * diff-mode.el (diff-mouse-goto-source): New function.
24 31
25 * vc-sccs.el: Doc fixes. 32 * vc-sccs.el: Doc fixes.
26 (vc-sccs-register-switches, vc-sccs-master-templates): Add 33 (vc-sccs-register-switches, vc-sccs-master-templates): Add :version.
27 :version.
28 34
29 * vc-rcs.el: Doc fixes. 35 * vc-rcs.el: Doc fixes.
30 (vc-rcs-register-switches, vc-rcs-checkin-switches) 36 (vc-rcs-register-switches, vc-rcs-checkin-switches)
31 (vc-rcs-checkout-switches, vc-rcs-header) 37 (vc-rcs-checkout-switches, vc-rcs-header)
32 (vc-rcs-master-templates): Add or change :version. 38 (vc-rcs-master-templates): Add or change :version.
33 39
34 * vc-cvs.el: DOc fixes. 40 * vc-cvs.el: Doc fixes.
35 (vc-cvs-register-switches, vc-cvs-header, vc-cvs-use-edit) 41 (vc-cvs-register-switches, vc-cvs-header, vc-cvs-use-edit)
36 (vc-cvs-stay-local): Add :version. 42 (vc-cvs-stay-local): Add :version.
37 43
@@ -79,8 +85,7 @@
79 85
80 * international/quail.el: Don't require face. 86 * international/quail.el: Don't require face.
81 (quail): New group. 87 (quail): New group.
82 (quail-other-command): Dummy command to make quail-help work 88 (quail-other-command): Dummy command to make quail-help work better.
83 better.
84 (quail-keyboard-layout-alist): Add Keyboard type "jp106". 89 (quail-keyboard-layout-alist): Add Keyboard type "jp106".
85 (quail-keyboard-layout-substitution): New variable. 90 (quail-keyboard-layout-substitution): New variable.
86 (quail-update-keyboard-layout): New function. 91 (quail-update-keyboard-layout): New function.
@@ -91,13 +96,13 @@
91 (quail-insert-kbd-layout): New function. 96 (quail-insert-kbd-layout): New function.
92 (quail-show-keyboard-layout): New function. 97 (quail-show-keyboard-layout): New function.
93 (quail-get-translation): If the definition is a vector of length 98 (quail-get-translation): If the definition is a vector of length
94 1, and the element is a string of lenght 1, return the character 99 1, and the element is a string of length 1, return the character
95 in that string. 100 in that string.
96 (quail-update-current-translations): Fix the case of 101 (quail-update-current-translations): Fix the case of
97 relative-index out of range. 102 relative-index out of range.
98 (quail-build-decode-map, quail-insert-decode-map): New Functions. 103 (quail-build-decode-map, quail-insert-decode-map): New Functions.
99 (quail-help): Show keyboard layout by quail-insert-kbd-layout. 104 (quail-help): Show keyboard layout by quail-insert-kbd-layout.
100 Show key sequences for all avairable characters. 105 Show key sequences for all available characters.
101 (quail-help-insert-keymap-description): Don't show such verbose 106 (quail-help-insert-keymap-description): Don't show such verbose
102 key bindings as quail-self-insert-command. 107 key bindings as quail-self-insert-command.
103 108
@@ -314,8 +319,7 @@
314 319
315 * vc-cvs.el (vc-cvs-remote-p): Allow FILE to be a directory, too. 320 * vc-cvs.el (vc-cvs-remote-p): Allow FILE to be a directory, too.
316 (vc-cvs-dir-state): New function. 321 (vc-cvs-dir-state): New function.
317 (vc-cvs-dir-state-heuristic): New function, subroutine of the 322 (vc-cvs-dir-state-heuristic): New function, subroutine of the above.
318 above.
319 (vc-cvs-parse-entry): New function, also to be used in 323 (vc-cvs-parse-entry): New function, also to be used in
320 vc-cvs-registered. 324 vc-cvs-registered.
321 325
@@ -667,8 +671,7 @@
667 * vc.el: Update Copyright and add a crude list of backend funs. 671 * vc.el: Update Copyright and add a crude list of backend funs.
668 (vc-writable-p): New function. 672 (vc-writable-p): New function.
669 (with-vc-file): Use vc-writable-p. 673 (with-vc-file): Use vc-writable-p.
670 (vc-next-action-on-file): Update call to vc-steal-lock and 674 (vc-next-action-on-file): Update call to vc-steal-lock and cleanup.
671 cleanup.
672 (vc-register): Avoid vc-name. 675 (vc-register): Avoid vc-name.
673 (vc-locking-user): Remove. 676 (vc-locking-user): Remove.
674 (vc-steal-lock): Make the `owner' arg non-optional. 677 (vc-steal-lock): Make the `owner' arg non-optional.
@@ -722,8 +725,7 @@
722 725
723 * vc-cvs.el: Update Copyright. 726 * vc-cvs.el: Update Copyright.
724 (vc-cvs-diff): Remove unused `backend' variable. 727 (vc-cvs-diff): Remove unused `backend' variable.
725 (vc-cvs-checkout): Only toggle read-only if the buffer is setup 728 (vc-cvs-checkout): Only toggle read-only if the buffer is setup right.
726 right.
727 729
728 * vc-cvs-hooks.el: Preload a proto vc-cvs-registered. 730 * vc-cvs-hooks.el: Preload a proto vc-cvs-registered.
729 731
@@ -804,8 +806,7 @@
804 Call vc-call-backend without the leading vc-. 806 Call vc-call-backend without the leading vc-.
805 (vc-responsible-backend, vc-finish-logentry, vc-annotate) 807 (vc-responsible-backend, vc-finish-logentry, vc-annotate)
806 (vc-check-headers): Call vc-call-backend without the leading vc-. 808 (vc-check-headers): Call vc-call-backend without the leading vc-.
807 (vc-annotate-time-span): Replace confusing use of `cond' with 809 (vc-annotate-time-span): Replace confusing use of `cond' with `or'.
808 `or'.
809 (vc-annotate-display): Replace confusing use of `cond' with `or'. 810 (vc-annotate-display): Replace confusing use of `cond' with `or'.
810 Call vc-call-backend without the leading vc-. 811 Call vc-call-backend without the leading vc-.
811 812
@@ -815,8 +816,7 @@
815 816
816 * vc-hooks.el (vc-backend-hook-functions, vc-backend-functions) 817 * vc-hooks.el (vc-backend-hook-functions, vc-backend-functions)
817 (vc-make-backend-function, vc-call): Pass names without leading 818 (vc-make-backend-function, vc-call): Pass names without leading
818 `vc-' to vc-call-backend so we can blindly prefix them with 819 `vc-' to vc-call-backend so we can blindly prefix them with vc-BACKEND.
819 vc-BACKEND.
820 (vc-loadup): Don't load vc-X-hooks if vc-X is requested. 820 (vc-loadup): Don't load vc-X-hooks if vc-X is requested.
821 (vc-call-backend): Always try to load vc-X-hooks. 821 (vc-call-backend): Always try to load vc-X-hooks.
822 (vc-registered): Remove vc- in call to vc-call-backend. 822 (vc-registered): Remove vc- in call to vc-call-backend.
@@ -830,8 +830,7 @@
830 `smerge-mode' if applicable. 830 `smerge-mode' if applicable.
831 (vc-next-action-on-file): Use `vc-maybe-resolve-conflicts' after 831 (vc-next-action-on-file): Use `vc-maybe-resolve-conflicts' after
832 calling `merge-news'. 832 calling `merge-news'.
833 (vc-merge): Use `vc-maybe-resolve-conflicts' after calling 833 (vc-merge): Use `vc-maybe-resolve-conflicts' after calling `merge'.
834 `merge'.
835 (vc-log-edit): New function. Replacement for `vc-log-mode' by 834 (vc-log-edit): New function. Replacement for `vc-log-mode' by
836 interfacing to log-edit.el. 835 interfacing to log-edit.el.
837 (vc-start-entry): Call `vc-log-edit' instead of `vc-log-mode' if 836 (vc-start-entry): Call `vc-log-edit' instead of `vc-log-mode' if
@@ -848,8 +847,7 @@
848 * vc-hooks.el (vc-default-back-end, vc-buffer-backend): Remove. 847 * vc-hooks.el (vc-default-back-end, vc-buffer-backend): Remove.
849 (vc-kill-buffer-hook): Remove `vc-buffer-backend' handling. 848 (vc-kill-buffer-hook): Remove `vc-buffer-backend' handling.
850 849
851 * vc-cvs-hooks.el (vc-handle-cvs): Make it a defvar and add a 850 * vc-cvs-hooks.el (vc-handle-cvs): Make it a defvar and add a FIXME.
852 FIXME.
853 851
8542000-09-04 Andre Spiegel <spiegel@gnu.org> 8522000-09-04 Andre Spiegel <spiegel@gnu.org>
855 853
@@ -890,8 +888,7 @@
8902000-09-04 Stefan Monnier <monnier@cs.yale.edu> 8882000-09-04 Stefan Monnier <monnier@cs.yale.edu>
891 889
892 * vc-cvs.el (vc-cvs-state): Typo. 890 * vc-cvs.el (vc-cvs-state): Typo.
893 (vc-cvs-merge-news): Return the status code rather than the error 891 (vc-cvs-merge-news): Return the status code rather than the error msg.
894 msg.
895 892
8962000-09-04 Andre Spiegel <spiegel@gnu.org> 8932000-09-04 Andre Spiegel <spiegel@gnu.org>
897 894
@@ -926,8 +923,7 @@
926 locking user (as a string) is returned. 923 locking user (as a string) is returned.
927 (vc-locking-user): Update, based on the above convention. The 924 (vc-locking-user): Update, based on the above convention. The
928 'vc-locking-user property has disappeared. 925 'vc-locking-user property has disappeared.
929 (vc-mode-line, vc-default-mode-line-string): Adapt to new 926 (vc-mode-line, vc-default-mode-line-string): Adapt to new `vc-state'.
930 `vc-state'.
931 927
932 * vc-cvs.el (vc-cvs-state): Don't overwrite a non-heuristic state 928 * vc-cvs.el (vc-cvs-state): Don't overwrite a non-heuristic state
933 with a heuristic one. 929 with a heuristic one.
@@ -940,8 +936,7 @@
940 936
9412000-09-04 Stefan Monnier <monnier@cs.yale.edu> 9372000-09-04 Stefan Monnier <monnier@cs.yale.edu>
942 938
943 * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff): Run cvs 939 * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff): Run cvs asynchronously.
944 asynchronously.
945 940
946 * vc.el (vc-do-command): kill-all-local-variables, to reset any 941 * vc.el (vc-do-command): kill-all-local-variables, to reset any
947 major-mode in which the buffer might have been put earlier. Use 942 major-mode in which the buffer might have been put earlier. Use
@@ -966,8 +961,7 @@
966 961
9672000-09-04 Stefan Monnier <monnier@cs.yale.edu> 9622000-09-04 Stefan Monnier <monnier@cs.yale.edu>
968 963
969 * vc.el (vc-backend-dispatch, vc-annotate-mode-syntax-table): 964 * vc.el (vc-backend-dispatch, vc-annotate-mode-syntax-table): Remove.
970 Remove.
971 (vc-prefix-map): Move from vc-hooks.el and make autoloaded. 965 (vc-prefix-map): Move from vc-hooks.el and make autoloaded.
972 (vc-release-greater-or-equal-p): Move to vc-rcs.el. 966 (vc-release-greater-or-equal-p): Move to vc-rcs.el.
973 (vc-file-clear-masterprops): Braindead "fix". It was a nop and 967 (vc-file-clear-masterprops): Braindead "fix". It was a nop and
@@ -976,10 +970,8 @@
976 (vc-recompute-state): Move from vc-hooks.el. 970 (vc-recompute-state): Move from vc-hooks.el.
977 (vc-next-action-on-file): Add a `simple' argument to allow 971 (vc-next-action-on-file): Add a `simple' argument to allow
978 avoiding the `recompute' step (use for vc-cvs-simple-toggle). 972 avoiding the `recompute' step (use for vc-cvs-simple-toggle).
979 (vc-default-toggle-read-only, vc-default-record-rename): New 973 (vc-default-toggle-read-only, vc-default-record-rename): New funs.
980 functions. 974 (vc-next-action, vc-dired-hook): Use vc-state instead of vc-cvs-status.
981 (vc-next-action, vc-dired-hook): Use vc-state instead of
982 vc-cvs-status.
983 (vc-dired-mode-map): Properly defvar it. 975 (vc-dired-mode-map): Properly defvar it.
984 (vc-print-log): Call log-view-mode if available. 976 (vc-print-log): Call log-view-mode if available.
985 (small-temporary-file-directory): defvar instead of use boundp. 977 (small-temporary-file-directory): defvar instead of use boundp.
@@ -1004,8 +996,7 @@
1004 (vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part, 996 (vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part,
1005 vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates. 997 vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates.
1006 (vc-rcs-checkout): Add a missing `new-version' argument in the 998 (vc-rcs-checkout): Add a missing `new-version' argument in the
1007 call to vc-rcs-latest-on-branch-p. Hopefully that was the right 999 call to vc-rcs-latest-on-branch-p. Hopefully that was the right one.
1008 one.
1009 1000
1010 * vc-rcs-hooks.el: Provide 'vc-rcs-hooks. 1001 * vc-rcs-hooks.el: Provide 'vc-rcs-hooks.
1011 (vc-rcs-trunk-p, vc-rcs-branch-part): Moved from vc-rcs.el. 1002 (vc-rcs-trunk-p, vc-rcs-branch-part): Moved from vc-rcs.el.
@@ -1023,13 +1014,11 @@
1023 (vc-call): New macro plus use it wherever possible. 1014 (vc-call): New macro plus use it wherever possible.
1024 (vc-backend-subdirectory-name): Use neither `vc-default-back-end' 1015 (vc-backend-subdirectory-name): Use neither `vc-default-back-end'
1025 nor `vc-find-binary' since it's only called from 1016 nor `vc-find-binary' since it's only called from
1026 vc-mistrust-permission which is only used once the backend is 1017 vc-mistrust-permission which is only used once the backend is known.
1027 known.
1028 (vc-checkout-model): Fix parenthesis. 1018 (vc-checkout-model): Fix parenthesis.
1029 (vc-recompute-state, vc-prefix-map): Move to vc.el. 1019 (vc-recompute-state, vc-prefix-map): Move to vc.el.
1030 1020
1031 * vc-cvs.el: Require 'vc and 'vc-cvs-hooks (for compiler 1021 * vc-cvs.el: Require 'vc and 'vc-cvs-hooks (for compiler warnings).
1032 warnings).
1033 (vc-cvs-release, vc-cvs-system-release): Remove. 1022 (vc-cvs-release, vc-cvs-system-release): Remove.
1034 (vc-cvs-use-edit, vc-cvs-simple-toggle): New config variables. 1023 (vc-cvs-use-edit, vc-cvs-simple-toggle): New config variables.
1035 (vc-cvs-dired-state-info): Use `cvs-state' and slightly different 1024 (vc-cvs-dired-state-info): Use `cvs-state' and slightly different
@@ -1068,8 +1057,7 @@
1068 (vc-do-command): Bind inhibit-read-only so as to properly handle 1057 (vc-do-command): Bind inhibit-read-only so as to properly handle
1069 the case where the destination buffer has been made read-only. 1058 the case where the destination buffer has been made read-only.
1070 (vc-diff): Delegate to vc-version-diff in all cases. 1059 (vc-diff): Delegate to vc-version-diff in all cases.
1071 (vc-version-diff): Setup the *vc-diff* buffer as was done in 1060 (vc-version-diff): Setup the *vc-diff* buffer as was done in vc-diff.
1072 vc-diff.
1073 (vc-annotate-mode-variables): Removed (code moved partly to 1061 (vc-annotate-mode-variables): Removed (code moved partly to
1074 defvars and partly to vc-annotate-add-menu). 1062 defvars and partly to vc-annotate-add-menu).
1075 (vc-annotate-mode): Turned into a derived-mode. 1063 (vc-annotate-mode): Turned into a derived-mode.
@@ -1092,10 +1080,9 @@
1092 1080
1093 * vc-sccs.el (vc-sccs-steal-lock): Renamed from `vc-sccs-steal'. 1081 * vc-sccs.el (vc-sccs-steal-lock): Renamed from `vc-sccs-steal'.
1094 1082
1095 * vc-sccs-hooks.el (vc-sccs-state): Somewhat rewritten. Now 1083 * vc-sccs-hooks.el (vc-sccs-state): Somewhat rewritten.
1096 handles state `unlocked-changes'. 1084 Now handles state `unlocked-changes'.
1097 (vc-sccs-workfile-unchanged-p): New function, to support the 1085 (vc-sccs-workfile-unchanged-p): New function, to support the above.
1098 above.
1099 1086
1100 * vc-rcs.el (vc-rcs-steal-lock): Renamed from `vc-rcs-steal'. 1087 * vc-rcs.el (vc-rcs-steal-lock): Renamed from `vc-rcs-steal'.
1101 1088
@@ -1127,10 +1114,10 @@
1127 Updated function lists. 1114 Updated function lists.
1128 (vc-call-backend): Fixed typo. 1115 (vc-call-backend): Fixed typo.
1129 1116
1130 * vc-sccs.el, vc-rcs.el, vc-cvs.el (vc-BACKEND-responsible-p): New 1117 * vc-sccs.el, vc-rcs.el, vc-cvs.el (vc-BACKEND-responsible-p):
1131 functions. 1118 New functions.
1132 (vc-BACKEND-register): Renamed from `vc-BACKEND-admin'. Removed 1119 (vc-BACKEND-register): Renamed from `vc-BACKEND-admin'.
1133 query option. Redocumented. 1120 Removed query option. Redocumented.
1134 1121
11352000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de> 11222000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de>
1136 1123
@@ -1152,8 +1139,7 @@
1152 1139
11532000-09-04 Martin Lorentzson <martinl@gnu.org> 11402000-09-04 Martin Lorentzson <martinl@gnu.org>
1154 1141
1155 * vc.el (vc-backend-release, vc-backend-release-p): Functions 1142 * vc.el (vc-backend-release, vc-backend-release-p): Moved to vc-rcs.el.
1156 moved into vc-rcs.el
1157 (vc-backend-revert): Function moved into `vc-revert'; 1143 (vc-backend-revert): Function moved into `vc-revert';
1158 `vc-next-action' must be updated to accomodate this change. 1144 `vc-next-action' must be updated to accomodate this change.
1159 (vc-backend-steal): Function moved into `vc-finish-steal'. 1145 (vc-backend-steal): Function moved into `vc-finish-steal'.
@@ -1167,51 +1153,51 @@
11672000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de> 11532000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de>
1168 1154
1169 * vc-rcs-hooks.el, vc-cvs-hooks.el (vc-uses-locking): 1155 * vc-rcs-hooks.el, vc-cvs-hooks.el (vc-uses-locking):
1170 Renamed to vc-checkout-model. Return appropriate 1156 Rename to vc-checkout-model. Return appropriate values.
1171 values. Updated callers. 1157 Update callers.
1172 1158
1173 * vc-hooks.el (vc-backend-hook-functions): Renamed vc-uses-locking 1159 * vc-hooks.el (vc-backend-hook-functions): Rename vc-uses-locking
1174 to vc-checkout-model. 1160 to vc-checkout-model.
1175 (vc-checkout-required): Renamed to vc-checkout-model. 1161 (vc-checkout-required): Rename to vc-checkout-model.
1176 Re-implemented and re-commented. 1162 Re-implement and re-comment.
1177 (vc-after-save): Use vc-checkout-model. 1163 (vc-after-save): Use vc-checkout-model.
1178 1164
11792000-09-04 Martin Lorentzson <martinl@gnu.org> 11652000-09-04 Martin Lorentzson <martinl@gnu.org>
1180 1166
1181 * vc.el (vc-workfile-unchanged-p,vc-diff,vc-version-diff): Updated 1167 * vc.el (vc-workfile-unchanged-p,vc-diff,vc-version-diff):
1182 to use the vc-BACKEND-diff functions instead; `vc-diff' is now 1168 Update to use the vc-BACKEND-diff functions instead.
1183 working. 1169 `vc-diff' is now working.
1184 1170
1185 * vc-rcs.el (vc-rcs-logentry-check): Function added. 1171 * vc-rcs.el (vc-rcs-logentry-check): New function.
1186 1172
1187 * vc-cvs.el (vc-cvs-logentry-check): Function added. 1173 * vc-cvs.el (vc-cvs-logentry-check): New function.
1188 1174
1189 * vc-sccs.el (vc-sccs-diff): Function changed name from 1175 * vc-sccs.el (vc-sccs-diff): Function changed name from
1190 `vc-backend-diff'. This makes `vc-diff' work. 1176 `vc-backend-diff'. This makes `vc-diff' work.
1191 1177
1192 * vc-hooks.el (vc-backend-functions): Added `vc-diff' to the list 1178 * vc-hooks.el (vc-backend-functions): Add `vc-diff' to the list
1193 of functions possibly implemented in a vc-BACKEND library. 1179 of functions possibly implemented in a vc-BACKEND library.
1194 (vc-checkout-required): Bug fixed that caused an error to be 1180 (vc-checkout-required): Fix bug that caused an error to be
1195 signaled during `vc-after-save'. 1181 signaled during `vc-after-save'.
1196 1182
1197 * vc.el: Typo fixed. This checkin is made with our new VC code 1183 * vc.el: Fix typo.
1198 base for the very first time. A simple `(vc-checkin 1184 This checkin is made with our new VC code base for the very first time.
1199 (buffer-file-name))' was used to perform it. 1185 A simple `(vc-checkin (buffer-file-name))' was used to perform it.
1200 1186
1201 * vc-cvs.el (vc-cvs-revert,vc-cvs-checkout): Function calls to 1187 * vc-cvs.el (vc-cvs-revert,vc-cvs-checkout): Function calls to
1202 `vc-checkout-required' updated to `vc-cvs-uses-locking'. 1188 `vc-checkout-required' updated to `vc-cvs-uses-locking'.
1203 1189
1204 * vc-hooks.el (vc-backend-hook-functions): `vc-checkout-required' 1190 * vc-hooks.el (vc-backend-hook-functions): `vc-checkout-required'
1205 updated to `vc-uses-locking'. 1191 updated to `vc-uses-locking'.
1206 (vc-checkout-required): Call to backend function 1192 (vc-checkout-required): Call to backend function.
1207 `vc-checkout-required' updated to `vc-uses-locking' instead. 1193 `vc-checkout-required' updated to `vc-uses-locking' instead.
1208 1194
1209 * vc-rcs-hooks.el (vc-rcs-fetch-master-state): Function calls to 1195 * vc-rcs-hooks.el (vc-rcs-fetch-master-state): Function calls to
1210 `vc-checkout-required' updated to `vc-rcs-uses-locking'. 1196 `vc-checkout-required' updated to `vc-rcs-uses-locking'.
1211 1197
1212 * vc.el (vc-checkin): Merged with `vc-backend-checkin' and updated 1198 * vc.el (vc-checkin): Merge with `vc-backend-checkin' and update
1213 to match the split into various backends. 1199 to match the split into various backends.
1214 (vc-backend-checkin): Removed. Merged with `vc-checkin'. 1200 (vc-backend-checkin): Remove. Merge with `vc-checkin'.
1215 (vc-retrieve-snapshot): Bug fix. 1201 (vc-retrieve-snapshot): Bug fix.
1216 1202
12172000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de> 12032000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de>
@@ -1291,8 +1277,8 @@
1291 1277
1292 * vc-rcs-hooks.el (vc-rcs-registered): Bug fix. 1278 * vc-rcs-hooks.el (vc-rcs-registered): Bug fix.
1293 1279
1294 * vc.el, vc-sccs-hooks.el, vc-rcs-hooks.el, vc-hooks.el: Renamed 1280 * vc.el, vc-sccs-hooks.el, vc-rcs-hooks.el, vc-hooks.el: Rename
1295 `vc-uses-locking' to `vc-checkout-required'. Renamed the `locked' 1281 `vc-uses-locking' to `vc-checkout-required'. Rename the `locked'
1296 state to `reserved'. 1282 state to `reserved'.
1297 1283
1298 * vc-cvs.el, vc-cvs-hooks.el: Rename `vc-uses-locking' to 1284 * vc-cvs.el, vc-cvs-hooks.el: Rename `vc-uses-locking' to
@@ -1300,12 +1286,12 @@
1300 1286
13012000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de> 12872000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de>
1302 1288
1303 * vc-rcs-hooks.el: Implemented new state model. Hardly anything 1289 * vc-rcs-hooks.el: Implement new state model. Hardly anything
1304 untouched. 1290 untouched.
1305 1291
1306 * vc-rcs.el (vc-rcs-latest-on-branch-p): Moved to vc-rcs-hooks.el. 1292 * vc-rcs.el (vc-rcs-latest-on-branch-p): Move to vc-rcs-hooks.el.
1307 1293
1308 * vc.el (vc-update-change-log): Use small-temporary-file-directory, 1294 * vc.el (vc-update-change-log): Use small-temporary-file-directory,
1309 if defined. (Merged from main line, slightly adapted.) 1295 if defined. (Merged from main line, slightly adapted.)
1310 1296
1311 * vc-cvs.el (vc-cvs-annotate-difference): Handle possible 1297 * vc-cvs.el (vc-cvs-annotate-difference): Handle possible
@@ -1321,32 +1307,28 @@
1321 1307
13222000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de> 13082000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de>
1323 1309
1324 * vc-hooks.el: Implemented new state model. 1310 * vc-hooks.el: Implement new state model.
1325 (vc-state, vc-state-heuristic, vc-default-state-heuristic): New 1311 (vc-state, vc-state-heuristic, vc-default-state-heuristic): New funs.
1326 functions. 1312 (vc-locking-user): Simplify. Now only needed if the file is
1327 (vc-locking-user): Simplified. Now only needed if the file is
1328 locked by somebody else. 1313 locked by somebody else.
1329 (vc-lock-from-permissions): Removed. Functionality is in 1314 (vc-lock-from-permissions): Remove. Functionality is in
1330 vc-sccs-hooks.el and vc-rcs-hooks.el now. 1315 vc-sccs-hooks.el and vc-rcs-hooks.el now.
1331 (vc-mode-line-string): New name for former vc-status. Adapted. 1316 (vc-mode-line-string): New name for former vc-status. Adapted.
1332 (vc-mode-line): Adapted to use the above. Removed optional 1317 (vc-mode-line): Adapt to use the above. Remove optional parameter.
1333 parameter.
1334 1318
1335 * vc-cvs-hooks.el (vc-cvs-state, vc-cvs-state-heuristic): New 1319 * vc-cvs-hooks.el (vc-cvs-state, vc-cvs-state-heuristic): New funs.
1336 functions. Various simplifications and adaptations all over the 1320 Various simplifications and adaptations all over the place.
1337 place.
1338 1321
1339 * vc-sccs-hooks.el (vc-sccs-state, vc-sccs-state-heuristic): New 1322 * vc-sccs-hooks.el (vc-sccs-state, vc-sccs-state-heuristic): New funs.
1340 functions. Simplified and adapted the rest. 1323 Simplify and adapt the rest.
1341 1324
1342 * vc.el (vc-resynch-window): Added TODO comment: check for 1325 * vc.el (vc-resynch-window): Add TODO comment: check for
1343 interaction with view mode according to recent RCS change. 1326 interaction with view mode according to recent RCS change.
1344 (vc-backend-merge-news): Merged "CMUP" patch from mainline. 1327 (vc-backend-merge-news): Merge "CMUP" patch from mainline.
1345 1328
13462000-09-04 Martin Lorentzson <martinl@gnu.org> 13292000-09-04 Martin Lorentzson <martinl@gnu.org>
1347 1330
1348 * vc.el: Converted the remaining function comments to 1331 * vc.el: Convert the remaining function comments to docstrings.
1349 documentation strings.
1350 1332
13512000-09-04 Martin Lorentzson <martinl@gnu.org> 13332000-09-04 Martin Lorentzson <martinl@gnu.org>
1352 1334
@@ -1374,46 +1356,45 @@
13742000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de> 13562000-09-04 Andre Spiegel <spiegel@inf.fu-berlin.de>
1375 1357
1376 * vc-hooks.el (vc-master-templates): Is really obsolete. 1358 * vc-hooks.el (vc-master-templates): Is really obsolete.
1377 Commented out the definition for now. What is the right procedure 1359 Comment out the definition for now. What is the right procedure
1378 to get rid of it? 1360 to get rid of it?
1379 (vc-registered, vc-backend, vc-buffer-backend, vc-name): Largely 1361 (vc-registered, vc-backend, vc-buffer-backend, vc-name): Largely
1380 rewritten. 1362 rewritten.
1381 (vc-default-registered): Removed. 1363 (vc-default-registered): Remove.
1382 (vc-check-master-templates): New function; does mostly what the 1364 (vc-check-master-templates): New function; does mostly what the
1383 above did before. 1365 above did before.
1384 (vc-locking-user): Don't rely on the backend to set the property. 1366 (vc-locking-user): Don't rely on the backend to set the property.
1385 1367
1386 * vc-rcs-hooks.el (vc-rcs-master-templates): Use simpler values. 1368 * vc-rcs-hooks.el (vc-rcs-master-templates): Use simpler values.
1387 Rewrote documentation. 1369 Rewrite documentation.
1388 (vc-rcs-templates-grabbed): New variable. 1370 (vc-rcs-templates-grabbed): New variable.
1389 (vc-rcs-grab-templates): New function. 1371 (vc-rcs-grab-templates): New function.
1390 (vc-rcs-registered): Rewritten to use above mechanism. 1372 (vc-rcs-registered): Rewrite to use above mechanism.
1391 1373
1392 * vc-sccs-hooks.el (vc-sccs-master-templates): Use simpler values. 1374 * vc-sccs-hooks.el (vc-sccs-master-templates): Use simpler values.
1393 Rewrote documentation. 1375 Rewrite documentation.
1394 (vc-sccs-templates-grabbed): New variable. 1376 (vc-sccs-templates-grabbed): New variable.
1395 (vc-sccs-grab-templates): New function. 1377 (vc-sccs-grab-templates): New function.
1396 (vc-sccs-registered): Rewritten to use above mechanism. 1378 (vc-sccs-registered): Rewrite to use above mechanism.
1397 (vc-sccs-search-project-dir): Renamed from 1379 (vc-sccs-search-project-dir): Rename from vc-search-sccs-project-dir.
1398 vc-search-sccs-project-dir. Don't throw the result, simply 1380 Don't throw the result, simply return it.
1399 return it.
1400 1381
1401 * vc-cvs-hooks.el (vc-cvs-master-templates): Variable removed. 1382 * vc-cvs-hooks.el (vc-cvs-master-templates): Remove.
1402 (vc-cvs-find-master): Removed. Code is now in vc-cvs-registered. 1383 (vc-cvs-find-master): Remove. Code is now in vc-cvs-registered.
1403 (vc-cvs-registered): Does the check itself now. Simplified. 1384 (vc-cvs-registered): Does the check itself now. Simplify.
1404 1385
1405 * vc-cvs.el (vc-cvs-revert): Merged and adapted "unedit" patch 1386 * vc-cvs.el (vc-cvs-revert): Merge and adapt "unedit" patch
1406 from main line. 1387 from main line.
1407 1388
14082000-09-04 Martin Lorentzson <martinl@gnu.org> 13892000-09-04 Martin Lorentzson <martinl@gnu.org>
1409 1390
1410 * vc-cvs.el (vc-cvs-diff): Function added. 1391 * vc-cvs.el (vc-cvs-diff): New function.
1411 1392
1412 * vc-sccs.el (vc-sccs-diff): Function added. 1393 * vc-sccs.el (vc-sccs-diff): New function.
1413 1394
1414 * vc-rcs.el (vc-rcs-diff): Function added. 1395 * vc-rcs.el (vc-rcs-diff): New function.
1415 (vc-rcs-checkout) Bug (typo) found and fixed. 1396 (vc-rcs-checkout): Bug (typo) found and fixed.
1416 (vc-rcs-register-switches) Variable `vc-rcs-register-switches' added. 1397 (vc-rcs-register-switches): New variable.
1417 1398
1418 * vc.el (vc-backend-diff): Function removed and placed in the 1399 * vc.el (vc-backend-diff): Function removed and placed in the
1419 backend files. 1400 backend files.
@@ -1438,10 +1419,10 @@
1438 * spec.txt: Added specification of vc-state. 1419 * spec.txt: Added specification of vc-state.
1439 1420
1440 * vc-sccs-hooks.el (vc-sccs-master-properties): 1421 * vc-sccs-hooks.el (vc-sccs-master-properties):
1441 Removed handling of vc-latest-version and 1422 Remove handling of vc-latest-version and
1442 vc-your-latest-version. What used to be vc-latest-version, is now 1423 vc-your-latest-version. What used to be vc-latest-version, is now
1443 returned as vc-workfile-version. 1424 returned as vc-workfile-version.
1444 (vc-sccs-workfile-version): Adapted. 1425 (vc-sccs-workfile-version): Adapt.
1445 1426
14462000-09-04 Dave Love <fx@gnu.org> 14272000-09-04 Dave Love <fx@gnu.org>
1447 1428
diff --git a/src/ChangeLog b/src/ChangeLog
index e524a45935f..b337d3a1b3f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12000-09-08 Stefan Monnier <monnier@cs.yale.edu>
2
3 * xfaces.c (Finternal_set_lisp_face_attribute): Minor thinko.
4
12000-09-08 Gerd Moellmann <gerd@gnu.org> 52000-09-08 Gerd Moellmann <gerd@gnu.org>
2 6
3 * ralloc.c (mmap_fd): Remove initializer which can make it 7 * ralloc.c (mmap_fd): Remove initializer which can make it