Fix typos and reword docstrings
This commit is contained in:
parent
15f0bccde5
commit
a282730ce9
4 changed files with 33 additions and 42 deletions
|
@ -4,7 +4,7 @@
|
||||||
;;; Variables
|
;;; Variables
|
||||||
|
|
||||||
(defvar doom-init-theme-p nil
|
(defvar doom-init-theme-p nil
|
||||||
"If non-nil, a theme as been loaded.")
|
"If non-nil, a theme has been loaded.")
|
||||||
|
|
||||||
(defvar doom-theme nil
|
(defvar doom-theme nil
|
||||||
"A symbol representing the Emacs theme to load at startup.
|
"A symbol representing the Emacs theme to load at startup.
|
||||||
|
@ -13,9 +13,7 @@ This is changed by `load-theme'.")
|
||||||
|
|
||||||
(defvar doom-font nil
|
(defvar doom-font nil
|
||||||
"The default font to use.
|
"The default font to use.
|
||||||
|
Must be a `font-spec', a font object, an XFT font string, or an XLFD string.
|
||||||
Expects either a `font-spec', font object, an XFT font string or an XLFD font
|
|
||||||
string.
|
|
||||||
|
|
||||||
This affects the `default' and `fixed-pitch' faces.
|
This affects the `default' and `fixed-pitch' faces.
|
||||||
|
|
||||||
|
@ -24,38 +22,33 @@ Examples:
|
||||||
(setq doom-font \"Terminus (TTF):pixelsize=12:antialias=off\")")
|
(setq doom-font \"Terminus (TTF):pixelsize=12:antialias=off\")")
|
||||||
|
|
||||||
(defvar doom-variable-pitch-font nil
|
(defvar doom-variable-pitch-font nil
|
||||||
"The font to use for variable-pitch text.
|
"The default font to use for variable-pitch text.
|
||||||
|
Must be a `font-spec', a font object, an XFT font string, or an XLFD string. See
|
||||||
Expects either a `font-spec', font object, a XFT font string or XLFD string. See
|
|
||||||
`doom-font' for examples.
|
`doom-font' for examples.
|
||||||
|
|
||||||
It is recommended you don't set specify a font-size, as to inherit `doom-font's
|
An omitted font size means to inherit `doom-font''s size.")
|
||||||
size.")
|
|
||||||
|
|
||||||
(defvar doom-serif-font nil
|
(defvar doom-serif-font nil
|
||||||
"The default font to use for the `fixed-pitch-serif' face.
|
"The default font to use for the `fixed-pitch-serif' face.
|
||||||
|
Must be a `font-spec', a font object, an XFT font string, or an XLFD string. See
|
||||||
Expects either a `font-spec', font object, a XFT font string or XLFD string. See
|
|
||||||
`doom-font' for examples.
|
`doom-font' for examples.
|
||||||
|
|
||||||
It is recommended you don't set specify a font-size, as to inherit `doom-font's
|
An omitted font size means to inherit `doom-font''s size.")
|
||||||
size.")
|
|
||||||
|
|
||||||
(defvar doom-unicode-font
|
(defvar doom-unicode-font
|
||||||
(if IS-MAC
|
(if IS-MAC
|
||||||
(font-spec :family "Apple Color Emoji")
|
(font-spec :family "Apple Color Emoji")
|
||||||
(font-spec :family "Symbola"))
|
(font-spec :family "Symbola"))
|
||||||
"Fallback font for unicode glyphs.
|
"Fallback font for Unicode glyphs.
|
||||||
|
Must be a `font-spec', a font object, an XFT font string, or an XLFD string. See
|
||||||
|
`doom-font' for examples.
|
||||||
|
|
||||||
It defaults to Apple Color Emoji on MacOS and Symbola on Linux. Expects either a
|
The defaults on macOS and Linux are Apple Color Emoji and Symbola, respectively.
|
||||||
`font-spec', font object, a XFT font string or XLFD string. See `doom-font' for
|
|
||||||
examples.
|
|
||||||
|
|
||||||
It is recommended you don't set specify a font-size, as to inherit `doom-font's
|
An omitted font size means to inherit `doom-font''s size.")
|
||||||
size.")
|
|
||||||
|
|
||||||
(defvar doom-unicode-extra-fonts nil
|
(defvar doom-unicode-extra-fonts nil
|
||||||
"Fonts to inject into the unicode charset before `doom-unicode-font'.")
|
"Fonts to inject into the Unicode charset before `doom-unicode-font'.")
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
@ -139,13 +132,12 @@ size.")
|
||||||
(not (eq (current-buffer) (doom-fallback-buffer))))
|
(not (eq (current-buffer) (doom-fallback-buffer))))
|
||||||
|
|
||||||
(defun doom-highlight-non-default-indentation-h ()
|
(defun doom-highlight-non-default-indentation-h ()
|
||||||
"Highlight whitespace that doesn't match your `indent-tabs-mode' setting.
|
"Highlight whitespace at odds with `indent-tabs-mode'.
|
||||||
|
That is, highlight tabs if the usual indentation is with spaces, and highlight
|
||||||
|
spaces at the beginnings of lines if the usual indentation is with tabs.
|
||||||
|
|
||||||
e.g. If you indent with spaces by default, tabs will be highlighted. If you
|
Does nothing if `whitespace-mode' or `global-whitespace-mode' is already active
|
||||||
indent with tabs, spaces at BOL are highlighted.
|
or if the current buffer is read-only or not file-visiting."
|
||||||
|
|
||||||
Does nothing if `whitespace-mode' or 'global-whitespace-mode' is already
|
|
||||||
active or if the current buffer is read-only or not file-visiting."
|
|
||||||
(unless (or (eq major-mode 'fundamental-mode)
|
(unless (or (eq major-mode 'fundamental-mode)
|
||||||
buffer-read-only
|
buffer-read-only
|
||||||
(bound-and-true-p global-whitespace-mode)
|
(bound-and-true-p global-whitespace-mode)
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
ophints ; highlight the region an operation acts on
|
ophints ; highlight the region an operation acts on
|
||||||
(popup +defaults) ; tame sudden yet inevitable temporary windows
|
(popup +defaults) ; tame sudden yet inevitable temporary windows
|
||||||
;;pretty-code ; ligatures or substitute text with pretty symbols
|
;;pretty-code ; ligatures or substitute text with pretty symbols
|
||||||
;;tabs ; an tab bar for Emacs
|
;;tabs ; a tab bar for Emacs
|
||||||
;;treemacs ; a project drawer, like neotree but cooler
|
;;treemacs ; a project drawer, like neotree but cooler
|
||||||
;;unicode ; extended unicode support for various languages
|
;;unicode ; extended unicode support for various languages
|
||||||
vc-gutter ; vcs diff in the fringe
|
vc-gutter ; vcs diff in the fringe
|
||||||
|
|
|
@ -16,24 +16,23 @@
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +lookup-online-backend-fn (identifier)
|
(defun +lookup-online-backend-fn (identifier)
|
||||||
"Opens the browser and searches for IDENTIFIER online.
|
"Open the browser and search for IDENTIFIER online.
|
||||||
|
When called for the first time, or with a non-nil prefix argument, prompt for
|
||||||
Will prompt for which search engine to use the first time (or if the universal
|
the search engine to use."
|
||||||
argument is non-nil)."
|
|
||||||
(+lookup/online
|
(+lookup/online
|
||||||
identifier
|
identifier
|
||||||
(+lookup--online-provider (not current-prefix-arg))))
|
(+lookup--online-provider (not current-prefix-arg))))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +lookup/online (query provider)
|
(defun +lookup/online (query provider)
|
||||||
"Looks up QUERY (a string) in you browser usin PROVIDER.
|
"Look up QUERY in the browser using PROVIDER.
|
||||||
|
When called interactively, prompt for a query and, when called for the first
|
||||||
|
time, the provider from `+lookup-provider-url-alist'. In subsequent calls, reuse
|
||||||
|
the previous provider. With a non-nil prefix argument, always prompt for the
|
||||||
|
provider.
|
||||||
|
|
||||||
PROVIDER should be a key of `+lookup-provider-url-alist'.
|
QUERY must be a string, and PROVIDER must be a key of
|
||||||
|
`+lookup-provider-url-alist'."
|
||||||
When used interactively, it will prompt for a query and, for the first time, the
|
|
||||||
provider from `+lookup-provider-url-alist'. On consecutive uses, the last
|
|
||||||
provider will be reused. If the universal argument is supplied, always prompt
|
|
||||||
for the provider."
|
|
||||||
(interactive
|
(interactive
|
||||||
(list (if (use-region-p) (doom-thing-at-point-or-region))
|
(list (if (use-region-p) (doom-thing-at-point-or-region))
|
||||||
(+lookup--online-provider current-prefix-arg)))
|
(+lookup--online-provider current-prefix-arg)))
|
||||||
|
@ -64,7 +63,7 @@ for the provider."
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +lookup/online-select ()
|
(defun +lookup/online-select ()
|
||||||
"Runs `+lookup/online', but always prompts for the provider to use."
|
"Run `+lookup/online', but always prompt for the provider to use."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let ((current-prefix-arg t))
|
(let ((current-prefix-arg t))
|
||||||
(call-interactively #'+lookup/online)))
|
(call-interactively #'+lookup/online)))
|
||||||
|
@ -77,7 +76,7 @@ for the provider."
|
||||||
(defvar counsel-search-engine)
|
(defvar counsel-search-engine)
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +lookup--online-backend-google (query)
|
(defun +lookup--online-backend-google (query)
|
||||||
"Search google, starting with QUERY, with live autocompletion."
|
"Search Google, starting with QUERY, with live autocompletion."
|
||||||
(cond ((fboundp 'counsel-search)
|
(cond ((fboundp 'counsel-search)
|
||||||
(let ((ivy-initial-inputs-alist `((t . ,query)))
|
(let ((ivy-initial-inputs-alist `((t . ,query)))
|
||||||
(counsel-search-engine 'google))
|
(counsel-search-engine 'google))
|
||||||
|
@ -91,7 +90,7 @@ for the provider."
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +lookup--online-backend-duckduckgo (query)
|
(defun +lookup--online-backend-duckduckgo (query)
|
||||||
"Search duckduckgo, starting with QUERY, with live autocompletion."
|
"Search DuckDuckGo, starting with QUERY, with live autocompletion."
|
||||||
(cond ((fboundp 'counsel-search)
|
(cond ((fboundp 'counsel-search)
|
||||||
(let ((ivy-initial-inputs-alist `((t . ,query)))
|
(let ((ivy-initial-inputs-alist `((t . ,query)))
|
||||||
(counsel-search-engine 'ddg))
|
(counsel-search-engine 'ddg))
|
||||||
|
|
|
@ -63,7 +63,7 @@ aren't working.
|
||||||
or =+pragmata-pro=.
|
or =+pragmata-pro=.
|
||||||
2. Install the patched version of the associated font with ~M-x
|
2. Install the patched version of the associated font with ~M-x
|
||||||
+pretty-code/install-patched-font~. Note: Pragmata Pro cannot be installed
|
+pretty-code/install-patched-font~. Note: Pragmata Pro cannot be installed
|
||||||
this way because it isn't a non-free font and must be purchased and installed
|
this way because it is a non-free font and must be purchased and installed
|
||||||
manually.
|
manually.
|
||||||
|
|
||||||
* TODO Features
|
* TODO Features
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue