Possible bug in resolving "~" folder

Possible bug in resolving "~" folder

[Dhruva Krishnamurthy]

Hello,
  I am using Emacs 21.3.50 (CVS) on W2K (MSVC 6.0 build).
Scenerio:
- Open a file (as in my case:"~/bin/cinclude.pl")
- Do a Save As (to "~/bin/cinclude1_0.pl")
- A call to (vc-mcvs-registered "~/bin/cinclude1_0.pl") is made
- In the "while" loop, a call to (file-name-directory "~") [progressively
going to top dir]
- The above call returns "nil". IMHO, it should have called
"expand-file-name" internally inside "file-name-directory" or should
handle 'nil' and return 'nil' instead of throwing error.

A fix which solved my problem was: in loaddefs.el @23991, call
expand-file-name
(defun vc-mcvs-registered (file)
  (let ((dir file))
    (while (and (stringp dir)
 		(not (equal dir (setq dir (file-name-directory (expand-file-name dir)))))) ;; Modified here
      (setq dir (if (file-directory-p
 		     (expand-file-name "MCVS/CVS" dir))
 		    t (directory-file-name dir))))
    (if (eq dir t)
 	(progn
 	  (load "vc-mcvs")
 	  (vc-mcvs-registered file)))))
-- 
Dhruva Krishnamurthy
Home: http://www32.brinkster.com/schemer/

Re: Possible bug in resolving "~" folder

[Stefan Monnier]

> Hello,
>   I am using Emacs 21.3.50 (CVS) on W2K (MSVC 6.0 build).
> Scenerio:
> - Open a file (as in my case:"~/bin/cinclude.pl")
> - Do a Save As (to "~/bin/cinclude1_0.pl")
> - A call to (vc-mcvs-registered "~/bin/cinclude1_0.pl") is made
> - In the "while" loop, a call to (file-name-directory "~") [progressively
> going to top dir]
> - The above call returns "nil". IMHO, it should have called
> "expand-file-name" internally inside "file-name-directory" or should
> handle 'nil' and return 'nil' instead of throwing error.
> 
> A fix which solved my problem was: in loaddefs.el @23991, call
> expand-file-name
> (defun vc-mcvs-registered (file)
>   (let ((dir file))
>     (while (and (stringp dir)
>  		(not (equal dir (setq dir (file-name-directory (expand-file-name dir)))))) ;; Modified here
>       (setq dir (if (file-directory-p
>  		     (expand-file-name "MCVS/CVS" dir))
>  		    t (directory-file-name dir))))
>     (if (eq dir t)
>  	(progn
>  	  (load "vc-mcvs")
>  	  (vc-mcvs-registered file)))))

It's been fixed a while ago in vc-mcvs.el, but it seems nobody has
refreshed the loaddefs.el file since.  The fix doesn't do the
expand-file-name but checks nil instead because I thought it was
neat that the search stops at ~ rather than going all the way to /.

Could someone commit a refreshed version of loaddefs.el ?
Mine has all kinds of unrelated stuff in it.


	Stefan