Mercurial > emacs
comparison lisp/subr.el @ 83423:b64b7e867d0a
Merged from miles@gnu.org--gnu-2005 (patch 677)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-677
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-463
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 26 Dec 2005 03:16:59 +0000 |
parents | 14a4eb789b45 915b73d58795 |
children | ec395f552d45 |
comparison
equal
deleted
inserted
replaced
83422:1f5d64c4df6f | 83423:b64b7e867d0a |
---|---|
2278 `lazy-completion-table' must be used to initialize the value of VAR." | 2278 `lazy-completion-table' must be used to initialize the value of VAR." |
2279 (declare (debug (symbol lambda-expr def-body))) | 2279 (declare (debug (symbol lambda-expr def-body))) |
2280 (let ((str (make-symbol "string"))) | 2280 (let ((str (make-symbol "string"))) |
2281 `(dynamic-completion-table | 2281 `(dynamic-completion-table |
2282 (lambda (,str) | 2282 (lambda (,str) |
2283 (unless (listp ,var) | 2283 (when (functionp ,var) |
2284 (setq ,var (,fun ,@args))) | 2284 (setq ,var (,fun ,@args))) |
2285 ,var)))) | 2285 ,var)))) |
2286 | 2286 |
2287 (defmacro complete-in-turn (a b) | 2287 (defmacro complete-in-turn (a b) |
2288 "Create a completion table that first tries completion in A and then in B. | 2288 "Create a completion table that first tries completion in A and then in B. |