4 files changed, 51 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 77673fb41ad..a6c3460f723 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-26  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * Makefile.in (etags, ctags): define EMACS_NAME as "GNU Emacs".
+
+2007-02-20  Ulrich Mueller  <ulm@kph.uni-mainz.de>  (tiny change)
+
+        * Makefile.in (EMACS, EMACSOPT): New variables.
+        (blessmail): Use `--no-site-file' when compiling.
+
 2007-02-05  Francesco Potort,Al(B  <pot@gnu.org>
 
         * etags.c (default_C_help, Cplusplus_help, PHP_help, print_help)
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index bddabd364ad..bef8f1b9c29 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -23,6 +23,10 @@
 # inherited from the environment.
 SHELL = /bin/sh
 
+# Following ../lisp/Makefile.in.
+EMACS = ../src/emacs
+EMACSOPT = -batch --no-site-file --multibyte
+
 # ==================== Things `configure' will edit ====================
 
 CC=@CC@
@@ -279,7 +283,7 @@ vcdiff: $(srcdir)/vcdiff
 
 #ifdef MOVEMAIL_NEEDS_BLESSING
 blessmail:
-        ../src/emacs -batch -l $(srcdir)/../lisp/mail/blessmail.el
+        $(EMACS) $(EMACSOPT) -l $(srcdir)/../lisp/mail/blessmail.el
         chmod +x blessmail
 #endif
 
@@ -409,7 +413,7 @@ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
         ${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
 
 etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h
-        $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
+        $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o etags
 
 ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
         $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse
@@ -417,7 +421,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h
 /* We depend on etags to assure that parallel makes don\'t write two
    etags.o files on top of each other.  */
 ctags${EXEEXT}: etags${EXEEXT}
-        $(CC) ${ALL_CFLAGS} -DCTAGS -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
+        $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs"\" -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) $(REGEXPOBJ) $(LOADLIBES) -o ctags
 
 profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index b557e5c7236..ea1e6cd7af8 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -484,13 +484,45 @@ file_name_absolute_p (filename)
   if (filename[0] == '\0') return FALSE;
 
 #ifdef WINDOWSNT
-  /* X:\xxx is always absolute; X:xxx is an error and will fail.  */
+  /* X:\xxx is always absolute.  */
   if (isalpha (filename[0])
       && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
     return TRUE;
 
   /* Both \xxx and \\xxx\yyy are absolute.  */
   if (filename[0] == '\\') return TRUE;
+
+  /*
+    FIXME:  There's a corner case not dealt with, "x:y", where:
+
+    1) x is a valid drive designation (usually a letter in the A-Z range)
+       and y is a path, relative to the current directory on drive x.  This
+       is absolute, *after* fixing the y part to include the current
+       directory in x.
+
+    2) x is a relative file name, and y is an NTFS stream name.  This is a
+       correct relative path, but it is very unusual.
+
+    The trouble is that first case items are also valid examples of the
+    second case, i.e., "c:test" can be understood as drive:path or as
+    file:stream.
+
+    The "right" fix would involve checking whether
+    - the current drive/partition is NTFS,
+    - x is a valid (and accesible) drive designator,
+    - x:y already exists as a file:stream in the current directory,
+    - y already exists on the current directory of drive x,
+    - the auspices are favorable,
+    and then taking an "informed decision" based on the above.
+
+    Whatever the result, Emacs currently does a very bad job of dealing
+    with NTFS file:streams: it cannot visit them, and the only way to
+    create one is by setting `buffer-file-name' to point to it (either
+    manually or with emacsclient). So perhaps resorting to 1) and ignoring
+    2) for now is the right thing to do.
+
+    Anyway, something to decide After the Release.
+  */
 #endif
 
   return FALSE;
@@ -884,7 +916,7 @@ w32_give_focus ()
 {
   HMODULE hUser32;
 
-  /* It should'nt happen when dealing with TCP sockets.  */
+  /* It shouldn't happen when dealing with TCP sockets.  */
   if (!emacs_pid) return;
 
   if (!(hUser32 = LoadLibrary ("user32.dll"))) return;
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 0a3045b477d..37ad6c9136d 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION         = 22.0.93
+VERSION         = 22.0.94
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \