From: ueno Date: Fri, 8 Feb 2008 07:43:04 +0000 (+0000) Subject: * epa-dired.el: X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Femacs-merge;p=elisp%2Fepg.git * 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. --- diff --git a/ChangeLog b/ChangeLog index 818d5f0..384c42a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-02-08 Daiki Ueno + + * 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. + 2008-02-07 Daiki Ueno * EasyPG: Version 0.0.16 released. diff --git a/epa-dired.el b/epa-dired.el index 769ee41..b20218b 100644 --- a/epa-dired.el +++ b/epa-dired.el @@ -1,17 +1,17 @@ ;;; epa-dired.el --- the EasyPG Assistant, dired extension -;; Copyright (C) 2006 Daiki Ueno +;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG -;; This file is part of EasyPG. +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. diff --git a/epa-file.el b/epa-file.el index 551a7a0..e643829 100644 --- a/epa-file.el +++ b/epa-file.el @@ -1,17 +1,17 @@ ;;; epa-file.el --- the EasyPG Assistant, transparent file encryption -;; Copyright (C) 2006 Daiki Ueno +;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG -;; This file is part of EasyPG. +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. diff --git a/epa-mail.el b/epa-mail.el index 0dd959b..f88a6f1 100644 --- a/epa-mail.el +++ b/epa-mail.el @@ -1,17 +1,17 @@ ;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer -;; Copyright (C) 2006,2007 Daiki Ueno +;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG, mail, message -;; This file is part of EasyPG. +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. diff --git a/epa-setup.el b/epa-setup.el index 1208b74..8737fed 100644 --- a/epa-setup.el +++ b/epa-setup.el @@ -1,17 +1,17 @@ ;;; epa-setup.el --- setup routine for the EasyPG Assistant. -;; Copyright (C) 2006,2007,2008 Daiki Ueno +;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG -;; This file is part of EasyPG. +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. @@ -36,4 +36,4 @@ (provide 'epa-setup) -;;; epa-setup.el ends here \ No newline at end of file +;;; epa-setup.el ends here diff --git a/epa.el b/epa.el index ec88f8e..700a41f 100644 --- a/epa.el +++ b/epa.el @@ -1,17 +1,17 @@ ;;; epa.el --- the EasyPG Assistant -;; Copyright (C) 2006 Daiki Ueno +;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG -;; This file is part of EasyPG. +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. @@ -639,9 +639,10 @@ If SECRET is non-nil, list secret keys instead of public keys." (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function - (format "Decrypting %s..." - (file-name-nondirectory file))) + (cons + #'epa-progress-callback-function + (format "Decrypting %s..." + (file-name-nondirectory file)))) (message "Decrypting %s..." (file-name-nondirectory file)) (epg-decrypt-file context file plain) (message "Decrypting %s...wrote %s" (file-name-nondirectory file) @@ -659,9 +660,10 @@ If SECRET is non-nil, list secret keys instead of public keys." (plain (if (equal (file-name-extension file) "sig") (file-name-sans-extension file)))) (epg-context-set-progress-callback context - #'epa-progress-callback-function - (format "Verifying %s..." - (file-name-nondirectory file))) + (cons + #'epa-progress-callback-function + (format "Verifying %s..." + (file-name-nondirectory file)))) (message "Verifying %s..." (file-name-nondirectory file)) (epg-verify-file context file plain) (message "Verifying %s...done" (file-name-nondirectory file)) @@ -724,9 +726,10 @@ If no one is selected, default secret key is used. " (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function - (format "Signing %s..." - (file-name-nondirectory file))) + (cons + #'epa-progress-callback-function + (format "Signing %s..." + (file-name-nondirectory file)))) (message "Signing %s..." (file-name-nondirectory file)) (epg-sign-file context file signature mode) (message "Signing %s...wrote %s" (file-name-nondirectory file) @@ -749,9 +752,10 @@ If no one is selected, symmetric encryption will be performed. "))) (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function - (format "Encrypting %s..." - (file-name-nondirectory file))) + (cons + #'epa-progress-callback-function + (format "Encrypting %s..." + (file-name-nondirectory file)))) (message "Encrypting %s..." (file-name-nondirectory file)) (epg-encrypt-file context file recipients cipher) (message "Encrypting %s...wrote %s" (file-name-nondirectory file) @@ -769,8 +773,9 @@ Don't use this command in Lisp programs!" (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function - "Decrypting...") + (cons + #'epa-progress-callback-function + "Decrypting...")) (message "Decrypting...") (setq plain (epg-decrypt-string context (buffer-substring start end))) (message "Decrypting...done") @@ -838,8 +843,9 @@ Don't use this command in Lisp programs!" (let ((context (epg-make-context epa-protocol)) plain) (epg-context-set-progress-callback context - #'epa-progress-callback-function - "Verifying...") + (cons + #'epa-progress-callback-function + "Verifying...")) (message "Verifying...") (setq plain (epg-verify-string context @@ -928,8 +934,9 @@ If no one is selected, default secret key is used. " (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function - "Signing...") + (cons + #'epa-progress-callback-function + "Signing...")) (message "Signing...") (setq signature (epg-sign-string context (epa--encode-coding-string @@ -997,8 +1004,9 @@ If no one is selected, symmetric encryption will be performed. ") (epg-context-set-passphrase-callback context #'epa-passphrase-callback-function) (epg-context-set-progress-callback context - #'epa-progress-callback-function - "Encrypting...") + (cons + #'epa-progress-callback-function + "Encrypting...")) (message "Encrypting...") (setq cipher (epg-encrypt-string context (epa--encode-coding-string @@ -1141,27 +1149,27 @@ Don't use this command in Lisp programs!" (epg-context-set-armor context t) (insert (epg-export-keys-to-string context keys)))) -;;;###autoload -(defun epa-sign-keys (keys &optional local) - "Sign selected KEYS. -If a prefix-arg is specified, the signature is marked as non exportable. - -Don't use this command in Lisp programs!" - (interactive - (let ((keys (epa--marked-keys))) - (unless keys - (error "No keys selected")) - (list keys current-prefix-arg))) - (let ((context (epg-make-context epa-protocol))) - (epg-context-set-passphrase-callback context - #'epa-passphrase-callback-function) - (epg-context-set-progress-callback context - #'epa-progress-callback-function - "Signing keys...") - (message "Signing keys...") - (epg-sign-keys context keys local) - (message "Signing keys...done"))) -(make-obsolete 'epa-sign-keys "Do not use.") +;; (defun epa-sign-keys (keys &optional local) +;; "Sign selected KEYS. +;; If a prefix-arg is specified, the signature is marked as non exportable. + +;; Don't use this command in Lisp programs!" +;; (interactive +;; (let ((keys (epa--marked-keys))) +;; (unless keys +;; (error "No keys selected")) +;; (list keys current-prefix-arg))) +;; (let ((context (epg-make-context epa-protocol))) +;; (epg-context-set-passphrase-callback context +;; #'epa-passphrase-callback-function) +;; (epg-context-set-progress-callback context +;; (cons +;; #'epa-progress-callback-function +;; "Signing keys...")) +;; (message "Signing keys...") +;; (epg-sign-keys context keys local) +;; (message "Signing keys...done"))) +;; (make-obsolete 'epa-sign-keys "Do not use.") (provide 'epa) diff --git a/epa.texi b/epa.texi index 9c71547..8fb5877 100644 --- a/epa.texi +++ b/epa.texi @@ -1,30 +1,31 @@ \input texinfo @c -*- mode: texinfo -*- @c %**start of header -@setfilename epa.info -@settitle EasyPG Assistant +@setfilename ../../info/epa +@settitle EasyPG Assistant User's Manual @c %**end of header -@include version.texi -@c @documentlanguage en -@dircategory GNU Emacs Lisp -@direntry -* epa: (epa). EasyPG Assistant -@end direntry +@set VERSION 1.0.0 -@ifinfo +@copying This file describes EasyPG Assistant. -Copyright (C) 2007 Daiki Ueno. +Copyright @copyright{} 2007, 2008 Free Software Foundation, Inc. +@quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License". -@end ifinfo +@end quotation +@end copying + +@dircategory Emacs +@direntry +* EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard. +@end direntry -@tex @titlepage @title EasyPG Assistant @@ -33,21 +34,12 @@ Free Documentation License". @page @vskip 0pt plus 1filll -Copyright @copyright{} 2007 Daiki Ueno. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled "GNU -Free Documentation License". +@insertcopying @end titlepage @page -@end tex - -@summarycontents -@contents +@c @summarycontents +@c @contents @node Top @top EasyPG Assistant user's manual diff --git a/epg-config.el b/epg-config.el index dfbd009..6675cbc 100644 --- a/epg-config.el +++ b/epg-config.el @@ -1,17 +1,17 @@ ;;; epg-config.el --- configuration of the EasyPG Library -;; Copyright (C) 2006 Daiki Ueno +;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG -;; This file is part of EasyPG. +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. diff --git a/epg.el b/epg.el index 54a0d0d..d9c334d 100644 --- a/epg.el +++ b/epg.el @@ -1,19 +1,18 @@ ;;; epg.el --- the EasyPG Library ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 2006 Daiki Ueno +;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Keywords: PGP, GnuPG -;; This file is part of EasyPG. +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) +;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details.