aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJuri Linkov2019-10-13 23:56:17 +0300
committerJuri Linkov2019-10-13 23:56:17 +0300
commit097a03d2a372c1285696779c7051d5b044d437f5 (patch)
tree9459b1614ab3e2856d4b794eca8fb84a30414972 /doc
parent21f2922b8436f67a8519339593cde69083d215c1 (diff)
downloademacs-097a03d2a372c1285696779c7051d5b044d437f5.tar.gz
emacs-097a03d2a372c1285696779c7051d5b044d437f5.zip
Enable tab-bar-mode from X resources
* lisp/startup.el (x-apply-session-resources): Enable tab-bar-mode when X resource "tabBar" class "TabBar" is "on", "yes" or "1". * doc/man/emacs.1.in: * doc/emacs/xresources.texi (Table of Resources): Document X resource "tabBar" (class "TabBar").
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/cmdargs.texi6
-rw-r--r--doc/emacs/xresources.texi5
-rw-r--r--doc/lispref/internals.texi4
-rw-r--r--doc/man/emacs.1.in5
4 files changed, 14 insertions, 6 deletions
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 2b403b4a33e..fa28c3eabcb 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1237,9 +1237,9 @@ Disable the blinking cursor on graphical displays.
1237@opindex -D 1237@opindex -D
1238@itemx --basic-display 1238@itemx --basic-display
1239@opindex --basic-display 1239@opindex --basic-display
1240Disable the menu-bar, the tool-bar, the scroll-bars, and tool tips, 1240Disable the menu-bar, the tool-bar, the scroll-bars, tool tips, and
1241and turn off the blinking cursor. This can be useful for making a 1241font-lock-mode, and turn off the blinking cursor. This can be useful
1242test case that simplifies debugging of display problems. 1242for making a test case that simplifies debugging of display problems.
1243@end table 1243@end table
1244 1244
1245 The @samp{--xrm} option (@pxref{Resources}) specifies additional 1245 The @samp{--xrm} option (@pxref{Resources}) specifies additional
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index d8b70ef9009..e349d40333f 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -319,6 +319,11 @@ Name to display in the title bar of the initial Emacs frame.
319If the value of this resource is @samp{off} or @samp{false} or 319If the value of this resource is @samp{off} or @samp{false} or
320@samp{0}, Emacs disables Tool Bar mode at startup (@pxref{Tool Bars}). 320@samp{0}, Emacs disables Tool Bar mode at startup (@pxref{Tool Bars}).
321 321
322@item @code{tabBar} (class @code{TabBar})
323@cindex tab bar
324If the value of this resource is @samp{on} or @samp{yes} or
325@samp{1}, Emacs enables Tab Bar mode at startup (@pxref{Tab Bars}).
326
322@item @code{useXIM} (class @code{UseXIM}) 327@item @code{useXIM} (class @code{UseXIM})
323@cindex XIM 328@cindex XIM
324@cindex X input methods 329@cindex X input methods
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index ab385168af2..e9fcbf48cb4 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -2324,8 +2324,8 @@ minibuffer or the echo area.
2324Non-zero if this window is a @dfn{pseudo window}. A pseudo window is 2324Non-zero if this window is a @dfn{pseudo window}. A pseudo window is
2325either a window used to display the menu bar or the tool bar (when 2325either a window used to display the menu bar or the tool bar (when
2326Emacs uses toolkits that don't display their own menu bar and tool 2326Emacs uses toolkits that don't display their own menu bar and tool
2327bar) or a window showing a tooltip on a tooltip frame. Pseudo windows 2327bar) or the tab bar or a window showing a tooltip on a tooltip frame.
2328are in general not accessible from Lisp code. 2328Pseudo windows are in general not accessible from Lisp code.
2329 2329
2330@item parent 2330@item parent
2331Internally, Emacs arranges windows in a tree; each group of siblings 2331Internally, Emacs arranges windows in a tree; each group of siblings
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in
index 25c32e018a0..5fe12aed95d 100644
--- a/doc/man/emacs.1.in
+++ b/doc/man/emacs.1.in
@@ -284,7 +284,7 @@ frames is a width of 80 and a height between 35 and 40, depending on
284the OS and the window manager. 284the OS and the window manager.
285See the Emacs manual, section "Options for Window Size and Position", 285See the Emacs manual, section "Options for Window Size and Position",
286for information on how window sizes interact 286for information on how window sizes interact
287with selecting or deselecting the tool bar and menu bar. 287with selecting or deselecting the tool bar, tab bar and menu bar.
288.TP 288.TP
289.BI \-lsp " pixels\fR,\fP " \-\-line\-spacing= "pixels" 289.BI \-lsp " pixels\fR,\fP " \-\-line\-spacing= "pixels"
290Additional space to put between lines. 290Additional space to put between lines.
@@ -517,6 +517,9 @@ window.
517.BR toolBar " (class " ToolBar ) 517.BR toolBar " (class " ToolBar )
518Number of lines to reserve for the tool bar. 518Number of lines to reserve for the tool bar.
519.TP 519.TP
520.BR tabBar " (class " TabBar )
521Number of lines to reserve for the tab bar.
522.TP
520.BR useXIM " (class " UseXIM ) 523.BR useXIM " (class " UseXIM )
521Turns off use of X input methods (XIM) if 524Turns off use of X input methods (XIM) if
522.I false 525.I false