mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Get rid of several uses of the term 'master' in favor of equivalent verbiage

Browse source 
using "repository".  No code changes.
This commit is contained in:
Eric S. Raymond 2010-04-09 13:19:53 -04:00
parent b13aef5499
commit 004f9b3f1b
5 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/vc-hooks.el
View file

@ -396,7 +396,7 @@ If the argument is a list, the files must all have the same back end."
(defun vc-backend-subdirectory-name (file)
"Return where the master and lock FILEs for the current directory are kept."
"Return where the repository for the current directory is kept."
(symbol-name (vc-backend file)))
(defun vc-name (file)
@ -467,13 +467,13 @@ For registered files, the value returned is one of:
USER The current version of the working file is locked by
some other USER (a string).
'needs-update The file has not been edited by the user, but there is
'needs-update The file has not been edited by the user, but there is
a more recent version on the current branch stored
in the master file.
in the repository.
'needs-merge The file has been edited by the user, and there is also
a more recent version on the current branch stored in
the master file. This state can only occur if locking
the repository. This state can only occur if locking
is not used for the file.
'unlocked-changes The working version of the file is not locked,
@ -552,7 +552,7 @@ and does not employ any heuristic at all."
unchanged))))
(defun vc-default-workfile-unchanged-p (backend file)
"Check if FILE is unchanged by diffing against the master version.
"Check if FILE is unchanged by diffing against the repository version.
Return non-nil if FILE is unchanged."
(zerop (condition-case err
;; If the implementation supports it, let the output