Merge branch 'feature/tabs'

5 files changed, 68 insertions, 14 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 04e2657e7c6..00a01999a73 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2030,6 +2030,34 @@ file-local variable, you may need to update the value.
 
 * New Modes and Packages in Emacs 27.1
 
+** 'tab-bar-mode' enables the tab-bar at the top of each frame,
+to switch named persistent window configurations in it using tabs.
+New tab-based keybindings (similar to frame-based commands):
+'C-x 6 2' creates a new tab;
+'C-x 6 0' deletes the current tab;
+'C-x 6 b' switches to buffer in another tab;
+'C-x 6 f' and 'C-x 6 C-f' edit file in another tab;
+'C-TAB' switches to the next tab;
+'S-C-TAB' switches to the previous tab.
+
+Also it's possible to switch named persistent window configurations
+without having graphical access to the tab-bar, even on a tty
+or when 'tab-bar-mode' is disabled, with these commands:
+'tab-new' creates a new window configuration;
+'tab-close' deletes the current window configuration;
+'tab-select' switches to the window configuration by its name;
+'tab-previous' switches to the previous window configuration;
+'tab-next' switches to the next window configuration;
+'tab-list' displays a list of named window configurations for switching.
+
+** 'global-tab-line-mode' enables the tab-line above each window to
+switch buffers in it to previous/next buffers.  Selecting a previous
+window-local tab is the same as running 'C-x <left>' (previous-buffer),
+selecting a next tab switches to the tab available by 'C-x <right>'
+(next-buffer).  Clicking on the plus icon adds a new buffer to the
+window-local tab-line of window buffers.  Using the mouse wheel on the
+tab-line scrolls the window buffers whose names are displayed in tabs.
+
 ** fileloop.el lets one setup multifile operations like search&replace.
 
 +++
diff --git a/etc/TODO b/etc/TODO
index 67de79f8a97..2c36f5bfe4b 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -324,20 +324,6 @@ consistency checks that make sure the new code computes the same results
 as the old code.  And once that works well, we can remove the old code
 and old fields.
 
-** Having tabs above a window to switch buffers in it.
-
-** "Perspectives" are named persistent window configurations.  We have
-had the window configuration mechanism in GNU Emacs since the
-beginning but we have never developed a good user interface to take
-advantage of them.  Eclipse's user interface seems to be good.
-
-Perspectives work well even if you do the equivalent of C-x 4 C-f
-because of the distinction between view windows vs file windows.  In
-Emacs this is more or less the "dedicated window" feature, but we have
-never really made it work for this.
-
-Perspectives also need to interact with the tabs.
-
 ** FFI (foreign function interface)
 See eg https://lists.gnu.org/r/emacs-devel/2013-10/msg00246.html
 
diff --git a/etc/images/tabs/README b/etc/images/tabs/README
new file mode 100644
index 00000000000..1e9f4e5b595
--- /dev/null
+++ b/etc/images/tabs/README
@@ -0,0 +1,8 @@
+This directory contains icons for the Tabs user interface.
+
+COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
+
+Files: close.xpm new.xpm
+Author: Juri Linkov <juri@linkov.net>
+Copyright (C) 2019 Free Software Foundation, Inc.
+License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/tabs/close.xpm b/etc/images/tabs/close.xpm
new file mode 100644
index 00000000000..1c3f4d8fd7d
--- /dev/null
+++ b/etc/images/tabs/close.xpm
@@ -0,0 +1,16 @@
+/* XPM */
+static char * close_xpm[] = {
+"9 9 4 1",
+"       c None",
+".      c #BFBFBF",
+"+      c #000000",
+"@      c #808080",
+"  .....  ",
+" ....... ",
+"..+@.@+..",
+"..@+@+@..",
+"...@+@...",
+"..@+@+@..",
+"..+@.@+..",
+" ....... ",
+"  .....  "};
diff --git a/etc/images/tabs/new.xpm b/etc/images/tabs/new.xpm
new file mode 100644
index 00000000000..e10a8ef238b
--- /dev/null
+++ b/etc/images/tabs/new.xpm
@@ -0,0 +1,16 @@
+/* XPM */
+static char * new_xpm[] = {
+"9 9 4 1",
+"       c None",
+".      c #BFBFBF",
+"+      c #808080",
+"@      c #000000",
+".........",
+"....+....",
+"....@....",
+"....@....",
+".+@@@@@+.",
+"....@....",
+"....@....",
+"....+....",
+"........."};