* minibuffer.el (read-file-name-completion-ignore-case):

Move before completion--in-region, for eager macro expansion.

Somehow, this avoids an eager macro expansion failure present during
bootstrap since ~ 2013-04-17.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 552af47db71de4be151b7c352c5040e66a10cf1c..1a5c0eb92d99ea1078c1934753b5f50728baa01a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Glenn Morris  <rgm@gnu.org>
+
+       * minibuffer.el (read-file-name-completion-ignore-case):
+       Move before completion--in-region, for eager macro expansion.
+
 2013-05-29  Juri Linkov  <juri@jurta.org>
 
        * replace.el (occur-engine): Rename `globalcount' to `global-lines'
@@ -1756,7 +1761,7 @@
 
 2013-04-21  Xue Fuqiao  <xfq.free@gmail.com>
 
-       * comint.el: (comint-dynamic-complete-functions, comint-mode-map):
+       * comint.el (comint-dynamic-complete-functions, comint-mode-map):
        `comint-dynamic-complete' is obsolete since 24.1, replaced by
        `completion-at-point'. (Bug#13774)
 

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index a5d79a415f69cc54d7e820c6a0e805a177a8020f..8bcf3afae056adb2de70e693ded6bf702554a312 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1796,6 +1796,14 @@ exit."
   (cl-assert (<= start (point)) (<= (point) end))
   (funcall completion-in-region-function start end collection predicate))
 
+(defcustom read-file-name-completion-ignore-case
+  (if (memq system-type '(ms-dos windows-nt darwin cygwin))
+      t nil)
+  "Non-nil means when reading a file name completion ignores case."
+  :group 'minibuffer
+  :type 'boolean
+  :version "22.1")
+
 (defun completion--in-region (start end collection &optional predicate)
   (with-wrapper-hook
       ;; FIXME: Maybe we should use this hook to provide a "display
@@ -2268,14 +2276,6 @@ except that it passes the file name through `substitute-in-file-name'.")
   "The function called by `read-file-name' to do its work.
 It should accept the same arguments as `read-file-name'.")
 
-(defcustom read-file-name-completion-ignore-case
-  (if (memq system-type '(ms-dos windows-nt darwin cygwin))
-      t nil)
-  "Non-nil means when reading a file name completion ignores case."
-  :group 'minibuffer
-  :type 'boolean
-  :version "22.1")
-
 (defcustom insert-default-directory t
   "Non-nil means when reading a filename start with default dir in minibuffer.