From 07da87e9ab7240c80568cb61fb2963c3ed538399 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 7 Jun 2008 02:35:02 +0000
Subject: [PATCH] Remove unnecessary eval-when-compiles.

---
 lisp/erc/ChangeLog       | 5 +++++
 lisp/erc/erc-autoaway.el | 5 +++--
 lisp/erc/erc-ibuffer.el  | 6 +++---
 lisp/erc/erc-menu.el     | 7 +++----
 lisp/erc/erc-stamp.el    | 6 +++---
 lisp/erc/erc.el          | 5 ++---
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 13ad7cd6fd4..de99c8ad3b3 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-07  Glenn Morris  <rgm@gnu.org>
+
+	* erc/erc-autoaway.el, erc/erc-ibuffer.el, erc/erc-menu.el:
+	* erc/erc-stamp.el, erc/erc.el: Remove unnecessary eval-when-compiles.
+
 2008-05-05  Juanma Barranquero  <lekktu@gmail.com>
 
 	* erc-goodies.el (erc-noncommands-list, noncommands)
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index 1f2e30cb9f5..ff91a90c4cb 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -1,6 +1,7 @@
 ;;; erc-autoaway.el --- Provides autoaway for ERC
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
@@ -45,7 +46,7 @@ This is only used when `erc-autoaway-idle-method' is set to 'emacs.")
   "Indicates whether this module was responsible for setting the
 user's away status.")
 
-(eval-when-compile (defvar erc-autoaway-idle-seconds))
+(defvar erc-autoaway-idle-seconds)
 
 (defun erc-autoaway-reestablish-idletimer ()
   "Reestablish the Emacs idletimer.
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 98f503791e6..1ec0a0538f4 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -1,6 +1,7 @@
 ;;; erc-ibuffer.el --- ibuffer integration with ERC
 
-;; Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
@@ -70,8 +71,7 @@
 				     erc-session-server)))))
 
 ;; Silence the byte-compiler
-(eval-when-compile
-  (defvar erc-modified-channels-alist))
+(defvar erc-modified-channels-alist)
 
 (define-ibuffer-column erc-modified (:name "M")
   (if (and (boundp 'erc-track-mode)
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index ea65bcdd136..0eb2b995225 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -1,7 +1,7 @@
 ;; erc-menu.el -- Menu-bar definitions for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2005, 2006,
-;;   2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007,
+;;   2008  Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, menu
@@ -129,8 +129,7 @@ ERC menu yet.")
      (message "You might have to restart Emacs to remove the ERC menu"))))
 
 ;; silence byte-compiler warning
-(eval-when-compile
-  (defvar erc-menu nil))
+(defvar erc-menu)
 
 (defun erc-menu-add ()
   "Add the ERC menu to the current buffer."
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index e7b53c53c84..1e10a668efb 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,6 +1,7 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
 
-;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008
+;;   Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, timestamp
@@ -263,8 +264,7 @@ property to get to the POSth column."
   (insert string))
 
 ;; Silence byte-compiler
-(eval-when-compile
-  (defvar erc-fill-column))
+(defvar erc-fill-column)
 
 (defun erc-insert-timestamp-right (string)
   "Insert timestamp on the right side of the screen.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 9750447c2ef..245fdf456a0 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3367,9 +3367,8 @@ the message given by REASON."
   t)
 (put 'erc-cmd-SERVER 'process-not-needed t)
 
-(eval-when-compile
-  (defvar motif-version-string)
-  (defvar gtk-version-string))
+(defvar motif-version-string)
+(defvar gtk-version-string)
 
 (defun erc-cmd-SV ()
   "Say the current ERC and Emacs version into channel."