diff options
author | Jan Djärv <[email protected]> | 2006-09-02 17:37:26 +0000 |
---|---|---|
committer | Jan Djärv <[email protected]> | 2006-09-02 17:37:26 +0000 |
commit | 655ea21ca38fc769588027b2e8097c1edda6f19d (patch) | |
tree | e698c59048ebb67777f25a722adf062bfb0e4d5d /src | |
parent | 79f6ba1f7a39b9a5a6b4282caefcefe03e8dc78c (diff) |
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/minibuf.c | 36 |
2 files changed, 22 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1082f79293..76a292d43b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-09-02 Jan Dj,Ad(Brv <[email protected]> + + * minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls + 2006-09-02 Jindrich Makovicka <[email protected]> (tiny change) * fns.c (concat) [__GNUC__]: Declare with diff --git a/src/minibuf.c b/src/minibuf.c index a5ad7077db..58da538572 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1149,24 +1149,6 @@ A user variable is one for which `user-variable-p' returns non-nil. */) return Fintern (name, Qnil); } -DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0, - doc: /* Perform completion on buffer names. -If the argument FLAG is nil, invoke `try-completion', if it's t, invoke -`all-completions', otherwise invoke `test-completion'. - -The arguments STRING and PREDICATE are as in `try-completion', -`all-completions', and `test-completion'. */) - (string, predicate, flag) - Lisp_Object string, predicate, flag; -{ - if (NILP (flag)) - return Ftry_completion (string, Vbuffer_alist, predicate); - else if (EQ (flag, Qt)) - return Fall_completions (string, Vbuffer_alist, predicate, Qt); - else /* assume `lambda' */ - return Ftest_completion (string, Vbuffer_alist, predicate); -} - DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, doc: /* Read the name of a buffer and return as a string. Prompt with PROMPT. @@ -1923,6 +1905,24 @@ the values STRING, PREDICATE and `lambda'. */) return Qt; } +DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0, + doc: /* Perform completion on buffer names. +If the argument FLAG is nil, invoke `try-completion', if it's t, invoke +`all-completions', otherwise invoke `test-completion'. + +The arguments STRING and PREDICATE are as in `try-completion', +`all-completions', and `test-completion'. */) + (string, predicate, flag) + Lisp_Object string, predicate, flag; +{ + if (NILP (flag)) + return Ftry_completion (string, Vbuffer_alist, predicate); + else if (EQ (flag, Qt)) + return Fall_completions (string, Vbuffer_alist, predicate, Qt); + else /* assume `lambda' */ + return Ftest_completion (string, Vbuffer_alist, predicate); +} + /* returns: * 0 no possible completion * 1 was already an exact and unique completion |