diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /lisp/obsolete/pgg.el | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/obsolete/pgg.el')
| -rw-r--r-- | lisp/obsolete/pgg.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/obsolete/pgg.el b/lisp/obsolete/pgg.el index 42030f7d502..876f3744bc2 100644 --- a/lisp/obsolete/pgg.el +++ b/lisp/obsolete/pgg.el @@ -174,7 +174,7 @@ is true, or else the output buffer is displayed." (defvar pgg-pending-timers (make-vector 7 0) "Hash table for managing scheduled pgg cache management timers. -We associate key and timer, so the timer can be cancelled if a new +We associate key and timer, so the timer can be canceled if a new timeout for the key is set while an old one is still pending.") (defun pgg-read-passphrase (prompt &optional key notruncate) |