[Emacs-diffs] Changes to emacs/lisp/pgg.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/12/16 04:31:33

Index: lisp/pgg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/pgg.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lisp/pgg.el 9 Dec 2007 22:14:32 -0000       1.10
+++ lisp/pgg.el 16 Dec 2007 04:31:33 -0000      1.11
@@ -42,12 +42,10 @@
 ;;;
 
 (eval-when-compile
-  (unless (featurep 'xemacs)
-    (defalias 'pgg-run-at-time 'run-at-time)
-    (defalias 'pgg-cancel-timer 'cancel-timer))
-
-  (when (featurep 'xemacs)
+  ;; 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)
       (if (condition-case nil
              (let ((delete-itimer 'delete-itimer)
                    (itimer-driver-start 'itimer-driver-start)
@@ -105,8 +103,11 @@
                        itimer
                        (append (list itimer function) args)))))
                 1e-9 (if time (max time 1e-9) 1e-9)
-                nil t itimers ,repeat ,function ,args))))
+                nil t itimers ,repeat ,function ,args))))))
 
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (progn
     (defun pgg-run-at-time (time repeat function &rest args)
       "Emulating function run as `run-at-time'.
 TIME should be nil meaning now, or a number of seconds from now.
@@ -116,8 +117,9 @@
     (defun pgg-cancel-timer (timer)
       "Emulate cancel-timer for xemacs."
       (let ((delete-itimer 'delete-itimer))
-        (funcall delete-itimer timer)))
-    ))
+           (funcall delete-itimer timer))))
+    (defalias 'pgg-run-at-time 'run-at-time)
+    (defalias 'pgg-cancel-timer 'cancel-timer)))
 
 (defun pgg-invoke (func scheme &rest args)
   (progn