comparison lisp/simple.el @ 89978:566253900690

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-40 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-535 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-536 sync-tree with gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-537 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-538 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-539 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-540 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-541 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-542 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-545 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-546 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-547 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-548 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-549 Use symbol-matching for generic-mode keywords * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-550 Update from CVS * [e-mail]--gnu-2004/gnus--devo--0--patch-2 Add {arch}/=cvs-sync-make-log * [e-mail]--gnu-2004/gnus--rel--5.8--base-0 Import from Gnus CVS branch V5-8 * [e-mail]--gnu-2004/gnus--rel--5.8--patch-1 {arch}/=tagging-method: Add CVS and autoconf grot to junk regexp * [e-mail]--gnu-2004/gnus--rel--5.8--patch-2 Use explicit tags for autoconf input files * [e-mail]--gnu-2004/gnus--rel--5.8--patch-3 Remove RCS keywords * [e-mail]--gnu-2004/gnus--rel--5.8--patch-4 Fix copied explicit id-tags * [e-mail]--gnu-2004/gnus--rel--5.8--patch-5 Add {arch}/=cvs-sync-make-log * [e-mail]--gnu-2004/gnus--rel--5.8--patch-6 configure.in: Use ifelse instead of m4_if for arch-tag: comment * [e-mail]--gnu-2004/gnus--rel--5.10--base-0 tag of [e-mail]--gnu-2004/gnus--rel--5.8--base-0 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-1 Gnus 5.10, from CVS branch v5-10 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-2 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-3 Use explicit tags for autoconf input files * [e-mail]--gnu-2004/gnus--rel--5.10--patch-4 sync-tree with gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-5 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-6 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-7 Remove RCS keywords * [e-mail]--gnu-2004/gnus--rel--5.10--patch-8 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-9 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-10 Add {arch}/=cvs-sync-make-log * [e-mail]--gnu-2004/gnus--rel--5.10--patch-11 Merge from gnus--rel--5.8 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-12 Update from CVS: make.bat: Fix line endings around arch-tag. * [e-mail]--gnu-2004/gnus--rel--5.10--patch-13 - [e-mail]--gnu-2004/gnus--rel--5.10--patch-17 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-21 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-22 Update from CVS: lisp/nndb.el (require): Remove tcp and duplicate cl. * [e-mail]--gnu-2004/gnus--rel--5.10--patch-23 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-24 lisp/nnimap.el (nnimap-open-connection): Remove extraneous end-paren * [e-mail]--gnu-2004/gnus--rel--5.10--patch-25 - [e-mail]--gnu-2004/gnus--rel--5.10--patch-26 Update from CVS

89977:549fdd6f6856

    (if (and mini-p
	     (or (not (active-minibuffer-window))
		 (not (equal buffer
			     (window-buffer (active-minibuffer-window))))))
	(error "Minibuffer is not active for completion")
      (unless (run-hook-with-args-until-success
	       'choose-completion-string-functions
	       choice buffer mini-p base-size)
	;; Insert the completion into the buffer where it was requested.
	(set-buffer buffer)
	(if base-size
	    (delete-region (+ base-size (if mini-p
					    (minibuffer-prompt-end)
					  (point-min)))
			   (point))

89978:566253900690

    (if (and mini-p
	     (or (not (active-minibuffer-window))
		 (not (equal buffer
			     (window-buffer (active-minibuffer-window))))))
	(error "Minibuffer is not active for completion")
      ;; Set buffer so buffer-local choose-completion-string-functions works.
      (set-buffer buffer)
      (unless (run-hook-with-args-until-success
	       'choose-completion-string-functions
	       choice buffer mini-p base-size)
	;; Insert the completion into the buffer where it was requested.
	(if base-size
	    (delete-region (+ base-size (if mini-p
					    (minibuffer-prompt-end)
					  (point-min)))
			   (point))