From: Jonas Bernoulli <jonas@bernoul.li>
To: 41268@debbugs.gnu.org
Subject: bug#41268: [PATCH 6/9] Drop unnecessary backward compatibility aliases
Date: Thu, 14 May 2020 21:13:22 +0200 [thread overview]
Message-ID: <20200514191325.22061-7-jonas@bernoul.li> (raw)
In-Reply-To: <20200514191325.22061-1-jonas@bernoul.li>
* lisp/epa-file.el (epa-file--encode-coding-string,
epa-file--decode-coding-string): Remove aliases for
encode-coding-string and decode-coding-string.
* lisp/epa-file.el (epa-file-write-region): Use encode-coding-string
instead of removed epa-file--encode-coding-string.
encode-coding-string and decode-coding-string existed every since
4ed4686978bd18292e2bb7b87a7b0e0407ecb3b1 added them in 1997.
---
lisp/epa-file.el | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index ede7177054..3e23c09a51 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -56,16 +56,6 @@ epa-file-select-keys
(defvar epa-file-passphrase-alist nil)
-(eval-and-compile
- (if (fboundp 'encode-coding-string)
- (defalias 'epa-file--encode-coding-string 'encode-coding-string)
- (defalias 'epa-file--encode-coding-string 'identity)))
-
-(eval-and-compile
- (if (fboundp 'decode-coding-string)
- (defalias 'epa-file--decode-coding-string 'decode-coding-string)
- (defalias 'epa-file--decode-coding-string 'identity)))
-
(defun epa-file-passphrase-callback-function (context key-id file)
(if (and epa-file-cache-passphrase-for-symmetric-encryption
(eq key-id 'SYM))
@@ -243,11 +233,7 @@ epa-file-write-region
(setq file (expand-file-name file))
(let* ((coding-system (or coding-system-for-write
(if (fboundp 'select-safe-coding-system)
- ;; This is needed since Emacs 22 has
- ;; no-conversion setting for *.gpg in
- ;; `auto-coding-alist'.
- (let ((buffer-file-name
- (file-name-sans-extension file)))
+ (let ((buffer-file-name file))
(select-safe-coding-system
(point-min) (point-max)))
buffer-file-coding-system)))
@@ -273,7 +259,7 @@ epa-file-write-region
(epg-encrypt-string
context
(if (stringp start)
- (epa-file--encode-coding-string start coding-system)
+ (encode-coding-string start coding-system)
(unless start
(setq start (point-min)
end (point-max)))
@@ -287,8 +273,8 @@ epa-file-write-region
;; decrypted contents.
(format-encode-buffer (with-current-buffer buffer
buffer-file-format))
- (epa-file--encode-coding-string (buffer-string)
- coding-system)))
+ (encode-coding-string (buffer-string)
+ coding-system)))
(if (or (eq epa-file-select-keys t)
(and (null epa-file-select-keys)
(not (local-variable-p 'epa-file-encrypt-to
--
2.26.0
next prev parent reply other threads:[~2020-05-14 19:13 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 19:13 bug#41276: [PATCH 0/9] Various small improvements to EasyPG Jonas Bernoulli
2020-05-14 19:13 ` bug#41272: [PATCH 1/9] * lisp/epa.el (epa-faces): Move definition Jonas Bernoulli
2020-05-14 19:13 ` bug#41269: [PATCH 2/9] Add all epa faces to epa-faces Custom group Jonas Bernoulli
2020-05-14 19:13 ` bug#41270: [PATCH 3/9] * lisp/epg-config.el (epg-config--make-gpg-configuration): Fix indentation Jonas Bernoulli
2020-05-14 19:13 ` bug#41275: [PATCH 4/9] Split EasyPG libraries into outline sections Jonas Bernoulli
2020-05-14 19:13 ` bug#41277: [PATCH 5/9] Improve and add doc-strings Jonas Bernoulli
2020-05-14 19:13 ` Jonas Bernoulli [this message]
2020-05-14 19:13 ` bug#41271: [PATCH 7/9] Cosmetic changes to epa libraries Jonas Bernoulli
2020-05-14 19:13 ` bug#41273: [PATCH 8/9] epa-key-list-mode-map: Use widget-keymap as parent keymap Jonas Bernoulli
2020-05-14 19:13 ` bug#41274: [PATCH 9/9] * lisp/epa.el (epa-show-key): New command Jonas Bernoulli
2020-06-23 22:57 ` Basil L. Contovounesios
2020-07-07 15:34 ` Jonas Bernoulli
[not found] ` <handler.41276.B.15894836275636.ack@debbugs.gnu.org>
2020-05-14 20:14 ` bug#41276: Acknowledgement ([PATCH 0/9] Various small improvements to EasyPG) Jonas Bernoulli
2020-05-14 22:33 ` Stefan Kangas
2020-05-15 7:26 ` Eli Zaretskii
2020-05-15 11:27 ` Jonas Bernoulli
2020-05-15 11:52 ` Eli Zaretskii
2020-05-15 16:56 ` Jonas Bernoulli
2020-05-15 17:42 ` Eli Zaretskii
2020-05-15 22:42 ` Jonas Bernoulli
2020-05-16 6:45 ` Eli Zaretskii
2020-05-14 20:16 ` bug#41276: [PATCH 1/9] * lisp/epa.el (epa-faces): Move definition Jonas Bernoulli
2020-05-14 20:16 ` bug#41276: [PATCH 2/9] Add all epa faces to epa-faces Custom group Jonas Bernoulli
2020-05-15 9:32 ` Robert Pluim
2020-06-23 22:57 ` Basil L. Contovounesios
2020-07-07 15:32 ` Jonas Bernoulli
2020-05-14 20:16 ` bug#41276: [PATCH 3/9] * lisp/epg-config.el (epg-config--make-gpg-configuration): Fix indentation Jonas Bernoulli
2020-05-14 20:16 ` bug#41276: [PATCH 4/9] Split EasyPG libraries into outline sections Jonas Bernoulli
2020-05-14 20:16 ` bug#41276: [PATCH 5/9] Improve and add doc-strings Jonas Bernoulli
2020-05-14 20:16 ` bug#41276: [PATCH 6/9] Drop unnecessary backward compatibility aliases Jonas Bernoulli
2020-05-14 20:16 ` bug#41276: [PATCH 7/9] Cosmetic changes to epa libraries Jonas Bernoulli
2020-05-14 20:16 ` bug#41276: [PATCH 8/9] epa-key-list-mode-map: Use widget-keymap as parent keymap Jonas Bernoulli
2020-05-15 7:27 ` Eli Zaretskii
2020-05-14 20:16 ` bug#41276: [PATCH 9/9] * lisp/epa.el (epa-show-key): New command Jonas Bernoulli
2020-05-14 23:04 ` bug#41276: [PATCH 0/9] Various small improvements to EasyPG Stefan Kangas
2020-05-15 9:26 ` Robert Pluim
2020-05-25 1:34 ` Noam Postavsky
2020-07-17 7:30 ` Robert Pluim
2020-07-07 15:47 ` bug#41276: [PATCH v2 0/8] " Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 1/8] * lisp/epa.el (epa-faces): Move definition Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 2/8] Add all epa faces to epa-faces Custom group Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 3/8] * lisp/epg-config.el (epg-config--make-gpg-configuration): Fix indentation Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 4/8] Improve and add doc-strings Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 5/8] Drop unnecessary backward compatibility aliases Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 6/8] Cosmetic changes to epa libraries Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 7/8] epa-key-list-mode-map: Use widget-keymap as parent keymap Jonas Bernoulli
2020-07-07 15:47 ` bug#41276: [PATCH v2 8/8] * lisp/epa.el (epa-show-key): New command Jonas Bernoulli
2020-07-07 18:30 ` bug#41276: [PATCH v2 0/8] Various small improvements to EasyPG Eli Zaretskii
2020-07-07 21:09 ` Jonas Bernoulli
2020-07-08 2:29 ` Eli Zaretskii
2020-07-08 12:08 ` Jonas Bernoulli
2020-07-14 18:09 ` Jonas Bernoulli
2020-07-14 18:16 ` Eli Zaretskii
2020-07-14 18:27 ` Jonas Bernoulli
2020-07-14 18:57 ` Eli Zaretskii
2020-07-14 20:20 ` Jonas Bernoulli
2020-07-15 2:22 ` Eli Zaretskii
2020-08-05 19:03 ` bug#41276: [PATCH 0/9] " Lars Ingebrigtsen
2020-08-06 7:22 ` bug#41268: " Jonas Bernoulli
2020-08-06 7:26 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200514191325.22061-7-jonas@bernoul.li \
--to=jonas@bernoul.li \
--cc=41268@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).