aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorPaul Eggert2015-09-07 08:41:44 -0700
committerPaul Eggert2015-09-07 16:09:27 -0700
commit6afef3f6ca2f3009c722b84e249903b7f807b044 (patch)
tree44bdc5bb1e8fb4d1fe66961490db57cbdf56d7a2 /lisp/faces.el
parentadd49b65a0bb50de447a95c1912232c79f28fdf9 (diff)
downloademacs-6afef3f6ca2f3009c722b84e249903b7f807b044.tar.gz
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/faces.el')
-rw-r--r--lisp/faces.el32
1 files changed, 16 insertions, 16 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 9e879c1e188..5485d80c926 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -574,7 +574,7 @@ If FACE is a face-alias, get the documentation for the target face."
574 (let ((alias (get face 'face-alias))) 574 (let ((alias (get face 'face-alias)))
575 (if alias 575 (if alias
576 (let ((doc (get alias 'face-documentation))) 576 (let ((doc (get alias 'face-documentation)))
577 (format-message "%s is an alias for the face %s.%s" face alias 577 (format "%s is an alias for the face `%s'.%s" face alias
578 (if doc (format "\n%s" doc) 578 (if doc (format "\n%s" doc)
579 ""))) 579 "")))
580 (get face 'face-documentation)))) 580 (get face 'face-documentation))))
@@ -1005,7 +1005,7 @@ a single face name."
1005 (setq default (car (split-string default crm-separator t)))) 1005 (setq default (car (split-string default crm-separator t))))
1006 1006
1007 (let ((prompt (if default 1007 (let ((prompt (if default
1008 (format-message "%s (default %s): " prompt default) 1008 (format-message "%s (default `%s'): " prompt default)
1009 (format "%s: " prompt))) 1009 (format "%s: " prompt)))
1010 aliasfaces nonaliasfaces faces) 1010 aliasfaces nonaliasfaces faces)
1011 ;; Build up the completion tables. 1011 ;; Build up the completion tables.
@@ -1137,8 +1137,8 @@ Value is the new attribute value."
1137 (let* ((completion-ignore-case t) 1137 (let* ((completion-ignore-case t)
1138 (value (completing-read 1138 (value (completing-read
1139 (format-message (if default 1139 (format-message (if default
1140 "%s for face %s (default %s): " 1140 "%s for face `%s' (default %s): "
1141 "%s for face %s: ") 1141 "%s for face `%s': ")
1142 name face default) 1142 name face default)
1143 completion-alist nil nil nil nil default))) 1143 completion-alist nil nil nil nil default)))
1144 (if (equal value "") default value))) 1144 (if (equal value "") default value)))
@@ -1225,7 +1225,7 @@ of a global face. Value is the new attribute value."
1225If optional argument FRAME is nil or omitted, use the selected frame." 1225If optional argument FRAME is nil or omitted, use the selected frame."
1226 (let ((completion-ignore-case t)) 1226 (let ((completion-ignore-case t))
1227 (completing-read (format-message 1227 (completing-read (format-message
1228 "Set font attributes of face %s from font: " face) 1228 "Set font attributes of face `%s' from font: " face)
1229 (append (fontset-list) (x-list-fonts "*" nil frame))))) 1229 (append (fontset-list) (x-list-fonts "*" nil frame)))))
1230 1230
1231 1231
@@ -1437,11 +1437,11 @@ If FRAME is omitted or nil, use the selected frame."
1437 (setq face alias) 1437 (setq face alias)
1438 (insert 1438 (insert
1439 (format-message 1439 (format-message
1440 "\n %s is an alias for the face %s.\n%s" 1440 "\n %s is an alias for the face `%s'.\n%s"
1441 f alias 1441 f alias
1442 (if (setq obsolete (get f 'obsolete-face)) 1442 (if (setq obsolete (get f 'obsolete-face))
1443 (format-message 1443 (format-message
1444 " This face is obsolete%s; use %s instead.\n" 1444 " This face is obsolete%s; use `%s' instead.\n"
1445 (if (stringp obsolete) 1445 (if (stringp obsolete)
1446 (format " since %s" obsolete) 1446 (format " since %s" obsolete)
1447 "") 1447 "")
@@ -1459,13 +1459,13 @@ If FRAME is omitted or nil, use the selected frame."
1459 (help-xref-button 1 'help-customize-face f))) 1459 (help-xref-button 1 'help-customize-face f)))
1460 (setq file-name (find-lisp-object-file-name f 'defface)) 1460 (setq file-name (find-lisp-object-file-name f 'defface))
1461 (when file-name 1461 (when file-name
1462 (princ (substitute-command-keys "Defined in ")) 1462 (princ (substitute-command-keys "Defined in `"))
1463 (princ (file-name-nondirectory file-name)) 1463 (princ (file-name-nondirectory file-name))
1464 (princ (substitute-command-keys "")) 1464 (princ (substitute-command-keys "'"))
1465 ;; Make a hyperlink to the library. 1465 ;; Make a hyperlink to the library.
1466 (save-excursion 1466 (save-excursion
1467 (re-search-backward 1467 (re-search-backward
1468 (substitute-command-keys "\\([^‘’]+\\)") nil t) 1468 (substitute-command-keys "`\\([^`']+\\)'") nil t)
1469 (help-xref-button 1 'help-face-def f file-name)) 1469 (help-xref-button 1 'help-face-def f file-name))
1470 (princ ".") 1470 (princ ".")
1471 (terpri) 1471 (terpri)
@@ -1552,7 +1552,7 @@ If FRAME is nil, the current FRAME is used."
1552 options)) 1552 options))
1553 ((eq req 'supports) 1553 ((eq req 'supports)
1554 (display-supports-face-attributes-p options frame)) 1554 (display-supports-face-attributes-p options frame))
1555 (t (error "Unknown req %S with options %S" 1555 (t (error "Unknown req `%S' with options `%S'"
1556 req options))))) 1556 req options)))))
1557 match)) 1557 match))
1558 1558
@@ -1925,7 +1925,7 @@ resulting color name in the echo area."
1925 (logand 65535 (nth 0 components)) 1925 (logand 65535 (nth 0 components))
1926 (logand 65535 (nth 1 components)) 1926 (logand 65535 (nth 1 components))
1927 (logand 65535 (nth 2 components)))))))) 1927 (logand 65535 (nth 2 components))))))))
1928 (when msg (message "Color: %s" color)) 1928 (when msg (message "Color: `%s'" color))
1929 color)) 1929 color))
1930 1930
1931(defun face-at-point (&optional thing multiple) 1931(defun face-at-point (&optional thing multiple)
@@ -2778,13 +2778,13 @@ also the same size as FACE on FRAME, or fail."
2778 (if (string-match-p "\\*" pattern) 2778 (if (string-match-p "\\*" pattern)
2779 (if (null (face-font face)) 2779 (if (null (face-font face))
2780 (error "No matching fonts are the same height as the frame default font") 2780 (error "No matching fonts are the same height as the frame default font")
2781 (error "No matching fonts are the same height as face %s" face)) 2781 (error "No matching fonts are the same height as face `%s'" face))
2782 (if (null (face-font face)) 2782 (if (null (face-font face))
2783 (error "Height of font %s doesn't match the frame default font" 2783 (error "Height of font `%s' doesn't match the frame default font"
2784 pattern) 2784 pattern)
2785 (error "Height of font %s doesn't match face %s" 2785 (error "Height of font `%s' doesn't match face `%s'"
2786 pattern face))) 2786 pattern face)))
2787 (error "No fonts match %s" pattern))) 2787 (error "No fonts match `%s'" pattern)))
2788 (car fonts)) 2788 (car fonts))
2789 (cdr (assq 'font (frame-parameters (selected-frame)))))) 2789 (cdr (assq 'font (frame-parameters (selected-frame))))))
2790 2790