[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: |
Wed, 28 Mar 2007 03:28:50 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/03/28 03:28:49
Index: complete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/complete.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- complete.el 27 Mar 2007 03:17:42 -0000 1.68
+++ complete.el 28 Mar 2007 03:28:49 -0000 1.69
@@ -187,6 +187,9 @@
(define-key global-map [remap lisp-complete-symbol]
'PC-lisp-complete-symbol)))))
+(defvar PC-do-completion-end nil
+ "Internal variable used by `PC-do-completion'.")
+
;;;###autoload
(define-minor-mode partial-completion-mode
"Toggle Partial Completion mode.
@@ -239,7 +242,9 @@
(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)))
+ (if mini-p (goto-char (point-max))
+ ;; Need a similar hack for the non-minibuffer-case -- gm.
+ (if PC-do-completion-end (goto-char PC-do-completion-end)))
nil))
;; Build the env-completion and mapping table.
(when (and partial-completion-mode (null PC-env-vars-alist))
@@ -759,9 +764,13 @@
;; completion gets confused trying to figure out
;; how much to replace, so we tell it explicitly
;; (ie, the number of chars in the buffer before
beg).
+ ;;
+ ;; Note that choose-completion-string-functions
+ ;; plays around with point.
(setq completion-base-size (if dirname
dirlength
- (- beg prompt-end))))))
+ (- beg prompt-end))
+ PC-do-completion-end end))))
(PC-temp-minibuffer-message " [Next char not unique]"))
nil)))))
@@ -869,6 +878,7 @@
(if (equal last-command 'PC-lisp-complete-symbol)
(PC-do-completion nil beg PC-lisp-complete-end)
(setq PC-lisp-complete-end (point-marker))
+ (set-marker-insertion-type PC-lisp-complete-end t)
(PC-do-completion nil beg end))))
(defun PC-complete-as-file-name ()
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Chong Yidong, 2007/03/05
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Michaƫl Cadilhac, 2007/03/07
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Kim F. Storm, 2007/03/07
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Chong Yidong, 2007/03/08
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Martin Rudalics, 2007/03/09
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Glenn Morris, 2007/03/09
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Martin Rudalics, 2007/03/10
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Stefan Monnier, 2007/03/21
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Glenn Morris, 2007/03/26
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/complete.el,v, Glenn Morris, 2007/03/28