aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2012-12-28 05:01:17 +0100
committerJoakim Verona2012-12-28 05:01:17 +0100
commit92101bdbd84a69a0875ee197898ec18c67f0e6c2 (patch)
treebdd4f504f9309772298e0abaaf1a3a2103ba8c75 /lisp/ChangeLog
parent37b812a117865833cc310f83bc86d9342f7e42d3 (diff)
parent23bd348c3f3c848957088950df797d49794f7667 (diff)
downloademacs-92101bdbd84a69a0875ee197898ec18c67f0e6c2.tar.gz
emacs-92101bdbd84a69a0875ee197898ec18c67f0e6c2.zip
auto upstream
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34cb50bb44c..c4d884a5010 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
12012-12-28 Daiki Ueno <ueno@gnu.org>
2
3 * epg.el: Support pinentry-curses.
4 Suggested by Werner Koch in
5 <http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00755.html>.
6 (epg-agent-file, epg-agent-mtime): New variable.
7 (epg--start): Record the modified time of gpg-agent socket file,
8 to restore Emacs frame after pinentry-curses termination.
9 (epg-wait-for-completion): Restore Emacs frame here.
10
12012-12-27 Juri Linkov <juri@jurta.org> 112012-12-27 Juri Linkov <juri@jurta.org>
2 12
3 * info.el (Info-file-completions): New variable. 13 * info.el (Info-file-completions): New variable.