(Download): Renamed from "Anonymous FTP"; modify for

[elisp/apel.git] / poe-xemacs.el

diff --git a/poe-xemacs.el b/poe-xemacs.el
index 5824235..5ebf94f 100644 (file)
--- a/poe-xemacs.el
+++ b/poe-xemacs.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -81,13 +81,14 @@ When called interactively, prompt for the name of the color to use."
 ;;; @ timer
 ;;;
 
+(condition-case nil
+    (require 'timer-funcs)
+  (error nil))
+(condition-case nil
+    (require 'timer)
+  (error nil))
 (or
- (condition-case nil
-     (require 'timer-funcs)
-   (error nil))
- (condition-case nil
-     (require 'timer)
-   (error nil))
+ (or (featurep 'timer-funcs) (featurep 'timer))
  (progn
    (require 'itimer)
    (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))