[Emacs-diffs] /srv/bzr/emacs/trunk r102080: * emacs.c (argmatch): Don't treat "--" as "--chdir".

[Chong Yidong]

------------------------------------------------------------
revno: 102080
author: Jim Meyering <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-24 12:00:57 -0400
message:
  * emacs.c (argmatch): Don't treat "--" as "--chdir".
modified:
  src/ChangeLog
  src/emacs.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-24 02:22:43 +0000
+++ b/src/ChangeLog     2010-10-24 16:00:57 +0000
@@ -1,3 +1,7 @@
+2010-10-24  Jim Meyering  <address@hidden>
+
+       * emacs.c (argmatch): Don't treat "--" as "--chdir".
+
 2010-10-24  Glenn Morris  <address@hidden>
 
        * w16select.c (syms_of_win16select) <selection-coding-system>:

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2010-10-13 14:50:06 +0000
+++ b/src/emacs.c       2010-10-24 16:00:57 +0000
@@ -829,13 +829,14 @@
       printf ("see the file named COPYING.\n");
       exit (0);
     }
-  if (argmatch (argv, argc, "-chdir", "--chdir", 2, &ch_to_dir, &skip_args))
-      if (chdir (ch_to_dir) == -1)
-        {
-          fprintf (stderr, "%s: Can't chdir to %s: %s\n",
-                   argv[0], ch_to_dir, strerror (errno));
-          exit (1);
-        }
+
+  if (argmatch (argv, argc, "-chdir", "--chdir", 4, &ch_to_dir, &skip_args))
+    if (chdir (ch_to_dir) == -1)
+      {
+       fprintf (stderr, "%s: Can't chdir to %s: %s\n",
+                argv[0], ch_to_dir, strerror (errno));
+       exit (1);
+      }
 
 
 #ifdef HAVE_PERSONALITY_LINUX32