summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-08-29 21:40:21 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-08-29 21:43:01 -0700
commit001c7dd928238a196dff4166ad29141116ef6d1c (patch)
tree00032c5e1001248c98d396d669d5a00571c4c8d4 /lisp/emacs-lisp
parent24ee55bfd4371e24a03db0fbd830ad5adac0ac4f (diff)
downloademacs-001c7dd928238a196dff4166ad29141116ef6d1c.tar.gz
emacs-001c7dd928238a196dff4166ad29141116ef6d1c.tar.bz2
emacs-001c7dd928238a196dff4166ad29141116ef6d1c.zip
Text quoting fixes in cedet, emulation, emacs-lisp
* lisp/cedet/ede.el (ede-check-project-directory): * lisp/cedet/semantic/analyze/debug.el: (semantic-analyzer-debug-insert-include-summary): * lisp/cedet/semantic/bovine/c.el (semantic-c-describe-environment): * lisp/cedet/semantic/decorate/include.el: (semantic-decoration-unknown-include-describe) (semantic-decoration-all-include-summary): * lisp/cedet/semantic/ia.el (semantic-ia-fast-jump): * lisp/emulation/edt.el (edt-load-keys): * lisp/emulation/viper-cmd.el: (viper-display-current-destructive-command) (viper-query-replace, viper-brac-function): * lisp/emulation/viper-ex.el (viper-get-ex-token, ex-compile): * lisp/emulation/viper-macs.el (viper-unrecord-kbd-macro): Respect text quoting style in doc string or diagnostic. * lisp/cedet/mode-local.el (describe-mode-local-overload): Use format-message to avoid overtranslating quotes. * lisp/emacs-lisp/checkdoc.el (checkdoc-in-sample-code-p): Escape an apostrophe in a docstring. * lisp/emacs-lisp/warnings.el (lwarn): Fix doc string.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/checkdoc.el2
-rw-r--r--lisp/emacs-lisp/warnings.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 8a845f9b5b5..b2c81197968 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1954,7 +1954,7 @@ from the comment."
"Return non-nil if the current point is in a code fragment.
A code fragment is identified by an open parenthesis followed by a
symbol which is a valid function or a word in all CAPS, or a parenthesis
-that is quoted with the ' character. Only the region from START to LIMIT
+that is quoted with the \\=' character. Only the region from START to LIMIT
is allowed while searching for the bounding parenthesis."
(save-match-data
(save-restriction
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index d729a9a9563..b88af1dbe1a 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -314,7 +314,7 @@ See also `warning-series', `warning-prefix-function' and
;; Any keymap that is defined will do.
;;;###autoload
(defun lwarn (type level message &rest args)
- "Display a warning message made from (format MESSAGE ARGS...).
+ "Display a warning message made from (format-message MESSAGE ARGS...).
\\<special-mode-map>
Aside from generating the message with `format-message',
this is equivalent to `display-warning'.
@@ -336,7 +336,7 @@ LEVEL should be either :debug, :warning, :error, or :emergency
;;;###autoload
(defun warn (message &rest args)
- "Display a warning message made from (format MESSAGE ARGS...).
+ "Display a warning message made from (format-message MESSAGE ARGS...).
Aside from generating the message with `format-message',
this is equivalent to `display-warning', using
`emacs' as the type and `:warning' as the level."