N:\bin\emacs\gnu-emacs\emacs-20.6\lisp>cvs diff -bwc -r v20-6 -r b20-6-2001-01-02-fns-backupdir
CVS diff: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cygdrive/K/data/version-control/cvsroot/emacs/gnu-emacs/lisp/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -u -IId: -b -w -c -r1.1.1.1 -r1.1.1.1.4.1
CVS diff: conflicting specifications of output style
*** ChangeLog	2000/12/10 19:53:54	1.1.1.1
--- ChangeLog	2001/01/03 02:50:48	1.1.1.1.4.1
***************
*** 1,3 ****
--- 1,12 ----
+ 2001-01-03 Wed  Jari Aalto  <jari.aalto@poboxes.com>
+ 
+ 	* w32-fns.el (and): NT Emacs dies or error if run like this:
+ 	(load-library w32.fns.el) (load-library w32.fns.el), yes,
+ 	to times and the C-x C-f ~/txt/file.txt --> error. The cause was,
+ 	that `make-auto-save-file-name' was taken second time
+ 	(symbol-function 'make-auto-save-file-name) causing circular
+ 	reference. Added extra code to make sure it will never happen.
+ 
  2000-02-26  Gerd Moellmann  <gerd@gnu.org>
  
  	* Version 20.6 released.
Index: w32-fns.el
===================================================================
RCS file: /cygdrive/K/data/version-control/cvsroot/emacs/gnu-emacs/lisp/w32-fns.el,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -u -IId: -b -w -c -r1.1.1.1 -r1.1.1.1.4.1
CVS diff: conflicting specifications of output style
*** w32-fns.el	2000/12/10 19:54:01	1.1.1.1
--- w32-fns.el	2001/01/03 02:50:50	1.1.1.1.4.1
***************
*** 229,236 ****
--- 229,243 ----
  				     (expand-file-name ".." exec-directory)))))
  
  ;; Avoid creating auto-save file names containing invalid characters.
+ ;; the symbol property 'w32-fns flags that we should do this only
+ ;; once. => This file can be "loaded" multiple times. 
+ ;;
+ (if (and (not (get 'make-auto-save-file-name 'w32-fns))
+ 	 (not (fboundp 'original-make-auto-save-file-name)))
+     (progn
        (fset 'original-make-auto-save-file-name
  	    (symbol-function 'make-auto-save-file-name))
+       (put 'make-auto-save-file-name 'w32-fns t)))
  
  (defun make-auto-save-file-name ()
    "Return file name to use for auto-saves of current buffer.
CVS diff: Diffing calendar
CVS diff: Diffing emacs-lisp
CVS diff: Diffing emulation
CVS diff: Diffing gnus
CVS diff: Diffing international
CVS diff: Diffing language
CVS diff: Diffing mail
CVS diff: Diffing play
CVS diff: Diffing progmodes
CVS diff: Diffing term
CVS diff: Diffing textmodes

N:\bin\emacs\gnu-emacs\emacs-20.6\lisp>