aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorPaul Eggert2019-11-11 10:30:13 -0800
committerPaul Eggert2019-11-11 10:32:53 -0800
commit6b4a97c1c78f39ce890d100acceceb652d14e20d (patch)
tree9d9f8347a952226adcd73680ed89c5679d6e5326 /lisp/vc
parent269796288a43520a1dcc481337af472d086faaa4 (diff)
downloademacs-6b4a97c1c78f39ce890d100acceceb652d14e20d.tar.gz
emacs-6b4a97c1c78f39ce890d100acceceb652d14e20d.zip
Fix some quoting glitches in doc strings
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/ediff-util.el6
-rw-r--r--lisp/vc/vc-bzr.el2
-rw-r--r--lisp/vc/vc-git.el4
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 52a765482e0..a481defe29f 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1274,21 +1274,21 @@ which see."
1274 (cond ((eq ediff-window-setup-function #'ediff-setup-windows-multiframe) 1274 (cond ((eq ediff-window-setup-function #'ediff-setup-windows-multiframe)
1275 (setq ediff-multiframe nil) 1275 (setq ediff-multiframe nil)
1276 (setq window-setup-func #'ediff-setup-windows-plain) 1276 (setq window-setup-func #'ediff-setup-windows-plain)
1277 (message "ediff is now in 'plain' mode")) 1277 (message "ediff is now in `plain' mode"))
1278 ((eq ediff-window-setup-function #'ediff-setup-windows-plain) 1278 ((eq ediff-window-setup-function #'ediff-setup-windows-plain)
1279 (if (and (ediff-buffer-live-p ediff-control-buffer) 1279 (if (and (ediff-buffer-live-p ediff-control-buffer)
1280 (window-live-p ediff-control-window)) 1280 (window-live-p ediff-control-window))
1281 (set-window-dedicated-p ediff-control-window nil)) 1281 (set-window-dedicated-p ediff-control-window nil))
1282 (setq ediff-multiframe t) 1282 (setq ediff-multiframe t)
1283 (setq window-setup-func #'ediff-setup-windows-multiframe) 1283 (setq window-setup-func #'ediff-setup-windows-multiframe)
1284 (message "ediff is now in 'multiframe' mode")) 1284 (message "ediff is now in `multiframe' mode"))
1285 (t 1285 (t
1286 (if (and (ediff-buffer-live-p ediff-control-buffer) 1286 (if (and (ediff-buffer-live-p ediff-control-buffer)
1287 (window-live-p ediff-control-window)) 1287 (window-live-p ediff-control-window))
1288 (set-window-dedicated-p ediff-control-window nil)) 1288 (set-window-dedicated-p ediff-control-window nil))
1289 (setq ediff-multiframe t) 1289 (setq ediff-multiframe t)
1290 (setq window-setup-func #'ediff-setup-windows-multiframe)) 1290 (setq window-setup-func #'ediff-setup-windows-multiframe))
1291 (message "ediff is now in 'multiframe' mode")) 1291 (message "ediff is now in `multiframe' mode"))
1292 1292
1293 ;; change default 1293 ;; change default
1294 (setq-default ediff-window-setup-function window-setup-func) 1294 (setq-default ediff-window-setup-function window-setup-func)
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 89f1fcce376..4c75eb79f1a 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -433,7 +433,7 @@ default if it is available."
433Return value is a cons (STATUS . WARNING), where WARNING is a 433Return value is a cons (STATUS . WARNING), where WARNING is a
434string or nil, and STATUS is one of the symbols: `added', 434string or nil, and STATUS is one of the symbols: `added',
435`ignored', `kindchanged', `modified', `removed', `renamed', `unknown', 435`ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
436which directly correspond to `bzr status' output, or 'unchanged 436which directly correspond to `bzr status' output, or `unchanged'
437for files whose copy in the working tree is identical to the one 437for files whose copy in the working tree is identical to the one
438in the branch repository (or whose status not be determined)." 438in the branch repository (or whose status not be determined)."
439;; Doc used to also say the following, but AFAICS, it has never been true. 439;; Doc used to also say the following, but AFAICS, it has never been true.
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 3960f725cf9..2046a9dceca 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -282,8 +282,8 @@ toggle display of the entire list."
282 "Convert CODE-LIST to a VC status. 282 "Convert CODE-LIST to a VC status.
283 283
284Each element of CODE-LIST comes from the first two characters of 284Each element of CODE-LIST comes from the first two characters of
285a line returned by 'git status --porcelain' and should be passed 285a line returned by `git status --porcelain' and should be passed
286in the order given by 'git status'." 286in the order given by `git status'."
287 ;; It is necessary to allow CODE-LIST to be a list because sometimes git 287 ;; It is necessary to allow CODE-LIST to be a list because sometimes git
288 ;; status returns multiple lines, e.g. for a file that is removed from 288 ;; status returns multiple lines, e.g. for a file that is removed from
289 ;; the index but is present in the HEAD and working tree. 289 ;; the index but is present in the HEAD and working tree.