*** empty log message ***

etc/NEWS

@@ -1218,6 +1218,77 @@ the buffer, just like for the local files.
 ** When invoked with a prefix argument, the command `list-abbrevs' now
 displays local abbrevs, only.
 
+** VC Changes
+
+VC has been overhauled internally.  It is now modular, making it
+easier to plug-in arbitrary version control backends.  (See Lisp
+Changes for details on the new structure.)  As a result, the mechanism
+to enable and disable support for particular version systems has
+changed: everything is now controlled by the new variable
+`vc-handled-backends'.  Its value is a list of atoms that identify
+version systems; the default is '(RCS CVS SCCS).  When finding a file,
+each of the backends in that list is tried in order to see whether the
+file is registered in that backend.
+
+When registering a new file, VC first tries each of the listed
+backends to see if any of them considers itself "responsible" for the
+directory of the file (e.g. because a corresponding subdirectory for
+master files exists).  If none of the backends is responsible, then
+the first backend in the list that could register the file is chosen.
+As a consequence, the variable `vc-default-back-end' is now obsolete.
+
+The old variable `vc-master-templates' is also obsolete, although VC
+still supports it for backward compatibility.  To define templates for
+RCS or SCCS, you should rather use the new variables
+vc-{rcs,sccs}-master-templates.  (There is no such feature under CVS
+where it doesn't make sense.)
+
+The variables `vc-ignore-vc-files' and `vc-handle-cvs' are also
+obsolete now, you must set `vc-handled-backends' to nil or exclude
+`CVS' from the list, respectively, to achieve their effect now.
+
+*** General Changes
+
+The variable `vc-checkout-carefully' is obsolete: the corresponding
+checks are always done now.
+
+VC Dired buffers are now kept up-to-date during all version control 
+operations.
+
+*** Changes for CVS
+
+There is a new user option, `vc-cvs-stay-local'.  If it is `t' (the
+default), then VC avoids network queries for files registered in
+remote repositories.  The state of such files is then only determined
+by heuristics and past information.  `vc-cvs-stay-local' can also be a
+regexp to match against repository hostnames; only files from hosts
+that match it are treated locally.  If the variable is nil, then VC
+queries the repository just as often as it does for local files.
+
+If `vc-cvs-stay-local' is on, and there have been changes in the
+repository, VC notifies you about it when you actually try to commit.
+If you want to check for updates from the repository without trying to
+commit, you can either use C-u C-x v m to perform an update on the
+current file, or you can use C-x v r RET to get an update for an
+entire directory tree.
+
+The new user option `vc-cvs-use-edit' indicates whether VC should call
+"cvs edit" to make files writeable; it defaults to `t'.  (This option
+is only meaningful if the CVSREAD variable is set, or if files are
+"watched" by other developers.)
+
+*** Lisp Changes in VC
+
+VC has been restructured internally to make it modular.  You can now
+add support for arbitrary version control backends by writing a
+library that provides a certain set of backend-specific functions, and
+then telling VC to use that library.  For example, to add support for
+a version system named FOO, you write a library named vc-foo.el, which
+provides a number of functions vc-foo-... (see commentary at the end
+of vc.el for a detailed list of them).  To make VC use that library,
+you need to put it somewhere into Emacs' load path and add the atom
+`FOO' to the list `vc-handled-backends'.
+
 ** New modes and packages
 
 +++

lisp/ChangeLog

@@ -1,5 +1,7 @@
 2000-09-04  Gerd Moellmann  <gerd@gnu.org>
 
+	* vc.el (vc-dired-resynch-file): Add autoload cookie.
+	
 	* vc.el (toplevel): Require `dired' at run-time for dired-mode-map.
 
 	* Makefile.in (DONTCOMPILE): Fix typo in file name.

lisp/cus-load.el

@@ -193,11 +193,12 @@
 (put 'spell 'custom-loads '("spell"))
 (put 'align 'custom-loads '("align"))
 (put 'rmail-headers 'custom-loads '("rmail"))
+(put 'timeclock 'custom-loads '("timeclock"))
 (put 'gnus-score-decay 'custom-loads '("gnus-score"))
 (put 'idlwave-shell-initial-commands 'custom-loads '("idlw-shell"))
 (put 'tildify 'custom-loads '("tildify"))
 (put 'cperl-autoinsert-details 'custom-loads '("cperl-mode"))
-(put 'help 'custom-loads '("help-macro" "help" "apropos" "cus-edit" "info-look" "info" "man" "tooltip" "woman"))
+(put 'help 'custom-loads '("help" "apropos" "cus-edit" "help-macro" "info-look" "info" "man" "tooltip" "woman"))
 (put 'forms 'custom-loads '("forms"))
 (put 'widget-documentation 'custom-loads '("wid-edit"))
 (put 'eshell-banner 'custom-loads '("em-banner"))
@@ -301,7 +302,7 @@
 (put 'metamail 'custom-loads '("metamail"))
 (put 'winner 'custom-loads '("winner"))
 (put 'ebrowse-faces 'custom-loads '("ebrowse"))
-(put 'wp 'custom-loads '("view" "cus-edit" "enriched" "lpr" "ps-print" "ebnf2ps" "bib-mode" "nroff-mode" "refbib" "refer" "scribe" "tildify"))
+(put 'wp 'custom-loads '("cus-edit" "enriched" "lpr" "ps-print" "view" "ebnf2ps" "bib-mode" "nroff-mode" "refbib" "refer" "scribe" "tildify"))
 (put 'reftex-citation-support 'custom-loads '("reftex-vars"))
 (put 'gnus-summary-choose 'custom-loads '("gnus-sum"))
 (put 'widget-browse 'custom-loads '("wid-browse"))
@@ -309,11 +310,11 @@
 (put 'diff 'custom-loads '("diff-mode" "diff"))
 (put 'unix 'custom-loads '("gud" "shell" "term" "sh-script" "rlogin"))
 (put 'external 'custom-loads '("bib-mode" "cus-edit" "locate" "server"))
-(put 'vc 'custom-loads '("files" "vc-hooks" "vc"))
+(put 'vc 'custom-loads '("files" "vc-hooks" "vc-cvs" "vc-rcs" "vc-sccs" "vc"))
 (put 'vhdl-highlight-faces 'custom-loads '("vhdl-mode"))
 (put 'which-func 'custom-loads '("which-func"))
 (put 'pc-select 'custom-loads '("pc-select"))
-(put 'i18n 'custom-loads '("ccl" "cus-edit" "double" "iso-acc" "iso-ascii" "ogonek"))
+(put 'i18n 'custom-loads '("cus-edit" "double" "ccl" "iso-acc" "iso-ascii" "ogonek"))
 (put 'sh 'custom-loads '("sh-script"))
 (put 'message-headers 'custom-loads '("message"))
 (put 'idlwave-code-formatting 'custom-loads '("idlwave"))
@@ -368,7 +369,6 @@
 (put 'speedbar-vc 'custom-loads '("speedbar"))
 (put 'jit-lock 'custom-loads '("jit-lock"))
 (put 'save-place 'custom-loads '("saveplace"))
-(put 'msb 'custom-loads '("msb"))
 (put 'bs 'custom-loads '("bs"))
 (put 'eldoc 'custom-loads '("eldoc"))
 (put 'change-log 'custom-loads '("add-log"))
@@ -437,7 +437,7 @@
 (put 'idlwave-completion 'custom-loads '("idlwave"))
 (put 'eshell-rebind 'custom-loads '("em-rebind"))
 (put 'bibtex 'custom-loads '("bibtex"))
-(put 'faces 'custom-loads '("faces" "facemenu" "cus-edit" "font-lock" "loaddefs" "hilit-chg" "paren" "ps-print" "speedbar" "time" "wid-edit" "woman" "gnus" "message" "cwarn" "make-mode"))
+(put 'faces 'custom-loads '("loaddefs" "faces" "facemenu" "cus-edit" "font-lock" "hilit-chg" "paren" "ps-print" "speedbar" "time" "wid-edit" "woman" "gnus" "message" "cwarn" "make-mode"))
 (put 'gnus-summary-various 'custom-loads '("gnus-sum"))
 (put 'applications 'custom-loads '("calendar" "cus-edit" "uniquify" "spell" "eshell"))
 (put 'ebrowse-member 'custom-loads '("ebrowse"))
@@ -459,7 +459,7 @@
 (put 'message-sending 'custom-loads '("message"))
 (put 'archive-arc 'custom-loads '("arc-mode"))
 (put 'rmail-output 'custom-loads '("rmailout"))
-(put 'editing 'custom-loads '("simple" "view" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "picture"))
+(put 'editing 'custom-loads '("simple" "indent" "paragraphs" "auto-show" "cus-edit" "faces" "outline" "hl-line" "hscroll" "vcursor" "view" "picture"))
 (put 'crisp 'custom-loads '("crisp"))
 (put 'nroff 'custom-loads '("nroff-mode"))
 (put 'executable 'custom-loads '("executable"))
@@ -474,7 +474,7 @@
 (put 'reftex-index-support 'custom-loads '("reftex-vars"))
 (put 'pascal 'custom-loads '("pascal"))
 (put 'rmail-retrieve 'custom-loads '("rmail" "rmailsum"))
-(put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "snmp-mode"))
+(put 'data 'custom-loads '("text-mode" "arc-mode" "forms" "hexl" "jka-compr" "saveplace" "sort" "tar-mode" "time-stamp" "timeclock" "snmp-mode"))
 (put 'mail 'custom-loads '("simple" "startup" "time" "gnus" "message" "emacsbug" "feedmail" "mail-extr" "mail-hist" "mail-utils" "mailalias" "metamail" "mh-e" "mspools" "rmail" "sendmail" "smtpmail" "supercite" "uce" "fortune" "eudc-vars"))
 (put 'paren-blinking 'custom-loads '("simple"))
 (put 'gnus-summary-sort 'custom-loads '("gnus-sum"))
@@ -596,8 +596,6 @@
 (custom-put-if-not 'footnote 'group-documentation "Support for footnotes in mail and news messages.")
 (custom-put-if-not 'custom-variable-default-form 'custom-version "20.3")
 (custom-put-if-not 'custom-variable-default-form 'standard-value t)
-(custom-put-if-not 'vc-ignore-vc-files 'custom-version "20.3")
-(custom-put-if-not 'vc-ignore-vc-files 'standard-value t)
 (custom-put-if-not 'mode-line 'custom-version "21.1")
 (custom-put-if-not 'mode-line 'group-documentation nil)
 (custom-put-if-not 'find-function-after-hook 'custom-version "20.3")
@@ -648,6 +646,8 @@
 (custom-put-if-not 'hexl-follow-ascii 'standard-value t)
 (custom-put-if-not 'browse-url-filename-alist 'custom-version "20.3")
 (custom-put-if-not 'browse-url-filename-alist 'standard-value t)
+(custom-put-if-not 'align 'custom-version "21.1")
+(custom-put-if-not 'align 'group-documentation "Align text to a specific column, by regexp.")
 (custom-put-if-not 'change-log-version-info-enabled 'custom-version "21.1")
 (custom-put-if-not 'change-log-version-info-enabled 'standard-value t)
 (custom-put-if-not 'sql-electric-stuff 'custom-version "20.8")
@@ -658,6 +658,8 @@
 (custom-put-if-not 'automatic-hscrolling 'standard-value t)
 (custom-put-if-not 'custom-buffer-done-function 'custom-version "21.1")
 (custom-put-if-not 'custom-buffer-done-function 'standard-value t)
+(custom-put-if-not 'cwarn 'custom-version "21.1")
+(custom-put-if-not 'cwarn 'group-documentation "Highlight suspicious C and C++ constructions.")
 (custom-put-if-not 'tags-apropos-additional-actions 'custom-version "21.1")
 (custom-put-if-not 'tags-apropos-additional-actions 'standard-value t)
 (custom-put-if-not 'generic-x 'custom-version "20.3")
@@ -676,6 +678,10 @@
 (custom-put-if-not 'fringe 'group-documentation nil)
 (custom-put-if-not 'vhdl 'custom-version "20.4")
 (custom-put-if-not 'vhdl 'group-documentation "Customizations for VHDL Mode.")
+(custom-put-if-not 'show-paren-priority 'custom-version "21.1")
+(custom-put-if-not 'show-paren-priority 'standard-value t)
+(custom-put-if-not 'vc-handled-backends 'custom-version "20.5")
+(custom-put-if-not 'vc-handled-backends 'standard-value t)
 (custom-put-if-not 'find-function-recenter-line 'custom-version "20.3")
 (custom-put-if-not 'find-function-recenter-line 'standard-value t)
 (custom-put-if-not 'tags-tag-face 'custom-version "21.1")
@@ -710,6 +716,8 @@
 (custom-put-if-not 'finger-X.500-host-regexps 'standard-value t)
 (custom-put-if-not 'uce-mail-reader 'custom-version "20.3")
 (custom-put-if-not 'uce-mail-reader 'standard-value t)
+(custom-put-if-not 'calculator 'custom-version "21.1")
+(custom-put-if-not 'calculator 'group-documentation "Simple pocket calculator.")
 (custom-put-if-not 'custom-button-pressed-face 'custom-version "21.1")
 (custom-put-if-not 'custom-button-pressed-face 'group-documentation nil)
 (custom-put-if-not 'dos-codepage-setup-hook 'custom-version "20.3.3")
@@ -734,6 +742,8 @@
 (custom-put-if-not 'focus-follows-mouse 'standard-value t)
 (custom-put-if-not 'pcl-cvs 'custom-version "21.1")
 (custom-put-if-not 'pcl-cvs 'group-documentation "Special support for the CVS versioning system.")
+(custom-put-if-not 'windmove 'custom-version "21.1")
+(custom-put-if-not 'windmove 'group-documentation "Directional selection of windows in a frame.")
 (custom-put-if-not 'fortran-comment-line-start-skip 'custom-version "21.1")
 (custom-put-if-not 'fortran-comment-line-start-skip 'standard-value t)
 (custom-put-if-not 'checkdoc 'custom-version "20.3")
@@ -760,12 +770,18 @@
 (custom-put-if-not 'show-paren-ring-bell-on-mismatch 'standard-value t)
 (custom-put-if-not 'rmail-default-body-file 'custom-version "20.3")
 (custom-put-if-not 'rmail-default-body-file 'standard-value t)
+(custom-put-if-not 'vc-dired-listing-switches 'custom-version "21.0")
+(custom-put-if-not 'vc-dired-listing-switches 'standard-value t)
 (custom-put-if-not 'rmail-movemail-flags 'custom-version "20.3")
 (custom-put-if-not 'rmail-movemail-flags 'standard-value t)
 (custom-put-if-not 'recentf 'custom-version "21.1")
 (custom-put-if-not 'recentf 'group-documentation "Maintain a menu of recently opened files.")
+(custom-put-if-not 'fortune 'custom-version "21.1")
+(custom-put-if-not 'fortune 'group-documentation "Settings for fortune.")
 (custom-put-if-not 'dired-at-point-require-prefix 'custom-version "20.3")
 (custom-put-if-not 'dired-at-point-require-prefix 'standard-value t)
+(custom-put-if-not 'diff-mode 'custom-version "21.1")
+(custom-put-if-not 'diff-mode 'group-documentation "Major-mode for viewing/editing diffs")
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'custom-version "20.3")
 (custom-put-if-not 'dabbrev-ignored-buffer-names 'standard-value t)
 (custom-put-if-not 'diary-unknown-time 'custom-version "20.3")
@@ -794,6 +810,8 @@
 (custom-put-if-not 'find-variable-regexp 'standard-value t)
 (custom-put-if-not 'header-line 'custom-version "21.1")
 (custom-put-if-not 'header-line 'group-documentation nil)
+(custom-put-if-not 'glasses 'custom-version "21.1")
+(custom-put-if-not 'glasses 'group-documentation "Make unreadable code likeThis(one) readable.")
 (custom-put-if-not 'easy-menu-precalculate-equivalent-keybindings 'custom-version "20.3")
 (custom-put-if-not 'easy-menu-precalculate-equivalent-keybindings 'standard-value t)
 (custom-put-if-not 'debugger-batch-max-lines 'custom-version "21.1")
@@ -802,14 +820,21 @@
 (custom-put-if-not 'desktop-enable 'standard-value t)
 (custom-put-if-not 'vc-dired-terse-display 'custom-version "20.3")
 (custom-put-if-not 'vc-dired-terse-display 'standard-value t)
+(custom-put-if-not 'server-kill-new-buffers 'custom-version "21.1")
+(custom-put-if-not 'server-kill-new-buffers 'standard-value t)
 (custom-put-if-not 'delphi 'custom-version "21.1")
 (custom-put-if-not 'delphi 'group-documentation "Major mode for editing Delphi source in Emacs")
 (custom-put-if-not 'eval-expression-print-level 'custom-version "21.1")
 (custom-put-if-not 'eval-expression-print-level 'standard-value t)
 
-(defvar custom-versions-load-alist '(("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "sh-script" "help" "compile") ("20.8" "sql") ("21.1" "debug" "dabbrev" "files" "paths" "sgml-mode" "net-utils" "font-lock" "fortran" "etags" "cus-edit" "frame" "add-log" "find-func" "wid-edit" "simple") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "vc-hooks" "cus-edit" "replace"))
+(defvar custom-versions-load-alist '(("21.0" "vc") ("20.3.3" "dos-vars") (21.1 "ange-ftp") ("20.4" "files" "sh-script" "help" "compile") ("20.5" "vc-hooks") ("20.8" "sql") ("21.1" "server" "debug" "dabbrev" "files" "paths" "sgml-mode" "net-utils" "font-lock" "paren" "fortran" "etags" "cus-edit" "frame" "add-log" "find-func" "wid-edit" "simple") ("20.3" "desktop" "easymenu" "hscroll" "dabbrev" "ffap" "rmail" "paren" "mailabbrev" "frame" "uce" "mouse" "diary-lib" "sendmail" "debug" "hexl" "vcursor" "vc" "compile" "etags" "help" "browse-url" "add-log" "find-func" "cus-edit" "replace"))
  "For internal use by custom.")
 
 (provide 'cus-load)
 
+;;; Local Variables:
+;;; version-control: never
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
 ;;; cus-load.el ends here