projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shr: Render td content with shr-descend
[gnus]
/
lisp
/
pgg-parse.el
diff --git
a/lisp/pgg-parse.el
b/lisp/pgg-parse.el
index
813b111
..
72f8729
100644
(file)
--- a/
lisp/pgg-parse.el
+++ b/
lisp/pgg-parse.el
@@
-1,18
+1,19
@@
;;; pgg-parse.el --- OpenPGP packet parsing
;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
;;; pgg-parse.el --- OpenPGP packet parsing
;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2006, 2007, 2008
, 2009, 2010
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
;; 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:
@@
-37,6
+36,7
@@
;;; Code:
(eval-when-compile
;;; Code:
(eval-when-compile
+ ;; For Emacs <22.2 and XEmacs.
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
(require 'cl))
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
(require 'cl))
@@
-505,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))))
@@
-520,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