diff options
author | Stefan Kangas <stefankangas@gmail.com> | 2022-09-21 10:24:25 +0200 |
---|---|---|
committer | Stefan Kangas <stefankangas@gmail.com> | 2022-09-21 10:25:06 +0200 |
commit | 9b14e312f409216dab647f839724d5df029e8195 (patch) | |
tree | ceaeb58d5d284cb4fb24ee62cca3f0881f1e1b60 /lisp/epa-ks.el | |
parent | 43c0ebd8bcdd33e534b514d87ea843e93b11b89d (diff) | |
parent | 478b786d5aa74fbb6476b51f0dea4e9ccf1f211b (diff) | |
download | emacs-9b14e312f409216dab647f839724d5df029e8195.tar.gz emacs-9b14e312f409216dab647f839724d5df029e8195.tar.bz2 emacs-9b14e312f409216dab647f839724d5df029e8195.zip |
Merge from origin/emacs-28
478b786d5a ; * doc/lispref/windows.texi (Window Hooks): Fix a typo (b...
5085351645 * lisp/text-modes/tex-mode.el (tex-mode): Fix AUCTeX regre...
ee6f8598ca Add vc-annotate-switches to manual
616dcf27e5 ; Fix typos in Lisp symbols
5405852541 Remove mention of non-existent `annotate-switches'
191505b8a3 Mention that src/macuvs.h sometimes needs committing
10373c4b68 ; More comment fixes in font.h (bug#57935)
c2595b8dcc ; * src/font.h (struct font_driver): Comment fix.
97b928ce09 MacOS ld warning from native compilation (bug#57849)
Diffstat (limited to 'lisp/epa-ks.el')
-rw-r--r-- | lisp/epa-ks.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/epa-ks.el b/lisp/epa-ks.el index df8a72af70e..4c539b56a37 100644 --- a/lisp/epa-ks.el +++ b/lisp/epa-ks.el @@ -41,7 +41,7 @@ (defcustom epa-keyserver "pgp.mit.edu" "Domain of keyserver. -This is used by `epa-ks-lookup-key', for looking up public keys." +This is used by `epa-search-keys', for looking up public keys." :type '(choice :tag "Keyserver" (repeat :tag "Random pool" (string :tag "Keyserver address")) @@ -180,7 +180,7 @@ If EXACT is non-nil, don't accept approximate matches." "Prepare KEYS for `tabulated-list-mode', for buffer BUF. KEYS is a list of `epa-ks-key' structures, as parsed by -`epa-ks-parse-result'." +`epa-ks--parse-buffer'." (when (buffer-live-p buf) (let (entries) (dolist (key keys) |