comparison lisp/complete.el @ 91015:b83d0dadb2a7

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
author Miles Bader <miles@gnu.org>
date Wed, 29 Aug 2007 05:03:40 +0000
parents 424b655804ca f839eef40802
children 14c4a6aac623
comparison
equal deleted inserted replaced
91014:2392e6a45952 91015:b83d0dadb2a7
829 ;; Note that choose-completion-string-functions 829 ;; Note that choose-completion-string-functions
830 ;; plays around with point. 830 ;; plays around with point.
831 (setq completion-base-size (if dirname 831 (setq completion-base-size (if dirname
832 dirlength 832 dirlength
833 (- beg prompt-end)))))) 833 (- beg prompt-end))))))
834 (PC-temp-minibuffer-message " [Next char not unique]")))))) 834 (PC-temp-minibuffer-message " [Next char not unique]"))
835 ;; Expansion of filenames is not reversible, so just keep 835 ;; Expansion of filenames is not reversible,
836 ;; the prefix. 836 ;; so just keep the prefix.
837 (when (and abbreviated filename) 837 (when (and abbreviated filename)
838 (delete-region (point) end)) 838 (delete-region (point) end))
839 nil) 839 nil)))))
840 840
841 ;; Only one possible completion 841 ;; Only one possible completion
842 (t 842 (t
843 (if (and (equal basestr (car poss)) 843 (if (and (equal basestr (car poss))
844 (not (and env-on filename)) 844 (not (and env-on filename))