* view.el (view-recenter): Allow recenter to compute window height

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

diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index 452530ec409ce6c5cba4673b586cd22f72786d47..9335248dcfe599adda9820c3510cd61913de4a97 100644 (file)
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -1,14 +1,14 @@
 ;;; 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.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -31,7 +29,7 @@
 (require 'pcomplete)
 
 (defgroup pcmpl-rpm nil
-  "Functions for dealing with CVS completions."
+  "Functions for dealing with rpm completions."
   :group 'pcomplete)
 
 ;; Functions:
@@ -59,7 +57,7 @@
 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."
+You can use \\[report-emacs-bug] to do so."
   (let (mode)
     (while (<= pcomplete-index pcomplete-last)
       (unless mode
@@ -137,7 +135,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")