* 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.
12 files changed:
(when projdetect
;; No project was loaded, but we have a project description
;; object. This means that we try to load it.
(when projdetect
;; No project was loaded, but we have a project description
;; object. This means that we try to load it.
;; Before loading, we need to check if it is a safe
;; project to load before requesting it to be loaded.
;; Before loading, we need to check if it is a safe
;; project to load before requesting it to be loaded.
(when (listp ede-project-directories)
(or (member dir ede-project-directories)
(when (funcall ede-check-project-query-fcn
(when (listp ede-project-directories)
(or (member dir ede-project-directories)
(when (funcall ede-check-project-query-fcn
- (format "`%s' is not listed in `ede-project-directories'.
+ (format-message
+ "`%s' is not listed in `ede-project-directories'.
Add it to the list of allowed project directories? "
Add it to the list of allowed project directories? "
(push dir ede-project-directories)
;; If possible, save `ede-project-directories'.
(if (or custom-file user-init-file)
(push dir ede-project-directories)
;; If possible, save `ede-project-directories'.
(if (or custom-file user-init-file)
"Unknown file name specifier %S"
pf)))
:targets nil)
"Unknown file name specifier %S"
pf)))
:targets nil)
))
(inits (oref obj initializers)))
;; Force the name to match for new objects.
))
(inits (oref obj initializers)))
;; Force the name to match for new objects.
(with-current-buffer describe-function-orig-buffer
(fetch-overload symbol)))))
(insert (overload-docstring-extension symbol) "\n\n")
(with-current-buffer describe-function-orig-buffer
(fetch-overload symbol)))))
(insert (overload-docstring-extension symbol) "\n\n")
- (insert (substitute-command-keys (format "default function: `%s'\n" default)))
+ (insert (format-message "default function: `%s'\n" default))
(when (and (boundp 'describe-function-orig-buffer) ;; added in Emacs 25
describe-function-orig-buffer)
(if override
(when (and (boundp 'describe-function-orig-buffer) ;; added in Emacs 25
describe-function-orig-buffer)
(if override
- (insert (substitute-command-keys
- (format "\noverride in buffer '%s': `%s'\n"
- describe-function-orig-buffer override)))
- (insert (substitute-command-keys (format "\nno override in buffer '%s'\n"
- describe-function-orig-buffer)))))
+ (insert (format-message "\noverride in buffer '%s': `%s'\n"
+ describe-function-orig-buffer override))
+ (insert (format-message "\nno override in buffer '%s'\n"
+ describe-function-orig-buffer))))
)))
(add-hook 'help-fns-describe-function-functions 'describe-mode-local-overload)
)))
(add-hook 'help-fns-describe-function-functions 'describe-mode-local-overload)
(princ "\n\nInclude Path Summary:")
(when edeobj
(princ "\n\nInclude Path Summary:")
(when edeobj
- (princ "\n\nThis file's project include search is handled by the EDE object:\n")
+ (princ (substitute-command-keys
+ "\n\nThis file's project include search is handled by the EDE object:\n"))
(princ " Buffer Target: ")
(princ (object-print edeobj))
(princ "\n")
(princ " Buffer Target: ")
(princ (object-print edeobj))
(princ "\n")
(princ "\nYou can fix the include path for ")
(princ (symbol-name (oref table major-mode)))
(princ "\nYou can fix the include path for ")
(princ (symbol-name (oref table major-mode)))
- (princ " by using this function:
+ (princ (substitute-command-keys " by using this function:
-M-x semantic-customize-system-include-path RET
+\\[semantic-customize-system-include-path]
which customizes the mode specific variable for the mode-local
which customizes the mode specific variable for the mode-local
-variable `semantic-dependency-system-include-path'.")
+variable `semantic-dependency-system-include-path'."))
)
(princ "\n No unknown includes.\n"))
)
(princ "\n No unknown includes.\n"))
(princ "\n\nInclude Path Summary:\n")
(when (and (boundp 'ede-object) ede-object)
(princ "\n\nInclude Path Summary:\n")
(when (and (boundp 'ede-object) ede-object)
- (princ "\n This file's project include is handled by:\n")
+ (princ (substitute-command-keys
+ "\n This file's project include is handled by:\n"))
(let ((objs (if (listp ede-object)
ede-object
(list ede-object))))
(let ((objs (if (listp ede-object)
ede-object
(list ede-object))))
)
(when semantic-dependency-include-path
)
(when semantic-dependency-include-path
- (princ "\n This file's generic include path is:\n")
+ (princ (substitute-command-keys
+ "\n This file's generic include path is:\n"))
(dolist (dir semantic-dependency-include-path)
(princ " ")
(princ dir)
(princ "\n")))
(when semantic-dependency-system-include-path
(dolist (dir semantic-dependency-include-path)
(princ " ")
(princ dir)
(princ "\n")))
(when semantic-dependency-system-include-path
- (princ "\n This file's system include path is:\n")
+ (princ (substitute-command-keys
+ "\n This file's system include path is:\n"))
(dolist (dir semantic-dependency-system-include-path)
(princ " ")
(princ dir)
(dolist (dir semantic-dependency-system-include-path)
(princ " ")
(princ dir)
(princ "Include File: ")
(princ (semantic-format-tag-name tag nil t))
(princ "\n\n")
(princ "Include File: ")
(princ (semantic-format-tag-name tag nil t))
(princ "\n\n")
- (princ "This header file has been marked \"Unknown\".
+ (princ (substitute-command-keys "\
+This header file has been marked \"Unknown\".
This means that Semantic has not been able to locate this file on disk.
When Semantic cannot find an include file, this means that the
This means that Semantic has not been able to locate this file on disk.
When Semantic cannot find an include file, this means that the
or, in your .emacs file do:
or, in your .emacs file do:
- (semantic-add-system-include \"/path/to/include\" '")
+ (semantic-add-system-include \"/path/to/include\" \\='"))
+ (princ (substitute-command-keys ")
to add the path to Semantic's search.
to add the path to Semantic's search.
need to update `semanticdb-project-roots' or better yet, use `ede'
to manage your project. See the ede manual for projects that will
wrap existing project code for Semantic's benefit.
need to update `semanticdb-project-roots' or better yet, use `ede'
to manage your project. See the ede manual for projects that will
wrap existing project code for Semantic's benefit.
(when (or (eq mm 'c++-mode) (eq mm 'c-mode))
(princ "
(when (or (eq mm 'c++-mode) (eq mm 'c-mode))
(princ "
(when (and (boundp 'ede-object)
(boundp 'ede-object-project)
ede-object)
(when (and (boundp 'ede-object)
(boundp 'ede-object-project)
ede-object)
- (princ " This file's project include search is handled by the EDE object:\n")
+ (princ (substitute-command-keys
+ " This file's project include search is handled by the EDE object:\n"))
(princ " Buffer Target: ")
(princ (object-print ede-object))
(princ "\n")
(princ " Buffer Target: ")
(princ (object-print ede-object))
(princ "\n")
- (princ "\n This file's system include path is:\n")
+ (princ (substitute-command-keys
+ "\n This file's system include path is:\n"))
(dolist (dir semantic-dependency-system-include-path)
(princ " ")
(princ dir)
(dolist (dir semantic-dependency-system-include-path)
(princ " ")
(princ dir)
(let ((secondclass (car (reverse (oref ctxt prefixtypes)))))
(cond
((and (semantic-tag-with-position-p secondclass)
(let ((secondclass (car (reverse (oref ctxt prefixtypes)))))
(cond
((and (semantic-tag-with-position-p secondclass)
- (y-or-n-p (format "Could not find `%s'. Jump to %s? "
- first (semantic-tag-name secondclass))))
+ (y-or-n-p (format-message
+ "Could not find `%s'. Jump to %s? "
+ first (semantic-tag-name secondclass))))
(semantic-ia--fast-jump-helper secondclass)
)
;; If we missed out on the class of the second item, then
;; just visit SECOND.
((and (semantic-tag-p second)
(semantic-ia--fast-jump-helper secondclass)
)
;; If we missed out on the class of the second item, then
;; just visit SECOND.
((and (semantic-tag-p second)
- (y-or-n-p (format "Could not find `%s'. Jump to %s? "
- first (semantic-tag-name second))))
+ (y-or-n-p (format-message
+ "Could not find `%s'. Jump to %s? "
+ first (semantic-tag-name second))))
(semantic-ia--fast-jump-helper second)
))))
(semantic-ia--fast-jump-helper second)
))))
"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
"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
is allowed while searching for the bounding parenthesis."
(save-match-data
(save-restriction
;; Any keymap that is defined will do.
;;;###autoload
(defun lwarn (type level message &rest args)
;; 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'.
\\<special-mode-map>
Aside from generating the message with `format-message',
this is equivalent to `display-warning'.
;;;###autoload
(defun warn (message &rest args)
;;;###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."
Aside from generating the message with `format-message',
this is equivalent to `display-warning', using
`emacs' as the type and `:warning' as the level."
(if (edt-y-or-n-p "Do you want to run it now? ")
(load-file path)
(error "EDT Emulation not configured")))
(if (edt-y-or-n-p "Do you want to run it now? ")
(load-file path)
(error "EDT Emulation not configured")))
- (insert "Nope, I can't seem to find it. :-(\n\n")
+ (insert (substitute-command-keys
+ "Nope, I can't seem to find it. :-(\n\n"))
(sit-for 20)
(error "EDT Emulation not configured"))))))
(sit-for 20)
(error "EDT Emulation not configured"))))))
(setq this-command 'viper-display-current-destructive-command)
(setq this-command 'viper-display-current-destructive-command)
- (message " `.' runs %s%s"
- (concat "`" (viper-array-to-string keys) "'")
+ (message " `.' runs `%s'%s"
+ (viper-array-to-string keys)
(viper-abbreviate-string
(if (featurep 'xemacs)
(replace-in-string ; xemacs
(viper-abbreviate-string
(if (featurep 'xemacs)
(replace-in-string ; xemacs
text ; emacs
)
max-text-len
text ; emacs
)
max-text-len
- " inserting `" "'" " ......."))
+ (format-message " inserting `") (format-message "'")
+ " ......."))
(query-replace-regexp
str
(viper-read-string-with-history
(query-replace-regexp
str
(viper-read-string-with-history
- (format "Query replace regexp `%s' with: " str)
+ (format-message "Query replace regexp `%s' with: " str)
nil ; no initial
'viper-replace1-history
(car viper-replace1-history) ; default
nil ; no initial
'viper-replace1-history
(car viper-replace1-history) ; default
(query-replace
str
(viper-read-string-with-history
(query-replace
str
(viper-read-string-with-history
- (format "Query replace `%s' with: " str)
+ (format-message "Query replace `%s' with: " str)
nil ; no initial
'viper-replace1-history
(car viper-replace1-history) ; default
nil ; no initial
'viper-replace1-history
(car viper-replace1-history) ; default
reg (buffer-name buf) line-no))
(princ (format "Here is some text around %c:\n\n %s"
reg text)))
reg (buffer-name buf) line-no))
(princ (format "Here is some text around %c:\n\n %s"
reg text)))
- (princ (format viper-EmptyTextmarker reg))))
+ (princ (format-message viper-EmptyTextmarker reg))))
))
(t (error viper-InvalidTextmarker reg)))))
))
(t (error viper-InvalidTextmarker reg)))))
(forward-char 1)
(cond ((looking-at "'") (setq ex-token nil))
((looking-at "[a-z]") (setq ex-token (following-char)))
(forward-char 1)
(cond ((looking-at "'") (setq ex-token nil))
((looking-at "[a-z]") (setq ex-token (following-char)))
- (t (error "Marks are ' and a-z")))
+ (t (error "%s" "Marks are ' and a-z")))
(forward-char 1))
((looking-at "\n")
(setq ex-token-type 'end-mark)
(forward-char 1))
((looking-at "\n")
(setq ex-token-type 'end-mark)
(defun ex-compile ()
"Reads args from the command line, then runs make with the args.
If no args are given, then it runs the last compile command.
(defun ex-compile ()
"Reads args from the command line, then runs make with the args.
If no args are given, then it runs the last compile command.
-Type 'mak ' (including the space) to run make with no args."
+Type `mak ' (including the space) to run make with no args."
(let (args)
(with-current-buffer (setq viper-ex-work-buf
(get-buffer-create viper-ex-work-buf-name))
(let (args)
(with-current-buffer (setq viper-ex-work-buf
(get-buffer-create viper-ex-work-buf-name))
(cond ((and (cdr buf-mapping)
(or (and (not (cdr mode-mapping)) (not (cdr global-mapping)))
(y-or-n-p
(cond ((and (cdr buf-mapping)
(or (and (not (cdr mode-mapping)) (not (cdr global-mapping)))
(y-or-n-p
- (format "Unmap %S for `%s' only? "
- (viper-display-macro macro-name)
- (buffer-name)))))
+ (format-message "Unmap %S for `%s' only? "
+ (viper-display-macro macro-name)
+ (buffer-name)))))
(setq macro-pair buf-mapping)
(message "%S is unmapped for %s in `%s'"
(viper-display-macro macro-name)
(setq macro-pair buf-mapping)
(message "%S is unmapped for %s in `%s'"
(viper-display-macro macro-name)
((and (cdr mode-mapping)
(or (not (cdr global-mapping))
(y-or-n-p
((and (cdr mode-mapping)
(or (not (cdr global-mapping))
(y-or-n-p
- (format "Unmap %S for the major mode `%S' only? "
- (viper-display-macro macro-name)
- major-mode))))
+ (format-message "Unmap %S for the major mode `%S' only? "
+ (viper-display-macro macro-name)
+ major-mode))))
(setq macro-pair mode-mapping)
(message "%S is unmapped for %s in %S"
(viper-display-macro macro-name) state-name major-mode))
(setq macro-pair mode-mapping)
(message "%S is unmapped for %s in %S"
(viper-display-macro macro-name) state-name major-mode))