; Fix breakage from previous commit

[gnu-emacs] / lisp / epa-dired.el

diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el
index ab0bf7d92a22bd4554554a5b008818f8e83fe2ef..3d39e7d38e7d1d3511905e4a219d21a0b09ae912 100644 (file)
--- a/lisp/epa-dired.el
+++ b/lisp/epa-dired.el
@@ -1,15 +1,16 @@
-;;; epa-dired.el --- the EasyPG Assistant, dired extension
-;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+;;; epa-dired.el --- the EasyPG Assistant, dired extension -*- lexical-binding: t -*-
+;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
+;; Package: epa
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,28 +18,14 @@
 ;; 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.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code:
 
 (require 'epa)
 (require 'dired)
 
-(defvar epa-dired-map
-  (let ((keymap (make-sparse-keymap)))
-    (define-key keymap "d" 'epa-dired-do-decrypt)
-    (define-key keymap "v" 'epa-dired-do-verify)
-    (define-key keymap "s" 'epa-dired-do-sign)
-    (define-key keymap "e" 'epa-dired-do-encrypt)
-    keymap))
-
-(fset 'epa-dired-prefix epa-dired-map)
-
-(defun epa-dired-mode-hook ()
-  (define-key dired-mode-map ":" 'epa-dired-prefix))
-
+;;;###autoload
 (defun epa-dired-do-decrypt ()
   "Decrypt marked files."
   (interactive)
@@ -48,6 +35,7 @@
       (setq file-list (cdr file-list)))
     (revert-buffer)))
 
+;;;###autoload
 (defun epa-dired-do-verify ()
   "Verify marked files."
   (interactive)
@@ -56,6 +44,7 @@
       (epa-verify-file (expand-file-name (car file-list)))
       (setq file-list (cdr file-list)))))
 
+;;;###autoload
 (defun epa-dired-do-sign ()
   "Sign marked files."
   (interactive)
@@ -70,6 +59,7 @@ If no one is selected, default secret key is used.  "
       (setq file-list (cdr file-list)))
     (revert-buffer)))
 
+;;;###autoload
 (defun epa-dired-do-encrypt ()
   "Encrypt marked files."
   (interactive)
@@ -77,20 +67,11 @@ If no one is selected, default secret key is used.  "
     (while file-list
       (epa-encrypt-file
        (expand-file-name (car file-list))
-       (epa-select-keys (epg-make-context) "Select recipents for encryption.
+       (epa-select-keys (epg-make-context) "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "))
       (setq file-list (cdr file-list)))
     (revert-buffer)))
 
-;;;###autoload
-(define-minor-mode epa-dired-mode
-  "Minor mode to hook EasyPG into Dired."
-  :global t :init-value nil :group 'epa-dired :version "23.1"
-  (remove-hook 'dired-mode-hook 'epa-dired-mode-hook)
-  (if epa-dired-mode
-      (add-hook 'dired-mode-hook 'epa-dired-mode-hook)))
-
 (provide 'epa-dired)
 
-;; arch-tag: 2025700b-48d0-4684-bc94-228ad1f8e9ff
 ;;; epa-dired.el ends here