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/ediff-init.el | |
| parent | abf673af29ba2a2e0001ebd1db183377724f0cc4 (diff) | |
| download | emacs-ac16149ba470ae8a625d42a61adbb6e84254c675.tar.gz | |
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/ediff-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index bf211599b9f..a1d405ac2a1 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -718,9 +718,9 @@ appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." (defcustom ediff-coding-system-for-read 'raw-text "The coding system for read to use when running the diff program as a subprocess. In most cases, the default will do. However, under certain circumstances in -MS-Windows you might need to use something like 'raw-text-dos here. +MS-Windows you might need to use something like `raw-text-dos' here. So, if the output that your diff program sends to Emacs contains extra ^M's, -you might need to experiment here, if the default or 'raw-text-dos doesn't +you might need to experiment here, if the default or `raw-text-dos' doesn't work." :type 'symbol :group 'ediff) @@ -750,7 +750,7 @@ to temp files in buffer jobs and when Ediff needs to find fine differences." (defun ediff-check-version (op major minor &optional type-of-emacs) "Check the current version against MAJOR and MINOR version numbers. The comparison uses operator OP, which may be any of: =, >, >=, <, <=. -TYPE-OF-EMACS is either 'xemacs or 'emacs." +TYPE-OF-EMACS is either `emacs' or `xemacs'." (declare (obsolete version< "23.1")) (and (cond ((eq type-of-emacs 'xemacs) (featurep 'xemacs)) ((eq type-of-emacs 'emacs) (featurep 'emacs)) |