diff lisp/packages/dabbrev.el @ 171:929b76928fce r20-3b12

Import from CVS: tag r20-3b12
author cvs
date Mon, 13 Aug 2007 09:47:52 +0200
parents cca96a509cfe
children
line wrap: on
line diff
--- a/lisp/packages/dabbrev.el	Mon Aug 13 09:47:00 2007 +0200
+++ b/lisp/packages/dabbrev.el	Mon Aug 13 09:47:52 2007 +0200
@@ -517,7 +517,7 @@
 		(re-search-forward
 		 (concat "\\(\\(" dabbrev--abbrev-char-regexp "\\)+\\)"))
 		(setq expansion
-		      (buffer-substring dabbrev--last-expansion-location
+		      (buffer-substring-no-properties dabbrev--last-expansion-location
 					(point)))
 		(if dabbrev--last-case-pattern
 		    (setq expansion (upcase expansion)))
@@ -643,7 +643,7 @@
 	    (error "No possible abbreviation preceding point"))))
     ;; Now find the beginning of that one.
     (dabbrev--goto-start-of-abbrev)
-    (buffer-substring dabbrev--last-abbrev-location
+    (buffer-substring-no-properties dabbrev--last-abbrev-location
 		      (point))))
 	
 ;;; Initializes all global variables
@@ -896,7 +896,7 @@
 	    ;; We have a truly valid match.  Find the end.
 	    (re-search-forward pattern2)
 	    (setq found-string
-		  (buffer-substring (match-beginning 1) (match-end 1)))
+		  (buffer-substring-no-properties (match-beginning 1) (match-end 1)))
 	    (and ignore-case (setq found-string (downcase found-string)))
 	    ;; Ignore this match if it's already in the table.
 	    (if (dabbrev-filter-elements
@@ -912,7 +912,7 @@
 	    ;; Put it into `dabbrev--last-table'
 	    ;; and return it (either downcased, or as is).
 	    (let ((result
-		   (buffer-substring (match-beginning 0) (match-end 0))))
+		   (buffer-substring-no-properties (match-beginning 0) (match-end 0))))
 	      (setq dabbrev--last-table
 		    (cons found-string dabbrev--last-table))
 	      (if (and ignore-case (eval dabbrev-case-replace))