summaryrefslogtreecommitdiff
path: root/lisp/vc/vc.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2021-09-14 07:55:56 +0200
committerStefan Kangas <stefan@marxist.se>2021-09-14 07:57:14 +0200
commit25ebb9374bdadf66153727831fc7ff131c8cf299 (patch)
tree7ed04a5efe70f4f6e66118aebd9ccee12275d6bf /lisp/vc/vc.el
parentcf2fa6c87f4da4665ff8a9e8e220bba0b5bccefc (diff)
downloademacs-25ebb9374bdadf66153727831fc7ff131c8cf299.tar.gz
emacs-25ebb9374bdadf66153727831fc7ff131c8cf299.tar.bz2
emacs-25ebb9374bdadf66153727831fc7ff131c8cf299.zip
; More minor docfixes found by checkdoc
Diffstat (limited to 'lisp/vc/vc.el')
-rw-r--r--lisp/vc/vc.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 4fcba65ab4d..512f07d2f63 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1012,7 +1012,7 @@ responsible for the given file."
(error "No VC backend is responsible for %s" file))))
(defun vc-expand-dirs (file-or-dir-list backend)
- "Expands directories in a file list specification.
+ "Expand directories in a file list specification.
Within directories, only files already under version control are noticed."
(let ((flattened '()))
(dolist (node file-or-dir-list)
@@ -1152,7 +1152,7 @@ BEWARE: this function may change the current buffer."
(memq (vc-state file) '(edited needs-merge conflict))))))
(defun vc-compatible-state (p q)
- "Controls which states can be in the same commit."
+ "Control which states can be in the same commit."
(or
(eq p q)
(and (member p '(edited added removed)) (member q '(edited added removed)))))