[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 6c686003512 3/3: Merge from origin/emacs-30
From: |
Eli Zaretskii |
Subject: |
master 6c686003512 3/3: Merge from origin/emacs-30 |
Date: |
Sat, 10 Aug 2024 04:16:38 -0400 (EDT) |
branch: master
commit 6c6860035121aaa5d5b45589f6f5b5f49ba63c0f
Merge: 361be932825 4dd953d3cc3
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge from origin/emacs-30
4dd953d3cc3 * lisp/epg.el (epg--start): Don't convert EOL on encoding...
---
lisp/epg.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/epg.el b/lisp/epg.el
index 494bdd68c41..6b4db52f298 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -683,7 +683,7 @@ callback data (if any)."
;; We encode and decode ourselves the text sent/received from gpg,
;; so the below disables automatic encoding and decoding by
;; subprocess communications routines.
- (set-process-coding-system process 'raw-text 'raw-text)
+ (set-process-coding-system process 'raw-text 'raw-text-unix)
(setf (epg-context-process context) process)))
(defun epg--process-filter (process input)