From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 19 Jun 2019 13:30:22 +0000 (+0200)
Subject: Fix compilation warning in pcmpl-gnu.el
X-Git-Tag: emacs-27.0.90~2399
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1584d4cd95527956cc639187c7fe185fff9726d8;p=emacs.git

Fix compilation warning in pcmpl-gnu.el

* lisp/pcmpl-gnu.el (pcomplete/tar): Remove binding of
pcomplete-suffix-list, because it's not consulted in any of the
functions called here, and has had no effect since 2011.  If we
want to support not inserting a space after the = sign, we have to
implement that, but it's not currently done.
---

diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index d9caf35577d..391441bd79c 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -158,153 +158,151 @@
   "Completion for the GNU tar utility."
   ;; options that end in an equal sign will want further completion...
   (let (saw-option complete-within)
-    (let ((pcomplete-suffix-list (if (boundp 'pcomplete-suffix-list)
-                                     (cons ?= pcomplete-suffix-list))))
-      (while (pcomplete-match "^-" 0)
-        (setq saw-option t)
-        (if (pcomplete-match "^--" 0)
-            (if (pcomplete-match "^--\\([^= \t\n\f]*\\)\\'" 0)
-                ;; FIXME: Extract this list from "tar --help".
-                (pcomplete-here*
-                 '("--absolute-names"
-                   "--after-date="
-                   "--append"
-                   "--atime-preserve"
-                   "--backup"
-                   "--block-number"
-                   "--blocking-factor="
-                   "--catenate"
-                   "--checkpoint"
-                   "--compare"
-                   "--compress"
-                   "--concatenate"
-                   "--confirmation"
-                   "--create"
-                   "--delete"
-                   "--dereference"
-                   "--diff"
-                   "--directory="
-                   "--exclude="
-                   "--exclude-from="
-                   "--extract"
-                   "--file="
-                   "--files-from="
-                   "--force-local"
-                   "--get"
-                   "--group="
-                   "--gzip"
-                   "--help"
-                   "--ignore-failed-read"
-                   "--ignore-zeros"
-                   "--incremental"
-                   "--info-script="
-                   "--interactive"
-                   "--keep-old-files"
-                   "--label="
-                   "--list"
-                   "--listed-incremental"
-                   "--mode="
-                   "--modification-time"
-                   "--multi-volume"
-                   "--new-volume-script="
-                   "--newer="
-                   "--newer-mtime"
-                   "--no-recursion"
-                   "--null"
-                   "--numeric-owner"
-                   "--old-archive"
-                   "--one-file-system"
-                   "--owner="
-                   "--portability"
-                   "--posix"
-                   "--preserve"
-                   "--preserve-order"
-                   "--preserve-permissions"
-                   "--read-full-records"
-                   "--record-size="
-                   "--recursive-unlink"
-                   "--remove-files"
-                   "--rsh-command="
-                   "--same-order"
-                   "--same-owner"
-                   "--same-permissions"
-                   "--sparse"
-                   "--starting-file="
-                   "--suffix="
-                   "--tape-length="
-                   "--to-stdout"
-                   "--totals"
-                   "--uncompress"
-                   "--ungzip"
-                   "--unlink-first"
-                   "--update"
-                   "--use-compress-program="
-                   "--verbose"
-                   "--verify"
-                   "--version"
-                   "--volno-file=")))
-          (pcomplete-opt "01234567ABCFGKLMNOPRSTUVWXZbcdfghiklmoprstuvwxz"))
-        (cond
-         ((pcomplete-match "\\`-\\'" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--after-date=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--backup=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--blocking-factor=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--directory=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-dirs)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--exclude-from=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-entries)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--exclude=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--\\(extract\\|list\\)\\'" 0)
-          (setq complete-within t))
-         ((pcomplete-match "\\`--file=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-dirs-or-entries pcmpl-gnu-tarfile-regexp)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--files-from=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-entries)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--group=\\(.*\\)" 0)
-          (pcomplete-here* (pcmpl-unix-group-names)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--info-script=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-entries)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--label=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--mode=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--new-volume-script=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-entries)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--newer=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--owner=\\(.*\\)" 0)
-          (pcomplete-here* (pcmpl-unix-user-names)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--record-size=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--rsh-command=\\(.*\\)" 0)
-          (pcomplete-here* (funcall pcomplete-command-completion-function)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--starting-file=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-entries)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--suffix=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--tape-length=" 0)
-          (pcomplete-here*))
-         ((pcomplete-match "\\`--use-compress-program=\\(.*\\)" 0)
-          (pcomplete-here* (funcall pcomplete-command-completion-function)
-                           (pcomplete-match-string 1 0)))
-         ((pcomplete-match "\\`--volno-file=\\(.*\\)" 0)
-          (pcomplete-here* (pcomplete-entries)
-                           (pcomplete-match-string 1 0))))))
+    (while (pcomplete-match "^-" 0)
+      (setq saw-option t)
+      (if (pcomplete-match "^--" 0)
+          (if (pcomplete-match "^--\\([^= \t\n\f]*\\)\\'" 0)
+              ;; FIXME: Extract this list from "tar --help".
+              (pcomplete-here*
+               '("--absolute-names"
+                 "--after-date="
+                 "--append"
+                 "--atime-preserve"
+                 "--backup"
+                 "--block-number"
+                 "--blocking-factor="
+                 "--catenate"
+                 "--checkpoint"
+                 "--compare"
+                 "--compress"
+                 "--concatenate"
+                 "--confirmation"
+                 "--create"
+                 "--delete"
+                 "--dereference"
+                 "--diff"
+                 "--directory="
+                 "--exclude="
+                 "--exclude-from="
+                 "--extract"
+                 "--file="
+                 "--files-from="
+                 "--force-local"
+                 "--get"
+                 "--group="
+                 "--gzip"
+                 "--help"
+                 "--ignore-failed-read"
+                 "--ignore-zeros"
+                 "--incremental"
+                 "--info-script="
+                 "--interactive"
+                 "--keep-old-files"
+                 "--label="
+                 "--list"
+                 "--listed-incremental"
+                 "--mode="
+                 "--modification-time"
+                 "--multi-volume"
+                 "--new-volume-script="
+                 "--newer="
+                 "--newer-mtime"
+                 "--no-recursion"
+                 "--null"
+                 "--numeric-owner"
+                 "--old-archive"
+                 "--one-file-system"
+                 "--owner="
+                 "--portability"
+                 "--posix"
+                 "--preserve"
+                 "--preserve-order"
+                 "--preserve-permissions"
+                 "--read-full-records"
+                 "--record-size="
+                 "--recursive-unlink"
+                 "--remove-files"
+                 "--rsh-command="
+                 "--same-order"
+                 "--same-owner"
+                 "--same-permissions"
+                 "--sparse"
+                 "--starting-file="
+                 "--suffix="
+                 "--tape-length="
+                 "--to-stdout"
+                 "--totals"
+                 "--uncompress"
+                 "--ungzip"
+                 "--unlink-first"
+                 "--update"
+                 "--use-compress-program="
+                 "--verbose"
+                 "--verify"
+                 "--version"
+                 "--volno-file=")))
+        (pcomplete-opt "01234567ABCFGKLMNOPRSTUVWXZbcdfghiklmoprstuvwxz"))
+      (cond
+       ((pcomplete-match "\\`-\\'" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--after-date=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--backup=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--blocking-factor=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--directory=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-dirs)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--exclude-from=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-entries)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--exclude=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--\\(extract\\|list\\)\\'" 0)
+        (setq complete-within t))
+       ((pcomplete-match "\\`--file=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-dirs-or-entries pcmpl-gnu-tarfile-regexp)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--files-from=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-entries)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--group=\\(.*\\)" 0)
+        (pcomplete-here* (pcmpl-unix-group-names)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--info-script=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-entries)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--label=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--mode=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--new-volume-script=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-entries)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--newer=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--owner=\\(.*\\)" 0)
+        (pcomplete-here* (pcmpl-unix-user-names)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--record-size=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--rsh-command=\\(.*\\)" 0)
+        (pcomplete-here* (funcall pcomplete-command-completion-function)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--starting-file=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-entries)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--suffix=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--tape-length=" 0)
+        (pcomplete-here*))
+       ((pcomplete-match "\\`--use-compress-program=\\(.*\\)" 0)
+        (pcomplete-here* (funcall pcomplete-command-completion-function)
+                         (pcomplete-match-string 1 0)))
+       ((pcomplete-match "\\`--volno-file=\\(.*\\)" 0)
+        (pcomplete-here* (pcomplete-entries)
+                         (pcomplete-match-string 1 0)))))
     (unless saw-option
       (pcomplete-here
        (mapcar 'char-to-string