Mercurial > emacs
changeset 66138:88bf1b026ccb
(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.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Mon, 17 Oct 2005 06:33:31 +0000 |
| parents | 8e90ee28ad1a |
| children | 50ae7c160214 |
| files | lisp/mh-e/ChangeLog lisp/mh-e/mh-comp.el |
| diffstat | 2 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog Mon Oct 17 06:28:55 2005 +0000 +++ b/lisp/mh-e/ChangeLog Mon Oct 17 06:33:31 2005 +0000 @@ -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.
--- a/lisp/mh-e/mh-comp.el Mon Oct 17 06:28:55 2005 +0000 +++ b/lisp/mh-e/mh-comp.el Mon Oct 17 06:33:31 2005 +0000 @@ -1633,6 +1633,16 @@ (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 @@ ((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)