(unexpand-abbrev): Better preserve markers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a36517e9cee6f5e16656732586e1df659e8b2999..59600dd747f2cb29ae6009931c18fd743ca65461 100644 (file)
--- 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 22c9ff40e3de1bc1b9ce930f3af510db5f838b1a..e8e89e92f405588d9675eef8d586ea77a85d0e08 100644 (file)
--- 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)