# HG changeset patch # User Glenn Morris # Date 1212806650 0 # Node ID eebbd7f329379990f73df7b711c49181b3d2bdb0 # Parent 470520f9b59675c98904ef65e47d548ff8e0ed34 Remove unnecessary eval-when-compiles and eval-and-compiles. diff -r 470520f9b596 -r eebbd7f32937 lisp/ediff-merg.el --- a/lisp/ediff-merg.el Sat Jun 07 02:42:43 2008 +0000 +++ b/lisp/ediff-merg.el Sat Jun 07 02:44:10 2008 +0000 @@ -352,7 +352,7 @@ (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 -r 470520f9b596 -r eebbd7f32937 lisp/strokes.el --- a/lisp/strokes.el Sat Jun 07 02:42:43 2008 +0000 +++ b/lisp/strokes.el Sat Jun 07 02:44:10 2008 +0000 @@ -1311,7 +1311,7 @@ ;;;;;###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 -r 470520f9b596 -r eebbd7f32937 lisp/wid-edit.el --- a/lisp/wid-edit.el Sat Jun 07 02:42:43 2008 +0000 +++ b/lisp/wid-edit.el Sat Jun 07 02:44:10 2008 +0000 @@ -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 ;; Maintainer: FSF @@ -3024,7 +3024,7 @@ :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.