[Emacs-diffs] /srv/bzr/emacs/trunk r105943: pcmpl-cvs.el fix for bug#9606

[Glenn Morris]

------------------------------------------------------------
revno: 105943
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-27 14:09:43 -0400
message:
  pcmpl-cvs.el fix for bug#9606
  
  * lisp/pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes
  to split-string.
modified:
  lisp/ChangeLog
  lisp/pcmpl-cvs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-27 17:45:18 +0000
+++ b/lisp/ChangeLog    2011-09-27 18:09:43 +0000
@@ -1,3 +1,8 @@
+2011-09-27  Glenn Morris  <address@hidden>
+
+       * pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes
+       to split-string.  (Bug#9606)
+
 2011-09-27  Lars Magne Ingebrigtsen  <address@hidden>
 
        * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection

=== modified file 'lisp/pcmpl-cvs.el'
--- a/lisp/pcmpl-cvs.el 2011-01-25 04:08:28 +0000
+++ b/lisp/pcmpl-cvs.el 2011-09-27 18:09:43 +0000
@@ -169,13 +169,13 @@
        (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)))