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/calc | |
parent | add49b65a0bb50de447a95c1912232c79f28fdf9 (diff) | |
download | emacs-6afef3f6ca2f3009c722b84e249903b7f807b044.tar.gz |
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/calc')
-rw-r--r-- | lisp/calc/calc-aent.el | 10 | ||||
-rw-r--r-- | lisp/calc/calc-embed.el | 2 | ||||
-rw-r--r-- | lisp/calc/calc-ext.el | 2 | ||||
-rw-r--r-- | lisp/calc/calc-graph.el | 2 | ||||
-rw-r--r-- | lisp/calc/calc-help.el | 16 | ||||
-rw-r--r-- | lisp/calc/calc-lang.el | 42 | ||||
-rw-r--r-- | lisp/calc/calc-misc.el | 4 | ||||
-rw-r--r-- | lisp/calc/calc-mode.el | 12 | ||||
-rw-r--r-- | lisp/calc/calc-prog.el | 14 | ||||
-rw-r--r-- | lisp/calc/calc-store.el | 2 | ||||
-rw-r--r-- | lisp/calc/calc-units.el | 6 | ||||
-rw-r--r-- | lisp/calc/calc-vec.el | 4 | ||||
-rw-r--r-- | lisp/calc/calc-yank.el | 4 | ||||
-rw-r--r-- | lisp/calc/calc.el | 12 |
14 files changed, 66 insertions, 66 deletions
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index 2c588c15287..2319c484498 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -1034,7 +1034,7 @@ in Calc algebraic input.") (defun math-restore-placeholders (x) "Replace placeholders by the proper characters in the symbol x. -This includes ‘#’ for ‘_’ and ‘'’ for ‘%’. +This includes `#' for `_' and `'' for `%'. If the current Calc language does not use placeholders, return nil." (if (or (memq calc-language calc-lang-allow-underscores) (memq calc-language calc-lang-allow-percentsigns)) @@ -1057,7 +1057,7 @@ If the current Calc language does not use placeholders, return nil." (defun math-read-if (cond op) (let ((then (math-read-expr-level 0))) (or (equal math-expr-data ":") - (throw 'syntax "Expected ‘:’")) + (throw 'syntax "Expected `:'")) (math-read-token) (list 'calcFunc-if cond then (math-read-expr-level (nth 3 op))))) @@ -1121,7 +1121,7 @@ If the current Calc language does not use placeholders, return nil." (math-read-expr-list)))) (if (not (or (equal math-expr-data calc-function-close) (eq math-exp-token 'end))) - (throw 'syntax "Expected ‘)’")) + (throw 'syntax "Expected `)'")) (math-read-token) (if (and (memq calc-language calc-lang-parens-are-subscripts) @@ -1177,7 +1177,7 @@ If the current Calc language does not use placeholders, return nil." (setq el (cdr el)))) (if (equal math-expr-data "]") (math-read-token) - (throw 'syntax "Expected ‘]’"))) + (throw 'syntax "Expected `]'"))) val))))) ((eq math-exp-token 'dollar) (let ((abs (if (> math-expr-data 0) math-expr-data (- math-expr-data)))) @@ -1246,7 +1246,7 @@ If the current Calc language does not use placeholders, return nil." (if (not (or (equal math-expr-data ")") (and (equal math-expr-data "]") (eq (car-safe exp) 'intv)) (eq math-exp-token 'end))) - (throw 'syntax "Expected ‘)’")) + (throw 'syntax "Expected `)'")) (math-read-token) exp)) ((eq math-exp-token 'string) diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index 3f6e83e0c6d..d0efe53f6e6 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -333,7 +333,7 @@ (message (concat "Embedded Calc mode enabled; " (if calc-embedded-quiet - "Type ‘C-x * x’" + "Type `C-x * x'" "Give this command again") " to return to normal"))))) (scroll-down 0)) ; fix a bug which occurs when truncate-lines is changed. diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 2442f020012..cb6ab6f8ecc 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -1957,7 +1957,7 @@ calc-kill calc-kill-region calc-yank)))) (desc (if (symbolp func) (if (= (logand kind 3) 0) - (format-message "‘%c’ = %s" key name) + (format-message "`%c' = %s" key name) (if pos (format "%s%c%s" (downcase (substring name 0 pos)) diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index 8378b23c0eb..20b0249ec1a 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -958,7 +958,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (define-key calc-dumb-map "\C-c\C-c" 'exit-recursive-edit))) (use-local-map calc-dumb-map) (setq truncate-lines t) - (message "Type ‘q’ or ‘C-c C-c’ to return to Calc") + (message "Type `q' or `C-c C-c' to return to Calc") (recursive-edit) (bury-buffer "*Gnuplot Trail*"))) diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el index 395b12d8699..444bb5ef920 100644 --- a/lisp/calc/calc-help.el +++ b/lisp/calc/calc-help.el @@ -240,7 +240,7 @@ C-w Describe how there is no warranty for Calc." (if (string-match "\\` +" prompts) (setq prompts (substring prompts (match-end 0)))) (setq msg (format-message - "%s: %s%s‘%s’%s%s %s%s" + "%s: %s%s`%s'%s%s %s%s" (if (string-match "\\`\\(calc-[-a-zA-Z0-9]+\\) *\\(.*\\)\\'" cmd) @@ -345,7 +345,7 @@ C-w Describe how there is no warranty for Calc." (calc-describe-thing var "Variable Index")) (defun calc-describe-thing (thing where &optional target not-quoted) - (message "Looking for ‘%s’ in %s..." thing where) + (message "Looking for `%s' in %s..." thing where) (let ((savewin (current-window-configuration))) (calc-info-goto-node where) (or (let ((case-fold-search nil)) @@ -361,7 +361,7 @@ C-w Describe how there is no warranty for Calc." (if Info-history (Info-last)) (set-window-configuration savewin) - (error "Can't find ‘%s’ in %s" thing where))) + (error "Can't find `%s' in %s" thing where))) (let (Info-history) (Info-goto-node (buffer-substring (match-beginning 1) (match-end 1)))) (let* ((string-target (or target thing)) @@ -380,7 +380,7 @@ C-w Describe how there is no warranty for Calc." (re-search-forward quoted nil t) (search-forward string-target nil t))))) (beginning-of-line) - (message "Found ‘%s’ in %s" thing where))) + (message "Found `%s' in %s" thing where))) (defun calc-view-news () (interactive) @@ -400,9 +400,9 @@ C-w Describe how there is no warranty for Calc." (princ "GNU Emacs Calculator.\n") (princ " By Dave Gillespie.\n") (princ (format " %s\n\n" emacs-copyright)) - (princ (format-message "Type ‘h s’ for a more detailed summary.\n")) + (princ (format-message "Type `h s' for a more detailed summary.\n")) (princ (format-message - "Or type ‘h i’ to read the full Calc manual on-line.\n\n")) + "Or type `h i' to read the full Calc manual on-line.\n\n")) (princ "Basic keys:\n") (let* ((calc-full-help-flag t)) (mapc (function (lambda (x) (princ (format @@ -417,10 +417,10 @@ C-w Describe how there is no warranty for Calc." (princ (if (eq (nth 2 msgs) ?v) (format-message - "\n‘v’ or ‘V’ prefix (vector/matrix) keys: \n") + "\n`v' or `V' prefix (vector/matrix) keys: \n") (if (nth 2 msgs) (format-message - "\n‘%c’ prefix (%s) keys:\n" + "\n`%c' prefix (%s) keys:\n" (nth 2 msgs) (or (cdr (assq (nth 2 msgs) calc-help-long-names)) diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index 70a9ff8a402..6b3b949424d 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el @@ -94,7 +94,7 @@ (interactive) (calc-wrapper (calc-set-language 'c) - (message "‘C’ language mode"))) + (message "C language mode"))) (put 'c 'math-oper-table '( ( "u!" calcFunc-lnot -1 1000 ) @@ -387,7 +387,7 @@ math-exp-token 'end math-expr-data "\000") x) - (throw 'syntax "Unmatched closing ‘/’"))) + (throw 'syntax "Unmatched closing `/'"))) (defun math-parse-fortran-subscr (sym args) (setq sym (math-build-var-name sym)) @@ -695,7 +695,7 @@ (defun math-parse-tex-sum (f val) (let (low high save) - (or (equal math-expr-data "_") (throw 'syntax "Expected ‘_’")) + (or (equal math-expr-data "_") (throw 'syntax "Expected `_'")) (math-read-token) (setq save math-exp-old-pos) (setq low (math-read-factor)) @@ -703,7 +703,7 @@ (progn (setq math-exp-old-pos (1+ save)) (throw 'syntax "Expected equation"))) - (or (equal math-expr-data "^") (throw 'syntax "Expected ‘^’")) + (or (equal math-expr-data "^") (throw 'syntax "Expected `^'")) (math-read-token) (setq high (math-read-factor)) (list (nth 2 f) (math-read-factor) (nth 1 low) (nth 2 low) high))) @@ -1165,14 +1165,14 @@ (while (assoc math-expr-data '(("ccol") ("lcol") ("rcol"))) (math-read-token) (or (equal math-expr-data calc-function-open) - (throw 'syntax "Expected ‘{’")) + (throw 'syntax "Expected `{'")) (math-read-token) (setq vec (cons (cons 'vec (math-read-expr-list)) vec)) (or (equal math-expr-data calc-function-close) - (throw 'syntax "Expected ‘}’")) + (throw 'syntax "Expected `}'")) (math-read-token)) (or (equal math-expr-data calc-function-close) - (throw 'syntax "Expected ‘}’")) + (throw 'syntax "Expected `}'")) (math-read-token) (math-transpose (cons 'vec (nreverse vec))))) @@ -1187,7 +1187,7 @@ (math-read-expr-list)))) (if (not (or (equal math-expr-data calc-function-close) (eq math-exp-token 'end))) - (throw 'syntax "Expected ‘)’")) + (throw 'syntax "Expected `)'")) (math-read-token) (cons (intern (format "calcFunc-%s'" (nth 1 x))) args))) (list 'var @@ -1211,7 +1211,7 @@ (interactive) (calc-wrapper (calc-set-language 'yacas) - (message "‘Yacas’ language mode"))) + (message "Yacas language mode"))) (put 'yacas 'math-vector-brackets "{}") @@ -1427,7 +1427,7 @@ (interactive) (calc-wrapper (calc-set-language 'maxima) - (message "‘Maxima’ language mode"))) + (message "Maxima language mode"))) (put 'maxima 'math-oper-table '(("+" + 100 100) @@ -1625,7 +1625,7 @@ (interactive) (calc-wrapper (calc-set-language 'giac) - (message "‘Giac’ language mode"))) + (message "Giac language mode"))) (put 'giac 'math-oper-table '( ( "[" (math-read-giac-subscr) 250 -1 ) @@ -1817,7 +1817,7 @@ order to Calc's." (defun math-read-giac-subscr (x op) (let ((idx (math-read-expr-level 0))) (or (equal math-expr-data "]") - (throw 'syntax "Expected ‘]’")) + (throw 'syntax "Expected `]'")) (math-read-token) (list 'calcFunc-subscr x (calc-normalize (list '+ idx 1))))) @@ -1954,7 +1954,7 @@ order to Calc's." (progn (math-read-token) (equal math-expr-data "]"))) - (throw 'syntax "Expected ‘]]’")) + (throw 'syntax "Expected `]]'")) (math-read-token) (list 'calcFunc-subscr x idx))) @@ -2237,7 +2237,7 @@ order to Calc's." (if (= sep ?\.) (setq h (1+ h))) (if (= sep ?\]) - (math-read-big-error (1- h) v "Expected ‘)’")) + (math-read-big-error (1- h) v "Expected `)'")) (if (= sep ?\)) (setq p (math-read-big-rec (1+ math-rb-h1) math-rb-v1 (1- h) math-rb-v2 v)) @@ -2252,7 +2252,7 @@ order to Calc's." 0 1) p)))) ((= (math-read-big-char (1- h) v) ?\]) - (math-read-big-error (1- h) v "Expected ‘)’")) + (math-read-big-error (1- h) v "Expected `)'")) ((= sep ?\,) (or (and (math-realp (car p)) (math-realp (nth 1 p))) (math-read-big-error @@ -2280,7 +2280,7 @@ order to Calc's." (setq h (math-read-big-balance (1+ hleft) v "[")) (if hright (or (= h hright) - (math-read-big-error hright v "Expected ‘]’")) + (math-read-big-error hright v "Expected `]'")) (setq hright h)) (setq p (cons (math-read-big-rec hleft v h (1+ v)) p)) @@ -2293,7 +2293,7 @@ order to Calc's." (setq h (1+ h))) (and (= (math-read-big-char h v) ?\]) (setq h (1+ h)))) - (math-read-big-error (1- h) v "Expected ‘]’")) + (math-read-big-error (1- h) v "Expected `]'")) (if (= (math-read-big-char h vtop) ?\,) (setq h (1+ h))) (math-read-big-emptyp math-rb-h1 (1+ v) (1- h) math-rb-v2 nil t) @@ -2317,7 +2317,7 @@ order to Calc's." (setq widest (math-read-big-char (1- h) v)) (if (or (memq widest '(?\; ?\))) (and (eq widest ?\.) (cdr p))) - (math-read-big-error (1- h) v "Expected ‘]’")) + (math-read-big-error (1- h) v "Expected `]'")) (if (= widest ?\.) (setq h (1+ h) widest (math-read-big-balance h v "[") @@ -2369,7 +2369,7 @@ order to Calc's." h widest) (= (math-read-big-char (1- h) v) ?\,))) (or (= (math-read-big-char (1- h) v) ?\)) - (math-read-big-error (1- h) v "Expected ‘)’")) + (math-read-big-error (1- h) v "Expected `)'")) (setq p (cons line (nreverse p)))) (setq p (list 'var (intern (math-remove-dashes p)) @@ -2433,7 +2433,7 @@ order to Calc's." math-rb-v2 baseline nil t))) (or (= (math-read-big-char math-read-big-h2 baseline) ?\:) (math-read-big-error math-read-big-h2 baseline - "Expected ‘:’")) + "Expected `:'")) (setq p (list (nth 1 widest) p y (math-read-big-rec (1+ math-read-big-h2) math-rb-v1 math-rb-h2 math-rb-v2 @@ -2509,7 +2509,7 @@ order to Calc's." (if (>= h len) (if what (math-read-big-error nil v (format-message - "Unmatched ‘%s’" what)) + "Unmatched `%s'" what)) (setq count 0)) (if (memq (aref line h) '(?\( ?\[)) (setq count (1+ count)) diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index e141589ab7b..aa0ccb79edd 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -217,7 +217,7 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C). (defun calc-help () (interactive) (let ((msgs - '("Press ‘h’ for complete help; press ‘?’ repeatedly for a summary" + '("Press `h' for complete help; press `?' repeatedly for a summary" "Letter keys: Negate; Precision; Yank; Why; Xtended cmd; Quit" "Letter keys: SHIFT + Undo, reDo; Inverse, Hyperbolic, Option" "Letter keys: SHIFT + sQrt; Sin, Cos, Tan; Exp, Ln, logB" @@ -953,7 +953,7 @@ Prompts for bug subject. Leaves you in a mail buffer." nil nil nil "Please describe exactly what actions triggered the bug and the precise symptoms of the bug. If possible, include a backtrace by -doing ‘\\[toggle-debug-on-error]’, then reproducing the bug. +doing `\\[toggle-debug-on-error]', then reproducing the bug. " ))) ;;;###autoload (defalias 'calc-report-bug 'report-calc-bug) diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el index b5eef7f6784..3ed9612f79a 100644 --- a/lisp/calc/calc-mode.el +++ b/lisp/calc/calc-mode.el @@ -110,11 +110,11 @@ (setq n (and (not (eq calc-auto-why t)) (if calc-auto-why t 1)))) (calc-change-mode 'calc-auto-why n nil) (cond ((null n) - (message "User must press ‘w’ to explain unsimplified results")) + (message "User must press `w' to explain unsimplified results")) ((eq n t) - (message "Automatically doing ‘w’ to explain unsimplified results")) + (message "Automatically doing `w' to explain unsimplified results")) (t - (message "Automatically doing ‘w’ only for unusual messages"))))) + (message "Automatically doing `w' only for unusual messages"))))) (defun calc-group-digits (n) (interactive "P") @@ -272,7 +272,7 @@ (vals (mapcar (function (lambda (v) (symbol-value (car v)))) calc-mode-var-list))) (unless calc-settings-file - (error "No ‘calc-settings-file’ specified")) + (error "No `calc-settings-file' specified")) (set-buffer (find-file-noselect (substitute-in-file-name calc-settings-file))) (goto-char (point-min)) @@ -572,8 +572,8 @@ (calc-change-mode 'calc-auto-recompute arg nil t) (calc-refresh-evaltos) (message (if calc-auto-recompute - "Automatically recomputing ‘=>’ forms when necessary" - "Not recomputing ‘=>’ forms automatically")))) + "Automatically recomputing `=>' forms when necessary" + "Not recomputing `=>' forms automatically")))) (defun calc-working (n) (interactive "P") diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el index 58d2b5ce431..57af0d27822 100644 --- a/lisp/calc/calc-prog.el +++ b/lisp/calc/calc-prog.el @@ -597,9 +597,9 @@ ",") ((equal name "#") (search-backward "#") - (error "Token ‘#’ is reserved")) + (error "Token `#' is reserved")) ((and unquoted (string-match "#" name)) - (error "Tokens containing ‘#’ must be quoted")) + (error "Tokens containing `#' must be quoted")) ((not (string-match "[^ ]" name)) (search-backward "\"" nil t) (error "Blank tokens are not allowed")) @@ -610,7 +610,7 @@ (quoted nil)) (while (progn (skip-chars-forward "\n\t ") - (if (eobp) (error "Expected ‘%s’" eterm)) + (if (eobp) (error "Expected `%s'" eterm)) (not (looking-at term))) (cond ((looking-at "%%") (end-of-line)) @@ -618,7 +618,7 @@ (forward-char 2) (let ((p (calc-read-parse-table-part "}" "}"))) (or (looking-at "[+*?]") - (error "Expected ‘+’, ‘*’, or ‘?’")) + (error "Expected `+', `*', or `?'")) (let ((sym (intern (buffer-substring (point) (1+ (point)))))) (forward-char 1) (looking-at "[^\n\t ]*") @@ -650,7 +650,7 @@ (match-end 1))))))) (goto-char (match-end 0))) ((looking-at ":=[\n\t ]") - (error "Misplaced ‘:=’")) + (error "Misplaced `:='")) (t (looking-at "[^\n\t ]*") (let ((end (match-end 0))) @@ -673,7 +673,7 @@ (or last-kbd-macro (error "No keyboard macro defined")) (setq calc-invocation-macro last-kbd-macro) - (message "Use ‘C-x * Z’ to invoke this macro")) + (message "Use `C-x * Z' to invoke this macro")) (defun calc-user-define-edit () (interactive) ; but no calc-wrapper! @@ -1899,7 +1899,7 @@ Redefine the corresponding command." `((and (,chk ,var) (math-reject-arg ,var ',qual))))) - (error "Unknown qualifier ‘%s’" qual-name)))))))) + (error "Unknown qualifier `%s'" qual-name)))))))) (defun math-do-arg-list-check (args is-opt is-rest) (cond ((null args) nil) diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el index 4cf5b8c3a31..3d8c865c7bf 100644 --- a/lisp/calc/calc-store.el +++ b/lisp/calc/calc-store.el @@ -443,7 +443,7 @@ (calc-edit-mode (list 'calc-finish-stack-edit (list 'quote var)) t (format-message - "Editing variable ‘%s’" (calc-var-name var))) + "Editing variable `%s'" (calc-var-name var))) (and value (insert (math-format-nice-expr value (frame-width)) "\n"))))) (calc-show-edit-buffer)) diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index d56c0b29c12..4373e52eb87 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -1625,10 +1625,10 @@ If COMP or STD is non-nil, put that in the units table instead." (format-message (concat "(**) When in TeX or LaTeX display mode, the TeX specific unit\n" - "names will not use the ‘tex’ prefix; the unit name for a\n" - "TeX point will be ‘pt’ instead of ‘texpt’, for example.\n" + "names will not use the `tex' prefix; the unit name for a\n" + "TeX point will be `pt' instead of `texpt', for example.\n" "To avoid conflicts, the unit names for pint and parsec will\n" - "be ‘pint’ and ‘parsec’ instead of ‘pt’ and ‘pc’.")))) + "be `pint' and `parsec' instead of `pt' and `pc'.")))) (view-mode) (message "Formatting units table...done")) (setq math-units-table-buffer-valid t) diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el index c7a3e716d61..cd157703f49 100644 --- a/lisp/calc/calc-vec.el +++ b/lisp/calc/calc-vec.el @@ -1618,13 +1618,13 @@ of two matrices is a matrix." (if (not (or (equal math-expr-data math-rb-close) (equal math-expr-data ")") (eq math-exp-token 'end))) - (throw 'syntax "Expected ‘]’"))) + (throw 'syntax "Expected `]'"))) (if (equal math-expr-data ";") (let ((math-exp-keep-spaces space-sep)) (setq vals (cons 'vec (math-read-matrix (list vals)))))) (if (not (or (equal math-expr-data math-rb-close) (eq math-exp-token 'end))) - (throw 'syntax "Expected ‘]’"))) + (throw 'syntax "Expected `]'"))) (or (eq math-exp-token 'end) (math-read-token)) vals))) diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el index cce04705da8..5694a4e56ae 100644 --- a/lisp/calc/calc-yank.el +++ b/lisp/calc/calc-yank.el @@ -603,9 +603,9 @@ To cancel the edit, simply kill the *Calc Edit* buffer." (insert (propertize (concat (or title title "Calc Edit Mode. ") - (format-message "Press ‘C-c C-c’") + (format-message "Press `C-c C-c'") (if allow-ret "" " or RET") - (format-message " to finish, ‘C-x k RET’ to cancel.\n\n")) + (format-message " to finish, `C-x k RET' to cancel.\n\n")) 'font-lock-face 'italic 'read-only t 'rear-nonsticky t 'front-sticky t)) (make-local-variable 'calc-edit-top) (setq calc-edit-top (point)))) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index ea20986bc85..b4b0ad8b185 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -989,11 +989,11 @@ Used by `calc-user-invocation'.") (defvar calc-last-kill nil "The last number killed in calc-mode.") (defvar calc-dollar-values nil - "Values to be used for ‘$’.") + "Values to be used for `$'.") (defvar calc-dollar-used nil - "The highest order of ‘$’ that occurred.") + "The highest order of `$' that occurred.") (defvar calc-hashes-used nil - "The highest order of ‘#’ that occurred.") + "The highest order of `#' that occurred.") (defvar calc-quick-prev-results nil "Previous results from Quick Calc.") (defvar calc-said-hello nil @@ -1474,7 +1474,7 @@ commands given here will actually operate on the *Calculator* stack." (and calc-display-trail (= (window-width) (frame-width)) (calc-trail-display 1 t))) - (message "Welcome to the GNU Emacs Calculator! Press ‘?’ or ‘h’ for help, ‘q’ to quit") + (message "Welcome to the GNU Emacs Calculator! Press `?' or `h' for help, `q' to quit") (run-hooks 'calc-start-hook) (and (windowp full-display) (window-point full-display) @@ -1622,7 +1622,7 @@ See calc-keypad for details." (stringp (nth 1 err)) (string-match "max-specpdl-size\\|max-lisp-eval-depth" (nth 1 err))) - (error "Computation got stuck or ran too long. Type ‘M’ to increase the limit") + (error "Computation got stuck or ran too long. Type `M' to increase the limit") (setq calc-aborted-prefix nil) (signal (car err) (cdr err))))) (when calc-aborted-prefix @@ -3856,7 +3856,7 @@ Also looks for the equivalent TeX words, \\gets and \\evalto." (defun calc-user-invocation () (interactive) (unless calc-invocation-macro - (error "Use ‘Z I’ inside Calc to define a ‘C-x * Z’ keyboard macro")) + (error "Use `Z I' inside Calc to define a `C-x * Z' keyboard macro")) (execute-kbd-macro calc-invocation-macro nil)) ;;; User-programmability. |