Changeset b470451


Ignore:
Timestamp:
Jun 25, 2011, 3:24:36 AM (7 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Branches:
master, release-1.8, release-1.9
Children:
8e515f9
Parents:
ad37b39
git-author:
Anders Kaseorg <andersk@mit.edu> (06/22/11 03:04:01)
git-committer:
Anders Kaseorg <andersk@mit.edu> (06/25/11 03:24:36)
Message:
history: Tell owl_history_store whether the new entry will be partial

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • commands.c

    r83a079a rb470451  
    26322632  ptr = skiptokens(buff, 1);
    26332633  hist = owl_global_get_cmd_history(&g);
    2634   owl_history_store(hist, ptr);
     2634  owl_history_store(hist, ptr, false);
    26352635  /* owl_function_makemsg("History '%s' stored successfully", ptr+1); */
    26362636  return NULL;
     
    26542654
    26552655  hist = owl_global_get_cmd_history(&g);
    2656   owl_history_store(hist, ptr);
     2656  owl_history_store(hist, ptr, false);
    26572657  return owl_function_command(ptr);
    26582658}
     
    27382738  hist = owl_editwin_get_history(e);
    27392739  if (hist)
    2740     owl_history_store(hist, owl_editwin_get_text(e));
     2740    owl_history_store(hist, owl_editwin_get_text(e), false);
    27412741
    27422742  owl_global_pop_context(&g);
     
    27512751  if (!hist)
    27522752    return;
    2753   if (!owl_history_is_touched(hist)) {
    2754     owl_history_store(hist, owl_editwin_get_text(e));
    2755     owl_history_set_partial(hist);
    2756   }
     2753  if (!owl_history_is_touched(hist))
     2754    owl_history_store(hist, owl_editwin_get_text(e), true);
    27572755  ptr=owl_history_get_prev(hist);
    27582756  if (ptr) {
     
    27932791
    27942792  if (hist)
    2795     owl_history_store(hist, owl_editwin_get_text(e));
     2793    owl_history_store(hist, owl_editwin_get_text(e), false);
    27962794
    27972795  /* Take a reference to the editwin, so that it survives the pop
  • functions.c

    r83a079a rb470451  
    18411841    if (enter) {
    18421842      owl_history *hist = owl_global_get_cmd_history(&g);
    1843       owl_history_store(hist, buff);
     1843      owl_history_store(hist, buff, false);
    18441844      owl_function_command_norv(buff);
    18451845    } else {
  • history.c

    rad37b39 rb470451  
    55  owl_list_create(&(h->hist));
    66  h->cur=0;                     /* current position in history */
    7   h->partial=0;                 /* is the 0th element is partially composed? */
     7  h->partial = false;           /* is the 0th element is partially composed? */
    88}
    99
     
    3636}
    3737
    38 void owl_history_store(owl_history *h, const char *line)
     38void owl_history_store(owl_history *h, const char *line, bool partial)
    3939{
    4040  int size;
     
    5858  /* add the new line */
    5959  owl_list_prepend_element(&(h->hist), g_strdup(line));
    60 }
    61 
    62 void owl_history_set_partial(owl_history *h)
    63 {
    64   if (!h) return;
    65   h->partial=1;
     60  h->partial = partial;
    6661}
    6762
     
    7469    g_free(owl_list_get_element(&(h->hist), 0));
    7570    owl_list_remove_element(&(h->hist), 0);
    76     h->partial = 0;
     71    h->partial = false;
    7772  }
    7873
  • owl.h

    r9923144 rb470451  
    457457  owl_list hist;
    458458  int cur;
    459   int partial;
     459  bool partial;
    460460} owl_history;
    461461
Note: See TracChangeset for help on using the changeset viewer.