aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorUlrich Müller2013-08-31 12:49:52 -0700
committerGlenn Morris2013-08-31 12:49:52 -0700
commit5d85cfe6f7c80faeb1259fe8bed95885cd4450ea (patch)
tree77df9396092046aa5ea74a2fb300262a8488c4e0 /doc
parent7605d081badfac6890d5f34966967bffdc18d715 (diff)
downloademacs-5d85cfe6f7c80faeb1259fe8bed95885cd4450ea.tar.gz
emacs-5d85cfe6f7c80faeb1259fe8bed95885cd4450ea.zip
* doc/emacs/xresources.texi (Motif Resources):
Rename from LessTif Resources. Update xrefs. * doc/emacs/emacs.texi: Update menu. * doc/man/emacs.1: Update manual links. Fixes: debbugs:15145
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog6
-rw-r--r--doc/emacs/emacs.texi2
-rw-r--r--doc/emacs/xresources.texi20
-rw-r--r--doc/man/ChangeLog4
-rw-r--r--doc/man/emacs.14
5 files changed, 23 insertions, 13 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2dd245a92ba..e4ab9a1e466 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
12013-08-31 Ulrich Müller <ulm@gentoo.org>
2
3 * xresources.texi (Motif Resources):
4 Rename from LessTif Resources. Update xrefs. (Bug#15145)
5 * emacs.texi: Update menu.
6
12013-08-28 Paul Eggert <eggert@cs.ucla.edu> 72013-08-28 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, 9 * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 8a518b82abb..985466810f2 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1189,7 +1189,7 @@ X Options and Resources
1189* Resources:: Using X resources with Emacs (in general). 1189* Resources:: Using X resources with Emacs (in general).
1190* Table of Resources:: Table of specific X resources that affect Emacs. 1190* Table of Resources:: Table of specific X resources that affect Emacs.
1191* Lucid Resources:: X resources for Lucid menus. 1191* Lucid Resources:: X resources for Lucid menus.
1192* LessTif Resources:: X resources for LessTif and Motif menus. 1192* Motif Resources:: X resources for Motif and LessTif menus.
1193* GTK resources:: Resources for GTK widgets. 1193* GTK resources:: Resources for GTK widgets.
1194 1194
1195GTK resources 1195GTK resources
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 3723c8e5e1d..b2ebf634ba0 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -27,7 +27,7 @@ system registry (@pxref{MS-Windows Registry}).
27* Resources:: Using X resources with Emacs (in general). 27* Resources:: Using X resources with Emacs (in general).
28* Table of Resources:: Table of specific X resources that affect Emacs. 28* Table of Resources:: Table of specific X resources that affect Emacs.
29* Lucid Resources:: X resources for Lucid menus. 29* Lucid Resources:: X resources for Lucid menus.
30* LessTif Resources:: X resources for LessTif and Motif menus. 30* Motif Resources:: X resources for Motif and LessTif menus.
31* GTK resources:: Resources for GTK widgets. 31* GTK resources:: Resources for GTK widgets.
32@end menu 32@end menu
33 33
@@ -260,7 +260,7 @@ compiled with GTK+ support.
260@ifnottex 260@ifnottex
261@item @code{selectionFont} (class @code{SelectionFont}) 261@item @code{selectionFont} (class @code{SelectionFont})
262Font name for pop-up menu items, in non-toolkit versions of Emacs. (For 262Font name for pop-up menu items, in non-toolkit versions of Emacs. (For
263toolkit versions, see @ref{Lucid Resources}, also see @ref{LessTif 263toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
264Resources}.) 264Resources}.)
265 265
266@item @code{selectionTimeout} (class @code{SelectionTimeout}) 266@item @code{selectionTimeout} (class @code{SelectionTimeout})
@@ -370,15 +370,15 @@ elements. Default is 1.
370Margin of the menu bar, in characters. Default is 1. 370Margin of the menu bar, in characters. Default is 1.
371@end table 371@end table
372 372
373@node LessTif Resources 373@node Motif Resources
374@appendixsec LessTif Menu X Resources 374@appendixsec Motif Menu X Resources
375@cindex Menu X Resources (LessTif widgets) 375@cindex Menu X Resources (Motif widgets)
376@cindex LessTif Widget X Resources 376@cindex Motif Widget X Resources
377 377
378 If Emacs is compiled with the X toolkit support using LessTif or 378 If Emacs is compiled with the X toolkit support using Motif or
379Motif widgets, you can use X resources to customize the appearance of 379LessTif widgets, you can use X resources to customize the appearance
380the menu bar, pop-up menus, and dialog boxes. However, the resources 380of the menu bar, pop-up menus, and dialog boxes. However, the
381are organized differently from Lucid widgets. 381resources are organized differently from Lucid widgets.
382 382
383 The resource names for the menu bar are in the @samp{pane.menubar} 383 The resource names for the menu bar are in the @samp{pane.menubar}
384class, and they must be specified in this form: 384class, and they must be specified in this form:
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8b550dc4417..0235b5f7b9b 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
12013-08-31 Ulrich Müller <ulm@gentoo.org>
2
3 * emacs.1: Update manual links.
4
12013-04-20 Petr Hracek <phracek@redhat.com> (tiny change) 52013-04-20 Petr Hracek <phracek@redhat.com> (tiny change)
2 6
3 * emacs.1: Add some more command-line options. (Bug#14165) 7 * emacs.1: Add some more command-line options. (Bug#14165)
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 9149be2c523..a306edc3ca9 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -445,7 +445,7 @@ Gives frames menu bars if
445.IR on ; 445.IR on ;
446don't have menu bars if 446don't have menu bars if
447.IR off . 447.IR off .
448See the Emacs manual, sections "Lucid Resources" and "LessTif 448See the Emacs manual, sections "Lucid Resources" and "Motif
449Resources", for how to control the appearance of the menu bar 449Resources", for how to control the appearance of the menu bar
450if you have one. 450if you have one.
451.TP 451.TP
@@ -492,7 +492,7 @@ The scroll bar width in pixels, equivalent to the frame parameter
492Font name for pop-up menu items, in non-toolkit versions of 492Font name for pop-up menu items, in non-toolkit versions of
493.IR Emacs . 493.IR Emacs .
494(For toolkit versions, see the Emacs manual, sections 494(For toolkit versions, see the Emacs manual, sections
495"Lucid Resources" and "LessTif Resources".) 495"Lucid Resources" and "Motif Resources".)
496.TP 496.TP
497.BR selectionTimeout " (class " SelectionTimeout ) 497.BR selectionTimeout " (class " SelectionTimeout )
498Number of milliseconds to wait for a selection reply. 498Number of milliseconds to wait for a selection reply.