diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/add-log.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-diff.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-cvs.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index c90413c42c2..e24b6ccae01 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el | |||
| @@ -685,7 +685,7 @@ nil, by matching `change-log-version-number-regexp-list'." | |||
| 685 | 685 | ||
| 686 | Optional arg FILE-NAME specifies the file to use. | 686 | Optional arg FILE-NAME specifies the file to use. |
| 687 | If FILE-NAME is nil, use the value of `change-log-default-name'. | 687 | If FILE-NAME is nil, use the value of `change-log-default-name'. |
| 688 | If `change-log-default-name' is nil, behave as though it were 'ChangeLog' | 688 | If `change-log-default-name' is nil, behave as though it were \"ChangeLog\" |
| 689 | \(or whatever we use on this operating system). | 689 | \(or whatever we use on this operating system). |
| 690 | 690 | ||
| 691 | If `change-log-default-name' contains a leading directory component, then | 691 | If `change-log-default-name' contains a leading directory component, then |
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index d0c0f7b3e83..b3093943d4e 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -1373,7 +1373,7 @@ affects only files whose names match the expression." | |||
| 1373 | ;; Normalize empty filter RE to nil. | 1373 | ;; Normalize empty filter RE to nil. |
| 1374 | (unless (> (length filter-re) 0) (setq filter-re nil)) | 1374 | (unless (> (length filter-re) 0) (setq filter-re nil)) |
| 1375 | ;; Indicate progress | 1375 | ;; Indicate progress |
| 1376 | (message "Comparing '%s' and '%s' modulo '%s'" d1 d2 filter-re) | 1376 | (message "Comparing ‘%s’ and ‘%s’ modulo ‘%s’" d1 d2 filter-re) |
| 1377 | (cond | 1377 | (cond |
| 1378 | ;; D1 & D2 directories => recurse | 1378 | ;; D1 & D2 directories => recurse |
| 1379 | ((and (file-directory-p d1) | 1379 | ((and (file-directory-p d1) |
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 9a41905abd2..298bcefb7bf 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el | |||
| @@ -281,8 +281,8 @@ committed and support display of sticky tags." | |||
| 281 | (propertize | 281 | (propertize |
| 282 | (if (zerop (length sticky-tag)) | 282 | (if (zerop (length sticky-tag)) |
| 283 | string | 283 | string |
| 284 | (setq help-echo (format "%s on the '%s' branch" | 284 | (setq help-echo (format-message "%s on the ‘%s’ branch" |
| 285 | help-echo sticky-tag)) | 285 | help-echo sticky-tag)) |
| 286 | (concat string "[" sticky-tag "]")) | 286 | (concat string "[" sticky-tag "]")) |
| 287 | 'help-echo help-echo))) | 287 | 'help-echo help-echo))) |
| 288 | 288 | ||
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 8d6eae58d25..755dbc1ca3b 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -83,7 +83,7 @@ If t, use no switches." | |||
| 83 | t ;`svn' doesn't support common args like -c or -b. | 83 | t ;`svn' doesn't support common args like -c or -b. |
| 84 | "String or list of strings specifying extra switches for svn diff under VC. | 84 | "String or list of strings specifying extra switches for svn diff under VC. |
| 85 | If nil, use the value of `vc-diff-switches' (or `diff-switches'), | 85 | If nil, use the value of `vc-diff-switches' (or `diff-switches'), |
| 86 | together with \"-x --diff-cmd=\"`diff-command' (since 'svn diff' | 86 | together with \"-x --diff-cmd=\"`diff-command' (since `svn diff' |
| 87 | does not support the default \"-c\" value of `diff-switches'). | 87 | does not support the default \"-c\" value of `diff-switches'). |
| 88 | If you want to force an empty list of arguments, use t." | 88 | If you want to force an empty list of arguments, use t." |
| 89 | :type '(choice (const :tag "Unspecified" nil) | 89 | :type '(choice (const :tag "Unspecified" nil) |