bug#1027: 23.0.60; pcomplete/rpm does not complete "rpm -qip filepath"

[Jens Petersen]

Hi,

In eshell, pcomplete/rpm does not handle the -p (file) option well currently:

eg "rpm -q -p filepath..." completes but not "rpm -qp filepath...".

Here is an improvement which at least checks the first argument for a -p 
option, so that "rpm -qp", "rpm --qp --changelog", etc all file complete rather 
than querying the rpm database.  I think this is good enough for now, though 
strictly all args should be checked for a -p option.

Jens


2008-09-26  Jens Petersen  <petersen@redhat.com>

        * pcmpl-rpm.el (pcomplete/rpm): Make "rpm -qp" use file completion.


Index: lisp/pcmpl-rpm.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/pcmpl-rpm.el,v
retrieving revision 1.13
diff -u -r1.13 pcmpl-rpm.el
--- lisp/pcmpl-rpm.el   6 May 2008 07:57:45 -0000       1.13
+++ lisp/pcmpl-rpm.el   26 Sep 2008 00:22:31 -0000
@@ -135,7 +135,9 @@
                 (pcmpl-rpm-all-query "--requires")))))
          (if (pcomplete-match "^-" 0)
              (pcomplete-opt "af.p(pcmpl-rpm-files)ilsdcvR")
-           (pcomplete-here (pcmpl-rpm-packages)))))
+           (if (pcomplete-test "-[^-]*p" 'first 1)
+               (pcomplete-here (pcmpl-rpm-files))      
+             (pcomplete-here (pcmpl-rpm-packages))))))
        ((pcomplete-test "--pipe")
        (pcomplete-here* (funcall pcomplete-command-completion-function)))
        ((pcomplete-test "--rmsource")