diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-16 08:59:50 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-16 09:00:14 -0700 |
commit | 9ce1d38890a77e93af0d20f51c53419c097200d3 (patch) | |
tree | 5f845e3286e199bfcd96f65b2c1396d2d5d86009 /lisp/emacs-lisp | |
parent | 3a91d153106aee673e0ba2cca58d7f3986d7ee13 (diff) | |
download | emacs-9ce1d38890a77e93af0d20f51c53419c097200d3.tar.gz emacs-9ce1d38890a77e93af0d20f51c53419c097200d3.tar.bz2 emacs-9ce1d38890a77e93af0d20f51c53419c097200d3.zip |
Use curved quotes in core elisp diagnostics
In the core elisp files, use curved quotes in diagnostic formats,
so that they follow user preference as per ‘text-quoting-style’
rather than being hard-coded to quote `like this'.
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/cus-start.el:
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl-generic-generalizers):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/env.el (setenv):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (face-documentation, read-face-name)
(face-read-string, read-face-font, face-spec-set-match-display)
(read-color, x-resolve-font-name):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-local-variables)
(hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file)
(basic-save-buffer, delete-directory, copy-directory)
(recover-session, recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/help.el (describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method):
* lisp/international/mule-conf.el (code-offset):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, compose-mail, set-variable)
(choose-completion-string, define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, )
(command-line, command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
Use curved quotes in diagnostics.
* lisp/international/mule.el (find-auto-coding):
Use " to quote in a diagnostic, to be consistent with the rest of
this file.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/byte-run.el | 4 | ||||
-rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 6 | ||||
-rw-r--r-- | lisp/emacs-lisp/macroexp.el | 4 | ||||
-rw-r--r-- | lisp/emacs-lisp/map-ynp.el | 6 | ||||
-rw-r--r-- | lisp/emacs-lisp/nadvice.el | 6 | ||||
-rw-r--r-- | lisp/emacs-lisp/tabulated-list.el | 2 | ||||
-rw-r--r-- | lisp/emacs-lisp/timer.el | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 081ea3183b9..2022e1d3e58 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -267,7 +267,7 @@ The return value is undefined. (cdr body) body))) nil) - (t (message "Warning: Unknown defun property `%S' in %S" + (t (message "Warning: Unknown defun property ‘%S’ in %S" (car x) name))))) decls)) (def (list 'defalias @@ -317,7 +317,7 @@ The return value is undefined. (declare (debug defun) (doc-string 3)) (or (memq (get name 'byte-optimizer) '(nil byte-compile-inline-expand)) - (error "`%s' is a primitive" name)) + (error "‘%s’ is a primitive" name)) `(prog1 (defun ,name ,arglist ,@body) (eval-and-compile diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 7ae63b1e6b1..cecd7378620 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -192,7 +192,7 @@ BODY, if present, is used as the body of a default method. (when doc (error "Multiple doc strings for %S" name)) (setq doc (cadr (pop options-and-methods)))) (`declare - (when declarations (error "Multiple `declare' for %S" name)) + (when declarations (error "Multiple ‘declare’ for %S" name)) (setq declarations (pop options-and-methods))) (`:method (push (cdr (pop options-and-methods)) methods)) (_ (push (pop options-and-methods) options)))) @@ -208,7 +208,7 @@ BODY, if present, is used as the body of a default method. defun-declarations-alist)))) (cond (f (apply (car f) name args (cdr declaration))) - (t (message "Warning: Unknown defun property `%S' in %S" + (t (message "Warning: Unknown defun property ‘%S’ in %S" (car declaration) name) nil)))) (cdr declarations)) @@ -1070,7 +1070,7 @@ The value returned is a list of elements of the form (and (assq type cl--generic-typeof-types) (progn (if (memq type '(vector array sequence)) - (message "`%S' also matches CL structs and EIEIO classes" type)) + (message "‘%S’ also matches CL structs and EIEIO classes" type)) (list cl--generic-typeof-generalizer))) (cl-call-next-method))) diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index ffc6585e191..cc461c81cdd 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -146,10 +146,10 @@ and also to avoid outputting the warning during normal execution." (defun macroexp--obsolete-warning (fun obsolescence-data type) (let ((instead (car obsolescence-data)) (asof (nth 2 obsolescence-data))) - (format "`%s' is an obsolete %s%s%s" fun type + (format "‘%s’ is an obsolete %s%s%s" fun type (if asof (concat " (as of " asof ")") "") (cond ((stringp instead) (concat "; " instead)) - (instead (format "; use `%s' instead." instead)) + (instead (format "; use ‘%s’ instead." instead)) (t "."))))) (defun macroexpand-1 (form &optional environment) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 08b34fbe2fe..ceae99b4209 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -198,9 +198,9 @@ Returns the number of actions taken." (objects (if help (nth 1 help) "objects")) (action (if help (nth 2 help) "act on"))) (concat - (format "Type SPC or `y' to %s the current %s; -DEL or `n' to skip the current %s; -RET or `q' to give up on the %s (skip all remaining %s); + (format "Type SPC or ‘y’ to %s the current %s; +DEL or ‘n’ to skip the current %s; +RET or ‘q’ to give up on the %s (skip all remaining %s); C-g to quit (cancel the whole command); ! to %s all remaining %s;\n" action object object action objects action diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index 5a59a980feb..4d5b0c78cc3 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -95,7 +95,7 @@ Each element has the form (WHERE BYTECODE STACK) where: (propertize (format "%s advice: " where) 'face 'warning) (let ((fun (advice--car flist))) - (if (symbolp fun) (format "`%S'" fun) + (if (symbolp fun) (format "‘%S’" fun) (let* ((name (cdr (assq 'name (advice--props flist)))) (doc (documentation fun t)) (usage (help-split-fundoc doc function))) @@ -176,7 +176,7 @@ WHERE is a symbol to select an entry in `advice--where-alist'." (advice--make-1 (aref main 1) (aref main 3) (advice--car main) rest (advice--props main))) (let ((desc (assq where advice--where-alist))) - (unless desc (error "Unknown add-function location `%S'" where)) + (unless desc (error "Unknown add-function location ‘%S’" where)) (advice--make-1 (nth 1 desc) (nth 2 desc) function main props))))) @@ -461,7 +461,7 @@ otherwise it is named `SYMBOL@NAME'. (advice (cond ((null name) `(lambda ,lambda-list ,@body)) ((or (stringp name) (symbolp name)) (intern (format "%s@%s" symbol name))) - (t (error "Unrecognized name spec `%S'" name))))) + (t (error "Unrecognized name spec ‘%S’" name))))) `(prog1 ,@(and (symbolp advice) `((defun ,advice ,lambda-list ,@body))) (advice-add ',symbol ,where #',advice ,@(and props `(',props)))))) diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index cd61eb9ae56..404dbd1dc17 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -129,7 +129,7 @@ no entry at POS. POS, if omitted or nil, defaults to point." TAG should be a string, with length <= `tabulated-list-padding'. If ADVANCE is non-nil, move forward by one line afterwards." (unless (stringp tag) - (error "Invalid argument to `tabulated-list-put-tag'")) + (error "Invalid argument to ‘tabulated-list-put-tag’")) (unless (> tabulated-list-padding 0) (error "Unable to tag the current line")) (save-excursion diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 9ae11b71e5e..dadbe5f7b67 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el @@ -324,7 +324,7 @@ This function is called, by name, directly by the C code." (apply (timer--function timer) (timer--args timer))) (error (message "Error running timer%s: %S" (if (symbolp (timer--function timer)) - (format " `%s'" (timer--function timer)) "") + (format " ‘%s’" (timer--function timer)) "") err))) (when (and retrigger ;; If the timer's been canceled, don't "retrigger" it |