[Emacs-diffs] emacs lib-src/ChangeLog lib-src/emacsclient.c l...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/03/10 14:09:26

Modified files:
        lib-src        : ChangeLog emacsclient.c 
        lisp           : ChangeLog server.el 

Log message:
        * server.el (server-process-filter): Use expand-file-name rather than
        command-line-normalize-file-name so as to use the `dir' when provided.
        * emacsclient.c (main): Always pass cwd via "-dir".  Pass the file
        names without prepending cwd to them, so Emacs uses its customary
        rules to determine how to interpret the file name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/ChangeLog?cvsroot=emacs&r1=2.521&r2=2.522
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/emacsclient.c?cvsroot=emacs&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15446&r2=1.15447
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.191&r2=1.192

Patches:
Index: lib-src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lib-src/ChangeLog,v
retrieving revision 2.521
retrieving revision 2.522
diff -u -b -r2.521 -r2.522
--- lib-src/ChangeLog   4 Mar 2009 04:16:39 -0000       2.521
+++ lib-src/ChangeLog   10 Mar 2009 14:08:52 -0000      2.522
@@ -1,3 +1,9 @@
+2009-03-10  Stefan Monnier  <address@hidden>
+
+       * emacsclient.c (main): Always pass cwd via "-dir".  Pass the file
+       names without prepending cwd to them, so Emacs uses its customary
+       rules to determine how to interpret the file name.
+
 2009-03-04  Glenn Morris  <address@hidden>
 
        * movemail.c (main) [MAIL_USE_POP]: Add -r to usage message.

Index: lib-src/emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- lib-src/emacsclient.c       23 Jan 2009 09:08:03 -0000      1.154
+++ lib-src/emacsclient.c       10 Mar 2009 14:08:53 -0000      1.155
@@ -1566,11 +1566,11 @@
           quote_argument (emacs_socket, environ[i]);
           send_to_emacs (emacs_socket, " ");
         }
+    }
       send_to_emacs (emacs_socket, "-dir ");
       quote_argument (emacs_socket, cwd);
       send_to_emacs (emacs_socket, "/");
       send_to_emacs (emacs_socket, " ");
-    }
 
  retry:
   if (nowait)
@@ -1613,7 +1613,6 @@
     {
       for (i = optind; i < argc; i++)
        {
-          int relative = 0;
 
          if (eval)
             {
@@ -1635,40 +1634,9 @@
                   send_to_emacs (emacs_socket, " ");
                   continue;
                 }
-              else
-                relative = 1;
-            }
-         else if (! file_name_absolute_p (argv[i]))
-#ifndef WINDOWSNT
-           relative = 1;
-#else
-           /* Call GetFullPathName so filenames of the form X:Y, where X is
-              a valid drive designator, are interpreted as drive:path, not
-              file:stream, and treated as absolute.
-              The user can still pass a file:stream if desired (for example,
-              .\X:Y), but it is not very useful, as Emacs currently does a
-              very bad job of dealing with NTFS streams. */
-           {
-             char *filename = (char *) xmalloc (MAX_PATH);
-             DWORD size;
-
-             size = GetFullPathName (argv[i], MAX_PATH, filename, NULL);
-             if (size > 0 && size < MAX_PATH)
-               argv[i] = filename;
-             else
-               {
-                 relative = 1;
-                 free (filename);
-               }
            }
-#endif
 
           send_to_emacs (emacs_socket, "-file ");
-          if (relative)
-            {
-              quote_argument (emacs_socket, cwd);
-              send_to_emacs (emacs_socket, "/");
-            }
           quote_argument (emacs_socket, argv[i]);
           send_to_emacs (emacs_socket, " ");
         }

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15446
retrieving revision 1.15447
diff -u -b -r1.15446 -r1.15447
--- lisp/ChangeLog      10 Mar 2009 13:33:23 -0000      1.15446
+++ lisp/ChangeLog      10 Mar 2009 14:09:23 -0000      1.15447
@@ -1,5 +1,8 @@
 2009-03-10  Stefan Monnier  <address@hidden>
 
+       * server.el (server-process-filter): Use expand-file-name rather than
+       command-line-normalize-file-name so as to use the `dir' when provided.
+
        * doc-view.el (doc-view-convert-current-doc): Fix last change.
 
 2009-03-10  Glenn Morris  <address@hidden>

Index: lisp/server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- lisp/server.el      23 Feb 2009 05:06:37 -0000      1.191
+++ lisp/server.el      10 Mar 2009 14:09:26 -0000      1.192
@@ -962,7 +962,7 @@
                  (let ((file (pop command-line-args-left)))
                    (if coding-system
                        (setq file (decode-coding-string file coding-system)))
-                   (setq file (command-line-normalize-file-name file))
+                    (setq file (expand-file-name file dir))
                    (push (cons file filepos) files)
                    (server-log (format "New file: %s %s"
                                         file (or filepos "")) proc))