*** complete.el	Tue Jan 23 07:40:00 2007
--- complete.el	Sat Feb 24 14:26:14 2007
***************
*** 661,679 ****
  				(looking-at PC-delim-regex))
  			      (setq skip (concat skip
  						 (regexp-quote prefix)
! 						 PC-ndelims-regex)
! 				    prefix (try-completion
! 					    (PC-chunk-after
! 					     ;; not basestr, because that does
! 					     ;; not reflect insertions
! 					     (buffer-substring
! 					      (+ beg (length dirname)) end)
! 					     skip)
! 					    (mapcar
!                                              (lambda (x)
!                                                (when (string-match skip x)
!                                                  (substring x (match-end 0))))
! 					     poss)))
  			      (or (> i 0) (> (length prefix) 0))
  			      (or (not (eq mode 'word))
  				  (and first (> (length prefix) 0)
--- 661,683 ----
  				(looking-at PC-delim-regex))
  			      (setq skip (concat skip
  						 (regexp-quote prefix)
! 						 PC-ndelims-regex))
! 			      (let ((chunk
! 				     (PC-chunk-after
! 				      ;; not basestr, because that does
! 				      ;; not reflect insertions
! 				      (buffer-substring-no-properties
! 				       (+ beg (length dirname)) end)
! 				      skip)))
! 				(setq prefix (try-completion
! 					      chunk
! 					      (mapcar
! 					       (lambda (x)
! 						 (when (string-match skip x)
! 						   (substring x (match-end 0))))
! 					       poss)))
! 				(or (stringp prefix)
! 				    (setq prefix (if prefix chunk ""))))
  			      (or (> i 0) (> (length prefix) 0))
  			      (or (not (eq mode 'word))
  				  (and first (> (length prefix) 0)