# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 740084110 0
# Node ID ca1e006fff42de1a40c46dce449757a0238503d0
# Parent  473c03886fc27d2ac9fdd10458ea551bd84d67db
(dabbrev-expand): Do all changes with replace-match.
In picture-mode, use picture-replace-match instead.

diff -r 473c03886fc2 -r ca1e006fff42 lisp/dabbrev.el
--- a/lisp/dabbrev.el	Mon Jun 14 18:53:40 1993 +0000
+++ b/lisp/dabbrev.el	Mon Jun 14 18:55:10 1993 +0000
@@ -162,8 +162,10 @@
 	  (setq last-dabbrevs-abbrev-location nil)
 	  (if (not first)
 	      (progn (undo-boundary)
-		     (delete-backward-char (length old))
-		     (insert abbrev)))
+		     (search-backward old)
+		     (if (eq major-mode 'picture-mode)
+			 (picture-replace-match abbrev t 'literal)
+		       (replace-match abbrev t 'literal))))
 	  (error (if first
 		     "No dynamic expansion for \"%s\" found."
 		     "No further dynamic expansions for \"%s\" found.")
@@ -177,7 +179,9 @@
       ;; First put back the original abbreviation with its original
       ;; case pattern.
       (save-excursion
-	(replace-match abbrev t 'literal))
+	(if (eq major-mode 'picture-mode)
+	    (picture-replace-match abbrev t 'literal)
+	  (replace-match abbrev t 'literal)))
       (search-forward abbrev)
       (let ((do-case (and do-case
 			  (string= (substring expansion 1)
@@ -189,9 +193,13 @@
 ;;; This used to be necessary, but no longer, 
 ;;; because now point is preserved correctly above.
 ;;;	(search-forward abbrev)
-	(replace-match (if do-case (downcase expansion) expansion)
-		       (not do-case)
-		       'literal))
+	(if (eq major-mode 'picture-mode)
+	    (picture-replace-match (if do-case (downcase expansion) expansion)
+				   (not do-case)
+				   'literal)
+	  (replace-match (if do-case (downcase expansion) expansion)
+			 (not do-case)
+			 'literal)))
       ;; Save state for re-expand.
       (setq last-dabbrevs-abbreviation abbrev)
       (setq last-dabbrevs-expansion expansion)