(completion--insert-strings): Don't delete past

bol.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47f99da80d1f0e0bb07ee7f436b7186df80349d2..dd96154553977ea042a9ca1b888cf9f960514c23 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-04  Andreas Schwab  <schwab@suse.de>
+
+       * minibuffer.el (completion--insert-strings): Don't delete past
+       bol.
+
 2008-05-03  Glenn Morris  <rgm@gnu.org>
 
        * ediff-diff.el, ediff-help.el, ediff-merg.el, ediff-mult.el:

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 02f695e41d3dc9658ee9d2280a451b6518021d0d..1bf3cb75b40004da9bcb4961e678b53852d0468c 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -608,14 +608,14 @@ It also eliminates runs of equal strings."
                                  ;; We can't just set tab-width, because
                                  ;; completion-setup-function will kill all
                                  ;; local variables :-(
-                                 `(display (space :align-to ,column))))
-         (when (< wwidth (+ (max colwidth
-                                 (if (consp str)
-                                     (+ (string-width (car str))
-                                         (string-width (cadr str)))
-                                   (string-width str)))
-                            column))
-           (delete-char -2) (insert "\n") (setq column 0))
+                                 `(display (space :align-to ,column)))
+           (when (< wwidth (+ (max colwidth
+                                   (if (consp str)
+                                       (+ (string-width (car str))
+                                          (string-width (cadr str)))
+                                     (string-width str)))
+                              column))
+             (delete-char -2) (insert "\n") (setq column 0)))
          (if (not (consp str))
              (put-text-property (point) (progn (insert str) (point))
                                 'mouse-face 'highlight)