Merge PR #2076 'Builtin terminal emulation'

1 files changed, 37 insertions, 19 deletions

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 5ece645b0d..dd20d61f75 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -68,6 +68,7 @@
 #include "nvim/spell.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
+#include "nvim/terminal.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
 #include "nvim/version.h"
@@ -307,20 +308,28 @@ close_buffer (
   bool del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
   bool wipe_buf = (action == DOBUF_WIPE);
 
-  /*
-   * Force unloading or deleting when 'bufhidden' says so.
-   * The caller must take care of NOT deleting/freeing when 'bufhidden' is
-   * "hide" (otherwise we could never free or delete a buffer).
-   */
-  if (buf->b_p_bh[0] == 'd') {          /* 'bufhidden' == "delete" */
-    del_buf = true;
+  // Force unloading or deleting when 'bufhidden' says so, but not for terminal
+  // buffers.
+  // The caller must take care of NOT deleting/freeing when 'bufhidden' is
+  // "hide" (otherwise we could never free or delete a buffer).
+  if (!buf->terminal) {
+    if (buf->b_p_bh[0] == 'd') {         // 'bufhidden' == "delete"
+      del_buf = true;
+      unload_buf = true;
+    } else if (buf->b_p_bh[0] == 'w') {  // 'bufhidden' == "wipe"
+      del_buf = true;
+      unload_buf = true;
+      wipe_buf = true;
+    } else if (buf->b_p_bh[0] == 'u')    // 'bufhidden' == "unload"
+      unload_buf = true;
+  }
+
+  if (buf->terminal && (unload_buf || del_buf || wipe_buf)) {
+    // terminal buffers can only be wiped
     unload_buf = true;
-  } else if (buf->b_p_bh[0] == 'w') { /* 'bufhidden' == "wipe" */
     del_buf = true;
-    unload_buf = true;
     wipe_buf = true;
-  } else if (buf->b_p_bh[0] == 'u')     /* 'bufhidden' == "unload" */
-    unload_buf = true;
+  }
 
   if (win_valid(win)) {
     /* Set b_last_cursor when closing the last window for the buffer.
@@ -383,6 +392,10 @@ close_buffer (
   if (buf->b_nwindows > 0 || !unload_buf)
     return;
 
+  if (buf->terminal) {
+    terminal_close(buf->terminal, NULL);
+  } 
+
   /* Always remove the buffer when there is no file name. */
   if (buf->b_ffname == NULL)
     del_buf = TRUE;
@@ -925,8 +938,8 @@ do_buffer (
     if (action != DOBUF_WIPE && buf->b_ml.ml_mfp == NULL && !buf->b_p_bl)
       return FAIL;
 
-    if (!forceit && bufIsChanged(buf)) {
-      if ((p_confirm || cmdmod.confirm) && p_write) {
+    if (!forceit && (buf->terminal || bufIsChanged(buf))) {
+      if ((p_confirm || cmdmod.confirm) && p_write && !buf->terminal) {
         dialog_changed(buf, FALSE);
         if (!buf_valid(buf))
           /* Autocommand deleted buffer, oops!  It's not changed
@@ -937,9 +950,14 @@ do_buffer (
         if (bufIsChanged(buf))
           return FAIL;
       } else {
-        EMSGN(_("E89: No write since last change for buffer %" PRId64
-                " (add ! to override)"),
-              buf->b_fnum);
+        if (buf->terminal) {
+          EMSG2(_("E89: %s will be killed(add ! to override)"),
+              (char *)buf->b_fname);
+        } else {
+          EMSGN(_("E89: No write since last change for buffer %" PRId64
+                  " (add ! to override)"),
+                buf->b_fnum);
+        }
         return FAIL;
       }
     }
@@ -2145,7 +2163,7 @@ void buflist_list(exarg_T *eap)
         (curwin->w_alt_fnum == buf->b_fnum ? '#' : ' '),
         buf->b_ml.ml_mfp == NULL ? ' ' :
         (buf->b_nwindows == 0 ? 'h' : 'a'),
-        !buf->b_p_ma ? '-' : (buf->b_p_ro ? '=' : ' '),
+        !MODIFIABLE(buf) ? '-' : (buf->b_p_ro ? '=' : ' '),
         (buf->b_flags & BF_READERR) ? 'x'
         : (bufIsChanged(buf) ? '+' : ' '),
         NameBuff);
@@ -2623,7 +2641,7 @@ void maketitle(void)
 
       switch (bufIsChanged(curbuf)
               + (curbuf->b_p_ro * 2)
-              + (!curbuf->b_p_ma * 4)) {
+              + (!MODIFIABLE(curbuf) * 4)) {
       case 1: STRCAT(buf, " +"); break;
       case 2: STRCAT(buf, " ="); break;
       case 3: STRCAT(buf, " =+"); break;
@@ -3250,7 +3268,7 @@ build_stl_str_hl (
       itemisflag = TRUE;
       switch ((opt == STL_MODIFIED_ALT)
               + bufIsChanged(wp->w_buffer) * 2
-              + (!wp->w_buffer->b_p_ma) * 4) {
+              + (!MODIFIABLE(wp->w_buffer)) * 4) {
       case 2: str = (char_u *)"[+]"; break;
       case 3: str = (char_u *)",+"; break;
       case 4: str = (char_u *)"[-]"; break;