X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fpgg.el;h=01c22dd2e95d30dc4164b29aec7d3dd49a15a6b9;hb=55c26cf1a9939dc7b28fcbab35f1d05d56d53242;hp=33bbace71f47a2e5eba4bf80c38dd129a3e99354;hpb=8b5af94e55ef83ee46b42d32d92fa1ce95dcacf5;p=gnus

diff --git a/lisp/pgg.el b/lisp/pgg.el
index 33bbace71..01c22dd2e 100644
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -1,12 +1,12 @@
 ;;; pgg.el --- glue for the various PGP implementations.
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2000, 2002-2012 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
 ;; Created: 1999/10/28
 ;; Keywords: PGP
+;; Obsolete-since: 24.1
 
 ;; This file is part of GNU Emacs.
 
@@ -23,8 +23,6 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; Commentary:
-
 ;;; Code:
 
 (require 'pgg-def)
@@ -33,6 +31,7 @@
 
 ;; Don't merge these two `eval-when-compile's.
 (eval-when-compile
+  ;; For Emacs <22.2 and XEmacs.
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
   (require 'cl))
 
@@ -40,10 +39,8 @@
 ;;;
 
 (eval-when-compile
-  ;; Define it as a null macro for Emacs in order to suppress a byte
-  ;; compile warning that Emacs 21 issues.
-  (defmacro pgg-run-at-time-1 (time repeat function args)
-    (when (featurep 'xemacs)
+  (when (featurep 'xemacs)
+    (defmacro pgg-run-at-time-1 (time repeat function args)
       (if (condition-case nil
 	      (let ((delete-itimer 'delete-itimer)
 		    (itimer-driver-start 'itimer-driver-start)
@@ -72,36 +69,36 @@
 	  `(let ((time ,time))
 	     (apply #'start-itimer "pgg-run-at-time"
 		    ,function (if time (max time 1e-9) 1e-9)
-		    ,repeat nil t ,args)))
-      `(let ((time ,time)
-	     (itimers (list nil)))
-	 (setcar
-	  itimers
-	  (apply #'start-itimer "pgg-run-at-time"
-		 (lambda (itimers repeat function &rest args)
-		   (let ((itimer (car itimers)))
-		     (if repeat
-			 (progn
-			   (set-itimer-function
-			    itimer
-			    (lambda (itimer repeat function &rest args)
-			      (set-itimer-restart itimer repeat)
-			      (set-itimer-function itimer function)
-			      (set-itimer-function-arguments itimer args)
-			      (apply function args)))
-			   (set-itimer-function-arguments
-			    itimer
-			    (append (list itimer repeat function) args)))
-		       (set-itimer-function
-			itimer
-			(lambda (itimer function &rest args)
-			  (delete-itimer itimer)
-			  (apply function args)))
-		       (set-itimer-function-arguments
-			itimer
-			(append (list itimer function) args)))))
-		 1e-9 (if time (max time 1e-9) 1e-9)
-		 nil t itimers ,repeat ,function ,args))))))
+		    ,repeat nil t ,args))
+	`(let ((time ,time)
+	       (itimers (list nil)))
+	   (setcar
+	    itimers
+	    (apply #'start-itimer "pgg-run-at-time"
+		   (lambda (itimers repeat function &rest args)
+		     (let ((itimer (car itimers)))
+		       (if repeat
+			   (progn
+			     (set-itimer-function
+			      itimer
+			      (lambda (itimer repeat function &rest args)
+				(set-itimer-restart itimer repeat)
+				(set-itimer-function itimer function)
+				(set-itimer-function-arguments itimer args)
+				(apply function args)))
+			     (set-itimer-function-arguments
+			      itimer
+			      (append (list itimer repeat function) args)))
+			 (set-itimer-function
+			  itimer
+			  (lambda (itimer function &rest args)
+			    (delete-itimer itimer)
+			    (apply function args)))
+			 (set-itimer-function-arguments
+			  itimer
+			  (append (list itimer function) args)))))
+		   1e-9 (if time (max time 1e-9) 1e-9)
+		   nil t itimers ,repeat ,function ,args)))))))
 
 (eval-and-compile
   (if (featurep 'xemacs)
@@ -177,7 +174,7 @@ is true, or else the output buffer is displayed."
 (defvar pgg-pending-timers (make-vector 7 0)
   "Hash table for managing scheduled pgg cache management timers.
 
-We associate key and timer, so the timer can be cancelled if a new
+We associate key and timer, so the timer can be canceled if a new
 timeout for the key is set while an old one is still pending.")
 
 (defun pgg-read-passphrase (prompt &optional key notruncate)
@@ -470,8 +467,8 @@ signer's public key from `pgg-default-keyserver-address'."
 	  (if (null signature) nil
 	    (with-temp-buffer
 	      (buffer-disable-undo)
-	      (if (fboundp 'set-buffer-multibyte)
-		  (set-buffer-multibyte nil))
+	      (unless (featurep 'xemacs)
+		(set-buffer-multibyte nil))
 	      (insert-file-contents signature)
 	      (cdr (assq 2 (pgg-decode-armor-region
 			    (point-min)(point-max)))))))
@@ -597,5 +594,4 @@ within the region."
 
 (provide 'pgg)
 
-;; arch-tag: 9cc705dd-1e6a-4c90-8dce-c3561f9a2cf4
 ;;; pgg.el ends here