[Emacs-diffs] emacs/lisp ChangeLog startup.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/02/20 14:24:57

Modified files:
        lisp           : ChangeLog startup.el 

Log message:
        (command-line): Don't match an empty argument as an
        option.
        (command-line-1): Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15370&r2=1.15371
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.526&r2=1.527

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15370
retrieving revision 1.15371
diff -u -b -r1.15370 -r1.15371
--- ChangeLog   20 Feb 2009 12:36:54 -0000      1.15370
+++ ChangeLog   20 Feb 2009 14:24:55 -0000      1.15371
@@ -1,3 +1,9 @@
+2009-02-20  Andreas Schwab  <address@hidden>
+
+       * startup.el (command-line): Don't match an empty argument as an
+       option.
+       (command-line-1): Likewise.
+
 2009-02-20  Daniel Jensen  <address@hidden>  (tiny change)
 
        * apropos.el (apropos-library): Check for null filename in load-history.

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -b -r1.526 -r1.527
--- startup.el  5 Jan 2009 03:19:46 -0000       1.526
+++ startup.el  20 Feb 2009 14:24:57 -0000      1.527
@@ -828,10 +828,10 @@
              (orig-argi argi)
              argval)
        ;; Handle --OPTION=VALUE format.
-       (when (string-match "^\\(--[^=]*\\)=" argi)
+       (when (string-match "\\`\\(--[^=]*\\)=" argi)
          (setq argval (substring argi (match-end 0))
                 argi (match-string 1 argi)))
-       (unless (equal argi "--")
+       (when (string-match "\\`--." orig-argi)
          (let ((completion (try-completion argi longopts)))
            (if (eq completion t)
                (setq argi (substring argi 1))
@@ -2125,12 +2125,11 @@
                (setq argi "")
              ;; Convert long options to ordinary options
              ;; and separate out an attached option argument into argval.
-             (when (string-match "^\\(--[^=]*\\)=" argi)
+             (when (string-match "\\`\\(--[^=]*\\)=" argi)
                (setq argval (substring argi (match-end 0))
                      argi (match-string 1 argi)))
-             (if (equal argi "--")
-                 (setq completion nil)
-               (setq completion (try-completion argi longopts)))
+             (when (string-match "\\`--." orig-argi)
+               (setq completion (try-completion argi longopts))
              (if (eq completion t)
                  (setq argi (substring argi 1))
                (if (stringp completion)
@@ -2139,7 +2138,7 @@
                          (error "Option `%s' is ambiguous" argi))
                      (setq argi (substring (car elt) 1)))
                  (setq argval nil
-                       argi orig-argi))))
+                         argi orig-argi)))))
 
            ;; Execute the option.
            (cond ((setq tem (assoc argi command-switch-alist))