summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-12-04 00:02:42 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-12-04 00:02:42 -0800
commitc80e3b4aed2e70eb6d8445d786c0df770094e9e1 (patch)
treee44fe2f2604d66890ec2442ea23e73ee5011907a /lisp/vc
parenta24bf23e0f6e5cea917b77cc455314cdcc31be5b (diff)
downloademacs-c80e3b4aed2e70eb6d8445d786c0df770094e9e1.tar.gz
emacs-c80e3b4aed2e70eb6d8445d786c0df770094e9e1.tar.bz2
emacs-c80e3b4aed2e70eb6d8445d786c0df770094e9e1.zip
Spelling fixes.
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/ediff-init.el2
-rw-r--r--lisp/vc/pcvs.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 787a8b7c0f1..d3db66a9e2a 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -370,7 +370,7 @@ It needs to be killed when we quit the session.")
this-command)))
(defgroup ediff-highlighting nil
- "Hilighting of difference regions in Ediff."
+ "Highlighting of difference regions in Ediff."
:prefix "ediff-"
:group 'ediff)
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 256719d4c84..9a8be04fc38 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -322,7 +322,7 @@ The argument is added (or not) to the list of FLAGS and is constructed
by appending the branch to ARG which defaults to \"-r\".
Since the `cvs-secondary-branch-prefix' is only active if the primary
prefix is active, it is important to read the secondary prefix before
-the primay since reading the primary can deactivate it."
+the primary since reading the primary can deactivate it."
(let ((branch (and (cvs-prefix-get 'cvs-branch-prefix 'read-only)
(cvs-prefix-get 'cvs-secondary-branch-prefix))))
(if branch (cons (concat (or arg "-r") branch) flags) flags)))