From: Glenn Morris <rgm@gnu.org>
Date: Sat, 7 Jun 2008 02:44:10 +0000 (+0000)
Subject: Remove unnecessary eval-when-compiles and eval-and-compiles.
X-Git-Tag: emacs-pretest-23.0.90~5038
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=937382fab3afce657a047818a1ba49ec7d5eb732;p=emacs.git

Remove unnecessary eval-when-compiles and eval-and-compiles.
---

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 88674d1a858..0a847772d3b 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -352,7 +352,7 @@ Combining is done according to the specifications in variable
 	(reverse delim-regs-list)
 	)))
 
-(eval-when-compile (defvar state-of-merge)) ; dynamic var
+(defvar state-of-merge)			; dynamic var
 
 ;; Check if the non-preferred merge has been modified since originally set.
 ;; This affects only the regions that are marked as default-A/B or combined.
diff --git a/lisp/strokes.el b/lisp/strokes.el
index a32efbf07c5..7d20298218c 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1311,7 +1311,7 @@ the stroke as a character in some language."
 ;;;;;###autoload
 ;;(defalias 'edit-strokes 'strokes-edit-strokes)
 
-(eval-when-compile (defvar view-mode-map))
+(defvar view-mode-map)
 
 ;;;###autoload
 (defun strokes-list-strokes (&optional chronological strokes-map)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index d8b6887e699..be024393a74 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1,7 +1,7 @@
 ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*-
 ;;
-;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008  Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
@@ -3024,7 +3024,7 @@ as the value."
   :complete-function 'ispell-complete-word
   :prompt-history 'widget-string-prompt-value-history)
 
-(eval-when-compile (defvar widget))
+(defvar widget)
 
 (defun widget-string-complete ()
   "Complete contents of string field.