[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108124: * lisp/dabbrev.el (dabbrev--
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108124: * lisp/dabbrev.el (dabbrev--ignore-case-p): New function. |
Date: |
Fri, 04 May 2012 15:17:01 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108124
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-04 15:17:01 -0400
message:
* lisp/dabbrev.el (dabbrev--ignore-case-p): New function.
(dabbrev-completion, dabbrev-expand, dabbrev--substitute-expansion):
Use it.
modified:
lisp/ChangeLog
lisp/dabbrev.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-05-04 19:14:42 +0000
+++ b/lisp/ChangeLog 2012-05-04 19:17:01 +0000
@@ -1,5 +1,9 @@
2012-05-04 Stefan Monnier <address@hidden>
+ * dabbrev.el (dabbrev--ignore-case-p): New function.
+ (dabbrev-completion, dabbrev-expand, dabbrev--substitute-expansion):
+ Use it.
+
* files.el (automount-dir-prefix): Mark as obsolete.
2012-05-04 Glenn Morris <address@hidden>
=== modified file 'lisp/dabbrev.el'
--- a/lisp/dabbrev.el 2012-03-12 20:07:45 +0000
+++ b/lisp/dabbrev.el 2012-05-04 19:17:01 +0000
@@ -361,6 +361,13 @@
;;??? Do we want this?
;;;###autoload (define-key esc-map [?\C-/] 'dabbrev-completion)
+(defun dabbrev--ignore-case-p (abbrev)
+ (and (if (eq dabbrev-case-fold-search 'case-fold-search)
+ case-fold-search
+ dabbrev-case-fold-search)
+ (or (not dabbrev-upcase-means-case-search)
+ (string= abbrev (downcase abbrev)))))
+
;;;###autoload
(defun dabbrev-completion (&optional arg)
"Completion on current word.
@@ -381,12 +388,7 @@
(abbrev (dabbrev--abbrev-at-point))
(beg (progn (search-backward abbrev) (point)))
(end (progn (search-forward abbrev) (point)))
- (ignore-case-p
- (and (if (eq dabbrev-case-fold-search 'case-fold-search)
- case-fold-search
- dabbrev-case-fold-search)
- (or (not dabbrev-upcase-means-case-search)
- (string= abbrev (downcase abbrev)))))
+ (ignore-case-p (dabbrev--ignore-case-p abbrev))
(list 'uninitialized)
(table
(lambda (s p a)
@@ -514,11 +516,7 @@
(setq expansion
(dabbrev--find-expansion
abbrev direction
- (and (if (eq dabbrev-case-fold-search 'case-fold-search)
- case-fold-search
- dabbrev-case-fold-search)
- (or (not dabbrev-upcase-means-case-search)
- (string= abbrev (downcase abbrev))))))))
+ (dabbrev--ignore-case-p abbrev)))))
(cond
((not expansion)
(dabbrev--reset-global-variables)
@@ -820,11 +818,7 @@
to record whether we upcased the expansion, downcased it, or did neither."
;;(undo-boundary)
(let ((use-case-replace
- (and (if (eq dabbrev-case-fold-search 'case-fold-search)
- case-fold-search
- dabbrev-case-fold-search)
- (or (not dabbrev-upcase-means-case-search)
- (string= abbrev (downcase abbrev)))
+ (and (dabbrev--ignore-case-p abbrev)
(if (eq dabbrev-case-replace 'case-replace)
case-replace
dabbrev-case-replace))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108124: * lisp/dabbrev.el (dabbrev--ignore-case-p): New function.,
Stefan Monnier <=