branch: externals/async
commit 7df4b6857f4b7f638d6245966e0fe0ab2d5b7d19
Merge: afd1ad5 7279cc6
Author: Thierry Volpiatto <[email protected]>
Commit: Thierry Volpiatto <[email protected]>
Merge branch 'master' of github.com:jwiegley/emacs-async
---
.gitignore | 3 +++
Makefile | 1 +
async-bytecomp.el | 3 ++-
async.el | 10 +++++-----
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bb6d27f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.elc
+*~
+async-autoloads.el
diff --git a/Makefile b/Makefile
index a755782..0b28c23 100644
--- a/Makefile
+++ b/Makefile
@@ -73,3 +73,4 @@ install:
uninstall:
rm -vf ${DESTDIR}*.elc
+ rm -vf ${DESTDIR}*.el
diff --git a/async-bytecomp.el b/async-bytecomp.el
index 2c96da0..7c113d5 100644
--- a/async-bytecomp.el
+++ b/async-bytecomp.el
@@ -51,7 +51,8 @@ the symbol `all', in this case packages are always compiled
asynchronously."
:group 'async
:type '(repeat (choice symbol)))
-(defvar async-byte-compile-log-file "~/.emacs.d/async-bytecomp.log")
+(defvar async-byte-compile-log-file
+ (concat user-emacs-directory "async-bytecomp.log"))
;;;###autoload
(defun async-byte-recompile-directory (directory &optional quiet)
diff --git a/async.el b/async.el
index e2889d1..169d40d 100644
--- a/async.el
+++ b/async.el
@@ -151,9 +151,9 @@ It is intended to be used as follows:
(defun async--receive-sexp (&optional stream)
(let ((sexp (decode-coding-string (base64-decode-string
- (read stream)) 'utf-8-unix))
+ (read stream)) 'utf-8-auto))
;; Parent expects UTF-8 encoded text.
- (coding-system-for-write 'utf-8-unix))
+ (coding-system-for-write 'utf-8-auto))
(if async-debug
(message "Received sexp {{{%s}}}" (pp-to-string sexp)))
(setq sexp (read sexp))
@@ -168,7 +168,7 @@ It is intended to be used as follows:
(print-circle t))
(prin1 sexp (current-buffer))
;; Just in case the string we're sending might contain EOF
- (encode-coding-region (point-min) (point-max) 'utf-8-unix)
+ (encode-coding-region (point-min) (point-max) 'utf-8-auto)
(base64-encode-region (point-min) (point-max) t)
(goto-char (point-min)) (insert ?\")
(goto-char (point-max)) (insert ?\" ?\n)))
@@ -184,7 +184,7 @@ It is intended to be used as follows:
"Called from the child Emacs process' command-line."
;; Make sure 'message' and 'prin1' encode stuff in UTF-8, as parent
;; process expects.
- (let ((coding-system-for-write 'utf-8-unix))
+ (let ((coding-system-for-write 'utf-8-auto))
(setq async-in-child-emacs t
debug-on-error async-debug)
(if debug-on-error
@@ -317,7 +317,7 @@ returns nil. It can still be useful, however, as an
argument to
`async-ready' or `async-wait'."
(let ((sexp start-func)
;; Subordinate Emacs will send text encoded in UTF-8.
- (coding-system-for-read 'utf-8-unix))
+ (coding-system-for-read 'utf-8-auto))
(setq async--procvar
(async-start-process
"emacs" (file-truename
