* lisp/minibuffer.el (completion--sifn-requote): Fix last change.

(minibuffer-local-must-match-filename-map):
Move define-obsolete-variable-alias before its var.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 717582a6f8f8f8ecbca1bf46c44b96ce82870c7e..cec6cdc26b47fe44937a9e7f1e7b62faf0c0b729 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * minibuffer.el (completion--sifn-requote): Fix last change.
+       (minibuffer-local-must-match-filename-map):
+       Move define-obsolete-variable-alias before its var.
+
 2012-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/pcase.el (pcase-let*, pcase-let): Fix edebug spec.

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 9fb7627fe645a6aeddb5f1b693b7f9ea324fdf2a..6cd7af7fd01c988a3bf6181c45535546a38dfeb3 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1952,10 +1952,10 @@ The completion method is determined by `completion-at-point-functions'."
 Gets combined either with `minibuffer-local-completion-map' or
 with `minibuffer-local-must-match-map'.")
 
-(defvar minibuffer-local-filename-must-match-map (make-sparse-keymap))
-(make-obsolete-variable 'minibuffer-local-filename-must-match-map nil "24.1")
 (define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map
   'minibuffer-local-filename-must-match-map "23.1")
+(defvar minibuffer-local-filename-must-match-map (make-sparse-keymap))
+(make-obsolete-variable 'minibuffer-local-filename-must-match-map nil "24.1")
 
 (let ((map minibuffer-local-ns-map))
   (define-key map " " 'exit-minibuffer)
@@ -2132,13 +2132,15 @@ same as `substitute-in-file-name'."
   ;; Kind of like in rfn-eshadow-update-overlay, only worse.
   (let ((qpos 0))
     ;; Handle substitute-in-file-name's truncation behavior.
-    (while (and (string-match "[\\/][~/\\]" qstr qpos)
-                ;; Hopefully our regexp covers all truncation cases.
-                ;; Also let's make sure sifn indeed truncates here.
-                (let ((tpos (1+ (match-beginning 0))))
-                  (equal (substitute-in-file-name qstr)
-                         (substitute-in-file-name (substring qstr tpos)))))
-      (setq qpos tpos))
+    (let (tpos)
+      (while (and (string-match "[\\/][~/\\]" qstr qpos)
+                  ;; Hopefully our regexp covers all truncation cases.
+                  ;; Also let's make sure sifn indeed truncates here.
+                  (progn
+                    (setq tpos (1+ (match-beginning 0)))
+                    (equal (substitute-in-file-name qstr)
+                           (substitute-in-file-name (substring qstr tpos)))))
+        (setq qpos tpos)))
     ;; `upos' is relative to the position corresponding to `qpos' in
     ;; (substitute-in-file-name qstr), so as qpos moves forward, upos
     ;; gets smaller.