From 4986c2c6c8b786409fb44f740b2e358736145313 Mon Sep 17 00:00:00 2001
From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Sat, 17 Mar 2001 18:59:39 +0000
Subject: 2001-03-17  Michael Kifer  <kifer@cs.sunysb.edu>

	* ediff-util.el: Copyright years.
	(ediff-choose-syntax-table): New function.
	(ediff-setup): Use ediff-choose-syntax-table.

	* ediff-init.el (ediff-with-syntax-table): New macro, uses
	with-syntax-table.

	* ediff.el: Date of last update, copyright years.

	* ediff-wind (ediff-setup-control-frame): Nill->nil.

	* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
	of Scott Bronson.
	(ex-cmd-assoc,ex-cmd-one-letr): New functions.
	(viper-check-sub,viper-get-ex-command,viper-execute-ex-command):
	Deleted functions.
	(viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new
	ex-token-list.

	* viper-util.el: Spaces, indentation.

	* viper.el: Changed version, modification time.
---
 lisp/ediff-wind.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/ediff-wind.el')

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 46d56595511..d987cecbe16 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -905,7 +905,7 @@ into icons, regardless of the window manager."
 			(make-frame ediff-control-frame-parameters))
 	    ediff-control-frame ctl-frame)
       ;; protect against undefined face-attribute
-      (condition-case nill
+      (condition-case nil
 	  (when (and ediff-emacs-p (face-attribute 'mode-line :box))
 	    (set-face-attribute 'mode-line ctl-frame :box nil))
 	(error))
-- 
cgit v1.2.1