Revert some changes.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index c9e7e8b..da72e83 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,7 +1,6 @@
 2000-11-30 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-       * gpg.el: Use itimer if xemacs.
-       (gpg-make-temp-file): Use expand-file-name.
+       * gpg.el: (gpg-make-temp-file): Use expand-file-name.
        (gpg-point-at-eol): New function.
        (gpg-call-process): Use it.
        (gpg-key-list-keys-parse-line): Ditto.

diff --git a/contrib/gpg.el b/contrib/gpg.el
index a66f036..09e1d59 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -7,7 +7,7 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 
-;; $Id: gpg.el,v 1.3 2000/11/22 22:55:47 zsh Exp $
+;; $Id: gpg.el,v 1.4 2000/12/01 04:01:39 zsh Exp $
 
 ;; This file is NOT (yet?) part of GNU Emacs.
 
@@ -108,10 +108,8 @@
 \f
 ;;;; Code:
 
+(require 'timer)
 (eval-when-compile 
-  (if (featurep 'xemacs)
-      (require 'itimer)
-    (require 'timer))
   (require 'cl))
 
 (defalias 'gpg-point-at-eol