Merge branch 'emacs-25-merge'

[gnu-emacs] / lisp / obsolete / complete.el

diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index b7e9474380284f892a8621d96819db5b3db92c1f..e67ae5e2e53ee13da3a613935a3d0b87e94037dd 100644 (file)
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -1,7 +1,6 @@
 ;;; complete.el --- partial completion mechanism plus other goodies
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 1999-2015 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: abbrev convenience
@@ -964,7 +963,7 @@ or properties are considered."
  Environment vars are converted to their values."
    (interactive)
    (let* ((end (point))
-          (beg (if (re-search-backward "[^\\][ \t\n\"\`\'][^ \t\n\"\`\']"
+          (beg (if (re-search-backward "[^\\][ \t\n\"`'][^ \t\n\"`']"
                                       (point-min) t)
                    (+ (point) 2)
                    (point-min)))
@@ -1075,7 +1074,7 @@ absolute rather than relative to some directory on the SEARCH-PATH."
          (setq search-path
                (mapcar (lambda (dir) (concat dir subdir))
                        search-path)
-               file ))
+               file nil))
       ;; Make list of completions in each directory on search-path
       (while search-path
        (let* ((dir (car search-path))
@@ -1120,5 +1119,4 @@ This is only used by "
 
 (provide 'complete)
 
-;; arch-tag: fc7e2768-ff44-4e22-b579-4d825b968458
 ;;; complete.el ends here