From: Gerd Moellmann <gerd@gnu.org>
Date: Sat, 27 Jan 2001 12:07:49 +0000 (+0000)
Subject: (dabbrev--substitute-expansion):
X-Git-Tag: emacs-pretest-21.0.96~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8dc5c94d1dccd886636c8cb61ee93bb8ee6d6a6a;p=emacs.git

(dabbrev--substitute-expansion):
Treat a one-capital-letter abbrev as "not all upper case",
so as to force preservation of the expansion's pattern
if the expansion starts with a capital letter.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 076b10bbec0..e14eeea3f8d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-27  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+	* dabbrev.el (dabbrev--substitute-expansion): 
+	Treat a one-capital-letter abbrev as "not all upper case",
+	so as to force preservation of the expansion's pattern
+	if the expansion starts with a capital letter.
+
 2001-01-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* facemenu.el (facemenu-set-face, facemenu-set-face-from-menu):
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 42e370a7b87..cfcc1fa365c 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,6 +1,6 @@
 ;;; dabbrev.el --- dynamic abbreviation package
 
-;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000
+;; Copyright (C) 1985, 86, 92, 94, 96, 1997, 2000, 2001
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Don Morrison
@@ -835,11 +835,15 @@ to record whether we upcased the expansion, downcased it, or did neither."
     ;; matches the start of the expansion,
     ;; copy the expansion's case
     ;; instead of downcasing all the rest.
+    ;; Treat a one-capital-letter abbrev as "not all upper case",
+    ;; so as to force preservation of the expansion's pattern
+    ;; if the expansion starts with a capital letter.
     (let ((expansion-rest (substring expansion 1)))
       (if (and (not (and (or (string= expansion-rest (downcase expansion-rest))
 			     (string= expansion-rest (upcase expansion-rest)))
 			 (or (string= abbrev (downcase abbrev))
-			     (string= abbrev (upcase abbrev)))))
+			     (and (string= abbrev (upcase abbrev))
+				  (> (length abbrev) 1)))))
 	       (string= abbrev
 			(substring expansion 0 (length abbrev))))
 	  (setq use-case-replace nil)))