From: Andreas Schwab <schwab@suse.de>
Date: Sun, 4 May 2008 09:30:57 +0000 (+0000)
Subject: (completion--insert-strings): Don't delete past
X-Git-Tag: emacs-pretest-23.0.90~5832
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5270bf519b9a421927475f51e327449137f44a84;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47f99da80d1..dd961545539 100644
--- 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 02f695e41d3..1bf3cb75b40 100644
--- 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)