aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2010-02-04 23:49:36 -0500
committerChong Yidong2010-02-04 23:49:36 -0500
commitce3a988d18429158cda0f146042e974de0a14fd8 (patch)
treead440cf8e920f44c4f5c0929cb9813d2f72fb4ff /lisp
parent51b23c448632f4947fb0e364b8f7d35b90c04e39 (diff)
downloademacs-ce3a988d18429158cda0f146042e974de0a14fd8.tar.gz
emacs-ce3a988d18429158cda0f146042e974de0a14fd8.zip
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).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e177ccd84f6..b6627e69ccc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-02-05 Chong Yidong <cyd@stupidchicken.com>
2
3 * startup.el (command-line-1): Convert options beginning with a
4 single dash as well (Bug#5519).
5
12010-02-05 Stefan Monnier <monnier@iro.umontreal.ca> 62010-02-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 Make `initials' completion work for /hh -> /home/horn again (bug#5524). 8 Make `initials' completion work for /hh -> /home/horn again (bug#5524).
diff --git a/lisp/startup.el b/lisp/startup.el
index 857ad97e448..129eb2e6093 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2103,7 +2103,7 @@ A fancy display is used on graphic displays, normal otherwise."
2103 (when (string-match "\\`\\(--[^=]*\\)=" argi) 2103 (when (string-match "\\`\\(--[^=]*\\)=" argi)
2104 (setq argval (substring argi (match-end 0)) 2104 (setq argval (substring argi (match-end 0))
2105 argi (match-string 1 argi))) 2105 argi (match-string 1 argi)))
2106 (when (string-match "\\`--." orig-argi) 2106 (when (string-match "\\`--?[^-]" orig-argi)
2107 (setq completion (try-completion argi longopts)) 2107 (setq completion (try-completion argi longopts))
2108 (if (eq completion t) 2108 (if (eq completion t)
2109 (setq argi (substring argi 1)) 2109 (setq argi (substring argi 1))