emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/complete.el [lexbind]
Date: Thu, 20 Nov 2003 19:36:34 -0500

Index: emacs/lisp/complete.el
diff -c emacs/lisp/complete.el:1.36.8.2 emacs/lisp/complete.el:1.36.8.3
*** emacs/lisp/complete.el:1.36.8.2     Tue Oct 14 19:50:52 2003
--- emacs/lisp/complete.el      Thu Nov 20 19:36:02 2003
***************
*** 1,6 ****
  ;;; complete.el --- partial completion mechanism plus other goodies
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
--- 1,6 ----
  ;;; complete.el --- partial completion mechanism plus other goodies
  
! ;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2003
  ;;  Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
***************
*** 394,400 ****
        ;; 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
--- 394,402 ----
        ;; Add wildcards if necessary
        (and filename
             (let ((dir (file-name-directory str))
!                  (file (file-name-nondirectory str))
!                ;; The base dir for file-completion is passed in `predicate'.
!                (default-directory (expand-file-name pred)))
               (while (and (stringp dir) (not (file-directory-p dir)))
                 (setq dir (directory-file-name dir))
                 (setq file (concat (replace-regexp-in-string
***************
*** 408,413 ****
--- 410,417 ----
        (and filename
           (string-match "\\*.*/" str)
           (let ((pat str)
+                ;; The base dir for file-completion is passed in `predicate'.
+                (default-directory (expand-file-name pred))
                 files)
             (setq p (1+ (string-match "/[^/]*\\'" pat)))
             (while (setq p (string-match PC-delim-regex pat p))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]