[Qemacs-commit] qemacs shell.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/03/25 13:49:39

Modified files:
        .              : shell.c 

Log message:
        C-x C-m finds the most recently used process buffer

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.118&r2=1.119

Patches:
Index: shell.c
===================================================================
RCS file: /sources/qemacs/qemacs/shell.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- shell.c     18 Mar 2017 14:13:33 -0000      1.118
+++ shell.c     25 Mar 2017 17:49:39 -0000      1.119
@@ -1550,8 +1550,14 @@
             if (shs->pid >= 0)
                 return;
         } else {
-            /* XXX: should find the last used shell buffer */
-            b = try_show_buffer(s, "*shell*");
+            /* Find the last used shell buffer */
+            const char *bname = "*shell*";
+
+            if ((b = eb_find(error_buffer)) != NULL
+            &&  qe_get_buffer_mode_data(b, &shell_mode, NULL) != NULL) {
+                bname = error_buffer;
+            }
+            b = try_show_buffer(s, bname);
             if (b) {
                 shs = qe_get_buffer_mode_data(b, &shell_mode, NULL);
                 if (shs && shs->pid >= 0)