From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 5 Jun 2008 05:06:58 +0000 (+0000)
Subject: (unexpand-abbrev): Better preserve markers.
X-Git-Tag: emacs-pretest-23.0.90~5091
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f68cfe84eb26b05a429e968c5c78aac868e1a0c7;p=emacs.git

(unexpand-abbrev): Better preserve markers.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a36517e9cee..59600dd747f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* abbrev.el (unexpand-abbrev): Better preserve markers.
+
 2008-06-05  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/autoload.el (autoload-rubric): New function,
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 22c9ff40e3d..e8e89e92f40 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -824,10 +824,11 @@ is not undone."
         ;; to do the expansion.
         (let ((val (symbol-value last-abbrev)))
           (unless (stringp val)
-            (error "value of abbrev-symbol must be a string"))
-          (delete-region (point) (+ (point) (length val)))
+            (error "Value of abbrev-symbol must be a string"))
           ;; Don't inherit properties here; just copy from old contents.
           (insert last-abbrev-text)
+          ;; Delete after inserting, to better preserve markers.
+          (delete-region (point) (+ (point) (length val)))
           (setq last-abbrev-text nil))))))
 
 (defun abbrev--write (sym)