diff options
| -rw-r--r-- | lisp/mh-e/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/mh-e/mh-alias.el | 3 | ||||
| -rw-r--r-- | lisp/mh-e/mh-compat.el | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index baba9c80ab9..8d1ec19415a 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,5 +1,9 @@ 2011-07-03 Bill Wohler <wohler@newt.com> + * mh-compat.el (mh-test-completion): Add compatibility function + for systems without test-completion. + * mh-alias.el (mh-alias-letter-expand-alias): Use it + * mh-utils.el: * mh-mime.el: Shush XEmacs compiler in mh-do-in-xemacs block. diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index 2df6025bf09..d1b3ccebf46 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el @@ -316,8 +316,7 @@ Blind aliases or users from /etc/passwd are not expanded." res) res))) ((t) (all-completions string mh-alias-alist pred)) - ((lambda) (if (fboundp 'test-completion) - (test-completion string mh-alias-alist pred)))))))))) + ((lambda) (mh-test-completion string mh-alias-alist pred))))))))) ;;; Alias File Updating diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 01a0f26b9e8..ff30c15fec4 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -260,6 +260,12 @@ The arguments FIXEDCASE, SUBEXP, and START, used by `replace-in-string' are ignored." (replace-in-string string regexp rep literal)) +(defun-mh mh-test-completion + test-completion (string collection &optional predicate) + "XEmacs does not have `test-completion'. +This function returns nil on that system." + nil) + ;; Copy of constant from url-util.el in Emacs 22; needed by Emacs 21. (if (not (boundp 'url-unreserved-chars)) (defconst mh-url-unreserved-chars |