mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-22 07:51:17 -08:00
Code Issues Projects Releases Wiki Activity

(mh-display-completion-list-compat): New macro which calls

Browse source 
`display-completion-list' correctly in older environments. Versions of
Emacs prior to version 22 lacked a COMMON-SUBSTRING argument.
(mh-complete-word): Use it.
This commit is contained in:
Bill Wohler 2005-10-17 06:33:31 +00:00
parent 790401011b
commit 79af55a7eb
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/mh-e/ChangeLog
View file

@ -1,5 +1,11 @@
2005-10-16 Bill Wohler <wohler@newt.com>
* mh-comp.el (mh-display-completion-list-compat): New macro which
calls `display-completion-list' correctly in older environments.
Versions of Emacs prior to version 22 lacked a COMMON-SUBSTRING
argument.
(mh-complete-word): Use it.
* mh-init.el (mh-image-load-path): Use locate-library to find
MH-E. This simplified the code a lot. Flattened out nested
statements even more.

13
lisp/mh-e/mh-comp.el
View file

@ -1633,6 +1633,16 @@ This is useful in breaking up paragraphs in replies."
(mh-do-in-xemacs (defvar mail-abbrevs))
(defmacro mh-display-completion-list-compat (word choices)
"Completes WORD from CHOICES using `display-completion-list'.
Calls `display-completion-list' correctly in older environments.
Versions of Emacs prior to version 22 lacked a COMMON-SUBSTRING argument
which is used to highlight the next possible character you can enter
in the current list of completions."
(if (>= emacs-major-version 22)
`(display-completion-list (all-completions ,word ,choices) ,word)
`(display-completion-list (all-completions ,word ,choices))))
;;;###mh-autoload
(defun mh-complete-word (word choices begin end)
"Complete WORD at from CHOICES.
@ -1650,8 +1660,7 @@ Any match found replaces the text from BEGIN to END."
((stringp completion)
(if (equal word completion)
(with-output-to-temp-buffer completions-buffer
(display-completion-list (all-completions word choices)
word))
(mh-display-completion-list-compat word choices))
(ignore-errors
(kill-buffer completions-buffer))
(delete-region begin end)