projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2012 to FSF copyright years for Emacs files.
[gnus]
/
lisp
/
pgg-parse.el
diff --git
a/lisp/pgg-parse.el
b/lisp/pgg-parse.el
index
11d0c65
..
c7484dd
100644
(file)
--- a/
lisp/pgg-parse.el
+++ b/
lisp/pgg-parse.el
@@
-1,18
+1,19
@@
;;; pgg-parse.el --- OpenPGP packet parsing
;;; pgg-parse.el --- OpenPGP packet parsing
-;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
-;; 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/10/28
;; Keywords: PGP, OpenPGP, GnuPG
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/10/28
;; Keywords: PGP, OpenPGP, GnuPG
+;; Package: pgg
+;; Obsolete-since: 24.1
;; This file is part of GNU Emacs.
;; 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
;; 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+21,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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/>.
;;; Commentary:
;;; Commentary:
@@
-36,7
+35,10
@@
;;; Code:
;;; Code:
-(eval-when-compile (require 'cl))
+(eval-when-compile
+ ;; For Emacs <22.2 and XEmacs.
+ (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
+ (require 'cl))
(defgroup pgg-parse ()
"OpenPGP packet parsing."
(defgroup pgg-parse ()
"OpenPGP packet parsing."
@@
-51,7
+53,7
@@
(defcustom pgg-parse-symmetric-key-algorithm-alist
'((1 . IDEA) (2 . 3DES) (4 . CAST5) (5 . SAFER-SK128))
(defcustom pgg-parse-symmetric-key-algorithm-alist
'((1 . IDEA) (2 . 3DES) (4 . CAST5) (5 . SAFER-SK128))
- "Alist of the assigned number to the s
i
mmetric key algorithm."
+ "Alist of the assigned number to the s
y
mmetric key algorithm."
:group 'pgg-parse
:type '(repeat
(cons (sexp :tag "Number") (sexp :tag "Type"))))
:group 'pgg-parse
:type '(repeat
(cons (sexp :tag "Number") (sexp :tag "Type"))))
@@
-178,6
+180,8
@@
(repeat))))
(repeat)))))
(repeat))))
(repeat)))))
+ (defvar pgg-parse-crc24)
+
(defun pgg-parse-crc24-string (string)
(let ((h (vector nil 183 1230 nil nil nil nil nil nil)))
(ccl-execute-on-string pgg-parse-crc24 h string)
(defun pgg-parse-crc24-string (string)
(let ((h (vector nil 183 1230 nil nil nil nil nil nil)))
(ccl-execute-on-string pgg-parse-crc24 h string)
@@
-463,6
+467,10
@@
pgg-parse-public-key-algorithm-alist)))
result))
pgg-parse-public-key-algorithm-alist)))
result))
+;; p-d-p only calls this if it is defined, but the compiler does not
+;; recognize that.
+(declare-function pgg-parse-crc24-string "pgg-parse" (string))
+
(defun pgg-decode-packets ()
(if (re-search-forward "^=\\([A-Za-z0-9+/]\\{4\\}\\)$" nil t)
(let ((p (match-beginning 0))
(defun pgg-decode-packets ()
(if (re-search-forward "^=\\([A-Za-z0-9+/]\\{4\\}\\)$" nil t)
(let ((p (match-beginning 0))
@@
-497,8
+505,8
@@
(defun pgg-parse-armor (string)
(with-temp-buffer
(buffer-disable-undo)
(defun pgg-parse-armor (string)
(with-temp-buffer
(buffer-disable-undo)
- (
if (fboundp 'set-buffer-multibyte
)
-
(set-buffer-multibyte nil))
+ (
unless (featurep 'xemacs
)
+ (set-buffer-multibyte nil))
(insert string)
(pgg-decode-armor-region (point-min)(point))))
(insert string)
(pgg-decode-armor-region (point-min)(point))))
@@
-512,5
+520,4
@@
(provide 'pgg-parse)
(provide 'pgg-parse)
-;;; arch-tag: 16c2eb82-1313-4a7c-a70f-420709b5b43e
;;; pgg-parse.el ends here
;;; pgg-parse.el ends here