aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2012-12-21 16:35:02 +0900
committerDaiki Ueno2012-12-21 16:35:02 +0900
commit3eb050925927e7060cb5ba192bf1d0f954c5980b (patch)
treeb2bfe903b4db54bc895b7a64169a5138f18e1481
parentc660916409de757a7f99036df226da3eed32f55e (diff)
downloademacs-3eb050925927e7060cb5ba192bf1d0f954c5980b.tar.gz
emacs-3eb050925927e7060cb5ba192bf1d0f954c5980b.zip
* epg.el (epg-error): Set `error-message' property.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/epg.el1
2 files changed, 2 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3c83e7e564..cd7dd97315b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
12012-12-21 Daiki Ueno <ueno@gnu.org> 12012-12-21 Daiki Ueno <ueno@gnu.org>
2 2
3 * epg.el (epg--start): Print GPG_AGENT_INFO in the debug buffer. 3 * epg.el (epg--start): Print GPG_AGENT_INFO in the debug buffer.
4 (epg-error): Set `error-message' property.
4 5
52012-12-21 Chong Yidong <cyd@gnu.org> 62012-12-21 Chong Yidong <cyd@gnu.org>
6 7
diff --git a/lisp/epg.el b/lisp/epg.el
index ea97ddd747c..833a68d6e7e 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -161,6 +161,7 @@
161(defvar epg-prompt-alist nil) 161(defvar epg-prompt-alist nil)
162 162
163(put 'epg-error 'error-conditions '(epg-error error)) 163(put 'epg-error 'error-conditions '(epg-error error))
164(put 'epg-error 'error-message "GPG error")
164 165
165(defun epg-make-data-from-file (file) 166(defun epg-make-data-from-file (file)
166 "Make a data object from FILE." 167 "Make a data object from FILE."