diff options
| author | Daiki Ueno | 2009-09-11 22:48:03 +0000 |
|---|---|---|
| committer | Daiki Ueno | 2009-09-11 22:48:03 +0000 |
| commit | 97d4bdba7eb24d2c34365dbb263fea844d7a1474 (patch) | |
| tree | 059373aa4bf0ad08d2dd7b06cbe07d721bbab603 | |
| parent | b18508ddd0488fb16b5ecbc19bba1edc658d0951 (diff) | |
| download | emacs-97d4bdba7eb24d2c34365dbb263fea844d7a1474.tar.gz emacs-97d4bdba7eb24d2c34365dbb263fea844d7a1474.zip | |
Fix the last commit.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/epg.el | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8870cbd73cc..72e1da01396 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * epg.el (epg-cipher-algorithm-alist): Add CAMELLIA. | 3 | * epg.el (epg-cipher-algorithm-alist): Add CAMELLIA. |
| 4 | (epg-digest-algorithm-alist): Add SHA224. | 4 | (epg-digest-algorithm-alist): Add SHA224. |
| 5 | (epg-context-set-passphrase-callback) | 5 | (epg-context-set-passphrase-callback) |
| 6 | (epg-context-set-progress-callback): Add more description about | 6 | (epg-context-set-progress-callback): Add description about |
| 7 | callback function. | 7 | callback function. |
| 8 | 8 | ||
| 9 | 2009-09-11 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2009-09-11 Stefan Monnier <monnier@iro.umontreal.ca> |
diff --git a/lisp/epg.el b/lisp/epg.el index 22f18762c5b..64489858a6d 100644 --- a/lisp/epg.el +++ b/lisp/epg.el | |||
| @@ -332,6 +332,7 @@ This function is for internal use only." | |||
| 332 | 332 | ||
| 333 | PASSPHRASE-CALLBACK is either a function, or a cons-cell whose | 333 | PASSPHRASE-CALLBACK is either a function, or a cons-cell whose |
| 334 | car is a function and cdr is a callback data. | 334 | car is a function and cdr is a callback data. |
| 335 | |||
| 335 | The function gets three arguments: the context, the key-id in | 336 | The function gets three arguments: the context, the key-id in |
| 336 | question, and the callback data (if any)." | 337 | question, and the callback data (if any)." |
| 337 | (unless (eq (car-safe context) 'epg-context) | 338 | (unless (eq (car-safe context) 'epg-context) |