[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/complete.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/complete.el,v |
Date: |
Sat, 14 Apr 2007 19:33:06 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/04/14 19:33:06
Index: complete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/complete.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- complete.el 29 Mar 2007 03:24:36 -0000 1.70
+++ complete.el 14 Apr 2007 19:33:06 -0000 1.71
@@ -190,6 +190,10 @@
(defvar PC-do-completion-end nil
"Internal variable used by `PC-do-completion'.")
+(defvar PC-goto-end nil
+ "Internal variable set in `PC-do-completion', used in
+`choose-completion-string-functions'.")
+
;;;###autoload
(define-minor-mode partial-completion-mode
"Toggle Partial Completion mode.
@@ -242,11 +246,16 @@
(if partial-completion-mode 'add-hook 'remove-hook)
'choose-completion-string-functions
(lambda (choice buffer mini-p base-size)
- (if mini-p (goto-char (point-max))
+ ;; When completing M-: (lisp- ) with point before the ), it is
+ ;; not appropriate to go to point-max (unlike the filename case).
+ (if (and (not PC-goto-end)
+ mini-p)
+ (goto-char (point-max))
;; Need a similar hack for the non-minibuffer-case -- gm.
(when PC-do-completion-end
(goto-char PC-do-completion-end)
(setq PC-do-completion-end nil)))
+ (setq PC-goto-end nil)
nil))
;; Build the env-completion and mapping table.
(when (and partial-completion-mode (null PC-env-vars-alist))
@@ -417,7 +426,13 @@
(let ((result (try-completion string alist predicate)))
(if (eq result t) string result)))
-(defun PC-do-completion (&optional mode beg end)
+;; TODO document MODE magic...
+(defun PC-do-completion (&optional mode beg end goto-end)
+ "Internal function to do the work of partial completion.
+Text to be completed lies between BEG and END. Normally when
+replacing text in the minibuffer, this function replaces up to
+point-max (as is appropriate for completing a file name). If
+GOTO-END is non-nil, however, it instead replaces up to END."
(or beg (setq beg (minibuffer-prompt-end)))
(or end (setq end (point-max)))
(let* ((table minibuffer-completion-table)
@@ -772,7 +787,8 @@
(setq completion-base-size (if dirname
dirlength
(- beg prompt-end))
- PC-do-completion-end end))))
+ PC-do-completion-end end
+ PC-goto-end goto-end))))
(PC-temp-minibuffer-message " [Next char not unique]"))
nil)))))
@@ -886,11 +902,11 @@
;; Alternatively alternatively, maybe end should be computed in
;; the same way as beg. That would change the behaviour though.
(if (equal last-command 'PC-lisp-complete-symbol)
- (PC-do-completion nil beg PC-lisp-complete-end)
+ (PC-do-completion nil beg PC-lisp-complete-end t)
(if PC-lisp-complete-end
(move-marker PC-lisp-complete-end end)
(setq PC-lisp-complete-end (copy-marker end t)))
- (PC-do-completion nil beg end))))
+ (PC-do-completion nil beg end t))))
(defun PC-complete-as-file-name ()
"Perform completion on file names preceding point.
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v,
Glenn Morris <=