Merge from emacs-24

[gnu-emacs] / doc / misc / efaq.texi

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index c54423e887ec61d8425d4cb63a73891140f73734..f048f75372c650bf30f6682e1c73cf9542cf1ac5 100644 (file)
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1,6 +1,6 @@
 \input texinfo   @c -*- mode: texinfo; -*-
 @c %**start of header
 \input texinfo   @c -*- mode: texinfo; -*-
 @c %**start of header

-@setfilename ../../info/efaq
+@setfilename ../../info/efaq.info

 @settitle GNU Emacs FAQ
 @documentencoding UTF-8
 @c %**end of header
 @settitle GNU Emacs FAQ
 @documentencoding UTF-8
 @c %**end of header


@@ -861,7 +861,6 @@ You can get Tkinfo at
 @cindex Files included with Emacs
 @cindex @file{COPYING}, description of file
 @cindex @file{DISTRIB}, description of file
 @cindex Files included with Emacs
 @cindex @file{COPYING}, description of file
 @cindex @file{DISTRIB}, description of file

-@cindex @file{GNU}, description of file

 @cindex @file{MACHINES}, description of file
 @cindex @file{NEWS}, description of file
 
 @cindex @file{MACHINES}, description of file
 @cindex @file{NEWS}, description of file
 


@@ -883,9 +882,6 @@ GNU General Public License
 @item DISTRIB
 Emacs Availability Information
 
 @item DISTRIB
 Emacs Availability Information
 

-@item GNU
-The GNU Manifesto
-

 @item MACHINES
 Status of Emacs on Various Machines and Systems
 
 @item MACHINES
 Status of Emacs on Various Machines and Systems
 


@@ -1578,10 +1574,9 @@ According to the documentation string for @code{delete-selection-mode}
 delete-selection-mode @key{RET}}):
 
 @quotation
 delete-selection-mode @key{RET}}):
 
 @quotation

-When Delete Selection mode is enabled, Transient Mark mode is also
-enabled and typed text replaces the selection if the selection is
-active.  Otherwise, typed text is just inserted at point regardless of
-any selection.
+When Delete Selection mode is enabled, typed text replaces the selection
+if the selection is active.  Otherwise, typed text is just inserted at
+point regardless of any selection.

 @end quotation
 
 This mode also allows you to delete (not kill) the highlighted region by
 @end quotation
 
 This mode also allows you to delete (not kill) the highlighted region by


@@ -1949,7 +1944,7 @@ automatically scrolls the display horizontally when point moves off the
 left or right edge of the window.
 
 Note that this is overridden by the variable
 left or right edge of the window.
 
 Note that this is overridden by the variable

-@code{truncate-partial-width-windows} if that variable is non-nil
+@code{truncate-partial-width-windows} if that variable is non-@code{nil}

 and the current buffer is not full-frame width.
 
 In Emacs 20, use @code{hscroll-mode}.
 and the current buffer is not full-frame width.
 
 In Emacs 20, use @code{hscroll-mode}.


@@ -2411,12 +2406,12 @@ printed an error message?  If so, compiling from within Emacs using the
 @kbd{M-x compile} and @kbd{M-x recompile} commands is a much more
 effective way of doing that.  Emacs automatically intercepts the compile
 error messages, inserts them into a special buffer called
 @kbd{M-x compile} and @kbd{M-x recompile} commands is a much more
 effective way of doing that.  Emacs automatically intercepts the compile
 error messages, inserts them into a special buffer called

-@code{*compilation*}, and lets you visit the locus of each message in
+@file{*compilation*}, and lets you visit the locus of each message in

 the source.  Type @kbd{C-x `} to step through the offending lines one by
 one (starting with Emacs 22, you can also use @kbd{M-g M-p} and
 @kbd{M-g M-n} to go to the previous and next matches directly).  Click
 @kbd{Mouse-2} or press @key{RET} on a message text in the
 the source.  Type @kbd{C-x `} to step through the offending lines one by
 one (starting with Emacs 22, you can also use @kbd{M-g M-p} and
 @kbd{M-g M-n} to go to the previous and next matches directly).  Click
 @kbd{Mouse-2} or press @key{RET} on a message text in the

-@code{*compilation*} buffer to go to the line whose number is mentioned
+@file{*compilation*} buffer to go to the line whose number is mentioned

 in that message.
 
 But if you indeed need to go to a certain text line, type @kbd{M-g M-g}
 in that message.
 
 But if you indeed need to go to a certain text line, type @kbd{M-g M-g}


@@ -2685,8 +2680,8 @@ Use the function @code{w32-send-sys-command}.  For example, you can
 put the following in your @file{.emacs} file:
 
 @lisp
 put the following in your @file{.emacs} file:
 
 @lisp

-(add-hook 'term-setup-hook
-          #'(lambda () (w32-send-sys-command ?\xF030)))
+(add-hook 'emacs-startup-hook
+          (lambda () (w32-send-sys-command ?\xF030)))

 @end lisp
 
 To avoid the slightly distracting visual effect of Emacs starting with
 @end lisp
 
 To avoid the slightly distracting visual effect of Emacs starting with


@@ -2853,8 +2848,7 @@ To make a terminfo entry for @samp{emacs}, use @code{tic} or
 @file{/usr/lib/terminfo/d/dumb} to @file{/usr/lib/terminfo/e/emacs}.
 
 Having a termcap/terminfo entry will not enable the use of full screen
 @file{/usr/lib/terminfo/d/dumb} to @file{/usr/lib/terminfo/e/emacs}.
 
 Having a termcap/terminfo entry will not enable the use of full screen

-programs in shell buffers.  Use @kbd{M-x terminal-emulator} for that
-instead.
+programs in shell buffers.  Use @kbd{M-x term} for that instead.

 
 A workaround to the problem of missing termcap/terminfo entries is to
 change terminal type @samp{emacs} to type @samp{dumb} or @samp{unknown}
 
 A workaround to the problem of missing termcap/terminfo entries is to
 change terminal type @samp{emacs} to type @samp{dumb} or @samp{unknown}


@@ -3270,8 +3264,8 @@ archive sites that make GNU software available.
 
 First of all, you should check to make sure that the package isn't
 already available.  For example, typing @kbd{M-x apropos @key{RET}
 
 First of all, you should check to make sure that the package isn't
 already available.  For example, typing @kbd{M-x apropos @key{RET}

-wordstar @key{RET}} lists all functions and variables containing the
-string @samp{wordstar}.
+python @key{RET}} lists all functions and variables containing the
+string @samp{python}.

 
 It is also possible that the package is on your system, but has not been
 loaded.  To see which packages are available for loading, look through
 
 It is also possible that the package is on your system, but has not been
 loaded.  To see which packages are available for loading, look through


@@ -3596,12 +3590,12 @@ been executed but is not, then you will experience this problem (this
 code/file execution order is not enforced after startup).
 
 To postpone the execution of Emacs Lisp code until after terminal or
 code/file execution order is not enforced after startup).
 
 To postpone the execution of Emacs Lisp code until after terminal or

-window-system setup, treat the code as a @dfn{lambda list} and set the
-value of either the @code{term-setup-hook} or @code{window-setup-hook}
-variable to this lambda function.  For example,
+window-system setup, treat the code as a @dfn{lambda list} and add it to
+@code{emacs-startup-hook} (or @code{tty-setup-hook} in Emacs 24.4 and
+newer).  For example,

 
 @lisp
 
 @lisp

-(add-hook 'term-setup-hook
+(add-hook 'emacs-startup-hook

           (lambda ()
            (when (string-match "\\`vt220" (or (getenv "TERM") ""))
              ;; Make vt220's "Do" key behave like M-x:
           (lambda ()
            (when (string-match "\\`vt220" (or (getenv "TERM") ""))
              ;; Make vt220's "Do" key behave like M-x: