(completion--embedded-envvar-table, read-file-name-internal):

Fix typos in 2008-04-11 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d369eb8cbf4e300238dfbfa7b86d07950ff69143..c3cede9b75a75ce62db58783c47b34efec10fd46 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * minibuffer.el (completion--embedded-envvar-table)
+       (read-file-name-internal): Fix typos in 2008-04-11 change.
+
+       * faces.el (read-face-name): Use `completion-table-in-turn',
+       not `complete-in-turn'.
+
 2008-04-13  Andreas Schwab  <schwab@suse.de>
 
        * progmodes/etags.el: Require 'cl when compiling.
@@ -19,8 +27,7 @@
 
 2008-04-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
-       * emacs-lisp/copyright.el (copyright-update-directory): New
-       command.
+       * emacs-lisp/copyright.el (copyright-update-directory): New command.
 
        * ediff-wind.el (ediff-split-window-function)
        (ediff-merge-split-window-function): Improve custom type.
@@ -39,8 +46,8 @@
        Mark obsolete name as risky too.
 
        * calendar/calendar.el (calendar-faces): New custom group.
-       (calendar-today, diary, holiday): Doc fix.  Move to calendar-faces
-       group.
+       (calendar-today, diary, holiday): Doc fix.
+       Move to calendar-faces group.
        * calendar/diary-lib.el (diary-face, diary-anniversary, diary-time)
        (diary-button): Doc fix.  Move to calendar-faces group.
 

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 26cbfc127910908694017d943858ddb7901d1351..f7e14b6d3751d449c605ea62c386e2ecb5ded4d4 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -559,7 +559,7 @@ during running `completion-setup-hook'."
                               "$\\([[:alnum:]_]*\\|{\\([^}]*\\)\\)\\'")
                       string)
     (let* ((beg (or (match-beginning 2) (match-beginning 1)))
-           (table (completion-make-envvar-table))
+           (table (completion--make-envvar-table))
            (prefix (substring string 0 beg)))
       (if (eq (aref string (1- beg)) ?{)
           (setq table (apply-partially 'completion-table-with-terminator
@@ -567,7 +567,7 @@ during running `completion-setup-hook'."
       (completion-table-with-context prefix table
                                      (substring string beg)
                                      pred action))))
-          
+
 (defun completion--file-name-table (string dir action)
   "Internal subroutine for read-file-name.  Do not call this."
   (setq dir (expand-file-name dir))
@@ -580,7 +580,7 @@ during running `completion-setup-hook'."
            (specdir (file-name-directory str))
            (realdir (if specdir (expand-file-name specdir dir)
                       (file-name-as-directory dir))))
-      
+
       (cond
        ((null action)
         (let ((comp (file-name-completion name realdir
@@ -595,7 +595,7 @@ during running `completion-setup-hook'."
               ;; If there's no real completion, but substitute-in-file-name
               ;; changed the string, then return the new string.
               str))))
-       
+
        ((eq action t)
         (let ((all (file-name-all-completions name realdir)))
           (if (memq read-file-name-predicate '(nil file-exists-p))
@@ -621,8 +621,8 @@ during running `completion-setup-hook'."
           (funcall (or read-file-name-predicate 'file-exists-p) str)))))))
 
 (defalias 'read-file-name-internal
-  (completion-table-in-turn 'completion-embedded-envvar-table
-                      'completion-file-name-table)
+  (completion-table-in-turn 'completion--embedded-envvar-table
+                      'completion--file-name-table)
   "Internal subroutine for `read-file-name'.  Do not call this.")
 
 (provide 'minibuffer)