diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-22 09:39:39 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-22 09:39:39 -0700 |
| commit | 4cf06bb751c75dd2ae82c6e845c194107f93ee14 (patch) | |
| tree | 4f1a08beafae83745aca7ec8be42274a40dfb1c5 /lisp/net/eww.el | |
| parent | f7a2ff3bf59a6cd85bc5c2d172398f89cfebe3f2 (diff) | |
| parent | b0d64be0bc581958bf3a74152a2cd10172916b03 (diff) | |
| download | emacs-4cf06bb751c75dd2ae82c6e845c194107f93ee14.tar.gz emacs-4cf06bb751c75dd2ae82c6e845c194107f93ee14.tar.bz2 emacs-4cf06bb751c75dd2ae82c6e845c194107f93ee14.zip | |
Merge from origin/emacs-28
b0d64be0bc (origin/emacs-28) Improve some NEWS entries
7fde84e881 Improve documentation of syntax-ppss-context slightly
5ecbed01b2 ; * test/lisp/mh-e/mh-utils-tests.el: Update macro declara...
168665da59 Move some xwidget entries
efde024361 time-stamp-tests: improvements to test macros
06c944cff1 Fix rfc6068-parse-mailto-url autoload
9b6b5e37ef Regexp-quote github domains in bug-reference
1f6cdeb12c Ensure valid end/beginning lines in message-mark-inserted-...
9b46150ab0 * etc/NEWS: Improve 'repeat-mode' entry.
9c37b812da ; * lisp/repeat.el (repeat-mode): Fix docstring typo.
caf87d80fa * lisp/repeat.el (repeat-keep-prefix): Expand description.
24083c8d13 * lisp/net/eww.el (eww-retrieve-command): Add :tag.
cf7d8fb1d7 Add description of cards to etc/refcards/README
d2849cc645 Fix 'calculate-lisp-indent' when "[" starts containing sex...
2a0a368ddc Fix typo in doc/emacs/anti.texi
9529e1d2fb Update doc of Edebug specification for macros
5bc522b4f4 ; * lisp/simple.el (kill-region): A better fix for bug#51320.
ee6bdd6eef Fix non-interactive behavior of 'kill-region'
2b7655ca0e ; More accurate doc string for 'tab-bar-format'
2841e26744 * test/lisp/dabbrev-tests.el: Use 'kbd' for readable keys.
1cdb4d2077 * lisp/menu-bar.el (menu-bar-keymap): Add optional arg KEY...
# Conflicts:
# etc/NEWS
# lisp/progmodes/bug-reference.el
Diffstat (limited to 'lisp/net/eww.el')
| -rw-r--r-- | lisp/net/eww.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 178a25e4be2..c24a2c52bee 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -145,12 +145,12 @@ The string will be passed through `substitute-command-keys'." "Command to retrieve an URL via an external program. If nil, `url-retrieve' is used to download the data. If `sync', `url-retrieve-synchronously' is used. -For other non-nil values, this should be a list where the first item -is the program, and the rest are the arguments." +For other non-nil values, this should be a list of strings where +the first item is the program, and the rest are the arguments." :version "28.1" :type '(choice (const :tag "Use `url-retrieve'" nil) (const :tag "Use `url-retrieve-synchronously'" sync) - (repeat string))) + (repeat :tag "Command/args" string ))) (defcustom eww-use-external-browser-for-content-type "\\`\\(video/\\|audio/\\|application/ogg\\)" @@ -1947,7 +1947,7 @@ Use link at point if there is one, else the current page's URL." (defun eww-set-character-encoding (charset) "Set character encoding to CHARSET. If CHARSET is nil then use UTF-8." - (interactive "zUse character set (default utf-8): " eww-mode) + (interactive "zUse character set (default `utf-8'): " eww-mode) (if (null charset) (eww-reload nil 'utf-8) (eww-reload nil charset))) |