mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(command-line): Don't match an empty argument as an

Browse Source 
option.
(command-line-1): Likewise.
This commit is contained in:
Andreas Schwab 2009-02-20 14:24:55 +00:00
parent 867d4bb371
commit 7b704afe99
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2009-02-20 Andreas Schwab <schwab@suse.de>
* startup.el (command-line): Don't match an empty argument as an
option.
(command-line-1): Likewise.
2009-02-20 Daniel Jensen <daniel@bigwalter.net> (tiny change)
* apropos.el (apropos-library): Check for null filename in load-history.

29
lisp/startup.el
View File

@ -828,10 +828,10 @@ opening the first frame (e.g. open a connection to an X server).")
(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,21 +2125,20 @@ A fancy display is used on graphic displays, normal otherwise."
(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)))
(if (eq completion t)
(setq argi (substring argi 1))
(if (stringp completion)
(let ((elt (assoc completion longopts)))
(or elt
(error "Option `%s' is ambiguous" argi))
(setq argi (substring (car elt) 1)))
(setq argval nil
argi orig-argi))))
(when (string-match "\\`--." orig-argi)
(setq completion (try-completion argi longopts))
(if (eq completion t)
(setq argi (substring argi 1))
(if (stringp completion)
(let ((elt (assoc completion longopts)))
(or elt
(error "Option `%s' is ambiguous" argi))
(setq argi (substring (car elt) 1)))
(setq argval nil
argi orig-argi)))))
;; Execute the option.
(cond ((setq tem (assoc argi command-switch-alist))