X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=opera;a=blobdiff_plain;f=src%2Fmain%2Fopera.lisp;h=173ea488ac4b99d8d2810562003bf31da3dde530;hp=0d70f9f0c5a6a793dcc8a855fac0cc2d20654bf8;hb=d6dc94d9d021b88cbbfe6adcdef7b9c5b7b0c50b;hpb=57382c64deeded63abbc5b1417e69dfd3db07fbf

diff --git a/src/main/opera.lisp b/src/main/opera.lisp
index 0d70f9f..173ea48 100644
--- a/src/main/opera.lisp
+++ b/src/main/opera.lisp
@@ -87,7 +87,8 @@
    ((process-options (remaining-options &optional current-strings)
      (if (not remaining-options)
       (format nil
-       (format nil "~~A~~{~~,,~A~~A~~}" command-width)
+       ; Then 1+ is for the space after the command
+       (format nil "~~A~~{~~%~~,,~A@A~~}" (1+ command-width))
        (car (reverse current-strings))
        (cdr (reverse current-strings)))
       (let*
@@ -186,8 +187,11 @@
 (defun option-present (option-name parsed-options)
  (find option-name parsed-options :key #'car))
 
-(defun option-argument (option-name parsed-options)
- (cadr (assoc option-name parsed-options)))
+(defun option-argument (option-name parsed-options &optional default)
+ (if
+  (option-present option-name parsed-options)
+  (cadr (assoc option-name parsed-options))
+  default))
 
 (defun option-arguments (option-name parsed-options)
  (mapcar #'cadr (remove option-name parsed-options :key #'car :test-not #'eql)))