Fix 2009-02-20 change to startup.el (Bug#5519).

* startup.el (command-line-1): Convert options beginning with a single dash as well (Bug#5519).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e177ccd84f6c7b003a060770ab20b53b7768cfc9..b6627e69ccc80e18f7db4606183ef6b1bc2619b2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * startup.el (command-line-1): Convert options beginning with a
+       single dash as well (Bug#5519).
+
 2010-02-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Make `initials' completion work for /hh -> /home/horn again (bug#5524).

diff --git a/lisp/startup.el b/lisp/startup.el
index 857ad97e448dc1bb1509592073f435940a0bdb22..129eb2e609354f73860a6d2ad887a12a2d2ba605 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2103,7 +2103,7 @@ A fancy display is used on graphic displays, normal otherwise."
              (when (string-match "\\`\\(--[^=]*\\)=" argi)
                (setq argval (substring argi (match-end 0))
                      argi (match-string 1 argi)))
-             (when (string-match "\\`--." orig-argi)
+             (when (string-match "\\`--?[^-]" orig-argi)
                (setq completion (try-completion argi longopts))
                (if (eq completion t)
                    (setq argi (substring argi 1))