pcmpl-cvs.el fix for bug#9606

* lisp/pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes
to split-string.

2 files changed, 12 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8bbb7f5fcc8..b258f1081b0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-27  Glenn Morris  <rgm@gnu.org>
+
+        * pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes
+        to split-string.  (Bug#9606)
+
 2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index b6c5eb62b17..3ff07bca20e 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -169,13 +169,13 @@ operation character applies, as displayed by 'cvs -n update'."
         (insert-file-contents (concat dir "CVS/Entries"))
         (goto-char (point-min))
         (while (not (eobp))
-          (let* ((line (buffer-substring (line-beginning-position)
-                                         (line-end-position)))
-                 (fields (split-string line "/"))
-                 text)
-            (if (eq (aref line 0) ?/)
-                (setq fields (cons "" fields)))
-            (setq text (nth 1 fields))
+          ;; Normal file: /NAME   -> "" "NAME"
+          ;; Directory  : D/NAME  -> "D" "NAME"
+          (let* ((fields (split-string (buffer-substring
+                                        (line-beginning-position)
+                                        (line-end-position))
+                                       "/"))
+                 (text (nth 1 fields)))
             (when text
               (if (string= (nth 0 fields) "D")
                   (setq text (file-name-as-directory text)))