Mercurial > emacs

changeset 94607:e0e6649ed314

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(completion--insert-strings): Don't delete past bol.
author Andreas Schwab <schwab@suse.de>
date Sun, 04 May 2008 09:30:57 +0000
parents 72eafc3867a7
children ce8579003c4f
files lisp/ChangeLog lisp/minibuffer.el
diffstat 2 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sat May 03 21:07:14 2008 +0000
+++ b/lisp/ChangeLog	Sun May 04 09:30:57 2008 +0000
@@ -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:
--- a/lisp/minibuffer.el	Sat May 03 21:07:14 2008 +0000
+++ b/lisp/minibuffer.el	Sun May 04 09:30:57 2008 +0000
@@ -608,14 +608,14 @@
                                  ;; 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)