diff options
| author | Jan Djärv | 2006-09-02 17:37:26 +0000 |
|---|---|---|
| committer | Jan Djärv | 2006-09-02 17:37:26 +0000 |
| commit | 655ea21ca38fc769588027b2e8097c1edda6f19d (patch) | |
| tree | e698c59048ebb67777f25a722adf062bfb0e4d5d | |
| parent | 79f6ba1f7a39b9a5a6b4282caefcefe03e8dc78c (diff) | |
| download | emacs-655ea21ca38fc769588027b2e8097c1edda6f19d.tar.gz emacs-655ea21ca38fc769588027b2e8097c1edda6f19d.zip | |
* minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls
| -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 1082f792934..76a292d43bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-09-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * minibuf.c (Finternal_complete_buffer): Move after DEFUN:s it calls | ||
| 4 | |||
| 1 | 2006-09-02 Jindrich Makovicka <makovick@gmail.com> (tiny change) | 5 | 2006-09-02 Jindrich Makovicka <makovick@gmail.com> (tiny change) |
| 2 | 6 | ||
| 3 | * fns.c (concat) [__GNUC__]: Declare with | 7 | * fns.c (concat) [__GNUC__]: Declare with |
diff --git a/src/minibuf.c b/src/minibuf.c index a5ad7077dbe..58da5385728 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. */) | |||
| 1149 | return Fintern (name, Qnil); | 1149 | return Fintern (name, Qnil); |
| 1150 | } | 1150 | } |
| 1151 | 1151 | ||
| 1152 | DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0, | ||
| 1153 | doc: /* Perform completion on buffer names. | ||
| 1154 | If the argument FLAG is nil, invoke `try-completion', if it's t, invoke | ||
| 1155 | `all-completions', otherwise invoke `test-completion'. | ||
| 1156 | |||
| 1157 | The arguments STRING and PREDICATE are as in `try-completion', | ||
| 1158 | `all-completions', and `test-completion'. */) | ||
| 1159 | (string, predicate, flag) | ||
| 1160 | Lisp_Object string, predicate, flag; | ||
| 1161 | { | ||
| 1162 | if (NILP (flag)) | ||
| 1163 | return Ftry_completion (string, Vbuffer_alist, predicate); | ||
| 1164 | else if (EQ (flag, Qt)) | ||
| 1165 | return Fall_completions (string, Vbuffer_alist, predicate, Qt); | ||
| 1166 | else /* assume `lambda' */ | ||
| 1167 | return Ftest_completion (string, Vbuffer_alist, predicate); | ||
| 1168 | } | ||
| 1169 | |||
| 1170 | DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, | 1152 | DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, |
| 1171 | doc: /* Read the name of a buffer and return as a string. | 1153 | doc: /* Read the name of a buffer and return as a string. |
| 1172 | Prompt with PROMPT. | 1154 | Prompt with PROMPT. |
| @@ -1923,6 +1905,24 @@ the values STRING, PREDICATE and `lambda'. */) | |||
| 1923 | return Qt; | 1905 | return Qt; |
| 1924 | } | 1906 | } |
| 1925 | 1907 | ||
| 1908 | DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0, | ||
| 1909 | doc: /* Perform completion on buffer names. | ||
| 1910 | If the argument FLAG is nil, invoke `try-completion', if it's t, invoke | ||
| 1911 | `all-completions', otherwise invoke `test-completion'. | ||
| 1912 | |||
| 1913 | The arguments STRING and PREDICATE are as in `try-completion', | ||
| 1914 | `all-completions', and `test-completion'. */) | ||
| 1915 | (string, predicate, flag) | ||
| 1916 | Lisp_Object string, predicate, flag; | ||
| 1917 | { | ||
| 1918 | if (NILP (flag)) | ||
| 1919 | return Ftry_completion (string, Vbuffer_alist, predicate); | ||
| 1920 | else if (EQ (flag, Qt)) | ||
| 1921 | return Fall_completions (string, Vbuffer_alist, predicate, Qt); | ||
| 1922 | else /* assume `lambda' */ | ||
| 1923 | return Ftest_completion (string, Vbuffer_alist, predicate); | ||
| 1924 | } | ||
| 1925 | |||
| 1926 | /* returns: | 1926 | /* returns: |
| 1927 | * 0 no possible completion | 1927 | * 0 no possible completion |
| 1928 | * 1 was already an exact and unique completion | 1928 | * 1 was already an exact and unique completion |