blob: 404e4228ea2cadf3dd66e39e81a9e24da64a0264 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- egg/wnnrpc.el.orig 2015-01-31 19:24:10.000000000 +0900
+++ egg/wnnrpc.el 2015-02-02 00:34:15.000000000 +0900
@@ -714,8 +714,14 @@
,send-expr ,@rcv-exprs))
(defmacro wnnrpc-get-result (&rest body)
- `(let (result)
- (comm-unpack (i) result)
+ `(let (result resulth)
+ (comm-unpack (w w) resulth result)
+ (cond ((and (= result 65535) (= resulth 65535))
+ (setq result -1))
+ ((= resulth (lsh (lsh resulth 16) -16))
+ (setq result (+ (lsh resulth 16) result)))
+ (t
+ (error "overflow")))
(if (< result 0)
(progn
(comm-unpack (i) result)
@@ -1716,8 +1722,7 @@
(insert contents)
(if (= result 2)
(insert-file-contents local-filename nil (1- (point))))
- (save-excursion
- (set-buffer (process-buffer proc))
+ (with-current-buffer (process-buffer proc)
(wnnrpc-get-result)))))))))
((quit error)
(wnnrpc-call-with-environment env ()
|
