* epa-dired.el:
* epa-mail.el:
* epa.el:
* epg-package-info.el:
* epa-file.el:
* epa-setup.el:
* epg-config.el:
* epg.el: License changed from GPL2+ to GPL3+.

* epa.texi: License changed from FDL1.1 to FDL1.2; re-arrange headers.

Synch with the trunk.

Synch with the trunk.

Added a missing entry on 2007-01-06.

Added a missing entry on 2006-11-11.

Marked the rest of changes by Hiroya Murata as tiny.

* epg.el: Reverted a change by Hiroya Murata on 2006-11-22.

Reverted a change by Hiroya Murata on 2006-12-20.

Synch with the trunk.

More simplified.

Simplified.

Display amount of affected lines as comment.

Add -u to cvs diff.

Fixed.

New file.

This commit was manufactured by cvs2svn to create branch 'emacs-merge'.

(epa-mail--find-usable-key): New function.
(epa-mail-encrypt): Use it.
Reported by intrigeri <intrigeri@boum.org>.

* epg-package-info.el.in (epg-bug-report-address): New constant.

Use modern AC_INIT.

Revert the last change.

(epg-reset): Clear "operation" and "operation-data" slots.

(epg-make-context): New slot "operation-data".
(epg--process-filter): Pick up status handler from "operation-data".
(epg-start-edit-key): New function.
(epg-edit-key): New function.

Undo the last change.

Removed OUTPUT arg from epg-start-edit-key & epg-edit-key.

(epg-make-context): New slot "edit-key-callback".
(epg-start-edit-key): New function.
(epg-edit-key): New function.

* epa.el (epa--show-key): Don't signal an error even if a time cannot be decoded.

* EasyPG: Version 0.0.15 released.
* configure.ac: Bump up version.

Update.

(epa-validity-face-alist): Fixed misuse of the list
widget type.
(epa-font-lock-keywords): Define as defvar.

Update.

Added 0.0.15 changes.

Fixed.

(epa-file-auto-mode-alist-entry): New variable.
(epa-file-enable): Install an entry in auto-mode-alist.
(epa-file-disable): Ditto.

Fixed.

(epa-verify-region): Decode the plaintext by
coding-system-for-read or one which can be saved in
epa-coding-system-used.

Fixed the last entry.

2007-08-02  Adrian Aichner  <adrian@xemacs.org>

       * epa.el (epa-validity-high): Fix load error by adding missing
       paren pair.

* epa-file.el (epa-file-insert-file-contents): Ignore errors from
file-local-copy.

Update.

Update.

Update.

* EasyPG: Version 0.0.14 released.
* configure.ac: Bump up version.

* epa.el: Use :weight or :slant keywords to define faces, if
available.

* epa-file.el (epa-file-insert-file-contents): If a file is not
directly accessible, use the local copy of the file.
Reported by Jaroslav Gresula <jgresula@gmail.com>

Thanks to -> Reported by

Add "(tiny change)".

* epa.el: Removed -face suffix from face names;
removed face symbol vars.

* epa.el: Removed -face suffix from face names.

* EasyPG: Version 0.0.13 released.

Describe 0.0.13 changes.

Undo the last change.

* epa-file.el (epa-file-write-region): Supply the BUFFER argument
to local-variable-p.
(epa-file-name-regexp): Accept files created by vc-find-version.
(epa-file-find-file-hook): Mark the current buffer as unmodified.
Suggested by Adrian Aichner <adrian@elisp.de>

(epa-file-write-region): Don't use epa-textmode.

* EasyPG: Version 0.0.12 released.
* configure.ac: Bump up version.

Update.

Update.

(epa-file-write-region): Respect epa-armor and
epa-textmode.

Fixed.

(epg--prompt-GET_BOOL-untrusted_key.override): Lookup
user-id from epg-user-id-alist.

Suppress byte-compiler warnings.

(epa-file-select-keys): New command.

* epa-file.el (epa-file-write-region): Ask recipients only the
first time.
(epa-file-select-keys): New user option.

* epa-file.el (epa-file-write-region): Ask recipients only the
first time.

Update.

* epa.el (epa-mark-key): Renamed from epa-mark.
(epa-unmark-key): Renamed from epa-unmark.
(epa-toggle-mark): Abolished.

* epa-file.el (epa-file-encrypt-to): Make it permanent local.

* epa-file.el (epa-file-insert-file-contents): Guess the value of
epa-file-encrypt-to from 'encrypted-to context-result.
* epg.el (epg--status-ENC_TO): New function.

Chris Moore is the author of the last epa-file change.

* epa-file.el (epa-file-name-regexp): Accept backup filenames.
Suggested by "[ #10192 ] customizing epa-file-name-regexp fails"

Added track

* epa-file.el (epa-file--file-name-regexp-set): New Custom :set
function.
(epa-file-name-regexp): Use it.
(epa-file-name-regexp-update): New command.
Reported by "[ #10192 ] customizing epa-file-name-regexp fails"

* epa-file.el (epa-file-find-file-hook): New function.
(epa-file-enable): Add epa-file-find-file-hook to find-file-hooks.
(epa-file-disable): Remove epa-file-find-file-hook from
find-file-hooks.

* EasyPG: Version 0.0.11 released.
* configure.ac: Bump up version.

Fixed.

Fixed.

Fixed.

Fixed.

Fixed.

Fixed.

Add 0.0.11 changes.

Remove @footnote.

Discourage use of inline PGP messages.

Fixed.

No need to specify --disable-gpg-test even if gpg has version < 1.4.3.

(epa--select-keys): New function.
(epa-select-keys): Use it; don't popup menu if keys have elements
less than 2.

Fixed.

(epa--insert-keys): Changed arglist.  All callers changed.

Fixed doc.

bury-buffer -> epa-exit-buffer

Fixed doc.

Fixed doc.

* epa.el (epa-protocol): defcustom -> defvar.
(epa-armor): Ditto.
(epa-textmode): Ditto.

Fixed.

Fixed.

* epa.el (epa-key-list-mode-map): Bind revert-buffer instead of
epa-list-keys.
(epa-key-list-mode): Set revert-buffer-function to epa--revert-buffer.
(epa--revert-buffer): New function.

Don't use epa-list-keys-arguments.

Fixed.

* epa.el (epa-select-keys): Simplified; don't select the first
matching key.

Fixed indent.

nconc -> append