diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-11-17 15:28:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-11-17 15:29:35 -0800 |
| commit | ac16149ba470ae8a625d42a61adbb6e84254c675 (patch) | |
| tree | 9575cf0f1c5139a1943f9a18dd444ddc46983aa9 /lisp/vc/smerge-mode.el | |
| parent | abf673af29ba2a2e0001ebd1db183377724f0cc4 (diff) | |
| download | emacs-ac16149ba470ae8a625d42a61adbb6e84254c675.tar.gz emacs-ac16149ba470ae8a625d42a61adbb6e84254c675.tar.bz2 emacs-ac16149ba470ae8a625d42a61adbb6e84254c675.zip | |
Fix docstring quoting problems with ‘ '’
Problem reported by Artur Malabarba in:
http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
Most of these fixes are to documentation; many involve fixing
longstanding quoting glitches that are independent of the
recent substitute-command-keys changes. The changes to code are:
* lisp/cedet/mode-local.el (mode-local-augment-function-help)
(describe-mode-local-overload):
Substitute docstrings before displaying them.
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
Quote the generated docstring for later substitution.
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 9f9224c226c..e9bfffd0354 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -735,17 +735,17 @@ major modes. Uses `smerge-resolve-function' to do the actual work." (smerge-auto-leave)))))) (defun smerge-diff-base-mine () - "Diff 'base' and 'mine' version in current conflict region." + "Diff `base' and `mine' version in current conflict region." (interactive) (smerge-diff 2 1)) (defun smerge-diff-base-other () - "Diff 'base' and 'other' version in current conflict region." + "Diff `base' and `other' version in current conflict region." (interactive) (smerge-diff 2 3)) (defun smerge-diff-mine-other () - "Diff 'mine' and 'other' version in current conflict region." + "Diff `mine' and `other' version in current conflict region." (interactive) (smerge-diff 1 3)) |