summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
2013-01-04 Daiki Ueno <ueno@gnu.org>
+ * epg.el: Silence byte-compiler warnings.
+ (epg--start): Use delete-char instead of delete-backward-char.
+ (epg-wait-for-completion): Pass FRAME arg to redraw-frame.
+
+2013-01-04 Daiki Ueno <ueno@gnu.org>
+
* epg.el (epg--start): Don't call "tty" program on W32 platforms.
Suggested by Eli Zaretskii <eliz@gnu.org>.
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."
(with-temp-buffer
(condition-case nil
(when (= (call-process "tty" "/dev/fd/0" t) 0)
- (delete-backward-char 1)
+ (delete-char -1)
(setq terminal-name (buffer-string)))
(file-error))))
(when terminal-name
@@ -1300,7 +1300,7 @@ This function is for internal use only."
(> (float-time (or (nth 5 (file-attributes epg-agent-file))
'(0 0 0 0)))
(float-time epg-agent-mtime))))
- (redraw-frame))
+ (redraw-frame (selected-frame)))
(epg-context-set-result-for
context 'error
(nreverse (epg-context-result-for context 'error))))