mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

(dabbrev-expand): When snarfing consecutive words,

Browse Source 
if previous one was upcased, upcase this one too.
(dabbrev--substitute-expansion): When snarfing consecutive words,
don't case convert here.
This commit is contained in:
Richard M. Stallman 1996-08-01 04:54:51 +00:00
parent 09af8ae6af
commit 07e47d0b70
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/dabbrev.el
View File

@ -438,7 +438,14 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
(markerp dabbrev--last-abbrev-location)
(marker-position dabbrev--last-abbrev-location)
(= (point) (1+ dabbrev--last-abbrev-location)))
(progn
(let* ((prev-expansion
(buffer-substring-no-properties
(- dabbrev--last-abbrev-location (length dabbrev--last-expansion))
dabbrev--last-abbrev-location))
;; If the previous expansion was upcased.
;; upcase this one too.
(upcase-it
(equal prev-expansion (upcase prev-expansion))))
;; The "abbrev" to expand is just the space.
(setq abbrev " ")
(save-excursion
@ -459,6 +466,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
(setq expansion
(buffer-substring dabbrev--last-expansion-location
(point)))
(if upcase-it
(setq expansion (upcase expansion)))
;; Record the end of this expansion, in case we repeat this.
(setq dabbrev--last-expansion-location (point)))
@ -756,9 +765,11 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
(substring expansion 0 (length abbrev)))
(not (string= abbrev (downcase abbrev)))
(not (string= abbrev (upcase abbrev))))
(setq use-case-replace nil)
(if use-case-replace
(setq expansion (downcase expansion))))
(setq use-case-replace nil))
(if (equal abbrev " ")
(setq use-case-replace nil))
(if use-case-replace
(setq expansion (downcase expansion)))
(if old
(save-excursion
(search-backward old))