Subject: 24.3.50; "LessTif Resources" should be "Motif Resources"
From: Ulrich Mueller <[email-masked]>
To: [email-masked]
Date: Tue, 20 Aug 2013 20:08:25 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Tags: patch

For some reason, the manual refers to "LessTif Resources" instead of
"Motif Resources". However, Motif is the original implementation,
whereas LessTif is an incomplete clone of it (whose development has
stalled). Furthermore, functions and variables are named *motif*
throughout (e.g., motif-version-string). Both Motif and LessTif are
free software, licensed under the LGPL. I think that it would serve
users better if the name of the original implementation was used.

The patch below changes LessTif (back) to Motif in some places,
partially reverting the following commit from 2001:
http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/36503

--- emacs-orig/doc/emacs/emacs.texi
+++ emacs/doc/emacs/emacs.texi
@@ -1189,7 +1189,7 @@
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 
 GTK resources
--- emacs-orig/doc/emacs/xresources.texi
+++ emacs/doc/emacs/xresources.texi
@@ -27,7 +27,7 @@
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 @end menu
 
@@ -260,7 +260,7 @@
 @ifnottex
 @item @code{selectionFont} (class @code{SelectionFont})
 Font name for pop-up menu items, in non-toolkit versions of Emacs.  (For
-toolkit versions, see @ref{Lucid Resources}, also see @ref{LessTif
+toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
 Resources}.)
 
 @item @code{selectionTimeout} (class @code{SelectionTimeout})
@@ -370,15 +370,15 @@
 Margin of the menu bar, in characters.  Default is 1.
 @end table
 
-@node LessTif Resources
-@appendixsec LessTif Menu X Resources
-@cindex Menu X Resources (LessTif widgets)
-@cindex LessTif Widget X Resources
-
-  If Emacs is compiled with the X toolkit support using LessTif or
-Motif widgets, you can use X resources to customize the appearance of
-the menu bar, pop-up menus, and dialog boxes.  However, the resources
-are organized differently from Lucid widgets.
+@node Motif Resources
+@appendixsec Motif Menu X Resources
+@cindex Menu X Resources (Motif widgets)
+@cindex Motif Widget X Resources
+
+  If Emacs is compiled with the X toolkit support using Motif or
+LessTif widgets, you can use X resources to customize the appearance
+of the menu bar, pop-up menus, and dialog boxes.  However, the
+resources are organized differently from Lucid widgets.
 
   The resource names for the menu bar are in the @samp{pane.menubar}
 class, and they must be specified in this form:
--- emacs-orig/doc/man/emacs.1
+++ emacs/doc/man/emacs.1
@@ -445,7 +445,7 @@
 .IR on ;
 don't have menu bars if
 .IR off .
-See the Emacs manual, sections "Lucid Resources" and "LessTif
+See the Emacs manual, sections "Lucid Resources" and "Motif
 Resources", for how to control the appearance of the menu bar
 if you have one.
 .TP
@@ -492,7 +492,7 @@
 Font name for pop-up menu items, in non-toolkit versions of
 .IR Emacs .
 (For toolkit versions, see the Emacs manual, sections
-"Lucid Resources" and "LessTif Resources".)
+"Lucid Resources" and "Motif Resources".)
 .TP
 .BR selectionTimeout " (class " SelectionTimeout )
 Number of milliseconds to wait for a selection reply.