aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2013-01-05 07:54:08 +0900
committerDaiki Ueno2013-01-05 07:54:08 +0900
commit1bd71e9fe16541bc48868a00ff372018961380b0 (patch)
tree8cbeff430fe14401d38fb6a5b3a6b6931e6016eb
parent00cd4c1cbd961403ae8e07fca4ffdbc26f84f5db (diff)
downloademacs-1bd71e9fe16541bc48868a00ff372018961380b0.tar.gz
emacs-1bd71e9fe16541bc48868a00ff372018961380b0.zip
* epg.el: Silence byte-compiler warnings.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/epg.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60b25d5ff66..5b54d34743c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12013-01-04 Daiki Ueno <ueno@gnu.org> 12013-01-04 Daiki Ueno <ueno@gnu.org>
2 2
3 * epg.el: Silence byte-compiler warnings.
4 (epg--start): Use delete-char instead of delete-backward-char.
5 (epg-wait-for-completion): Pass FRAME arg to redraw-frame.
6
72013-01-04 Daiki Ueno <ueno@gnu.org>
8
3 * epg.el (epg--start): Don't call "tty" program on W32 platforms. 9 * epg.el (epg--start): Don't call "tty" program on W32 platforms.
4 Suggested by Eli Zaretskii <eliz@gnu.org>. 10 Suggested by Eli Zaretskii <eliz@gnu.org>.
5 11
diff --git a/lisp/epg.el b/lisp/epg.el
index 01f7210c9a9..3f04aa2e07a 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1170,7 +1170,7 @@ This function is for internal use only."
1170 (with-temp-buffer 1170 (with-temp-buffer
1171 (condition-case nil 1171 (condition-case nil
1172 (when (= (call-process "tty" "/dev/fd/0" t) 0) 1172 (when (= (call-process "tty" "/dev/fd/0" t) 0)
1173 (delete-backward-char 1) 1173 (delete-char -1)
1174 (setq terminal-name (buffer-string))) 1174 (setq terminal-name (buffer-string)))
1175 (file-error)))) 1175 (file-error))))
1176 (when terminal-name 1176 (when terminal-name
@@ -1300,7 +1300,7 @@ This function is for internal use only."
1300 (> (float-time (or (nth 5 (file-attributes epg-agent-file)) 1300 (> (float-time (or (nth 5 (file-attributes epg-agent-file))
1301 '(0 0 0 0))) 1301 '(0 0 0 0)))
1302 (float-time epg-agent-mtime)))) 1302 (float-time epg-agent-mtime))))
1303 (redraw-frame)) 1303 (redraw-frame (selected-frame)))
1304 (epg-context-set-result-for 1304 (epg-context-set-result-for
1305 context 'error 1305 context 'error
1306 (nreverse (epg-context-result-for context 'error)))) 1306 (nreverse (epg-context-result-for context 'error))))