* files.el (auto-save-mode): Move to simple.el to fix bootstrap.

* simple.el (auto-save-mode): Move from files.el.
* minibuffer.el (completion--common-suffix): Fix copy&paste error.

4 files changed, 31 insertions, 25 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df7d21c6124..24e1b98f736 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
+        * simple.el (auto-save-mode): Move from files.el.
+        * minibuffer.el (completion--common-suffix): Fix copy&paste error.
+
 2010-05-07  Christian von Roques <roques@mti.ag> (tiny change)
 
         * lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
@@ -27,12 +33,12 @@
 
 2010-05-06  Michael Albinus  <michael.albinus@gmx.de>
 
-        * net/tramp.el (top, with-progress-reporter): Use
-        `symbol-function' inside `funcall'.
+        * net/tramp.el (top, with-progress-reporter):
+        Use `symbol-function' inside `funcall'.
 
         * net/tramp-compat.el (tramp-compat-file-attributes)
-        (tramp-compat-delete-file, tramp-compat-delete-directory): Handle
-        only `wrong-number-of-arguments' error.
+        (tramp-compat-delete-file, tramp-compat-delete-directory):
+        Handle only `wrong-number-of-arguments' error.
 
         * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Fix typo.
         (tramp-gvfs-handle-file-selinux-context): Use `symbol-function'
diff --git a/lisp/files.el b/lisp/files.el
index 9090f8afc88..406ee7e00cb 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5150,26 +5150,6 @@ The optional second argument indicates whether to kill internal buffers too."
         (kill-buffer-ask buffer)))))
 
 
-(define-minor-mode auto-save-mode
-  "Toggle auto-saving of contents of current buffer.
-With prefix argument ARG, turn auto-saving on if positive, else off."
-  :variable ((and buffer-auto-save-file-name
-                  ;; If auto-save is off because buffer has shrunk,
-                  ;; then toggling should turn it on.
-                  (>= buffer-saved-size 0))
-             . (lambda (val)
-                 (setq buffer-auto-save-file-name
-                       (cond
-                        ((null val) nil)
-                        ((and buffer-file-name auto-save-visited-file-name
-                              (not buffer-read-only))
-                         buffer-file-name)
-                        (t (make-auto-save-file-name))))))
-  ;; If -1 was stored here, to temporarily turn off saving,
-  ;; turn it back on.
-  (and (< buffer-saved-size 0)
-       (setq buffer-saved-size 0)))
-
 (defun rename-auto-save-file ()
   "Adjust current buffer's auto save file name for current conditions.
 Also rename any existing auto save file, if it was made in this session."
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 31bdb6993fa..4d8a6d0ebc0 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1992,7 +1992,7 @@ filter out additional entries (because TABLE migth not obey PRED)."
   (completion--sreverse
    (try-completion
     ""
-    (mapcar 'completion--sreverse comps))))
+    (mapcar 'completion--sreverse strs))))
 
 (defun completion-pcm--merge-completions (strs pattern)
   "Extract the commonality in STRS, with the help of PATTERN."
diff --git a/lisp/simple.el b/lisp/simple.el
index 8e45ca4694d..5948536262c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5306,6 +5306,26 @@ With ARG, turn Size Indication mode on if ARG is positive,
 otherwise turn it off.  When Size Indication mode is enabled, the
 size of the accessible part of the buffer appears in the mode line."
   :global t :group 'mode-line)
+
+(define-minor-mode auto-save-mode
+  "Toggle auto-saving of contents of current buffer.
+With prefix argument ARG, turn auto-saving on if positive, else off."
+  :variable ((and buffer-auto-save-file-name
+                  ;; If auto-save is off because buffer has shrunk,
+                  ;; then toggling should turn it on.
+                  (>= buffer-saved-size 0))
+             . (lambda (val)
+                 (setq buffer-auto-save-file-name
+                       (cond
+                        ((null val) nil)
+                        ((and buffer-file-name auto-save-visited-file-name
+                              (not buffer-read-only))
+                         buffer-file-name)
+                        (t (make-auto-save-file-name))))))
+  ;; If -1 was stored here, to temporarily turn off saving,
+  ;; turn it back on.
+  (and (< buffer-saved-size 0)
+       (setq buffer-saved-size 0)))
 
 (defgroup paren-blinking nil
   "Blinking matching of parens and expressions."