[Emacs-diffs] Changes to emacs/lisp/complete.el

[Francesco Potortì]

Index: emacs/lisp/complete.el
diff -c emacs/lisp/complete.el:1.37 emacs/lisp/complete.el:1.38
*** emacs/lisp/complete.el:1.37 Fri Nov  8 18:39:29 2002
--- emacs/lisp/complete.el      Mon Dec  2 03:49:45 2002
***************
*** 383,389 ****
             (delete-region beg end)
             (insert str)
             (setq end (+ beg (length str)))))
!       
        ;; Prepare various delimiter strings
        (or (equal PC-word-delimiters PC-delims)
          (setq PC-delims PC-word-delimiters
--- 383,389 ----
             (delete-region beg end)
             (insert str)
             (setq end (+ beg (length str)))))
! 
        ;; Prepare various delimiter strings
        (or (equal PC-word-delimiters PC-delims)
          (setq PC-delims PC-word-delimiters
***************
*** 392,408 ****
                PC-delims-list (append PC-delims nil)))
  
        ;; Add wildcards if necessary
!       (let ((dir (file-name-directory str))
!           (file (file-name-nondirectory str)))
!       (while (and (stringp dir) (not (file-directory-p dir)))
!         (setq dir (directory-file-name dir))
!         (setq file (concat (replace-regexp-in-string
!                             PC-delim-regex "*\\&"
!                             (file-name-nondirectory dir))
!                            "*/" file))
!         (setq dir (file-name-directory dir)))
!       (setq str (concat dir file)))
!       
        ;; Look for wildcard expansions in directory name
        (and filename
           (string-match "\\*.*/" str)
--- 392,409 ----
                PC-delims-list (append PC-delims nil)))
  
        ;; Add wildcards if necessary
!       (and filename
!            (let ((dir (file-name-directory str))
!                  (file (file-name-nondirectory str)))
!              (while (and (stringp dir) (not (file-directory-p dir)))
!                (setq dir (directory-file-name dir))
!                (setq file (concat (replace-regexp-in-string
!                                    PC-delim-regex "*\\&"
!                                    (file-name-nondirectory dir))
!                                   "*/" file))
!                (setq dir (file-name-directory dir)))
!              (setq str (concat dir file))))
! 
        ;; Look for wildcard expansions in directory name
        (and filename
           (string-match "\\*.*/" str)
***************
*** 890,896 ****
  ;;; This is adapted from lib-complete.el, by Mike Williams.
  (defun PC-include-file-all-completions (file search-path &optional full)
    "Return all completions for FILE in any directory on SEARCH-PATH.
! If optional third argument FULL is non-nil, returned pathnames should be 
  absolute rather than relative to some directory on the SEARCH-PATH."
    (setq search-path
        (mapcar (lambda (dir)
--- 891,897 ----
  ;;; This is adapted from lib-complete.el, by Mike Williams.
  (defun PC-include-file-all-completions (file search-path &optional full)
    "Return all completions for FILE in any directory on SEARCH-PATH.
! If optional third argument FULL is non-nil, returned pathnames should be
  absolute rather than relative to some directory on the SEARCH-PATH."
    (setq search-path
        (mapcar (lambda (dir)
***************
*** 900,906 ****
        ;; It's an absolute file name, so don't need search-path
        (progn
        (setq file (expand-file-name file))
!       (file-name-all-completions 
         (file-name-nondirectory file) (file-name-directory file)))
      (let ((subdir (file-name-directory file))
          (ndfile (file-name-nondirectory file))
--- 901,907 ----
        ;; It's an absolute file name, so don't need search-path
        (progn
        (setq file (expand-file-name file))
!       (file-name-all-completions
         (file-name-nondirectory file) (file-name-directory file)))
      (let ((subdir (file-name-directory file))
          (ndfile (file-name-nondirectory file))
***************
*** 918,926 ****
          (if (file-directory-p dir)
              (progn
                (setq file-lists
!                     (cons 
                       (mapcar (lambda (file) (concat subdir file))
!                              (file-name-all-completions ndfile 
                                                          (car search-path)))
                       file-lists))))
          (setq search-path (cdr search-path))))
--- 919,927 ----
          (if (file-directory-p dir)
              (progn
                (setq file-lists
!                     (cons
                       (mapcar (lambda (file) (concat subdir file))
!                              (file-name-all-completions ndfile
                                                          (car search-path)))
                       file-lists))))
          (setq search-path (cdr search-path))))