/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
* Copyright (C) 2000 Edmund Grimley Evans <edmundo@rano.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
*/
#if HAVE_CONFIG_H
#include "mutt_curses.h"
#include "keymap.h"
#include "history.h"
+#include "buffy.h"
+
+#include "lib/mem.h"
#include <string.h>
if (ch != OP_NULL) {
first = 0;
- if (ch != OP_EDITOR_COMPLETE)
+ if (ch != OP_EDITOR_COMPLETE && ch != OP_EDITOR_COMPLETE_QUERY)
state->tabs = 0;
redraw = M_REDRAW_LINE;
switch (ch) {
if (flags & M_EFILE) {
first = 1; /* clear input if user types a real key later */
my_wcstombs (buf, buflen, state->wbuf, state->curpos);
- mutt_buffy (buf, buflen);
+ buffy_next (buf, buflen);
state->curpos = state->lastchar =
my_mbstowcs (&state->wbuf, &state->wbuflen, 0, buf);
break;
/* fall through to completion routine (M_FILE) */
case OP_EDITOR_COMPLETE:
+ case OP_EDITOR_COMPLETE_QUERY:
state->tabs++;
if (flags & M_CMD) {
for (i = state->curpos; i && state->wbuf[i - 1] != ' '; i--);
replace_part (state, i, buf);
}
- else if (flags & M_ALIAS) {
+ else if (flags & M_ALIAS && ch == OP_EDITOR_COMPLETE) {
/* invoke the alias-menu to get more addresses */
for (i = state->curpos; i && state->wbuf[i - 1] != ',' &&
state->wbuf[i - 1] != ':'; i--);
goto bye;
}
break;
- }
- else if (flags & M_COMMAND) {
+ } else if (flags & M_ALIAS && ch == OP_EDITOR_COMPLETE_QUERY) {
+ /* invoke the query-menu to get more addresses */
+ if ((i = state->curpos)) {
+ for (; i && state->wbuf[i - 1] != ','; i--);
+ for (; i < state->curpos && state->wbuf[i] == ' '; i++);
+ }
+ my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);
+ mutt_query_complete (buf, buflen);
+ replace_part (state, i, buf);
+ rv = 1;
+ goto bye;
+ } else if (flags & M_COMMAND) {
my_wcstombs (buf, buflen, state->wbuf, state->curpos);
- i = strlen (buf);
+ i = mutt_strlen (buf);
if (i && buf[i - 1] == '=' &&
mutt_var_value_complete (buf, buflen, i))
state->tabs = 0;
goto self_insert;
break;
- case OP_EDITOR_COMPLETE_QUERY:
- if (flags & M_ALIAS) {
- /* invoke the query-menu to get more addresses */
- if ((i = state->curpos)) {
- for (; i && state->wbuf[i - 1] != ','; i--);
- for (; i < state->curpos && state->wbuf[i] == ' '; i++);
- }
-
- my_wcstombs (buf, buflen, state->wbuf + i, state->curpos - i);
- mutt_query_complete (buf, buflen);
- replace_part (state, i, buf);
-
- rv = 1;
- goto bye;
- }
- else
- goto self_insert;
-
case OP_EDITOR_QUOTE_CHAR:
{
event_t event;