[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107784: * lisp/pcmpl-rpm.el (pcomplete/rpm): Handle -qf.

[Glenn Morris]

------------------------------------------------------------
revno: 107784
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-04-07 11:52:43 -0700
message:
  * lisp/pcmpl-rpm.el (pcomplete/rpm): Handle -qf.
  
  Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00165.html
modified:
  lisp/ChangeLog
  lisp/pcmpl-rpm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-07 08:12:04 +0000
+++ b/lisp/ChangeLog    2012-04-07 18:52:43 +0000
@@ -1,3 +1,7 @@
+2012-04-07  Glenn Morris  <address@hidden>
+
+       * pcmpl-rpm.el (pcomplete/rpm): Handle -qf.
+
 2012-04-07  Eli Zaretskii  <address@hidden>
 
        * minibuffer.el (completion-in-region-mode-map): Bind

=== modified file 'lisp/pcmpl-rpm.el'
--- a/lisp/pcmpl-rpm.el 2012-01-19 07:21:25 +0000
+++ b/lisp/pcmpl-rpm.el 2012-04-07 18:52:43 +0000
@@ -1,6 +1,6 @@
 ;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Package: pcomplete
 
@@ -29,6 +29,13 @@
 
 ;; Functions:
 
+;; FIXME rpm -qa can be slow, so:
+;; Adding --nodigest --nosignature is MUCH faster.
+;; (Probably need to test --help for those options though.)
+;; Consider caching the result (cf woman).
+;; Consider printing an explanatory message before running -qa.
+;;
+;; Seems pointless for this to be a defsubst.
 (defsubst pcmpl-rpm-packages ()
   (split-string (pcomplete-process-result "rpm" "-q" "-a")))
 
@@ -92,6 +99,7 @@
               '("--changelog"
                 "--dbpath"
                 "--dump"
+                "--file"
                 "--ftpport"            ;nyi for the next four
                 "--ftpproxy"
                 "--httpport"
@@ -112,6 +120,8 @@
                (pcomplete-here*))
               ((pcomplete-test "--rcfile")
                (pcomplete-here* (pcomplete-entries)))
+              ((pcomplete-test "--file")
+               (pcomplete-here* (pcomplete-entries)))
               ((pcomplete-test "--root")
                (pcomplete-here* (pcomplete-dirs)))
               ((pcomplete-test "--scripts")
@@ -129,7 +139,9 @@
              (pcomplete-opt "af.p(pcmpl-rpm-files)ilsdcvR")
            (if (pcomplete-test "-[^-]*p" 'first 1)
                (pcomplete-here (pcmpl-rpm-files))
-             (pcomplete-here (pcmpl-rpm-packages))))))
+              (if (pcomplete-test "-[^-]*f" 'first 1)
+                  (pcomplete-here* (pcomplete-entries))
+                (pcomplete-here (pcmpl-rpm-packages)))))))
        ((pcomplete-test "--pipe")
        (pcomplete-here* (funcall pcomplete-command-completion-function)))
        ((pcomplete-test "--rmsource")