From 5378922157d05941fb8d9c881e06af8167745a9d Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 5 Feb 2008 07:08:57 +0000 Subject: [PATCH] Synch with the trunk. --- epa-dired.el | 2 +- epa-file.el | 2 +- epa-mail.el | 2 +- epa-setup.el | 25 +++++++++++++++++++++++++ epa.el | 2 +- epg-config.el | 2 +- epg-package-info.el.in | 2 +- epg.el | 2 +- pgg-epg.el | 2 +- 9 files changed, 33 insertions(+), 8 deletions(-) diff --git a/epa-dired.el b/epa-dired.el index aa4e406..769ee41 100644 --- a/epa-dired.el +++ b/epa-dired.el @@ -13,7 +13,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License diff --git a/epa-file.el b/epa-file.el index 4d6df44..4dc3ffd 100644 --- a/epa-file.el +++ b/epa-file.el @@ -13,7 +13,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License diff --git a/epa-mail.el b/epa-mail.el index 97b3204..0dd959b 100644 --- a/epa-mail.el +++ b/epa-mail.el @@ -13,7 +13,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License diff --git a/epa-setup.el b/epa-setup.el index 82690f5..1208b74 100644 --- a/epa-setup.el +++ b/epa-setup.el @@ -1,3 +1,28 @@ +;;; epa-setup.el --- setup routine for the EasyPG Assistant. +;; Copyright (C) 2006,2007,2008 Daiki Ueno + +;; Author: Daiki Ueno +;; Keywords: PGP, GnuPG + +;; This file is part of EasyPG. + +;; This program 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, +;; 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. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Code: + (autoload 'epa-list-keys "epa") (autoload 'epa-dired-mode-hook "epa-dired") diff --git a/epa.el b/epa.el index 8c7305b..5e2a7d6 100644 --- a/epa.el +++ b/epa.el @@ -13,7 +13,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License diff --git a/epg-config.el b/epg-config.el index c5c5a7f..dfbd009 100644 --- a/epg-config.el +++ b/epg-config.el @@ -13,7 +13,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License diff --git a/epg-package-info.el.in b/epg-package-info.el.in index a77410a..1a89b8b 100644 --- a/epg-package-info.el.in +++ b/epg-package-info.el.in @@ -13,7 +13,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License diff --git a/epg.el b/epg.el index ea0d4a1..723c222 100644 --- a/epg.el +++ b/epg.el @@ -15,7 +15,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License diff --git a/pgg-epg.el b/pgg-epg.el index 16fe555..99dbee6 100644 --- a/pgg-epg.el +++ b/pgg-epg.el @@ -15,7 +15,7 @@ ;; This program 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 +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -- 1.7.10.4