*** ../bash-4.1-patched/builtins/fc.def 2009-03-21 14:03:43.000000000 -0400 --- builtins/fc.def 2011-04-19 15:46:17.000000000 -0400 *************** *** 304,307 **** --- 304,317 ---- last_hist = i - rh - hist_last_line_added; + /* XXX */ + if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; + if (last_hist < 0) + { + sh_erange ((char *)NULL, _("history specification")); + return (EXECUTION_FAILURE); + } + if (list) { *************** *** 466,470 **** { int sign, n, clen, rh; ! register int i, j; register char *s; --- 476,480 ---- { int sign, n, clen, rh; ! register int i, j, last_hist; register char *s; *************** *** 486,490 **** calculation as if it were on. */ rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); ! i -= rh + hist_last_line_added; /* No specification defaults to most recent command. */ --- 496,508 ---- calculation as if it were on. */ rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); ! last_hist = i - rh - hist_last_line_added; ! ! if (i == last_hist && hlist[last_hist] == 0) ! while (last_hist >= 0 && hlist[last_hist] == 0) ! last_hist--; ! if (last_hist < 0) ! return (-1); ! ! i = last_hist; /* No specification defaults to most recent command. */