mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(partial-completion-mode): Set PC-do-completion-end to nil after use.

Browse source 
(PC-lisp-complete-symbol): Create and use a marker at `end',
rather than using point-marker.
This commit is contained in:
Glenn Morris 2007-03-29 03:24:36 +00:00
parent aae26e176f
commit 660fd6fb69
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/complete.el
View file

@ -244,7 +244,9 @@ second TAB brings up the `*Completions*' buffer."
(lambda (choice buffer mini-p base-size)
(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)))
(when PC-do-completion-end
(goto-char PC-do-completion-end)
(setq PC-do-completion-end nil)))
nil))
;; Build the env-completion and mapping table.
(when (and partial-completion-mode (null PC-env-vars-alist))
@ -820,6 +822,8 @@ of `minibuffer-completion-table' and the minibuffer contents.")
(setq quit-flag nil
unread-command-events '(7))))))))
;; Does not need to be buffer-local (?) because only used when one
;; PC-l-c-s immediately follows another.
(defvar PC-lisp-complete-end nil
"Internal variable used by `PC-lisp-complete-symbol'.")
@ -834,6 +838,12 @@ 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))))
(beg (save-excursion
(with-syntax-table lisp-mode-syntax-table
(backward-sexp 1)
@ -877,8 +887,9 @@ or properties are considered."
;; 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)
(setq PC-lisp-complete-end (point-marker))
(set-marker-insertion-type 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))))
(defun PC-complete-as-file-name ()