Mercurial > hg > xemacs-beta

comparison man/xemacs-faq.texi @ 5384:3889ef128488

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix misspelled words, and some grammar, across the entire source tree. See xemacs-patches message with ID <AANLkTi=edkEKtK3pZ60ytsG5pTJQy2TjAEVCZCLOa-oA@mail.gmail.com>.
author Jerry James <james@xemacs.org>
date Thu, 24 Mar 2011 11:00:11 -0600
parents b7232de2a937
children 593d9f73a7e8
comparison
equal deleted inserted replaced
5383:294ab9180fad 5384:3889ef128488
737 and was also the last version without international language support. 737 and was also the last version without international language support.
738 738
739 @node Q1.0.3, Q1.0.4, Q1.0.2, Introduction 739 @node Q1.0.3, Q1.0.4, Q1.0.2, Introduction
740 @unnumberedsubsec Q1.0.3: How do you pronounce XEmacs? 740 @unnumberedsubsec Q1.0.3: How do you pronounce XEmacs?
741 741
742 The most common pronounciation is @samp{Eks eemax}, @samp{Eks'im&ks} in 742 The most common pronunciation is @samp{Eks eemax}, @samp{Eks'im&ks} in
743 Kirshenbaum IPA. (See 743 Kirshenbaum IPA. (See
744 @uref{http://www.kirshenbaum.net/IPA/ascii-ipa.pdf} if you know the IPA 744 @uref{http://www.kirshenbaum.net/IPA/ascii-ipa.pdf} if you know the IPA
745 already and want to know how to map from Kirshenbaum to it.) 745 already and want to know how to map from Kirshenbaum to it.)
746 746
747 @node Q1.0.4, Q1.0.5, Q1.0.3, Introduction 747 @node Q1.0.4, Q1.0.5, Q1.0.3, Introduction
2443 2443
2444 @item erc 2444 @item erc
2445 ERC is an Emacs InternetRelayChat client. 2445 ERC is an Emacs InternetRelayChat client.
2446 2446
2447 @item escreen 2447 @item escreen
2448 Multiple editing sessions withing a single frame (like screen). 2448 Multiple editing sessions within a single frame (like screen).
2449 2449
2450 @item eshell 2450 @item eshell
2451 Command shell implemented entirely in Emacs Lisp. 2451 Command shell implemented entirely in Emacs Lisp.
2452 2452
2453 @item ess 2453 @item ess
4030 4030
4031 Please see the @file{PROBLEMS} file that comes with XEmacs (it's in 4031 Please see the @file{PROBLEMS} file that comes with XEmacs (it's in
4032 the top-level source directory) to read what it says about your 4032 the top-level source directory) to read what it says about your
4033 platform. 4033 platform.
4034 4034
4035 If you compiled XEmacs 21.4 or ealier using @samp{--use-union-type}, or 4035 If you compiled XEmacs 21.4 or earlier using @samp{--use-union-type}, or
4036 21.5 or later using @samp{--enable-union-type} (or in either case used 4036 21.5 or later using @samp{--enable-union-type} (or in either case used
4037 the option @samp{USE_UNION_TYPE} in @file{config.inc} under Windows), 4037 the option @samp{USE_UNION_TYPE} in @file{config.inc} under Windows),
4038 try recompiling again without it. The union type has been known to 4038 try recompiling again without it. The union type has been known to
4039 trigger compiler errors in a number of cases. 4039 trigger compiler errors in a number of cases.
4040 4040
8999 You may see an unreasonable diff (often large) that doesn't seem to 8999 You may see an unreasonable diff (often large) that doesn't seem to
9000 reflect your work. 9000 reflect your work.
9001 9001
9002 This is usually due to using @code{hg diff} on a @dfn{merge commit}. 9002 This is usually due to using @code{hg diff} on a @dfn{merge commit}.
9003 That means the commit has multiple parents, and joins together two lines 9003 That means the commit has multiple parents, and joins together two lines
9004 of development that occured concurrently. 9004 of development that occurred concurrently.
9005 9005
9006 You're diffing against the "wrong" one; try the other one. You get the 9006 You're diffing against the "wrong" one; try the other one. You get the
9007 relevent revision number or ID from @code{hg log}. In more detail: 9007 relevant revision number or ID from @code{hg log}. In more detail:
9008 9008
9009 When there is a merge in Mercurial, it will often be the case that 9009 When there is a merge in Mercurial, it will often be the case that
9010 one of the parents is the immediate predecessor of the merge 9010 one of the parents is the immediate predecessor of the merge
9011 commit. @code{hg log} will report something like 9011 commit. @code{hg log} will report something like
9012 9012
9052 9052
9053 Once upon a time, an XEmacs developer wrote: 9053 Once upon a time, an XEmacs developer wrote:
9054 9054
9055 > GAAAAK! What's the best way to restore ChangeLog and its history? 9055 > GAAAAK! What's the best way to restore ChangeLog and its history?
9056 9056
9057 He had just inadvertantly pushed a commit which deleted 9057 He had just inadvertently pushed a commit which deleted
9058 @file{src/ChangeLog}! The history is still there, not to worry. (In 9058 @file{src/ChangeLog}! The history is still there, not to worry. (In
9059 this case, another developer had restored src/ChangeLog already.) The 9059 this case, another developer had restored src/ChangeLog already.) The
9060 best way depends on a number of things. First, let's look at the log 9060 best way depends on a number of things. First, let's look at the log
9061 and the state of the DAG (the graph of commits). Here's the log, 9061 and the state of the DAG (the graph of commits). Here's the log,
9062 formatted somewhat differently from the usual output for compactness. 9062 formatted somewhat differently from the usual output for compactness.