Merge from mainline.

[gnu-emacs] / lisp / pcmpl-rpm.el

diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index c1bfbe6e9170380844cbb420a5529ee769a013f0..754d7ce7434c73fe66e042463ed561aa5e670788 100644 (file)
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -1,7 +1,7 @@
 ;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -20,18 +20,12 @@
 
 ;;; Commentary:
 
-;; These functions provide completion rules for RedHat's `rpm' tool.
+;; These functions provide completion rules for the `rpm' command.
 
 ;;; Code:
 
-(provide 'pcmpl-rpm)
-
 (require 'pcomplete)
 
-(defgroup pcmpl-rpm nil
-  "Functions for dealing with CVS completions."
-  :group 'pcomplete)
-
 ;; Functions:
 
 (defsubst pcmpl-rpm-packages ()
@@ -53,11 +47,8 @@
 
 ;;;###autoload
 (defun pcomplete/rpm ()
-  "Completion for RedHat's `rpm' command.
-These rules were taken from the output of `rpm --help' on a RedHat 6.1
-system.  They follow my interpretation of what followed, but since I'm
-not a major rpm user/builder, please send me any corrections you find.
-You can use \\[eshell-report-bug] to do so."
+  "Completion for the `rpm' command."
+  ;; Originally taken from the output of `rpm --help' on a Red Hat 6.1 system.
   (let (mode)
     (while (<= pcomplete-index pcomplete-last)
       (unless mode
@@ -135,7 +126,9 @@ You can use \\[eshell-report-bug] to do so."
                 (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")
@@ -325,5 +318,7 @@ You can use \\[eshell-report-bug] to do so."
        (t
        (error "You must select a mode: -q, -i, -U, --verify, etc"))))))
 
+(provide 'pcmpl-rpm)
+
 ;; arch-tag: 4e64b490-fecf-430e-b2b9-70a8ad64b8c1
 ;;; pcmpl-rpm.el ends here