diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-07 08:41:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-07 16:09:27 -0700 |
| commit | 6afef3f6ca2f3009c722b84e249903b7f807b044 (patch) | |
| tree | 44bdc5bb1e8fb4d1fe66961490db57cbdf56d7a2 /lisp/emacs-lisp | |
| parent | add49b65a0bb50de447a95c1912232c79f28fdf9 (diff) | |
| download | emacs-6afef3f6ca2f3009c722b84e249903b7f807b044.tar.gz emacs-6afef3f6ca2f3009c722b84e249903b7f807b044.tar.bz2 emacs-6afef3f6ca2f3009c722b84e249903b7f807b044.zip | |
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* 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/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, 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/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* 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/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* 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)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(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, version-to-list):
* 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):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
Diffstat (limited to 'lisp/emacs-lisp')
39 files changed, 256 insertions, 249 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index bbff34db804..62330fca71b 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -1870,7 +1870,7 @@ function at point for which PREDICATE returns non-nil)." (if (equal function "") (if (ad-is-advised default) default - (error "ad-read-advised-function: ‘%s’ is not advised" default)) + (error "ad-read-advised-function: `%s' is not advised" default)) (intern function)))) (defvar ad-advice-class-completion-table @@ -1887,7 +1887,7 @@ class of FUNCTION)." (cl-dolist (class ad-advice-classes) (if (ad-get-advice-info-field function class) (cl-return class))) - (error "ad-read-advice-class: ‘%s’ has no advices" function))) + (error "ad-read-advice-class: `%s' has no advices" function))) (let ((class (completing-read (format "%s (default %s): " (or prompt "Class") default) ad-advice-class-completion-table nil t))) @@ -1904,7 +1904,7 @@ An optional PROMPT is used to prompt for the name." (ad-get-advice-info-field function class))) (default (if (null name-completion-table) - (error "ad-read-advice-name: ‘%s’ has no %s advice" + (error "ad-read-advice-name: `%s' has no %s advice" function class) (car (car name-completion-table)))) (prompt (format "%s (default %s): " (or prompt "Name") default)) @@ -1995,9 +1995,9 @@ FUNCTION was not advised)." (interactive (ad-read-advice-specification "Enable advice of")) (if (ad-is-advised function) (if (eq (ad-enable-advice-internal function class name t) 0) - (error "ad-enable-advice: ‘%s’ has no %s advice matching ‘%s’" + (error "ad-enable-advice: `%s' has no %s advice matching `%s'" function class name)) - (error "ad-enable-advice: ‘%s’ is not advised" function))) + (error "ad-enable-advice: `%s' is not advised" function))) ;;;###autoload (defun ad-disable-advice (function class name) @@ -2005,9 +2005,9 @@ FUNCTION was not advised)." (interactive (ad-read-advice-specification "Disable advice of")) (if (ad-is-advised function) (if (eq (ad-enable-advice-internal function class name nil) 0) - (error "ad-disable-advice: ‘%s’ has no %s advice matching ‘%s’" + (error "ad-disable-advice: `%s' has no %s advice matching `%s'" function class name)) - (error "ad-disable-advice: ‘%s’ is not advised" function))) + (error "ad-disable-advice: `%s' is not advised" function))) (defun ad-enable-regexp-internal (regexp class flag) "Set enable FLAGs of all CLASS advices whose name contains a REGEXP match. @@ -2053,9 +2053,9 @@ in that CLASS." (ad-set-advice-info-field function class (delq advice-to-remove (ad-get-advice-info-field function class))) - (error "ad-remove-advice: ‘%s’ has no %s advice ‘%s’" + (error "ad-remove-advice: `%s' has no %s advice `%s'" function class name))) - (error "ad-remove-advice: ‘%s’ is not advised" function))) + (error "ad-remove-advice: `%s' is not advised" function))) ;;;###autoload (defun ad-add-advice (function advice class position) @@ -2319,7 +2319,7 @@ INDEX counts from zero." ,value-form)) (argument-access `(setq ,argument-access ,value-form)) - (t (error "ad-set-argument: No argument at position %d of ‘%s’" + (t (error "ad-set-argument: No argument at position %d of `%s'" index arglist))))) (defun ad-get-arguments (arglist index) @@ -2361,7 +2361,7 @@ The assignment starts at position INDEX." (setq index (1+ index)) (setq values-index (1+ values-index))) (if (null set-forms) - (error "ad-set-arguments: No argument at position %d of ‘%s’" + (error "ad-set-arguments: No argument at position %d of `%s'" index arglist) (if (= (length set-forms) 1) ;; For exactly one set-form we can use values-form directly,... @@ -2412,14 +2412,14 @@ The assignment starts at position INDEX." ;; The mapping should work for any two argument lists. (defun ad-map-arglists (source-arglist target-arglist) - "Make ‘funcall/apply’ form to map SOURCE-ARGLIST to TARGET-ARGLIST. + "Make `funcall/apply' form to map SOURCE-ARGLIST to TARGET-ARGLIST. The arguments supplied to TARGET-ARGLIST will be taken from SOURCE-ARGLIST just as if they had been supplied to a function with TARGET-ARGLIST directly. Excess source arguments will be neglected, missing source arguments will be -supplied as nil. Returns a ‘funcall’ or ‘apply’ form with the second element -being ‘function’ which has to be replaced by an actual function argument. -Example: ‘(ad-map-arglists '(a &rest args) '(w x y z))’ will return - ‘(funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))’." +supplied as nil. Returns a `funcall' or `apply' form with the second element +being `function' which has to be replaced by an actual function argument. +Example: (ad-map-arglists '(a &rest args) '(w x y z)) will return + (funcall ad--addoit-function a (car args) (car (cdr args)) (nth 2 args))." (let* ((parsed-source-arglist (ad-parse-arglist source-arglist)) (source-reqopt-args (append (nth 0 parsed-source-arglist) (nth 1 parsed-source-arglist))) @@ -2911,14 +2911,14 @@ the value of `ad-redefinition-action' and de/activate again." (if (not (eq current-definition original-definition)) ;; We have a redefinition: (if (not (memq ad-redefinition-action '(accept discard warn))) - (error "ad-redefinition-action: ‘%s’ %s" + (error "ad-redefinition-action: `%s' %s" function "invalidly redefined") (if (eq ad-redefinition-action 'discard) nil ;; Just drop it! (funcall (or fsetfun #'fset) function newdef) (ad-activate-internal function) (if (eq ad-redefinition-action 'warn) - (message "ad-handle-definition: ‘%s’ got redefined" + (message "ad-handle-definition: `%s' got redefined" function)))) ;; either advised def or correct original is in place: nil) @@ -2953,7 +2953,7 @@ definition will always be cached for later usage." current-prefix-arg)) (cond ((not (ad-is-advised function)) - (error "ad-activate: ‘%s’ is not advised" function)) + (error "ad-activate: `%s' is not advised" function)) ;; Just return for forward advised and not yet defined functions: ((not (ad-get-orig-definition function)) nil) ((not (ad-has-any-advice function)) (ad-unadvise function)) @@ -2977,10 +2977,10 @@ a call to `ad-activate'." (interactive (list (ad-read-advised-function "Deactivate advice of" 'ad-is-active))) (if (not (ad-is-advised function)) - (error "ad-deactivate: ‘%s’ is not advised" function) + (error "ad-deactivate: `%s' is not advised" function) (cond ((ad-is-active function) (if (not (ad-get-orig-definition function)) - (error "ad-deactivate: ‘%s’ has no original definition" + (error "ad-deactivate: `%s' has no original definition" function) (ad-clear-advicefunname-definition function) (ad-set-advice-info-field function 'active nil) diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 716e1c69c7b..c3c61d6c81e 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -255,11 +255,11 @@ (cdr (assq name byte-compile-function-environment))))) (pcase fn (`nil - (byte-compile-warn "attempt to inline ‘%s’ before it was defined" + (byte-compile-warn "attempt to inline `%s' before it was defined" name) form) (`(autoload . ,_) - (error "File ‘%s’ didn't define ‘%s’" (nth 1 fn) name)) + (error "File `%s' didn't define `%s'" (nth 1 fn) name)) ((and (pred symbolp) (guard (not (eq fn t)))) ;A function alias. (byte-compile-inline-expand (cons fn (cdr form)))) ((pred byte-code-function-p) @@ -336,7 +336,7 @@ bindings) values nil)) ((and (not optionalp) (null values)) - (byte-compile-warn "attempt to open-code ‘%s’ with too few arguments" name) + (byte-compile-warn "attempt to open-code `%s' with too few arguments" name) (setq arglist nil values 'too-few)) (t (setq bindings (cons (list (car arglist) (car values)) @@ -347,7 +347,7 @@ (progn (or (eq values 'too-few) (byte-compile-warn - "attempt to open-code ‘%s’ with too many arguments" name)) + "attempt to open-code `%s' with too many arguments" name)) form) ;; The following leads to infinite recursion when loading a @@ -383,7 +383,7 @@ form)) ((eq fn 'quote) (if (cdr (cdr form)) - (byte-compile-warn "malformed quote form: ‘%s’" + (byte-compile-warn "malformed quote form: `%s'" (prin1-to-string form))) ;; map (quote nil) to nil to simplify optimizer logic. ;; map quoted constants to nil if for-effect (just because). @@ -407,7 +407,7 @@ (if (symbolp binding) binding (if (cdr (cdr binding)) - (byte-compile-warn "malformed let binding: ‘%s’" + (byte-compile-warn "malformed let binding: `%s'" (prin1-to-string binding))) (list (car binding) (byte-optimize-form (nth 1 binding) nil)))) @@ -420,7 +420,7 @@ (cons (byte-optimize-form (car clause) nil) (byte-optimize-body (cdr clause) for-effect)) - (byte-compile-warn "malformed cond form: ‘%s’" + (byte-compile-warn "malformed cond form: `%s'" (prin1-to-string clause)) clause)) (cdr form)))) @@ -457,7 +457,7 @@ ((eq fn 'if) (when (< (length form) 3) - (byte-compile-warn "too few arguments for ‘if’")) + (byte-compile-warn "too few arguments for `if'")) (cons fn (cons (byte-optimize-form (nth 1 form) nil) (cons @@ -485,7 +485,7 @@ (cons fn (mapcar 'byte-optimize-form (cdr form))))) ((eq fn 'interactive) - (byte-compile-warn "misplaced interactive spec: ‘%s’" + (byte-compile-warn "misplaced interactive spec: `%s'" (prin1-to-string form)) nil) @@ -539,7 +539,7 @@ (cons fn (mapcar #'byte-optimize-form (cdr form)))) ((not (symbolp fn)) - (byte-compile-warn "‘%s’ is a malformed function" + (byte-compile-warn "`%s' is a malformed function" (prin1-to-string fn)) form) @@ -1054,7 +1054,7 @@ (defun byte-optimize-while (form) (when (< (length form) 2) - (byte-compile-warn "too few arguments for ‘while’")) + (byte-compile-warn "too few arguments for `while'")) (if (nth 1 form) form)) @@ -1090,7 +1090,7 @@ (nconc (list 'funcall fn) butlast (mapcar (lambda (x) (list 'quote x)) (nth 1 last)))) (byte-compile-warn - "last arg to apply can't be a literal atom: ‘%s’" + "last arg to apply can't be a literal atom: `%s'" (prin1-to-string last)) nil)) form))) diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 3c561db4b81..73c2977e8eb 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/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 9edb8d7122c..279ffa37b7e 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -814,7 +814,7 @@ CONST2 may be evaluated multiple times." off (cdr lap-entry)) (cond ((not (symbolp op)) - (error "Non-symbolic opcode ‘%s’" op)) + (error "Non-symbolic opcode `%s'" op)) ((eq op 'TAG) (setcar off pc)) (t @@ -1120,7 +1120,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." pt) (when dir (unless was-same - (insert (format-message "Leaving directory ‘%s’\n" + (insert (format-message "Leaving directory `%s'\n" default-directory)))) (unless (bolp) (insert "\n")) @@ -1136,7 +1136,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." (when dir (setq default-directory dir) (unless was-same - (insert (format-message "Entering directory ‘%s’\n" + (insert (format-message "Entering directory `%s'\n" default-directory)))) (setq byte-compile-last-logged-file byte-compile-current-file byte-compile-last-warned-form nil) @@ -1339,7 +1339,7 @@ extra args." (nargs (- (length form) 2))) (unless (= nargs nfields) (byte-compile-warn - "‘%s’ called with %d args to fill %d format field(s)" (car form) + "`%s' called with %d args to fill %d format field(s)" (car form) nargs nfields))))) (dolist (elt '(format message error)) @@ -1359,7 +1359,7 @@ extra args." (plist-get keyword-args :group) (not (and (consp name) (eq (car name) 'quote))) (byte-compile-warn - "%s for ‘%s’ fails to specify containing group" + "%s for `%s' fails to specify containing group" (cdr (assq (car form) '((custom-declare-group . defgroup) (custom-declare-face . defface) @@ -1378,7 +1378,7 @@ extra args." (let ((calls (assq name byte-compile-unresolved-functions)) nums sig min max) (when (and calls macrop) - (byte-compile-warn "macro ‘%s’ defined too late" name)) + (byte-compile-warn "macro `%s' defined too late" name)) (setq byte-compile-unresolved-functions (delq calls byte-compile-unresolved-functions)) (setq calls (delq t calls)) ;Ignore higher-order uses of the function. @@ -1386,7 +1386,7 @@ extra args." (when (and (symbolp name) (eq (function-get name 'byte-optimizer) 'byte-compile-inline-expand)) - (byte-compile-warn "defsubst ‘%s’ was used before it was defined" + (byte-compile-warn "defsubst `%s' was used before it was defined" name)) (setq sig (byte-compile-arglist-signature arglist) nums (sort (copy-sequence (cdr calls)) (function <)) @@ -1465,7 +1465,7 @@ extra args." ;; so don't warn about them. macroexpand cl--compiling-file)))) - (byte-compile-warn "function ‘%s’ from cl package called at runtime" + (byte-compile-warn "function `%s' from cl package called at runtime" func))) form) @@ -1507,12 +1507,12 @@ extra args." (if (fboundp f) (push f noruntime) (push f unresolved))) ;; Complain about the no-run-time functions (byte-compile-print-syms - "the function ‘%s’ might not be defined at runtime." + "the function `%s' might not be defined at runtime." "the following functions might not be defined at runtime:" noruntime) ;; Complain about the unresolved functions (byte-compile-print-syms - "the function ‘%s’ is not known to be defined." + "the function `%s' is not known to be defined." "the following functions are not known to be defined:" unresolved))) nil) @@ -1818,7 +1818,7 @@ The value is non-nil if there were no errors, nil if errors." ;; (byte-compile-abbreviate-file filename) ;; (with-current-buffer input-buffer no-byte-compile)) (when (file-exists-p target-file) - (message "%s deleted because of ‘no-byte-compile: %s’" + (message "%s deleted because of `no-byte-compile: %s'" (byte-compile-abbreviate-file target-file) (buffer-local-value 'no-byte-compile input-buffer)) (condition-case nil (delete-file target-file) (error nil))) @@ -2301,12 +2301,12 @@ list that represents a doc string reference. (when (and (symbolp sym) (not (string-match "[-*/:$]" (symbol-name sym))) (byte-compile-warning-enabled-p 'lexical)) - (byte-compile-warn "global/dynamic var ‘%s’ lacks a prefix" + (byte-compile-warn "global/dynamic var `%s' lacks a prefix" sym)) (when (memq sym byte-compile-lexical-variables) (setq byte-compile-lexical-variables (delq sym byte-compile-lexical-variables)) - (byte-compile-warn "Variable ‘%S’ declared after its first use" sym)) + (byte-compile-warn "Variable `%S' declared after its first use" sym)) (push sym byte-compile-bound-variables)) (defun byte-compile-file-form-defvar (form) @@ -2423,7 +2423,7 @@ not to take responsibility for the actual compilation of the code." ;; Don't warn when compiling the stubs in byte-run... (not (assq name byte-compile-initial-macro-environment))) (byte-compile-warn - "‘%s’ defined multiple times, as both function and macro" + "`%s' defined multiple times, as both function and macro" name)) (setcdr that-one nil)) (this-one @@ -2431,13 +2431,13 @@ not to take responsibility for the actual compilation of the code." ;; Hack: Don't warn when compiling the magic internal ;; byte-compiler macros in byte-run.el... (not (assq name byte-compile-initial-macro-environment))) - (byte-compile-warn "%s ‘%s’ defined multiple times in this file" + (byte-compile-warn "%s `%s' defined multiple times in this file" (if macro "macro" "function") name))) ((eq (car-safe (symbol-function name)) (if macro 'lambda 'macro)) (when (byte-compile-warning-enabled-p 'redefine) - (byte-compile-warn "%s ‘%s’ being redefined as a %s" + (byte-compile-warn "%s `%s' being redefined as a %s" (if macro "function" "macro") name (if macro "macro" "function"))) @@ -2454,7 +2454,7 @@ not to take responsibility for the actual compilation of the code." (stringp (car-safe (cdr-safe (cdr-safe body))))) ;; FIXME: We've done that already just above, so this looks wrong! ;;(byte-compile-set-symbol-position name) - (byte-compile-warn "probable ‘\"’ without ‘\\’ in doc string of %s" + (byte-compile-warn "probable `\"' without `\\' in doc string of %s" name)) (if (not (listp body)) @@ -2982,13 +2982,13 @@ for symbols generated by the byte compiler itself." (`(',var . ,_) (when (assq var byte-compile-lexical-variables) (byte-compile-log-warning - (format-message "%s cannot use lexical var ‘%s’" fn var) + (format-message "%s cannot use lexical var `%s'" fn var) nil :error))))) (when (macroexp--const-symbol-p fn) - (byte-compile-warn "‘%s’ called as a function" fn)) + (byte-compile-warn "`%s' called as a function" fn)) (when (and (byte-compile-warning-enabled-p 'interactive-only) interactive-only) - (byte-compile-warn "‘%s’ is for interactive use only%s" + (byte-compile-warn "`%s' is for interactive use only%s" fn (cond ((stringp interactive-only) (format "; %s" @@ -2996,7 +2996,7 @@ for symbols generated by the byte compiler itself." interactive-only))) ((and (symbolp 'interactive-only) (not (eq interactive-only t))) - (format-message "; use ‘%s’ instead." + (format-message "; use `%s' instead." interactive-only)) (t ".")))) (if (eq (car-safe (symbol-function (car form))) 'macro) @@ -3041,7 +3041,7 @@ for symbols generated by the byte compiler itself." (byte-compile-warning-enabled-p 'mapcar)) (byte-compile-set-symbol-position 'mapcar) (byte-compile-warn - "‘mapcar’ called for effect; use ‘mapc’ or ‘dolist’ instead")) + "`mapcar' called for effect; use `mapc' or `dolist' instead")) (byte-compile-push-constant (car form)) (mapc 'byte-compile-form (cdr form)) ; wasteful, but faster. (byte-compile-out 'byte-call (length (cdr form)))) @@ -3129,8 +3129,8 @@ for symbols generated by the byte compiler itself." (cond ((or (not (symbolp var)) (macroexp--const-symbol-p var)) (when (byte-compile-warning-enabled-p 'constants) (byte-compile-warn (if (eq access-type 'let-bind) - "attempt to let-bind %s ‘%s’" - "variable reference to %s ‘%s’") + "attempt to let-bind %s `%s'" + "variable reference to %s `%s'") (if (symbolp var) "constant" "nonvariable") (prin1-to-string var)))) ((let ((od (get var 'byte-obsolete-variable))) @@ -3168,7 +3168,7 @@ for symbols generated by the byte compiler itself." (boundp var) (memq var byte-compile-bound-variables) (memq var byte-compile-free-references)) - (byte-compile-warn "reference to free variable ‘%S’" var) + (byte-compile-warn "reference to free variable `%S'" var) (push var byte-compile-free-references)) (byte-compile-dynamic-variable-op 'byte-varref var)))) @@ -3184,7 +3184,7 @@ for symbols generated by the byte compiler itself." (boundp var) (memq var byte-compile-bound-variables) (memq var byte-compile-free-assignments)) - (byte-compile-warn "assignment to free variable ‘%s’" var) + (byte-compile-warn "assignment to free variable `%s'" var) (push var byte-compile-free-assignments)) (byte-compile-dynamic-variable-op 'byte-varset var)))) @@ -3365,7 +3365,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (defun byte-compile-subr-wrong-args (form n) (byte-compile-set-symbol-position (car form)) - (byte-compile-warn "‘%s’ called with %d arg%s, but requires %s" + (byte-compile-warn "`%s' called with %d arg%s, but requires %s" (car form) (length (cdr form)) (if (= 1 (length (cdr form))) "" "s") n) ;; Get run-time wrong-number-of-args error. @@ -3733,7 +3733,7 @@ discarding." (macroexp--const-symbol-p var t)) (byte-compile-warning-enabled-p 'constants) (byte-compile-warn - "variable assignment to %s ‘%s’" + "variable assignment to %s `%s'" (if (symbolp var) "constant" "nonvariable") (prin1-to-string var))) (byte-compile-normal-call `(set-default ',var ,@(cdr form))))))) @@ -4107,7 +4107,7 @@ binding slots have been popped." (list 'not (cons (or (get (car form) 'byte-compile-negated-op) (error - "Compiler error: ‘%s’ has no ‘byte-compile-negated-op’ property" + "Compiler error: `%s' has no `byte-compile-negated-op' property" (car form))) (cdr form)))) @@ -4170,7 +4170,7 @@ binding slots have been popped." (byte-compile-set-symbol-position 'condition-case) (unless (symbolp var) (byte-compile-warn - "‘%s’ is not a variable-name or nil (in condition-case)" var)) + "`%s' is not a variable-name or nil (in condition-case)" var)) (if fun-bodies (setq var (make-symbol "err"))) (byte-compile-push-constant var) (if fun-bodies @@ -4189,7 +4189,7 @@ binding slots have been popped." (setq ok nil))) ok)))) (byte-compile-warn - "‘%S’ is not a condition name or list of such (in condition-case)" + "`%S' is not a condition name or list of such (in condition-case)" condition)) ;; (not (or (eq condition 't) ;; (and (stringp (get condition 'error-message)) @@ -4222,7 +4222,7 @@ binding slots have been popped." (byte-compile-set-symbol-position 'condition-case) (unless (symbolp var) (byte-compile-warn - "‘%s’ is not a variable-name or nil (in condition-case)" var)) + "`%s' is not a variable-name or nil (in condition-case)" var)) (dolist (clause (reverse clauses)) (let ((condition (nth 1 clause))) @@ -4230,7 +4230,7 @@ binding slots have been popped." (dolist (c condition) (unless (and c (symbolp c)) (byte-compile-warn - "‘%S’ is not a condition name (in condition-case)" c)) + "`%S' is not a condition name (in condition-case)" c)) ;; In reality, the `error-conditions' property is only required ;; for the argument to `signal', not to `condition-case'. ;;(unless (consp (get c 'error-conditions)) @@ -4272,7 +4272,7 @@ binding slots have been popped." (if (and (eq 'set-buffer (car-safe (car-safe (cdr form)))) (byte-compile-warning-enabled-p 'suspicious)) (byte-compile-warn - "Use ‘with-current-buffer’ rather than save-excursion+set-buffer")) + "Use `with-current-buffer' rather than save-excursion+set-buffer")) (byte-compile-out 'byte-save-excursion 0) (byte-compile-body-do-effect (cdr form)) (byte-compile-out 'byte-unbind 1)) @@ -4312,7 +4312,7 @@ binding slots have been popped." (when (and (symbolp (nth 1 form)) (not (string-match "[-*/:$]" (symbol-name (nth 1 form)))) (byte-compile-warning-enabled-p 'lexical)) - (byte-compile-warn "global/dynamic var ‘%s’ lacks a prefix" + (byte-compile-warn "global/dynamic var `%s' lacks a prefix" (nth 1 form))) (let ((fun (nth 0 form)) (var (nth 1 form)) @@ -4323,7 +4323,7 @@ binding slots have been popped." (and (eq fun 'defconst) (null (cddr form)))) (let ((ncall (length (cdr form)))) (byte-compile-warn - "‘%s’ called with %d argument%s, but %s %s" + "`%s' called with %d argument%s, but %s %s" fun ncall (if (= 1 ncall) "" "s") (if (< ncall 2) "requires" "accepts only") @@ -4332,7 +4332,7 @@ binding slots have been popped." (if (eq fun 'defconst) (push var byte-compile-const-variables)) (when (and string (not (stringp string))) - (byte-compile-warn "third arg to ‘%s %s’ is not a string: %s" + (byte-compile-warn "third arg to `%s %s' is not a string: %s" fun var string)) (byte-compile-form-do-effect (if (cddr form) ; `value' provided @@ -4355,7 +4355,7 @@ binding slots have been popped." (not (fboundp (eval (nth 1 form)))) (byte-compile-warn "The compiler ignores `autoload' except at top level. You should - probably put the autoload of the macro ‘%s’ at top-level." + probably put the autoload of the macro `%s' at top-level." (eval (nth 1 form)))) (byte-compile-normal-call form)) @@ -4363,7 +4363,7 @@ binding slots have been popped." ;; The ones that remain are errors. (defun byte-compile-lambda-form (_form) (byte-compile-set-symbol-position 'lambda) - (error "‘lambda’ used as function name is invalid")) + (error "`lambda' used as function name is invalid")) ;; Compile normally, but deal with warnings for the function being defined. (put 'defalias 'byte-hunk-handler 'byte-compile-file-form-defalias) @@ -4435,7 +4435,7 @@ binding slots have been popped." (if (and (eq (car-safe (car-safe (cdr-safe form))) 'quote) (byte-compile-warning-enabled-p 'make-local)) (byte-compile-warn - "‘make-variable-buffer-local’ not called at toplevel")) + "`make-variable-buffer-local' not called at toplevel")) (byte-compile-normal-call form)) (put 'make-variable-buffer-local 'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local) @@ -4567,7 +4567,7 @@ invoked interactively." (length (nth 2 y)))))) (`name (lambda (x y) (string< (car x) (car y)))) - (_ (error "‘byte-compile-call-tree-sort’: ‘%s’ - unknown sort mode" + (_ (error "`byte-compile-call-tree-sort': `%s' - unknown sort mode" byte-compile-call-tree-sort)))))) (message "Generating call tree...") (let ((rest byte-compile-call-tree) @@ -4680,7 +4680,7 @@ already up-to-date." ;; startup.el. (defvar command-line-args-left) ;Avoid 'free variable' warning (if (not noninteractive) - (error "‘batch-byte-compile’ is to be used only with -batch")) + (error "`batch-byte-compile' is to be used only with -batch")) (let ((error nil)) (while command-line-args-left (if (file-directory-p (expand-file-name (car command-line-args-left))) diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index a20e201add6..205ae6d711e 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -300,7 +300,7 @@ places where they originally did not directly appear." (prog1 binder (setq binder (list binder))) (when (cddr binder) (byte-compile-log-warning - (format-message "Malformed ‘%S’ binding: %S" + (format-message "Malformed `%S' binding: %S" letsym binder))) (setq value (cadr binder)) (car binder))) @@ -546,7 +546,7 @@ FORM is the parent form that binds this var." (`((,(and var (guard (eq ?_ (aref (symbol-name var) 0)))) . ,_) ,_ ,_ ,_ ,_) (byte-compile-log-warning - (format-message "%s ‘%S’ not left unused" varkind var)))) + (format-message "%s `%S' not left unused" varkind var)))) (pcase vardata (`((,var . ,_) nil ,_ ,_ nil) ;; FIXME: This gives warnings in the wrong order, with imprecise line @@ -558,7 +558,7 @@ FORM is the parent form that binds this var." (eq ?_ (aref (symbol-name var) 0)) ;; As a special exception, ignore "ignore". (eq var 'ignored)) - (byte-compile-log-warning (format-message "Unused lexical %s ‘%S’" + (byte-compile-log-warning (format-message "Unused lexical %s `%S'" varkind var)))) ;; If it's unused, there's no point converting it into a cons-cell, even if ;; it's captured and mutated. diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index d97287960a8..06601252a4c 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el @@ -652,7 +652,7 @@ SORT-PRED if desired." (set-buffer b) (erase-buffer) (insert "cd " d ";du -sk * \n") - (message "Running ‘cd %s;du -sk *’..." d) + (message "Running `cd %s;du -sk *'..." d) (call-process-region (point-min) (point-max) shell-file-name t (current-buffer) nil) (goto-char (point-min)) diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el index bdcb4ec00a2..3b69e959282 100644 --- a/lisp/emacs-lisp/check-declare.el +++ b/lisp/emacs-lisp/check-declare.el @@ -106,7 +106,7 @@ don't know how to recognize (e.g. some macros)." (symbolp (setq fileonly (nth 4 form)))) (setq alist (cons (list fnfile fn arglist fileonly) alist)) ;; FIXME make this more noticeable. - (if form (message "Malformed declaration for ‘%s’" (cadr form)))))) + (if form (message "Malformed declaration for `%s'" (cadr form)))))) (message "%sdone" m) alist)) @@ -279,7 +279,7 @@ TYPE is a string giving the nature of the error. Warning is displayed in entry)) (warning-fill-prefix " ")) (display-warning 'check-declare - (format-message "said ‘%s’ was defined in %s: %s" + (format-message "said `%s' was defined in %s: %s" fn (file-name-nondirectory fnfile) type) nil check-declare-warning-buffer))) @@ -318,7 +318,7 @@ Return a list of any errors found." See `check-declare-directory' for more information." (interactive "fFile to check: ") (or (file-exists-p file) - (error "File ‘%s’ not found" file)) + (error "File `%s' not found" file)) (let ((m (format "Checking %s..." file)) errlist) (message "%s" m) @@ -332,8 +332,8 @@ See `check-declare-directory' for more information." Returns non-nil if any false statements are found." (interactive "DDirectory to check: ") (or (file-directory-p (setq root (expand-file-name root))) - (error "Directory ‘%s’ not found" root)) - (let ((m "Checking ‘declare-function’ statements...") + (error "Directory `%s' not found" root)) + (let ((m "Checking `declare-function' statements...") (m2 "Finding files with declarations...") errlist files) (message "%s" m) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index b2c81197968..4a9e16ae88e 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1419,7 +1419,7 @@ regexp short cuts work. FP is the function defun information." (when (re-search-forward "^(" e t) (if (checkdoc-autofix-ask-replace (match-beginning 0) (match-end 0) - "Escape this ‘(’? " + (format-message "Escape this `('? ") "\\(") nil (checkdoc-create-error @@ -1715,7 +1715,7 @@ function,command,variable,option or symbol." ms1)))))) (if (checkdoc-autofix-ask-replace (match-beginning 1) (match-end 1) (format-message - "If this is the argument ‘%s’, it should appear as %s. Fix? " + "If this is the argument `%s', it should appear as %s. Fix? " (car args) (upcase (car args))) (upcase (car args)) t) (setq found (match-beginning 1)))))) @@ -1741,7 +1741,7 @@ function,command,variable,option or symbol." ms1)))))) nil) (checkdoc-create-error (format-message - "Argument ‘%s’ should appear (as %s) in the doc string" + "Argument `%s' should appear (as %s) in the doc string" (car args) (upcase (car args))) s (marker-position e))) (if (or (and order (eq order 'yes)) @@ -1825,15 +1825,15 @@ Replace with \"%s\"? " original replace) (or (boundp found) (fboundp found))) (progn (setq msg (format-message - "Add quotes around Lisp symbol ‘%s’? " ms)) + "Add quotes around Lisp symbol `%s'? " ms)) (if (checkdoc-autofix-ask-replace (match-beginning 1) (+ (match-beginning 1) (length ms)) - msg (concat "‘" ms "’") t) + msg (format-message "`%s'" ms) t) (setq msg nil) (setq msg (format-message - "Lisp symbol ‘%s’ should appear in quotes" ms)))))) + "Lisp symbol `%s' should appear in quotes" ms)))))) (if msg (checkdoc-create-error msg (match-beginning 1) (+ (match-beginning 1) @@ -1849,7 +1849,7 @@ Replace with \"%s\"? " original replace) (match-string 2) t) nil (checkdoc-create-error - "Symbols t and nil should not appear in ‘...’ quotes" + "Symbols t and nil should not appear in single quotes" (match-beginning 1) (match-end 1))))) ;; Here is some basic sentence formatting (checkdoc-sentencespace-region-engine (point) e) @@ -2487,22 +2487,24 @@ Argument TYPE specifies the type of question, such as `error' or `y-or-n-p'." ;; If we see a ?, then replace with "? ". (if (checkdoc-autofix-ask-replace (match-beginning 0) (match-end 0) - "‘y-or-n-p’ argument should end with \"? \". Fix? " + (format-message + "`y-or-n-p' argument should end with \"? \". Fix? ") "? " t) nil (checkdoc-create-error - "‘y-or-n-p’ argument should end with \"? \"" + "`y-or-n-p' argument should end with \"? \"" (match-beginning 0) (match-end 0))) (if (save-excursion (forward-sexp 1) (forward-char -2) (looking-at " ")) (if (checkdoc-autofix-ask-replace (match-beginning 0) (match-end 0) - "‘y-or-n-p’ argument should end with \"? \". Fix? " + (format-message + "`y-or-n-p' argument should end with \"? \". Fix? ") "? " t) nil (checkdoc-create-error - "‘y-or-n-p’ argument should end with \"? \"" + "`y-or-n-p' argument should end with \"? \"" (match-beginning 0) (match-end 0))) (if (and ;; if this isn't true, we have a problem. (save-excursion (forward-sexp 1) @@ -2510,11 +2512,12 @@ Argument TYPE specifies the type of question, such as `error' or `y-or-n-p'." (looking-at "\"")) (checkdoc-autofix-ask-replace (match-beginning 0) (match-end 0) - "‘y-or-n-p’ argument should end with \"? \". Fix? " + (format-message + "`y-or-n-p' argument should end with \"? \". Fix? ") "? \"" t)) nil (checkdoc-create-error - "‘y-or-n-p’ argument should end with \"? \"" + "`y-or-n-p' argument should end with \"? \"" (match-beginning 0) (match-end 0))))))) ;; Now, let's just run the spell checker on this guy. (checkdoc-ispell-docstring-engine (save-excursion (forward-sexp 1) diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 7a7712ac0d3..dddfca7ae83 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -415,7 +415,7 @@ as an integer unless JUNK-ALLOWED is non-nil." (cond ((and junk-allowed (null sum)) sum) (junk-allowed (* sign sum)) ((or (/= start end) (null sum)) - (error "Not an integer string: ‘%s’" string)) + (error "Not an integer string: `%s'" string)) (t (* sign sum))))))) @@ -774,16 +774,16 @@ including `cl-block' and `cl-eval-when'." ;; FIXME: Add a `cl-class-of' or `cl-typeof' or somesuch. (metatype (cl--class-name (symbol-value (aref class 0))))) (insert (symbol-name type) - (substitute-command-keys " is a type (of kind ‘")) + (substitute-command-keys " is a type (of kind `")) (help-insert-xref-button (symbol-name metatype) 'cl-help-type metatype) - (insert (substitute-command-keys "’)")) + (insert (substitute-command-keys "')")) (when location - (insert (substitute-command-keys " in ‘")) + (insert (substitute-command-keys " in `")) (help-insert-xref-button (help-fns-short-filename location) 'cl-type-definition type location 'define-type) - (insert (substitute-command-keys "’"))) + (insert (substitute-command-keys "'"))) (insert ".\n") ;; Parents. @@ -793,10 +793,10 @@ including `cl-block' and `cl-eval-when'." (insert " Inherits from ") (while (setq cur (pop pl)) (setq cur (cl--class-name cur)) - (insert (substitute-command-keys "‘")) + (insert (substitute-command-keys "`")) (help-insert-xref-button (symbol-name cur) 'cl-help-type cur) - (insert (substitute-command-keys (if pl "’, " "’")))) + (insert (substitute-command-keys (if pl "', " "'")))) (insert ".\n"))) ;; Children, if available. ¡For EIEIO! @@ -807,10 +807,10 @@ including `cl-block' and `cl-eval-when'." (when ch (insert " Children ") (while (setq cur (pop ch)) - (insert (substitute-command-keys "‘")) + (insert (substitute-command-keys "`")) (help-insert-xref-button (symbol-name cur) 'cl-help-type cur) - (insert (substitute-command-keys (if ch "’, " "’")))) + (insert (substitute-command-keys (if ch "', " "'")))) (insert ".\n"))) ;; Type's documentation. @@ -826,10 +826,10 @@ including `cl-block' and `cl-eval-when'." (when generics (insert (propertize "Specialized Methods:\n\n" 'face 'bold)) (dolist (generic generics) - (insert (substitute-command-keys "‘")) + (insert (substitute-command-keys "`")) (help-insert-xref-button (symbol-name generic) 'help-function generic) - (insert (substitute-command-keys "’")) + (insert (substitute-command-keys "'")) (pcase-dolist (`(,qualifiers ,args ,doc) (cl--generic-method-documentation generic type)) (insert (format " %s%S\n" qualifiers args) diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 5d527619d6d..c012a30a41f 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)) @@ -864,11 +864,11 @@ MET-NAME is a cons (SYMBOL . SPECIALIZERS)." (cl--generic-method-specializers method))) (file (find-lisp-object-file-name met-name 'cl-defmethod))) (when file - (insert (substitute-command-keys " in ‘")) + (insert (substitute-command-keys " in `")) (help-insert-xref-button (help-fns-short-filename file) 'help-function-def met-name file 'cl-defmethod) - (insert (substitute-command-keys "’.\n")))) + (insert (substitute-command-keys "'.\n")))) (insert "\n" (or (nth 2 info) "Undocumented") "\n\n"))))))) (defun cl--generic-specializers-apply-to-type-p (specializers type) @@ -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/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 30581e37e94..d5d8ef0a8a1 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1132,7 +1132,7 @@ For more details, see Info node `(cl)Loop Facility'. (cond ((null cl--loop-args) - (error "Malformed ‘cl-loop’ macro")) + (error "Malformed `cl-loop' macro")) ((eq word 'named) (setq cl--loop-name (pop cl--loop-args))) @@ -1140,7 +1140,7 @@ For more details, see Info node `(cl)Loop Facility'. ((eq word 'initially) (if (memq (car cl--loop-args) '(do doing)) (pop cl--loop-args)) (or (consp (car cl--loop-args)) - (error "Syntax error on ‘initially’ clause")) + (error "Syntax error on `initially' clause")) (while (consp (car cl--loop-args)) (push (pop cl--loop-args) cl--loop-initially))) @@ -1150,7 +1150,7 @@ For more details, see Info node `(cl)Loop Facility'. (or (cl--pop2 cl--loop-args) '(quote nil))) (if (memq (car cl--loop-args) '(do doing)) (pop cl--loop-args)) (or (consp (car cl--loop-args)) - (error "Syntax error on ‘finally’ clause")) + (error "Syntax error on `finally' clause")) (if (and (eq (caar cl--loop-args) 'return) (null cl--loop-name)) (setq cl--loop-result-explicit (or (nth 1 (pop cl--loop-args)) '(quote nil))) @@ -1177,7 +1177,7 @@ For more details, see Info node `(cl)Loop Facility'. above below by)) (push word cl--loop-args) (if (memq (car cl--loop-args) '(downto above)) - (error "Must specify ‘from’ value for downward cl-loop")) + (error "Must specify `from' value for downward cl-loop")) (let* ((down (or (eq (car cl--loop-args) 'downfrom) (memq (nth 2 cl--loop-args) '(downto above)))) @@ -1197,7 +1197,7 @@ For more details, see Info node `(cl)Loop Facility'. (step-var (and (not (macroexp-const-p step)) (make-symbol "--cl-var--")))) (and step (numberp step) (<= step 0) - (error "Loop ‘by’ value is not positive: %s" step)) + (error "Loop `by' value is not positive: %s" step)) (push (list var (or start 0)) loop-for-bindings) (if end-var (push (list end-var end) loop-for-bindings)) (if step-var (push (list step-var step) @@ -1276,7 +1276,7 @@ For more details, see Info node `(cl)Loop Facility'. ((memq word '(element elements)) (let ((ref (or (memq (car cl--loop-args) '(in-ref of-ref)) (and (not (memq (car cl--loop-args) '(in of))) - (error "Expected ‘of’")))) + (error "Expected `of'")))) (seq (cl--pop2 cl--loop-args)) (temp-seq (make-symbol "--cl-seq--")) (temp-idx @@ -1284,7 +1284,7 @@ For more details, see Info node `(cl)Loop Facility'. (if (and (= (length (cadr cl--loop-args)) 2) (eq (cl-caadr cl--loop-args) 'index)) (cadr (cl--pop2 cl--loop-args)) - (error "Bad ‘using’ clause")) + (error "Bad `using' clause")) (make-symbol "--cl-idx--")))) (push (list temp-seq seq) loop-for-bindings) (push (list temp-idx 0) loop-for-bindings) @@ -1309,7 +1309,7 @@ For more details, see Info node `(cl)Loop Facility'. ((memq word hash-types) (or (memq (car cl--loop-args) '(in of)) - (error "Expected ‘of’")) + (error "Expected `of'")) (let* ((table (cl--pop2 cl--loop-args)) (other (if (eq (car cl--loop-args) 'using) @@ -1317,7 +1317,7 @@ For more details, see Info node `(cl)Loop Facility'. (memq (cl-caadr cl--loop-args) hash-types) (not (eq (cl-caadr cl--loop-args) word))) (cadr (cl--pop2 cl--loop-args)) - (error "Bad ‘using’ clause")) + (error "Bad `using' clause")) (make-symbol "--cl-var--")))) (if (memq word '(hash-value hash-values)) (setq var (prog1 other (setq other var)))) @@ -1372,7 +1372,7 @@ For more details, see Info node `(cl)Loop Facility'. ((memq word key-types) (or (memq (car cl--loop-args) '(in of)) - (error "Expected ‘of’")) + (error "Expected `of'")) (let ((cl-map (cl--pop2 cl--loop-args)) (other (if (eq (car cl--loop-args) 'using) @@ -1380,7 +1380,7 @@ For more details, see Info node `(cl)Loop Facility'. (memq (cl-caadr cl--loop-args) key-types) (not (eq (cl-caadr cl--loop-args) word))) (cadr (cl--pop2 cl--loop-args)) - (error "Bad ‘using’ clause")) + (error "Bad `using' clause")) (make-symbol "--cl-var--")))) (if (memq word '(key-binding key-bindings)) (setq var (prog1 other (setq other var)))) @@ -1430,7 +1430,7 @@ For more details, see Info node `(cl)Loop Facility'. (get word 'cl-loop-for-handler)))) (if handler (funcall handler var) - (error "Expected a ‘for’ preposition, found %s" word))))) + (error "Expected a `for' preposition, found %s" word))))) (eq (car cl--loop-args) 'and)) (setq ands t) (pop cl--loop-args)) @@ -1569,7 +1569,7 @@ For more details, see Info node `(cl)Loop Facility'. ((memq word '(do doing)) (let ((body nil)) - (or (consp (car cl--loop-args)) (error "Syntax error on ‘do’ clause")) + (or (consp (car cl--loop-args)) (error "Syntax error on `do' clause")) (while (consp (car cl--loop-args)) (push (pop cl--loop-args) body)) (push (cons 'progn (nreverse (cons t body))) cl--loop-body))) @@ -1802,7 +1802,7 @@ Labels have lexical scope and dynamic extent." `((go . ,(lambda (label) (let ((catch-tag (cdr (assq label cl--tagbody-alist)))) (unless catch-tag - (error "Unknown cl-tagbody go label ‘%S’" label)) + (error "Unknown cl-tagbody go label `%S'" label)) `(throw ',catch-tag ',label)))) ,@macroexpand-all-environment))))) @@ -2101,7 +2101,7 @@ by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...). macroexpand-all-environment)))) (if (or (null (cdar bindings)) (cl-cddar bindings)) (macroexp--warn-and-return - (format-message "Malformed ‘cl-symbol-macrolet’ binding: %S" + (format-message "Malformed `cl-symbol-macrolet' binding: %S" (car bindings)) expansion) expansion))) diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index ba50680e8b9..46472ccd257 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -86,7 +86,7 @@ (defun cl-unload-function () "Stop unloading of the Common Lisp extensions." - (message "Cannot unload the feature ‘cl’") + (message "Cannot unload the feature `cl'") ;; Stop standard unloading! t) @@ -459,15 +459,15 @@ definitions, or lack thereof). (if (or (and (fboundp (car x)) (eq (car-safe (symbol-function (car x))) 'macro)) (cdr (assq (car x) macroexpand-all-environment))) - (error "Use ‘labels’, not ‘flet’, to rebind macro names")) + (error "Use `labels', not `flet', to rebind macro names")) (let ((func `(cl-function (lambda ,(cadr x) (cl-block ,(car x) ,@(cddr x)))))) (when (cl--compiling-file) ;; Bug#411. It would be nice to fix this. (and (get (car x) 'byte-compile) - (error "Byte-compiling a redefinition of ‘%s’ \ -will not work - use ‘labels’ instead" (symbol-name (car x)))) + (error "Byte-compiling a redefinition of `%s' \ +will not work - use `labels' instead" (symbol-name (car x)))) ;; FIXME This affects the rest of the file, when it ;; should be restricted to the flet body. (and (boundp 'byte-compile-function-environment) diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index ece6883ccbe..1317d699d25 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -350,7 +350,7 @@ independently replaces consecutive years with a range." (or (getenv "ORGANIZATION") str) '(if (copyright-offset-too-large-p) - (message "Copyright extends beyond ‘copyright-limit’ and won't be updated automatically.")) + (message "Copyright extends beyond `copyright-limit' and won't be updated automatically.")) comment-end \n) ;; TODO: recurse, exclude COPYING etc. @@ -361,7 +361,7 @@ If FIX is non-nil, run `copyright-fix-years' instead." (interactive "DDirectory: \nMFilenames matching (regexp): ") (dolist (file (directory-files directory t match nil)) (unless (file-directory-p file) - (message "Updating file ‘%s’" file) + (message "Updating file `%s'" file) ;; FIXME we should not use find-file+save+kill. (let ((enable-local-variables :safe) (enable-local-eval nil)) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 3ad496ac203..0162a9a230a 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -880,7 +880,7 @@ Maybe clear the markers and delete the symbol's edebug property?" (setq dotted-form (edebug-read-storing-offsets stream)) elements (nconc elements dotted-form) (if (not (eq (edebug-next-token-class) 'rparen)) - (edebug-syntax-error "Expected ‘)’")) + (edebug-syntax-error "Expected `)'")) (setq edebug-read-dotted-list (listp dotted-form)) )) elements) diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index e1051b26e16..400bdb95c06 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -218,7 +218,7 @@ for CLASS. Optional ALLOW-SUBCLASS says that it is ok for `eieio-persistent-read' to load in subclasses of class instead of being pedantic." (unless class - (message "Unsafe call to ‘eieio-persistent-read’.")) + (message "Unsafe call to `eieio-persistent-read'.")) (when class (cl-check-type class class)) (let ((ret nil) (buffstr nil)) diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index c47f7f943a2..a2f5f8af8ea 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -547,7 +547,7 @@ If SKIPNIL is non-nil, then if default value is nil return t instead." (if (not (eq type t)) (if (not (equal type tp)) (error - "Child slot type ‘%s’ does not match inherited type ‘%s’ for ‘%s’" + "Child slot type `%s' does not match inherited type `%s' for `%s'" type tp a)) (setf (cl--slot-descriptor-type new) tp)) ;; If we have a repeat, only update the initarg... @@ -567,7 +567,7 @@ If SKIPNIL is non-nil, then if default value is nil return t instead." (let ((super-prot (alist-get :protection oprops)) (prot (alist-get :protection nprops))) (if (not (eq prot super-prot)) - (error "Child slot protection ‘%s’ does not match inherited protection ‘%s’ for ‘%s’" + (error "Child slot protection `%s' does not match inherited protection `%s' for `%s'" prot super-prot a))) ;; End original PLN @@ -736,7 +736,7 @@ Argument FN is the function calling this verifier." ((and (or `',name (and name (pred keywordp))) (guard (not (memq name eieio--known-slot-names)))) (macroexp--warn-and-return - (format-message "Unknown slot ‘%S’" name) exp 'compile-only)) + (format-message "Unknown slot `%S'" name) exp 'compile-only)) (_ exp))))) (cl-check-type slot symbol) (cl-check-type obj (or eieio-object class)) diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 0b003360ed5..a5d8b6fcf89 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -141,11 +141,11 @@ are not abstract." (setq location (find-lisp-object-file-name ctr def))) (when location - (insert (substitute-command-keys " in ‘")) + (insert (substitute-command-keys " in `")) (help-insert-xref-button (help-fns-short-filename location) 'cl-type-definition ctr location 'define-type) - (insert (substitute-command-keys "’"))) + (insert (substitute-command-keys "'"))) (insert ".\nCreates an object of class " (symbol-name ctr) ".") (goto-char (point-max)) (if (autoloadp def) diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el index ac8124a1927..a1eabcf9700 100644 --- a/lisp/emacs-lisp/eieio-speedbar.el +++ b/lisp/emacs-lisp/eieio-speedbar.el @@ -323,7 +323,7 @@ Argument DEPTH is the depth at which the tag line is inserted." (cl-defmethod eieio-speedbar-child-make-tag-lines ((object eieio-speedbar) _depth) "Base method for creating tag lines for non-object children." - (error "You must implement ‘eieio-speedbar-child-make-tag-lines’ for %s" + (error "You must implement `eieio-speedbar-child-make-tag-lines' for %s" (eieio-object-name object))) (cl-defmethod eieio-speedbar-expand ((object eieio-speedbar) depth) @@ -364,7 +364,7 @@ TOKEN is the object. INDENT is the current indentation level." (cl-defmethod eieio-speedbar-child-description ((obj eieio-speedbar)) "Return a description for a child of OBJ which is not an object." - (error "You must implement ‘eieio-speedbar-child-description’ for %s" + (error "You must implement `eieio-speedbar-child-description' for %s" (eieio-object-name obj))) (defun eieio-speedbar-item-info () diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index d6c27be0567..bf28f8975bc 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -114,10 +114,10 @@ and reference them using the function `class-option'." (cond ((and (stringp (car options-and-doc)) (/= 1 (% (length options-and-doc) 2))) - (error "Too many arguments to ‘defclass’")) + (error "Too many arguments to `defclass'")) ((and (symbolp (car options-and-doc)) (/= 0 (% (length options-and-doc) 2))) - (error "Too many arguments to ‘defclass’"))) + (error "Too many arguments to `defclass'"))) (if (stringp (car options-and-doc)) (setq options-and-doc @@ -942,7 +942,7 @@ this object." "Change the class of OBJ to type CLASS. This may create or delete slots, but does not affect the return value of `eq'." - (error "EIEIO: ‘change-class’ is unimplemented")) + (error "EIEIO: `change-class' is unimplemented")) ;; Hook ourselves into help system for describing classes and methods. ;; FIXME: This is not actually needed any more since we can click on the diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el index 15eeb49707b..86ac33c2600 100644 --- a/lisp/emacs-lisp/elint.el +++ b/lisp/emacs-lisp/elint.el @@ -249,9 +249,9 @@ This environment can be passed to `macroexpand'." (elint-set-mode-line t) (with-current-buffer elint-log-buffer (unless (string-equal default-directory dir) - (elint-log-message (format-message " \nLeaving directory ‘%s’" + (elint-log-message (format-message " \nLeaving directory `%s'" default-directory) t) - (elint-log-message (format-message "Entering directory ‘%s’" dir) t) + (elint-log-message (format-message "Entering directory `%s'" dir) t) (setq default-directory dir)))) (let ((str (format "Linting file %s" file))) (message "%s..." str) @@ -374,7 +374,7 @@ Returns the forms." ;; quoted check cannot be elsewhere, since quotes skipped. (if (looking-back "'" (1- (point))) ;; Eg cust-print.el uses ' as a comment syntax. - (elint-warning "Skipping quoted form ‘'%.20s...’" + (elint-warning "Skipping quoted form `%c%.20s...'" ?\' (read (current-buffer))) (condition-case nil (setq tops (cons @@ -383,7 +383,7 @@ Returns the forms." tops)) (end-of-file (goto-char elint-current-pos) - (error "Missing ‘)’ in top form: %s" + (error "Missing `)' in top form: %s" (buffer-substring elint-current-pos (line-end-position)))))))) (nreverse tops)))) @@ -401,7 +401,7 @@ Return nil if there are no more forms, t otherwise." (cond ;; Eg nnmaildir seems to use [] as a form of comment syntax. ((not (listp form)) - (elint-warning "Skipping non-list form ‘%s’" form)) + (elint-warning "Skipping non-list form `%s'" form)) ;; Add defined variable ((memq (car form) '(defvar defconst defcustom)) (setq elint-env (elint-env-add-var elint-env (cadr form)))) @@ -432,7 +432,7 @@ Return nil if there are no more forms, t otherwise." (if (or (< (length form) 4) (eq (nth 3 form) t) (unless (stringp (nth 2 form)) - (elint-error "Malformed declaration for ‘%s’" + (elint-error "Malformed declaration for `%s'" (cadr form)) t)) 'unknown @@ -758,7 +758,7 @@ CODE can be a lambda expression, a macro, or byte-compiled code." (and (eq (car-safe alias) 'quote) (eq (car-safe target) 'quote) (eq (elint-get-args (cadr target) env) 'undefined) - (elint-warning "Alias ‘%s’ has unknown target ‘%s’" + (elint-warning "Alias `%s' has unknown target `%s'" (cadr alias) (cadr target)))) (elint-form form env t)) @@ -796,7 +796,7 @@ CODE can be a lambda expression, a macro, or byte-compiled code." (setq newenv (elint-env-add-var newenv (car s)))) (t (elint-error - "Malformed ‘let’ declaration: %s" s)))) + "Malformed `let' declaration: %s" s)))) varlist) ;; Lint the body forms diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 91fc1572d50..d47e5d94b9d 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -121,7 +121,7 @@ Emacs bug 6581 at URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581'." (defun ert-get-test (symbol) "If SYMBOL names a test, return that. Signal an error otherwise." - (unless (ert-test-boundp symbol) (error "No test named ‘%S’" symbol)) + (unless (ert-test-boundp symbol) (error "No test named `%S'" symbol)) (get symbol 'ert--test)) (defun ert-set-test (symbol definition) @@ -2065,7 +2065,7 @@ and how to display message." "--" ["Show backtrace" ert-results-pop-to-backtrace-for-test-at-point] ["Show messages" ert-results-pop-to-messages-for-test-at-point] - ["Show ‘should’ forms" ert-results-pop-to-should-forms-for-test-at-point] + ["Show `should' forms" ert-results-pop-to-should-forms-for-test-at-point] ["Describe test" ert-results-describe-test-at-point] "--" ["Delete test" ert-delete-test] @@ -2377,9 +2377,9 @@ To be used in the ERT results buffer." (ert--print-backtrace backtrace) (debugger-make-xrefs) (goto-char (point-min)) - (insert "Backtrace for test ‘") + (insert (substitute-command-keys "Backtrace for test `")) (ert-insert-test-name-button (ert-test-name test)) - (insert "’:\n"))))))) + (insert (substitute-command-keys "':\n")))))))) (defun ert-results-pop-to-messages-for-test-at-point () "Display the part of the *Messages* buffer generated during the test at point. @@ -2398,9 +2398,9 @@ To be used in the ERT results buffer." (ert-simple-view-mode) (insert (ert-test-result-messages result)) (goto-char (point-min)) - (insert "Messages for test ‘") + (insert (substitute-command-keys "Messages for test `")) (ert-insert-test-name-button (ert-test-name test)) - (insert "’:\n"))))) + (insert (substitute-command-keys "':\n")))))) (defun ert-results-pop-to-should-forms-for-test-at-point () "Display the list of `should' forms executed during the test at point. @@ -2428,9 +2428,10 @@ To be used in the ERT results buffer." (ert--pp-with-indentation-and-newline form-description) (ert--make-xrefs-region begin (point))))) (goto-char (point-min)) - (insert "‘should’ forms executed during test ‘") + (insert (substitute-command-keys + "`should' forms executed during test `")) (ert-insert-test-name-button (ert-test-name test)) - (insert "’:\n") + (insert (substitute-command-keys "':\n")) (insert "\n") (insert (concat "(Values are shallow copies and may have " "looked different during the test if they\n" @@ -2507,9 +2508,11 @@ To be used in the ERT results buffer." (let ((file-name (and test-name (symbol-file test-name 'ert-deftest)))) (when file-name - (insert " defined in ‘" (file-name-nondirectory file-name) "’") + (insert (format-message " defined in `%s'" + (file-name-nondirectory file-name))) (save-excursion - (re-search-backward "‘\\([^‘’]+\\)’" nil t) + (re-search-backward (substitute-command-keys "`\\([^`']+\\)'") + nil t) (help-xref-button 1 'help-function-def test-name file-name))) (insert ".") (fill-region-as-paragraph (point-min) (point)) diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 86a1f283238..026a4a749a9 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -296,7 +296,7 @@ Otherwise, TYPE specifies the kind of definition, and it is interpreted via `find-function-regexp-alist'. The search is done in the source for library LIBRARY." (if (null library) - (error "Don't know where ‘%s’ is defined" symbol)) + (error "Don't know where `%s' is defined" symbol)) ;; Some functions are defined as part of the construct ;; that defines something else. (while (and (symbolp symbol) (get symbol 'definition-name)) @@ -368,9 +368,9 @@ message about the whole chain of aliases." (setq aliases (if aliases (concat aliases (format-message - ", which is an alias for ‘%s’" + ", which is an alias for `%s'" (symbol-name def))) - (format-message "‘%s’ is an alias for ‘%s’" + (format-message "`%s' is an alias for `%s'" function (symbol-name def))))) (setq function (find-function-advised-original function) def (find-function-advised-original function))) diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el index 79e760d511c..123f64b9660 100644 --- a/lisp/emacs-lisp/generator.el +++ b/lisp/emacs-lisp/generator.el @@ -661,7 +661,7 @@ The caller of `iter-next' receives VALUE, and the next call to `iter-next' resumes execution at the previous `iter-yield' point." (identity value) - (error "‘iter-yield’ used outside a generator")) + (error "`iter-yield' used outside a generator")) (defmacro iter-yield-from (value) "When used inside a generator function, delegate to a sub-iterator. diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 67609820a33..bbe6b36ab9a 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -239,7 +239,7 @@ instead the assignment is turned into something equivalent to so as to preserve the semantics of `setf'." (declare (debug (sexp (&or symbolp lambda-expr) &optional sexp))) (when (eq 'lambda (car-safe setter)) - (message "Use ‘gv-define-setter’ or name %s's setter function" name)) + (message "Use `gv-define-setter' or name %s's setter function" name)) `(gv-define-setter ,name (val &rest args) ,(if fix-return `(macroexp-let2 nil v val diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index 6fdd348caab..393f0dd99e8 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -542,21 +542,21 @@ copyright notice is allowed." ((null name) "Can't find package name") ((not (lm-authors)) - "‘Author:’ tag missing") + "`Author:' tag missing") ((not (lm-maintainer)) - "‘Maintainer:’ tag missing") + "`Maintainer:' tag missing") ((not (lm-summary)) "Can't find the one-line summary description") ((not (lm-keywords)) - "‘Keywords:’ tag missing") + "`Keywords:' tag missing") ((not (lm-keywords-finder-p)) - "‘Keywords:’ has no valid finder keywords (see ‘finder-known-keywords’)") + "`Keywords:' has no valid finder keywords (see `finder-known-keywords')") ((not (lm-commentary-mark)) - "Can't find a ‘Commentary’ section marker") + "Can't find a `Commentary' section marker") ((not (lm-history-mark)) - "Can't find a ‘History’ section marker") + "Can't find a `History' section marker") ((not (lm-code-mark)) - "Can't find a ‘Code’ section marker") + "Can't find a `Code' section marker") ((progn (goto-char (point-max)) (not diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 6189976e866..2c33d39c32f 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -147,10 +147,10 @@ and also to avoid outputting the warning during normal execution." (let ((instead (car obsolescence-data)) (asof (nth 2 obsolescence-data))) (format-message - "‘%s’ is an obsolete %s%s%s" fun type + "`%s' is an obsolete %s%s%s" fun type (if asof (concat " (as of " asof ")") "") (cond ((stringp instead) (concat "; " (substitute-command-keys instead))) - (instead (format-message "; use ‘%s’ instead." instead)) + (instead (format-message "; 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 3ac7094990d..43fd4ef57a6 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -199,9 +199,9 @@ Returns the number of actions taken." (action (if help (nth 2 help) "act on"))) (concat (format-message "\ -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); +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 7eebb5ebaf8..2cd34e12810 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-message "‘%S’" fun) + (if (symbolp fun) (format-message "`%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/package-x.el b/lisp/emacs-lisp/package-x.el index 608bf734bef..81d0b834722 100644 --- a/lisp/emacs-lisp/package-x.el +++ b/lisp/emacs-lisp/package-x.el @@ -296,7 +296,7 @@ destination, prompt for one." ((string-match "\\.tar\\'" file) (tar-mode) (package-tar-file-info)) ((string-match "\\.el\\'" file) (package-buffer-info)) - (t (error "Unrecognized extension ‘%s’" + (t (error "Unrecognized extension `%s'" (file-name-extension file)))))) (package-upload-buffer-internal pkg-desc (file-name-extension file))))) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f6583bba487..b0d2ff96629 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -456,13 +456,13 @@ This is, approximately, the inverse of `version-to-list'. (push (int-to-string num) str-list) (push "." str-list)) ((< num -4) - (error "Invalid version list ‘%s’" vlist)) + (error "Invalid version list `%s'" vlist)) (t ;; pre, or beta, or alpha (cond ((equal "." (car str-list)) (pop str-list)) ((not (string-match "[0-9]+" (car str-list))) - (error "Invalid version list ‘%s’" vlist))) + (error "Invalid version list `%s'" vlist))) (push (cond ((= num -1) "pre") ((= num -2) "beta") ((= num -3) "alpha") @@ -623,7 +623,7 @@ Return the max version (as a string) if the package is held at a lower version." ((stringp force) ; held (unless (version-list-= version (version-to-list force)) force)) - (t (error "Invalid element in ‘package-load-list’"))))) + (t (error "Invalid element in `package-load-list'"))))) (defun package-built-in-p (package &optional min-version) "Return true if PACKAGE is built-in to Emacs. @@ -672,7 +672,7 @@ correspond to previously loaded files (those returned by (let* ((name (package-desc-name pkg-desc)) (pkg-dir (package-desc-dir pkg-desc))) (unless pkg-dir - (error "Internal error: unable to find directory for ‘%s’" + (error "Internal error: unable to find directory for `%s'" (package-desc-full-name pkg-desc))) (let* ((loaded-files-list (when reload (package--list-loaded-files pkg-dir)))) @@ -767,8 +767,8 @@ Newer versions are always activated, regardless of FORCE." (unless (package-activate (car req)) (throw 'dep-failure req)))))) (if fail - (warn "Unable to activate package ‘%s’. -Required package ‘%s-%s’ is unavailable" + (warn "Unable to activate package `%s'. +Required package `%s-%s' is unavailable" package (car fail) (package-version-join (cadr fail))) ;; If all goes well, activate the package itself. (package-activate-1 pkg-vec force))))))) @@ -1484,7 +1484,7 @@ similar to an entry in `package-alist'. Save the cached copy to ;; Even if the sig fails, this download is done, so ;; remove it from the in-progress list. (package--update-downloads-in-progress archive) - (error "Unsigned archive ‘%s’" name)) + (error "Unsigned archive `%s'" name)) ;; Write out the archives file. (write-region content nil local-file nil 'silent) ;; Write out good signatures into archive-contents.signed file. @@ -1514,7 +1514,7 @@ perform the downloads asynchronously." (when async ;; The t at the end means to propagate connection errors. (lambda () (package--update-downloads-in-progress archive) t))) - (error (message "Failed to download ‘%s’ archive." + (error (message "Failed to download `%s' archive." (car archive)))))) ;;;###autoload @@ -1583,7 +1583,7 @@ SEEN is used internally to detect infinite recursion." (package-desc-full-name already)) (setq packages (delq already packages)) (setq already nil)) - (error "Need package ‘%s-%s’, but only %s is being installed" + (error "Need package `%s-%s', but only %s is being installed" next-pkg (package-version-join next-version) (package-version-join (package-desc-version already))))) (cond @@ -1612,20 +1612,20 @@ SEEN is used internally to detect infinite recursion." (setq problem (if (stringp disabled) (format-message - "Package ‘%s’ held at version %s, but version %s required" + "Package `%s' held at version %s, but version %s required" next-pkg disabled (package-version-join next-version)) - (format-message "Required package ‘%s’ is disabled" + (format-message "Required package `%s' is disabled" next-pkg))))) (t (setq found pkg-desc))))) (unless found (cond (problem (error "%s" problem)) (found-something - (error "Need package ‘%s-%s’, but only %s is available" + (error "Need package `%s-%s', but only %s is available" next-pkg (package-version-join next-version) found-something)) - (t (error "Package ‘%s-%s’ is unavailable" + (t (error "Package `%s-%s' is unavailable" next-pkg (package-version-join next-version))))) (setq packages (package-compute-transaction (cons found packages) @@ -1785,7 +1785,7 @@ if all the in-between dependencies are also in PACKAGE-LIST." (unless (or good-sigs (eq package-check-signature 'allow-unsigned)) ;; Even if the sig fails, this download is done, so ;; remove it from the in-progress list. - (error "Unsigned package: ‘%s’" + (error "Unsigned package: `%s'" (package-desc-name pkg-desc))) ;; Signature checked, unpack now. (with-temp-buffer (insert content) @@ -1926,7 +1926,7 @@ to install it but still mark it as selected." (package-desc-reqs pkg))) (package-compute-transaction () (list (list pkg)))))) (package-download-transaction transaction) - (message "‘%s’ is already installed" (package-desc-full-name pkg)))) + (message "`%s' is already installed" (package-desc-full-name pkg)))) (defun package-strip-rcs-id (str) "Strip RCS version ID from the version string STR. @@ -2001,7 +2001,7 @@ If some packages are not installed propose to install them." ;; using here, because the outcome is the same either way (nothing ;; gets installed). (if (not package-selected-packages) - (message "‘package-selected-packages’ is empty, nothing to install") + (message "`package-selected-packages' is empty, nothing to install") (cl-loop for p in package-selected-packages unless (package-installed-p p) collect p into lst @@ -2066,13 +2066,13 @@ If NOSAVE is non-nil, the package is not removed from (expand-file-name package-user-dir)) (expand-file-name dir))) ;; Don't delete "system" packages. - (error "Package ‘%s’ is a system package, not deleting" + (error "Package `%s' is a system package, not deleting" (package-desc-full-name pkg-desc))) ((and (null force) (setq pkg-used-elsewhere-by (package--used-elsewhere-p pkg-desc))) ;; Don't delete packages used as dependency elsewhere. - (error "Package ‘%s’ is used by ‘%s’ as dependency, not deleting" + (error "Package `%s' is used by `%s' as dependency, not deleting" (package-desc-full-name pkg-desc) (package-desc-name pkg-used-elsewhere-by))) (t @@ -2087,7 +2087,7 @@ If NOSAVE is non-nil, the package is not removed from (delete pkg-desc pkgs) (unless (cdr pkgs) (setq package-alist (delq pkgs package-alist)))) - (message "Package ‘%s’ deleted." (package-desc-full-name pkg-desc)))))) + (message "Package `%s' deleted." (package-desc-full-name pkg-desc)))))) ;;;###autoload (defun package-reinstall (pkg) @@ -2116,7 +2116,8 @@ will be deleted." ;; do absolutely nothing. (when (or package-selected-packages (yes-or-no-p - "‘package-selected-packages’ is empty! Really remove ALL packages? ")) + (format-message + "`package-selected-packages' is empty! Really remove ALL packages? "))) (let ((removable (package--removable-packages))) (if removable (when (y-or-n-p @@ -2224,7 +2225,7 @@ Otherwise no newline is inserted." "Installed" (capitalize status)) 'font-lock-face 'package-status-builtin-face)) - (insert (substitute-command-keys " in ‘")) + (insert (substitute-command-keys " in `")) (let ((dir (abbreviate-file-name (file-name-as-directory (if (file-in-directory-p pkg-dir package-user-dir) @@ -2234,10 +2235,10 @@ Otherwise no newline is inserted." (if (and (package-built-in-p name) (not (package-built-in-p name version))) (insert (substitute-command-keys - "’,\n shadowing a ") + "',\n shadowing a ") (propertize "built-in package" 'font-lock-face 'package-status-builtin-face)) - (insert (substitute-command-keys "’"))) + (insert (substitute-command-keys "'"))) (if signed (insert ".") (insert " (unsigned).")) @@ -2385,7 +2386,7 @@ Otherwise no newline is inserted." (defun package-install-button-action (button) (let ((pkg-desc (button-get button 'package-desc))) - (when (y-or-n-p (format-message "Install package ‘%s’? " + (when (y-or-n-p (format-message "Install package `%s'? " (package-desc-full-name pkg-desc))) (package-install pkg-desc nil) (revert-buffer nil t) @@ -2393,7 +2394,7 @@ Otherwise no newline is inserted." (defun package-delete-button-action (button) (let ((pkg-desc (button-get button 'package-desc))) - (when (y-or-n-p (format-message "Delete package ‘%s’? " + (when (y-or-n-p (format-message "Delete package `%s'? " (package-desc-full-name pkg-desc))) (package-delete pkg-desc) (revert-buffer nil t) @@ -2912,8 +2913,8 @@ If optional arg BUTTON is non-nil, describe its associated package." (cl-remove-if-not (lambda (e) (string-match re (symbol-name (car e)))) package-archive-contents))) (message (substitute-command-keys - (concat "Hiding %s packages, type ‘\\[package-menu-toggle-hiding]’" - " to toggle or ‘\\[customize-variable] RET package-hidden-regexps’" + (concat "Hiding %s packages, type `\\[package-menu-toggle-hiding]'" + " to toggle or `\\[customize-variable] RET package-hidden-regexps'" " to customize it")) (length hidden))))) @@ -3097,7 +3098,7 @@ prompt (see `package-menu--prompt-transaction-p')." (length packages) (mapconcat #'package-desc-full-name packages ", "))) ;; Exactly 1 - (t (format-message "package ‘%s’" + (t (format-message "package `%s'" (package-desc-full-name (car packages)))))) (defun package-menu--prompt-transaction-p (delete install upgrade) @@ -3153,7 +3154,7 @@ objects removed." (condition-case-unless-debug err (let ((inhibit-message package-menu-async)) (package-delete elt nil 'nosave)) - (error (message "Error trying to delete ‘%s’: %S" + (error (message "Error trying to delete `%s': %S" (package-desc-full-name elt) err)))))) @@ -3284,7 +3285,7 @@ Store this list in `package-menu--new-package-list'." (defun package-menu--find-and-notify-upgrades () "Notify the user of upgradable packages." (when-let ((upgrades (package-menu--find-upgrades))) - (message "%d package%s can be upgraded; type ‘%s’ to mark %s for upgrading." + (message "%d package%s can be upgraded; type `%s' to mark %s for upgrading." (length upgrades) (if (= (length upgrades) 1) "" "s") (substitute-command-keys "\\[package-menu-mark-upgrades]") diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index c7f07846618..ea4f38add76 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -197,7 +197,7 @@ Currently, the following patterns are provided this way:" (pcase--dontwarn-upats (cons x pcase--dontwarn-upats))) (pcase--expand ;; FIXME: Could we add the FILE:LINE data in the error message? - exp (append cases `((,x (error "No clause matching ‘%S’" ,x))))))) + exp (append cases `((,x (error "No clause matching `%S'" ,x))))))) ;;;###autoload (defmacro pcase-lambda (lambda-list &rest body) @@ -775,7 +775,7 @@ Otherwise, it defers to REST which is a list of branches of the form (let ((code (pcase--u1 matches code vars rest))) (if (eq upat '_) code (macroexp--warn-and-return - "Pattern t is deprecated. Use ‘_’ instead" + "Pattern t is deprecated. Use `_' instead" code)))) ((eq upat 'pcase--dontcare) :pcase--dontcare) ((memq (car-safe upat) '(guard pred)) @@ -860,7 +860,7 @@ Otherwise, it defers to REST which is a list of branches of the form (pcase--u rest)) vars (list `((and . ,matches) ,code . ,vars)))) - (t (error "Unknown pattern ‘%S’" upat))))) + (t (error "Unknown pattern `%S'" upat))))) (t (error "Incorrect MATCH %S" (car matches))))) (def-edebug-spec diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index de1f6d15a75..a499b038b93 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -458,7 +458,7 @@ matching parts of the target buffer will be highlighted." (setq reb-subexp-mode t) (reb-update-modestring) (use-local-map reb-subexp-mode-map) - (message "‘0’-‘9’ to display subexpressions ‘q’ to quit subexp mode")) + (message "`0'-`9' to display subexpressions `q' to quit subexp mode")) (defun reb-show-subexp (subexp &optional pause) "Visually show limit of subexpression SUBEXP of recent search. diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el index 8badac391c7..2447dfa8e38 100644 --- a/lisp/emacs-lisp/ring.el +++ b/lisp/emacs-lisp/ring.el @@ -175,14 +175,14 @@ Comparison is done via `equal'. The index is 0-based." "Return the next item in the RING, after ITEM. Raise error if ITEM is not in the RING." (let ((curr-index (ring-member ring item))) - (unless curr-index (error "Item is not in the ring: ‘%s’" item)) + (unless curr-index (error "Item is not in the ring: `%s'" item)) (ring-ref ring (ring-plus1 curr-index (ring-length ring))))) (defun ring-previous (ring item) "Return the previous item in the RING, before ITEM. Raise error if ITEM is not in the RING." (let ((curr-index (ring-member ring item))) - (unless curr-index (error "Item is not in the ring: ‘%s’" item)) + (unless curr-index (error "Item is not in the ring: `%s'" item)) (ring-ref ring (ring-minus1 curr-index (ring-length ring))))) (defun ring-extend (ring x) diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 7b0de6edb69..a21ac7a2835 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -324,7 +324,7 @@ a standalone symbol." (defun rx-check (form) "Check FORM according to its car's parsing info." (unless (listp form) - (error "rx ‘%s’ needs argument(s)" form)) + (error "rx `%s' needs argument(s)" form)) (let* ((rx (rx-info (car form) 'head)) (nargs (1- (length form))) (min-args (nth 1 rx)) @@ -332,16 +332,16 @@ a standalone symbol." (type-pred (nth 3 rx))) (when (and (not (null min-args)) (< nargs min-args)) - (error "rx form ‘%s’ requires at least %d args" + (error "rx form `%s' requires at least %d args" (car form) min-args)) (when (and (not (null max-args)) (> nargs max-args)) - (error "rx form ‘%s’ accepts at most %d args" + (error "rx form `%s' accepts at most %d args" (car form) max-args)) (when (not (null type-pred)) (dolist (sub-form (cdr form)) (unless (funcall type-pred sub-form) - (error "rx form ‘%s’ requires args satisfying ‘%s’" + (error "rx form `%s' requires args satisfying `%s'" (car form) type-pred)))))) @@ -395,7 +395,7 @@ FORM is of the form `(and FORM1 ...)'." (defun rx-anything (form) "Match any character." (if (consp form) - (error "rx ‘anything’ syntax error: %s" form)) + (error "rx `anything' syntax error: %s" form)) (rx-or (list 'or 'not-newline ?\n))) @@ -452,7 +452,7 @@ Only both edges of each range is checked." (let ((i 0) c1 c2 l) (if (= 0 (length str)) - (error "String arg for Rx ‘any’ must not be empty")) + (error "String arg for Rx `any' must not be empty")) (while (string-match ".-." str i) ;; string before range: convert it to characters (if (< i (match-beginning 0)) @@ -482,13 +482,13 @@ Only both edges of each range is checked." (error nil)))) (if (or (null translation) (null (string-match "\\`\\[\\[:[-a-z]+:\\]\\]\\'" translation))) - (error "Invalid char class ‘%s’ in Rx ‘any’" arg)) + (error "Invalid char class `%s' in Rx `any'" arg)) (list (substring translation 1 -1)))) ; strip outer brackets ((and (integerp (car-safe arg)) (integerp (cdr-safe arg))) (list arg)) ((stringp arg) (rx-check-any-string arg)) ((error - "rx ‘any’ requires string, character, char pair or char class args")))) + "rx `any' requires string, character, char pair or char class args")))) (defun rx-any (form) @@ -581,7 +581,7 @@ ARG is optional." (eq arg 'word-boundary) (and (consp arg) (memq (car arg) '(not any in syntax category)))) - (error "rx ‘not’ syntax error: %s" arg)) + (error "rx `not' syntax error: %s" arg)) t) @@ -640,7 +640,7 @@ If SKIP is non-nil, allow that number of items after the head, i.e. (setq form (rx-trans-forms form 1)) (unless (and (integerp (nth 1 form)) (> (nth 1 form) 0)) - (error "rx ‘=’ requires positive integer first arg")) + (error "rx `=' requires positive integer first arg")) (format "%s\\{%d\\}" (rx-form (nth 2 form) '*) (nth 1 form))) @@ -650,7 +650,7 @@ If SKIP is non-nil, allow that number of items after the head, i.e. (setq form (rx-trans-forms form 1)) (unless (and (integerp (nth 1 form)) (> (nth 1 form) 0)) - (error "rx ‘>=’ requires positive integer first arg")) + (error "rx `>=' requires positive integer first arg")) (format "%s\\{%d,\\}" (rx-form (nth 2 form) '*) (nth 1 form))) @@ -671,14 +671,14 @@ FORM is either `(repeat N FORM1)' or `(repeat N M FORMS...)'." (cond ((= (length form) 3) (unless (and (integerp (nth 1 form)) (> (nth 1 form) 0)) - (error "rx ‘repeat’ requires positive integer first arg")) + (error "rx `repeat' requires positive integer first arg")) (format "%s\\{%d\\}" (rx-form (nth 2 form) '*) (nth 1 form))) ((or (not (integerp (nth 2 form))) (< (nth 2 form) 0) (not (integerp (nth 1 form))) (< (nth 1 form) 0) (< (nth 2 form) (nth 1 form))) - (error "rx ‘repeat’ range error")) + (error "rx `repeat' range error")) (t (format "%s\\{%d,%d\\}" (rx-form (nth 3 form) '*) (nth 1 form) (nth 2 form))))) @@ -713,7 +713,7 @@ FORM is either `(repeat N FORM1)' or `(repeat N M FORMS...)'." (defun rx-check-backref (arg) "Check arg ARG for Rx `backref'." (or (and (integerp arg) (>= arg 1) (<= arg 9)) - (error "rx ‘backref’ requires numeric 1<=arg<=9: %s" arg))) + (error "rx `backref' requires numeric 1<=arg<=9: %s" arg))) (defun rx-kleene (form) "Parse and produce code from FORM. @@ -786,7 +786,7 @@ of all atomic regexps." (if (= 1 (length name)) (setq syntax (aref name 0)))))) (unless syntax - (error "Unknown rx syntax ‘%s’" sym))) + (error "Unknown rx syntax `%s'" sym))) (format "\\s%c" syntax))) @@ -794,7 +794,7 @@ of all atomic regexps." "Check the argument FORM of a `(category FORM)'." (unless (or (integerp form) (cdr (assq form rx-categories))) - (error "Unknown category ‘%s’" form)) + (error "Unknown category `%s'" form)) t) @@ -846,16 +846,16 @@ shy groups around the result and some more in other functions." (cond ((stringp info) info) ((null info) - (error "Unknown rx form ‘%s’" form)) + (error "Unknown rx form `%s'" form)) (t (funcall (nth 0 info) form))))) ((consp form) (let ((info (rx-info (car form) 'head))) (unless (consp info) - (error "Unknown rx form ‘%s’" (car form))) + (error "Unknown rx form `%s'" (car form))) (funcall (nth 0 info) form))) (t - (error "rx syntax error at ‘%s’" form)))) + (error "rx syntax error at `%s'" form)))) ;;;###autoload diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 9678cfa39b6..0c24f796d19 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -2213,13 +2213,13 @@ One way to generate local rules is the command `smie-config-guess'." (let* ((existing (assq major-mode smie-config)) (config (cond ((null existing) - (message "Local rules saved in ‘smie-config’") + (message "Local rules saved in `smie-config'") smie-config--buffer-local) ((y-or-n-p "Replace the existing mode's config? ") - (message "Mode rules replaced in ‘smie-config’") + (message "Mode rules replaced in `smie-config'") smie-config--buffer-local) ((y-or-n-p "Merge with existing mode's config? ") - (message "Mode rules adjusted in ‘smie-config’") + (message "Mode rules adjusted in `smie-config'") (append smie-config--buffer-local (cdr existing))) (t (error "Abort"))))) (if existing diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 9637e42c879..e6d451ac62e 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -90,7 +90,7 @@ threading." (when (> (length binding) 2) (signal 'error - (cons "‘let’ bindings can have only one value-form" binding))) + (cons "`let' bindings can have only one value-form" binding))) binding) (defsubst internal--build-binding-value-form (binding prev-var) diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 404dbd1dc17..cd61eb9ae56 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/testcover.el b/lisp/emacs-lisp/testcover.el index 3e6039ee9fd..110c63f777a 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -475,7 +475,7 @@ same value during coverage testing." (aset testcover-vector idx (cons '1value val))) ((not (and (eq (car-safe (aref testcover-vector idx)) '1value) (equal (cdr (aref testcover-vector idx)) val))) - (error "Value of form marked with ‘1value’ does vary: %s" val))) + (error "Value of form marked with `1value' does vary: %s" val))) val) diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 0a0296fc9fb..dca459f2bf6 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-message " ‘%s’" (timer--function timer)) + (format-message " `%s'" (timer--function timer)) "") err))) (when (and retrigger |