Merge branch 'emacs-25-merge'

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

diff --git a/lisp/obsolete/complete.el b/lisp/obsolete/complete.el
index 7c7582f80d9a3039d819a93e82809f3627536ec2..e67ae5e2e53ee13da3a613935a3d0b87e94037dd 100644 (file)
--- a/lisp/obsolete/complete.el
+++ b/lisp/obsolete/complete.el
@@ -963,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)))
@@ -1074,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))