Merge from emacs--devo--0

[gnus] / lisp / pgg-def.el

diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index 058dca4..f293740 100644 (file)
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -1,7 +1,7 @@
 ;;; pgg-def.el --- functions/macros for defining PGG functions
 
 ;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
@@ -9,10 +9,10 @@
 
 ;; 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 2, 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
@@ -20,9 +20,7 @@
 ;; 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:
 
@@ -71,6 +69,11 @@ Whether the passphrase is cached at all is controlled by
   :group 'pgg
   :type 'integer)
 
+(defcustom pgg-passphrase-coding-system nil
+  "Coding system to encode passphrase."
+  :group 'pgg
+  :type 'coding-system)
+
 (defvar pgg-messages-coding-system nil
   "Coding system used when reading from a PGP external process.")
 
@@ -87,9 +90,9 @@ Whether the passphrase is cached at all is controlled by
   "If t, inform the recipient that the input is text.")
 
 (defmacro pgg-truncate-key-identifier (key)
-  `(if (> (length ,key) 8) (substring ,key 8) ,key))
+  `(if (> (length ,key) 8) (substring ,key -8) ,key))
 
 (provide 'pgg-def)
 
-;;; arch-tag: c425f3ab-ed75-4055-bb46-431a418c94b7
+;; arch-tag: c425f3ab-ed75-4055-bb46-431a418c94b7
 ;;; pgg-def.el ends here