From: "Sean O'Rourke" <sorourke@cs.ucsd.edu>
To: Leo <sdl.web@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: For after-the-release: enhanced partial completion
Date: Tue, 05 Jun 2007 19:12:51 -0700 [thread overview]
Message-ID: <m27iqhrfto.fsf@cs.ucsd.edu> (raw)
In-Reply-To: <m2tztm8li8.fsf@sl392.st-edmunds.cam.ac.uk> (Leo's message of "Tue\, 05 Jun 2007 16\:32\:47 +0100")
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
Leo <sdl.web@gmail.com> writes:
> One minor problem, see the following examples:
>
> M-x e-l-m TAB => M-x e-l-m ; patched
> M-x e-l-m TAB => M-x e-l-mode ; un-patched
I can't reproduce this. I get the desired expansion to
"e-l-mode" with point before the first dash. I haven't made any
further changes since the last patch I sent, but I've attached it
again in case something got screwed up.
/s
[-- Attachment #2: Type: text/plain, Size: 3629 bytes --]
Index: complete.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/complete.el,v
retrieving revision 1.72
diff -p -u -w -r1.72 complete.el
--- complete.el 14 Apr 2007 20:23:31 -0000 1.72
+++ complete.el 6 Jun 2007 02:12:32 -0000
@@ -454,6 +454,7 @@ GOTO-END is non-nil, however, it instead
env-on
regex
p offset
+ abbreviated
(poss nil)
helpposs
(case-fold-search completion-ignore-case))
@@ -590,17 +591,23 @@ GOTO-END is non-nil, however, it instead
pred nil))
;; Find an initial list of possible completions
- (if (not (setq p (string-match (concat PC-delim-regex
+ (unless (setq p (string-match (concat PC-delim-regex
(if filename "\\|\\*" ""))
str
- (+ (length dirname) offset))))
+ (+ (length dirname) offset)))
;; Minibuffer contains no hyphens -- simple case!
- (setq poss (all-completions (if env-on
- basestr str)
+ (setq poss (all-completions (if env-on basestr str)
table
pred))
-
+ (unless (or filename poss)
+ ;; Try completion as an abbreviation, e.g. "mvb" -> "m-v-b"
+ ;; -> "multiple-value-bind"
+ (setq regex (concat "\\`" (mapconcat #'list str "[^-]*-"))
+ origstr str
+ p 1
+ abbreviated t)))
+ (when p
;; Use all-completions to do an initial cull. This is a big win,
;; since all-completions is written in C!
(let ((compl (all-completions (if env-on
@@ -609,12 +616,17 @@ GOTO-END is non-nil, however, it instead
table
pred)))
(setq p compl)
+ (when (and compl abbreviated)
+ (setq basestr (mapconcat 'list str "-"))
+ (delete-region beg end)
+ (setq end (+ beg (length basestr)))
+ (insert basestr)))
(while p
(and (string-match regex (car p))
(progn
(set-text-properties 0 (length (car p)) '() (car p))
(setq poss (cons (car p) poss))))
- (setq p (cdr p)))))
+ (setq p (cdr p))))
;; If table had duplicates, they can be here.
(delete-dups poss)
@@ -648,6 +660,7 @@ GOTO-END is non-nil, however, it instead
(and p (setq poss p))))
;; Now we have a list of possible completions
+
(cond
;; No valid completions found
@@ -657,6 +670,9 @@ GOTO-END is non-nil, however, it instead
(let ((PC-word-failed-flag t))
(delete-backward-char 1)
(PC-do-completion 'word))
+ (when abbreviated
+ (delete-region beg end)
+ (insert origstr))
(beep)
(PC-temp-minibuffer-message (if ambig
" [Ambiguous dir name]"
@@ -857,13 +873,11 @@ only symbols with function definitions a
Otherwise, all symbols with function definitions, values
or properties are considered."
(interactive)
- (let* ((end (point))
- ;; To complete the word under point, rather than just the portion
- ;; before point, use this:
-;;; (save-excursion
-;;; (with-syntax-table lisp-mode-syntax-table
-;;; (forward-sexp 1)
-;;; (point))))
+ (let* ((end
+ (save-excursion
+ (with-syntax-table lisp-mode-syntax-table
+ (skip-syntax-forward "_w")
+ (point))))
(beg (save-excursion
(with-syntax-table lisp-mode-syntax-table
(backward-sexp 1)
[-- Attachment #3: Type: text/plain, Size: 142 bytes --]
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel
next prev parent reply other threads:[~2007-06-06 2:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-17 5:39 For after-the-release: enhanced partial completion Sean O'Rourke
2007-06-04 15:26 ` Leo
2007-06-04 16:09 ` Leo
2007-06-04 16:19 ` Sean O'Rourke
2007-06-04 17:02 ` Leo
2007-06-04 21:33 ` Sean O'Rourke
[not found] ` <m2wsyjbd7a.fsf@sl392.st-edmunds.cam.ac.uk>
2007-06-04 22:10 ` Sean O'Rourke
2007-06-04 22:20 ` Sean O'Rourke
2007-06-05 6:40 ` Leo
2007-06-05 10:39 ` Leo
2007-06-05 14:56 ` Sean O'Rourke
2007-06-05 15:32 ` Leo
2007-06-06 2:12 ` Sean O'Rourke [this message]
2007-06-07 1:46 ` Leo
2007-06-07 4:08 ` Sean O'Rourke
2007-06-08 11:57 ` unicode-2 fail to bootstrap (was: For after-the-release: enhanced partial completion) Leo
2007-06-10 13:53 ` unicode-2 fail to bootstrap Sean O'Rourke
2007-06-10 23:42 ` unicode-2 fail to bootstrap (was: For after-the-release: enhanced partial completion) Kenichi Handa
2007-06-04 19:27 ` For after-the-release: enhanced partial completion Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m27iqhrfto.fsf@cs.ucsd.edu \
--to=sorourke@cs.ucsd.edu \
--cc=emacs-devel@gnu.org \
--cc=sdl.web@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).