diff options
Diffstat (limited to 'man')
82 files changed, 666 insertions, 513 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index f68e9bcdc8e..d9b86056304 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,140 @@ +2005-08-19 Katsumi Yamaoka <yamaoka@jpl.org> + + * emacs-mime.texi (time-date): Fix description of safe-date-to-time. + +2005-08-18 Katsumi Yamaoka <yamaoka@jpl.org> + + * emacs-mime.texi (Handles): Remove duplicate item. + (Encoding Customization): Fix the default value for + mm-coding-system-priorities. + (Charset Translation): Emacs doesn't use mm-mime-mule-charset-alist. + (Basic Functions): Fix reference. + +2005-08-09 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus.texi (Charsets): Fj hierarchy uses iso-2022-jp. + +2005-08-22 Juri Linkov <juri@jurta.org> + + * display.texi (Standard Faces): Merge the text from + `(elisp)Standard Faces' into this node. + +2005-08-18 Luc Teirlinck <teirllm@auburn.edu> + + * emacs.texi (Top): Delete menu item for deleted node + Keyboard Translations. + +2005-08-18 Richard M. Stallman <rms@gnu.org> + + * faq.texi (Obtaining the FAQ): Delete refs to Lerner's email + and web site. + + * trouble.texi (Unasked-for Search): + Delete xref to Keyboard Translations. + + * glossary.texi (Glossary): Delete xref. + + * faq.texi (Swapping keys): Xref for normal-erase-is-backspace-mode, + not keyboard-translate. + + * custom.texi (Minor Modes): Say that the list here is not complete. + (Keyboard Translations): Node deleted. + (Disabling): Delete xref to it. + (Customization Groups): Fix Custom buffer example. + (Hooks): Mention remove-hooks. + +2005-08-17 Luc Teirlinck <teirllm@auburn.edu> + + * building.texi (GDB Graphical Interface): Improve filling of menu + item. + +2005-08-18 Nick Roberts <nickrob@snap.net.nz> + + * building.texi (GDB Graphical Interface): Use better node names. + +2005-08-14 Richard M. Stallman <rms@gnu.org> + + * text.texi (Sentences): Fix xref. + +2005-08-14 Juri Linkov <juri@jurta.org> + + * building.texi (Compilation, Grep Searching): Move grep command + headings from `Compilation' to `Grep Searching'. + + * dired.texi (Dired and Find): + * maintaining.texi (Tags Search): Replace grep xref to + `Compilation' node with `Grep Searching'. + + * files.texi (Comparing Files): Replace xref to `Compilation' with + `Compilation Mode'. + +2005-08-13 Alan Mackenzie <acm@muc.de> + + * search.texi (Non-ASCII Isearch): Correct a typo. + (Replacement Commands): Mention query-replace key binding. + +2005-08-11 Richard M. Stallman <rms@gnu.org> + + * programs.texi (Options for Comments): Fix xref. + + * search.texi (Regexp Backslash, Regexp Example): New nodes split + out of Regexps. + + * faq.texi (Using regular expressions): Fix xref. + +2005-08-09 Juri Linkov <juri@jurta.org> + + * building.texi (Compilation): Use `itemx' instead of `item'. + (Grep Searching): Simplify phrase. + + * display.texi (Standard Faces): Describe vertical-border on + window systems. + + * windows.texi (Split Window): Simplify phrase and mention + vertical-border face. + +2005-08-09 Richard M. Stallman <rms@gnu.org> + + * files.texi (Comparing Files): Clarify compare-windows. + + * calendar.texi (Scroll Calendar): Document < and > in calendar. + +2005-08-09 Juri Linkov <juri@jurta.org> + + * info.texi (Help-P): Replace `Prev' with `Previous'. + (Help-M, Help-Xref): Add S-TAB. + (Help-FOO): Update `u' command. + (Help-Xref): Move info about Mouse-2 from `Help-Int'. + Update info about visibility of xref parts. + (Help-Int): Fix `m' command. Rename `Info-last' to + `Info-history-back'. Add `Info-history-forward'. + (Advanced): Fix `g*' and `M-n' commands. + (Info Search): Add `index-apropos' in stand-alone browser. + Add isearch commands. + (Emacs Info Variables): Remove `Info-fontify'. + Add `Info-mode-hook'. Update face names. + Add `Info-fontify-maximum-menu-size', + `Info-fontify-visited-nodes', `Info-isearch-search'. + +2005-08-07 Michael Albinus <michael.albinus@gmx.de> + + Sync with Tramp 2.0.50. + + * tramp.texi: Use @option{} consequently for method names. + (Inline methods, External transfer methods): Remove references to + Cygwin. + (Issues with Cygwin ssh): Explain trouble with Cygwin's ssh + implementation. + +2005-08-06 Eli Zaretskii <eliz@gnu.org> + + * mule.texi (Coding Systems): Rephrase the paragraph about + codepages: no need for "M-x codepage-setup" anymore, except on + MS-DOS. + + * msdog.texi (MS-DOS and MULE): Clarify that this section is for + the MS-DOS port only. + 2005-07-30 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (info): Don't run multi-install-info.bat. @@ -113,7 +250,6 @@ * mh-e.texi (Copying): * trouble.texi (Checklist): Update FSF's address. ->>>>>>> 1.631 2005-07-03 Richard M. Stallman <rms@gnu.org> * flymake.texi (Example -- Configuring a tool called directly): @@ -3808,8 +3944,8 @@ ;; coding: iso-2022-7bit ;; End: - Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001 - Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/man/Makefile.in b/man/Makefile.in index b8da48143bf..3cc88bf7b94 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,7 +1,7 @@ #### Makefile for the Emacs Manual and other documentation. -# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +# 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/man/abbrevs.texi b/man/abbrevs.texi index 9ecdac7044f..2272b2ba133 100644 --- a/man/abbrevs.texi +++ b/man/abbrevs.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Abbrevs, Picture, Maintaining, Top @chapter Abbrevs diff --git a/man/ack.texi b/man/ack.texi index 5d9b26be7c1..48a32072083 100644 --- a/man/ack.texi +++ b/man/ack.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1994,1995,1996,1997,1999,2000,2001 -@c Free Software Foundation, Inc. +@c Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @node Acknowledgments, Screen, Concept Index, Top diff --git a/man/ada-mode.texi b/man/ada-mode.texi index a74150fe75a..4a25440f991 100644 --- a/man/ada-mode.texi +++ b/man/ada-mode.texi @@ -8,7 +8,8 @@ @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @copying -Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/anti.texi b/man/anti.texi index 896924e3ad9..ecff1f06a8c 100644 --- a/man/anti.texi +++ b/man/anti.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2005 Free Software Foundation, Inc. +@c Copyright (C) 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Antinews, Mac OS, X Resources, Top diff --git a/man/autotype.texi b/man/autotype.texi index 9d88443e891..f760a6f8aed 100644 --- a/man/autotype.texi +++ b/man/autotype.texi @@ -1,6 +1,7 @@ \input texinfo @c This is an annex of the Emacs manual. -@c Copyright (C) 1994, 1995, 2002 Free Software Foundation, Inc. +@c Copyright (C) 1994, 1995, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c Author: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389 @setfilename ../info/autotype @c @node Autotypist, Picture, Abbrevs, Top @@ -11,7 +12,8 @@ @c @cindex autotypist @copying -Copyright @copyright{} 1994, 1995, 1999 Free Software Foundation, Inc. +Copyright @copyright{} 1994, 1995, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/basic.texi b/man/basic.texi index d94e52b0112..2f5aa3162e1 100644 --- a/man/basic.texi +++ b/man/basic.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Basic, Minibuffer, Exiting, Top @chapter Basic Editing Commands diff --git a/man/buffers.texi b/man/buffers.texi index 694c7780854..9c572ca17c4 100644 --- a/man/buffers.texi +++ b/man/buffers.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 2000, 2001, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Buffers, Windows, Files, Top @chapter Using Multiple Buffers diff --git a/man/building.texi b/man/building.texi index 69b56f467f5..30daa8def26 100644 --- a/man/building.texi +++ b/man/building.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Building, Maintaining, Programs, Top @chapter Compiling and Testing Programs @@ -48,16 +49,8 @@ the @samp{*compilation*} buffer. @item M-x recompile Invoke a compiler with the same command as in the last invocation of @kbd{M-x compile}. -@item M-x grep -Run @code{grep} asynchronously under Emacs, with matching lines -listed in the buffer named @samp{*grep*}. -@item M-x grep-find -@item M-x find-grep -Run @code{grep} via @code{find}, with user-specified arguments, and -collect output in the buffer named @samp{*grep*}. @item M-x kill-compilation -@itemx M-x kill-grep -Kill the running compilation or @code{grep} subprocess. +Kill the running compilation subprocess. @end table @findex compile @@ -323,13 +316,25 @@ Emacs. @xref{MS-DOS}. @node Grep Searching @section Searching with Grep under Emacs -@findex grep Just as you can run a compiler from Emacs and then visit the lines -where there were compilation errors, you can also run @code{grep} and +with compilation errors, you can also run @code{grep} and then visit the lines on which matches were found. This works by treating the matches reported by @code{grep} as if they were ``errors.'' - To do this, type @kbd{M-x grep}, then enter a command line that +@table @kbd +@item M-x grep +Run @code{grep} asynchronously under Emacs, with matching lines +listed in the buffer named @samp{*grep*}. +@item M-x grep-find +@itemx M-x find-grep +Run @code{grep} via @code{find}, with user-specified arguments, and +collect output in the buffer named @samp{*grep*}. +@item M-x kill-grep +Kill the running @code{grep} subprocess. +@end table + +@findex grep + To run @code{grep}, type @kbd{M-x grep}, then enter a command line that specifies how to run @code{grep}. Use the same arguments you would give @code{grep} when running it normally: a @code{grep}-style regexp (usually in single-quotes to quote the shell's special characters) @@ -768,16 +773,16 @@ session. If you have customized @code{gud-gdb-command-name} in that way, then you can use @kbd{M-x gdba} to invoke GDB in graphical mode. @menu -* Layout:: Control the number of displayed buffers. -* Breakpoints Buffer:: A breakpoint control panel. -* Stack Buffer:: Select a frame from the call stack. -* Watch Expressions:: Monitor variable values in the speedbar. -* Other Buffers:: Input/output, locals, registers, assembler, threads - and memory buffers. +* GDB User Interface Layout:: Control the number of displayed buffers. +* Breakpoints Buffer:: A breakpoint control panel. +* Stack Buffer:: Select a frame from the call stack. +* Watch Expressions:: Monitor variable values in the speedbar. +* Other GDB User Interface Buffers:: Input/output, locals, registers, + assembler, threads and memory buffers. @end menu -@node Layout -@subsubsection Layout +@node GDB User Interface Layout +@subsubsection GDB User Interface Layout @cindex GDB User Interface layout @findex gdb-many-windows @@ -912,7 +917,7 @@ FUNCTION::VARIABLE format to display variables in the speedbar. Since this does not work for variables defined in compound statements, the default value is @code{nil}. -@node Other Buffers +@node Other GDB User Interface Buffers @subsubsection Other Buffers @table @asis diff --git a/man/calc.texi b/man/calc.texi index 3ceb0c3ebff..a4e66de1a3d 100644 --- a/man/calc.texi +++ b/man/calc.texi @@ -83,7 +83,8 @@ @copying This file documents Calc, the GNU Emacs calculator. -Copyright (C) 1990, 1991, 2001, 2002, 2005 Free Software Foundation, Inc. +Copyright (C) 1990, 1991, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -118,8 +119,8 @@ Software Foundation raise funds for GNU development.'' @page @vskip 0pt plus 1filll -Copyright @copyright{} 1990, 1991, 2001, 2002, 2005 -Free Software Foundation, Inc. +Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @insertcopying @end titlepage diff --git a/man/calendar.texi b/man/calendar.texi index 293905ca544..e5ddaa28e1b 100644 --- a/man/calendar.texi +++ b/man/calendar.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2005 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Calendar/Diary, Gnus, Dired, Top @chapter The Calendar and the Diary @@ -235,9 +235,9 @@ the months on it. Scrolling the calendar means moving the strip horizontally, so that new months become visible in the window. @table @kbd -@item C-x < +@item < Scroll calendar one month forward (@code{scroll-calendar-left}). -@item C-x > +@item > Scroll calendar one month backward (@code{scroll-calendar-right}). @item C-v @itemx @key{NEXT} @@ -249,15 +249,15 @@ Scroll calendar three months backward (@code{scroll-calendar-right-three-months}). @end table -@kindex C-x < @r{(Calendar mode)} +@kindex < @r{(Calendar mode)} @findex scroll-calendar-left -@kindex C-x > @r{(Calendar mode)} +@kindex > @r{(Calendar mode)} @findex scroll-calendar-right The most basic calendar scroll commands scroll by one month at a time. This means that there are two months of overlap between the -display before the command and the display after. @kbd{C-x <} scrolls +display before the command and the display after. @kbd{<} scrolls the calendar contents one month to the left; that is, it moves the -display forward in time. @kbd{C-x >} scrolls the contents to the +display forward in time. @kbd{>} scrolls the contents to the right, which moves backwards in time. @kindex C-v @r{(Calendar mode)} diff --git a/man/cc-mode.texi b/man/cc-mode.texi index b9113088d44..5f9164dbf34 100644 --- a/man/cc-mode.texi +++ b/man/cc-mode.texi @@ -67,7 +67,7 @@ This manual is for CC Mode in Emacs. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003 Free Software Foundation, Inc. + 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/cl.texi b/man/cl.texi index b99322b1e23..8fc54ed02d8 100644 --- a/man/cl.texi +++ b/man/cl.texi @@ -5,7 +5,7 @@ @copying This file documents the GNU Emacs Common Lisp emulation package. -Copyright (C) 1993, 2002, 2005 Free Software Foundation, Inc. +Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/cmdargs.texi b/man/cmdargs.texi index 2dbdb5c5887..dad7e61dbf2 100644 --- a/man/cmdargs.texi +++ b/man/cmdargs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, -@c 2001, 03, 04, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Emacs Invocation, X Resources, GNU Free Documentation License, Top @appendix Command Line Arguments for Emacs Invocation diff --git a/man/commands.texi b/man/commands.texi index e0208473419..facc3d6f3a9 100644 --- a/man/commands.texi +++ b/man/commands.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Characters, Keys and Commands diff --git a/man/custom.texi b/man/custom.texi index 38e885cefc7..d531d92eb0f 100644 --- a/man/custom.texi +++ b/man/custom.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001,2002,2004,2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Customization, Quitting, Amusements, Top @chapter Customization @@ -33,9 +33,6 @@ replay sequences of keys. you can control their functioning. * Key Bindings:: The keymaps say what command each key runs. By changing them, you can "redefine keys". -* Keyboard Translations:: If your keyboard passes an undesired code - for a key, you can tell Emacs to - substitute another code. * Syntax:: The syntax table controls how words and expressions are parsed. * Init File:: How to write common customizations in the @@ -78,16 +75,16 @@ directly turns Outline minor mode on and off. To check whether a given minor mode works this way, use @kbd{C-h v} to ask for documentation on the variable name. - These minor-mode variables provide a good way for Lisp programs to turn -minor modes on and off; they are also useful in a file's local variables -list. But please think twice before setting minor modes with a local -variables list, because most minor modes are a matter of user -preference---other users editing the same file might not want the same -minor modes you prefer. + These minor-mode variables provide a good way for Lisp programs to +turn minor modes on and off; they are also useful in a file's local +variables list (@pxref{File Variables}). But please think twice +before setting minor modes with a local variables list, because most +minor modes are a matter of user preference---other users editing the +same file might not want the same minor modes you prefer. - The buffer-local minor modes include Abbrev mode, Auto Fill mode, -Auto Save mode, Font-Lock mode, Glasses mode, ISO Accents mode, -Outline minor mode, Overwrite mode, and Binary Overwrite mode. + The most useful buffer-local minor modes include Abbrev mode, Auto +Fill mode, Auto Save mode, Font-Lock mode, Glasses mode, ISO Accents +mode, Outline minor mode, Overwrite mode, and Binary Overwrite mode. Abbrev mode allows you to define abbreviations that automatically expand as you type them. For example, @samp{amd} might expand to @samp{abbrev @@ -146,11 +143,11 @@ they overwrite other characters and can be overwritten by them. In Binary Overwrite mode, digits after @kbd{C-q} specify an octal character code, as usual. - The following minor modes normally apply to all buffers at once. -Since each is enabled or disabled by the value of a variable, you -@emph{can} set them differently for particular buffers, by explicitly -making the corresponding variables local in those buffers. -@xref{Locals}. + Here are some useful minor modes that normally apply to all buffers +at once. Since each is enabled or disabled by the value of a +variable, you @emph{can} set them differently for particular buffers, +by explicitly making the corresponding variables local in those +buffers. @xref{Locals}. Icomplete mode displays an indication of available completions when you are in the minibuffer and completion is active. @xref{Completion @@ -222,10 +219,6 @@ under it. It looks like this, in part: Customization of the One True Editor. See also [Manual]. -Confirm Kill Emacs: [Hide] [Value Menu] Don't confirm - [State]: this option is unchanged from its standard setting. -How to ask for confirmation when leaving Emacs. [More] - Editing group: [Go to Group] Basic text editing facilities. @@ -854,8 +847,9 @@ recently added hook functions are executed first. If you play with adding various different versions of a hook function by calling @code{add-hook} over and over, remember that all -the versions you added will remain in the hook variable together. -To clear them out, you can do @code{(setq @var{hook-variable} nil)}. +the versions you added will remain in the hook variable together. You +can clear out individual functions with @code{remove-hook}, or do +@code{(setq @var{hook-variable} nil)} to remove everything. @node Locals @subsection Local Variables @@ -1638,14 +1632,14 @@ word: Many keyboards have a ``numeric keypad'' on the right hand side. The numeric keys in the keypad double up as cursor motion keys, toggled by a key labelled @samp{Num Lock}. By default, Emacs -translates these keys to the corresponding keys in the main keyboard -(@pxref{Keyboard Translations}). For example, when @samp{Num Lock} is -on, the key labelled @samp{8} on the numeric keypad produces -@code{kp-8}, which is translated to @kbd{8}; when @samp{Num Lock} is -off, the same key produces @code{kp-up}, which is translated to -@key{UP}. If you rebind a key such as @kbd{8} or @key{UP}, it affects -the equivalent keypad key too. However, if you rebind a @samp{kp-} -key directly, that won't affect its non-keypad equivalent. +translates these keys to the corresponding keys in the main keyboard. +For example, when @samp{Num Lock} is on, the key labelled @samp{8} on +the numeric keypad produces @code{kp-8}, which is translated to +@kbd{8}; when @samp{Num Lock} is off, the same key produces +@code{kp-up}, which is translated to @key{UP}. If you rebind a key +such as @kbd{8} or @key{UP}, it affects the equivalent keypad key too. +However, if you rebind a @samp{kp-} key directly, that won't affect +its non-keypad equivalent. Emacs provides a convenient method for binding the numeric keypad keys, using the variables @code{keypad-setup}, @@ -1893,52 +1887,6 @@ invoke it; disabling also applies if the command is invoked using @kbd{M-x}. Disabling a command has no effect on calling it as a function from Lisp programs. -@node Keyboard Translations -@section Keyboard Translations - - Some keyboards do not make it convenient to send all the special -characters that Emacs uses. The most common problem case is the -@key{DEL} character. Some keyboards provide no convenient way to type -this very important character---usually because they were designed to -expect the character @kbd{C-h} to be used for deletion. On these -keyboards, if you press the key normally used for deletion, Emacs handles -the @kbd{C-h} as a prefix character and offers you a list of help -options, which is not what you want. - -@cindex keyboard translations -@findex keyboard-translate - You can work around this problem within Emacs by setting up keyboard -translations to turn @kbd{C-h} into @key{DEL} and @key{DEL} into -@kbd{C-h}, as follows: - -@example -;; @r{Translate @kbd{C-h} to @key{DEL}.} -(keyboard-translate ?\C-h ?\C-?) - -;; @r{Translate @key{DEL} to @kbd{C-h}.} -(keyboard-translate ?\C-? ?\C-h) -@end example - - Keyboard translations are not the same as key bindings in keymaps -(@pxref{Keymaps}). Emacs contains numerous keymaps that apply in -different situations, but there is only one set of keyboard -translations, and it applies to every character that Emacs reads from -the terminal. Keyboard translations take place at the lowest level of -input processing; the keys that are looked up in keymaps contain the -characters that result from keyboard translation. - - On a window system, the keyboard key named @key{DELETE} is a function -key and is distinct from the @acronym{ASCII} character named @key{DEL}. -@xref{Named ASCII Chars}. Keyboard translations affect only @acronym{ASCII} -character input, not function keys; thus, the above example used on a -window system does not affect the @key{DELETE} key. However, the -translation above isn't necessary on window systems, because Emacs can -also distinguish between the @key{BACKSPACE} key and @kbd{C-h}; and it -normally treats @key{BACKSPACE} as @key{DEL}. - - For full information about how to use keyboard translations, see -@ref{Translating Input,,,elisp, The Emacs Lisp Reference Manual}. - @node Syntax @section The Syntax Table @cindex syntax table diff --git a/man/dired-x.texi b/man/dired-x.texi index 3e1c724dd5a..c1a3e9dbe66 100644 --- a/man/dired-x.texi +++ b/man/dired-x.texi @@ -28,7 +28,8 @@ This documents the ``extra'' features for Dired Mode for GNU Emacs found in the file @file{dired-x.el}. -Copyright @copyright{} 1993, 1994, 2001, 2002 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 1994, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to make and distribute verbatim copies of this diff --git a/man/dired.texi b/man/dired.texi index 8cb4646075e..051c735f996 100644 --- a/man/dired.texi +++ b/man/dired.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Dired, Calendar/Diary, Rmail, Top @chapter Dired, the Directory Editor @@ -1075,7 +1075,7 @@ use @kbd{M-x find-grep-dired}. This command reads two minibuffer arguments, @var{directory} and @var{regexp}; it chooses all the files in @var{directory} or its subdirectories that contain a match for @var{regexp}. It works by running the programs @code{find} and -@code{grep}. See also @kbd{M-x grep-find}, in @ref{Compilation}. +@code{grep}. See also @kbd{M-x grep-find}, in @ref{Grep Searching}. Remember to write the regular expression for @code{grep}, not for Emacs. (An alternative method of showing files whose contents match a given regexp is the @kbd{% g @var{regexp}} command, see @ref{Marks vs Flags}.) diff --git a/man/display.texi b/man/display.texi index 06b3a58642f..58e69ad4e60 100644 --- a/man/display.texi +++ b/man/display.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997, 2000, 2001, 2002, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Display, Search, Registers, Top @chapter Controlling the Display @@ -104,14 +104,18 @@ future Emacs versions. To see what faces are currently defined, and what they look like, type @kbd{M-x list-faces-display}. It's possible for a given face to look different in different frames; this command shows the appearance -in the frame in which you type it. Here are the standard faces -for specifying text appearance: +in the frame in which you type it. + +Here are the standard faces for specifying text appearance. You can +use them on specific text, when you want the effects they produce. @table @code @item default This face is used for ordinary text that doesn't specify any other face. @item bold This face uses a bold variant of the default font, if it has one. +It's up to you to choose a default font that has a bold variant, +if you want to use one. @item italic This face uses an italic variant of the default font, if it has one. @item bold-italic @@ -119,9 +123,15 @@ This face uses a bold italic variant of the default font, if it has one. @item underline This face underlines text. @item fixed-pitch -The basic fixed-pitch face. +This face forces use of a particular fixed-width font. @item variable-pitch -The basic variable-pitch face. +This face forces use of a particular variable-width font. It's +reasonable to customize this to use a different variable-width font, +if you like, but you should not make it a fixed-width font. +@item shadow +This face is used for making the text less noticeable than the surrounding +ordinary text. Usually this can be achieved by using shades of gray in +contrast with either black or white default foreground color. @end table Here's an incomplete list of faces used to highlight parts of the @@ -146,19 +156,15 @@ mode is enabled---see below). This face is used for displaying a secondary X selection (@pxref{Secondary Selection}). @item trailing-whitespace -The face for highlighting trailing whitespace when -@code{show-trailing-whitespace} is non-@code{nil}; see @ref{Useless -Whitespace}. +The face for highlighting excess spaces and tabs at the end of a line +when @code{show-trailing-whitespace} is non-@code{nil}; see +@ref{Useless Whitespace}. @item nobreak-space The face for displaying the character ``nobreak space''. @item escape-glyph The face for highlighting the @samp{\} or @samp{^} that indicates a control character. It's also used when @samp{\} indicates a nobreak space or nobreak (soft) hyphen. -@item shadow -The basic face for making the text less noticeable than the surrounding -ordinary text. Usually this is achieved by using shades of grey in -contrast with either black or white default foreground color. @end table @cindex @code{region} face @@ -175,10 +181,13 @@ appearance of these parts of the frame. @table @code @item mode-line -This face is used for the mode line of the currently selected window. -By default, it's drawn with shadows for a ``raised'' effect on window -systems, and drawn as the inverse of the default face on non-windowed -terminals. +@itemx modeline +This face is used for the mode line of the currently selected window, +and for menu bars when toolkit menus are not used. By default, it's +drawn with shadows for a ``raised'' effect on window systems, and +drawn as the inverse of the default face on non-windowed terminals. +@code{modeline} is an alias for the @code{mode-line} face, for +compatibility with old Emacs versions. @item mode-line-inactive Like @code{mode-line}, but used for mode lines of the windows other than the selected one (if @code{mode-line-in-non-selected-windows} is @@ -186,15 +195,22 @@ non-@code{nil}). This face inherits from @code{mode-line}, so changes in that face affect mode lines in all windows. @item header-line Similar to @code{mode-line} for a window's header line. Most modes -don't use the header line, but the Info mode does. +don't use the header line, but some special modes, such the Info mode, do. @item vertical-border -This face is used for the vertical divider between windows on -character terminals. By default this face inherits from the -@code{mode-line-inactive} face. +This face is used for the vertical divider between windows. +By default this face inherits from the @code{mode-line-inactive} face +on character terminals. On window systems the foreground color of +this face is used for the vertical line between windows without +scrollbars. @item minibuffer-prompt +@cindex @code{minibuffer-prompt} face +@vindex minibuffer-prompt-properties This face is used for the prompt strings displayed in the minibuffer. +By default, Emacs automatically adds this face to the value of +@code{minibuffer-prompt-properties}, which is a list of text +properties used to display the prompt text. @item fringe -@cindex fringe +@cindex @code{fringe} face The face for the fringes to the left and right of windows on graphic displays. (The fringes are the narrow portions of the Emacs frame between the text area and the window's right and left borders.) diff --git a/man/ebrowse.texi b/man/ebrowse.texi index 8e3510242cf..93c82fbbba0 100644 --- a/man/ebrowse.texi +++ b/man/ebrowse.texi @@ -10,7 +10,8 @@ @copying This file documents Ebrowse, a C++ class browser for GNU Emacs. -Copyright @copyright{} 2000, 2002 Free Software Foundation, Inc. +Copyright @copyright{} 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/ediff.texi b/man/ediff.texi index 7b997e4b0eb..1991aa642d3 100644 --- a/man/ediff.texi +++ b/man/ediff.texi @@ -25,8 +25,8 @@ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. -Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi index 06c0a4d77dc..7bd36f3ce46 100644 --- a/man/emacs-mime.texi +++ b/man/emacs-mime.texi @@ -9,7 +9,7 @@ @copying This file documents the Emacs MIME interface functionality. -Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 +Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation @@ -213,10 +213,6 @@ Set the undisplayer object. @findex mm-handle-disposition Return the parsed @code{Content-Disposition} of the part. -@item mm-handle-disposition -@findex mm-handle-disposition -Return the description of the part. - @item mm-get-content-id Returns the handle(s) referred to by @code{Content-ID}. @@ -813,7 +809,9 @@ by using the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}). @item mm-coding-system-priorities @vindex mm-coding-system-priorities Prioritize coding systems to use for outgoing messages. The default -is @code{nil}, which means to use the defaults in Emacs. It is a list of +is @code{nil}, which means to use the defaults in Emacs, but is +@code{(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)} when +running Emacs in the Japanese language environment. It is a list of coding system symbols (aliases of coding systems are also allowed, use @kbd{M-x describe-coding-system} to make sure you are specifying correct coding system names). For example, if you have configured Emacs @@ -880,8 +878,9 @@ used, of course. @vindex mm-mime-mule-charset-alist Things are slightly more complicated when running Emacs with @sc{mule} support. In this case, a list of the @sc{mule} charsets used in the -part is obtained, and the @sc{mule} charsets are translated to @acronym{MIME} -charsets by consulting the variable @code{mm-mime-mule-charset-alist}. +part is obtained, and the @sc{mule} charsets are translated to +@acronym{MIME} charsets by consulting the table provided by Emacs itself +or the variable @code{mm-mime-mule-charset-alist} for XEmacs. If this results in a single @acronym{MIME} charset, this is used to encode the part. But if the resulting list of @acronym{MIME} charsets contains more than one element, two things can happen: If it is possible to encode the @@ -1168,7 +1167,7 @@ in the subsequent sections. This chapter describes the basic, ground-level functions for parsing and handling. Covered here is parsing @code{From} lines, removing comments from header lines, decoding encoded words, parsing date headers and so -on. High-level functionality is dealt with in the next chapter +on. High-level functionality is dealt with in the first chapter (@pxref{Decoding and Viewing}). @menu @@ -1504,7 +1503,7 @@ Take a time and return the number of days that represents. @item safe-date-to-time Take a date and return a time. If the date is not syntactically valid, -return a ``zero'' date. +return a ``zero'' time. @item time-less-p Take two times and say whether the first time is less (i. e., earlier) diff --git a/man/emacs-xtra.texi b/man/emacs-xtra.texi index 94a37c2ec5e..d17a506a498 100644 --- a/man/emacs-xtra.texi +++ b/man/emacs-xtra.texi @@ -10,8 +10,7 @@ @copying This manual describes specialized features of Emacs. -Copyright (C) 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/emacs.texi b/man/emacs.texi index a4e713fd6f6..6eb78640bd4 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -11,8 +11,8 @@ This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, updated for Emacs version @value{EMACSVER}. -Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, -1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -787,9 +787,6 @@ Customization you can control their functioning. * Key Bindings:: The keymaps say what command each key runs. By changing them, you can "redefine keys". -* Keyboard Translations:: If your keyboard passes an undesired code - for a key, you can tell Emacs to - substitute another code. * Syntax:: The syntax table controls how words and expressions are parsed. * Init File:: How to write common customizations in the diff --git a/man/entering.texi b/man/entering.texi index fe76bf34844..1d04ab427f6 100644 --- a/man/entering.texi +++ b/man/entering.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Entering Emacs, Exiting, Text Characters, Top @chapter Entering and Exiting Emacs diff --git a/man/eshell.texi b/man/eshell.texi index 82e957f4de8..fe36780955b 100644 --- a/man/eshell.texi +++ b/man/eshell.texi @@ -8,7 +8,8 @@ @copying This manual is for Eshell, the Emacs shell. -Copyright @copyright{} 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. +Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/eudc.texi b/man/eudc.texi index b5ff83be14a..23df55bb97b 100644 --- a/man/eudc.texi +++ b/man/eudc.texi @@ -12,7 +12,8 @@ EUDC is the Emacs Unified Directory Client, a common interface to directory servers using various protocols such as LDAP or the CCSO white pages directory system (PH/QI) -Copyright 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/faq.texi b/man/faq.texi index bccc23e181c..1212ed87d8e 100644 --- a/man/faq.texi +++ b/man/faq.texi @@ -10,7 +10,7 @@ @set VER 21.3 @copying -Copyright 2001, 2002, 2003 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Copyright 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@* Copyright 1992,1993 Steven Byrnes@* Copyright 1990,1991,1992 Joseph Brian Wells@* @@ -1005,23 +1005,11 @@ administrator, because the most recent FAQ should not expire for a while. @item -Via HTTP or FTP. You can always fetch the latest FAQ from - -@uref{http://www.lerner.co.il/emacs/} and - -@uref{ftp://ftp.lerner.co.il/pub/emacs/} - -@item In the Emacs distribution. Since Emacs 18.56, the FAQ at the time of release has been part of the Emacs distribution as either @file{etc/FAQ} or @file{man/faq.texi} (@pxref{File-name conventions}). @item -Via the World Wide Web. A hypertext version is available at - -@uref{http://www.lerner.co.il/emacs/} - -@item Via anonymous ftp and e-mail from @file{rtfm.mit.edu} (and its mirror in Europe), the main repository for FAQs and other items posted to news.answers. The Emacs FAQs are available at @@ -1046,13 +1034,6 @@ send usenet/news.answers/GNU-Emacs-FAQ/part5 For more information, send email to @email{mail-server@@rtfm.mit.edu} with @samp{help} and @samp{index} in the body on separate lines. - -@item -As the very last resort, you can e-mail a request to -@email{emacs-faq@@lerner.co.il}. Don't do this unless you have made a -good-faith effort to obtain the FAQ list via one of the methods listed -above. - @end itemize @c ------------------------------------------------------------ @@ -2206,7 +2187,7 @@ otherwise. @inforef{Frame Commands, Frame Commands, emacs}. @cindex Unix regeps, differences from Emacs @cindex Text strings, putting regexps in -@inforef{Regexps, Regexps, emacs}. +@inforef{Regexp Backslash, Regexp Backslash, emacs}. The @code{or} operator is @samp{\|}, not @samp{|}, and the grouping operators are @samp{\(} and @samp{\)}. Also, the string syntax for a backslash is @@ -4637,9 +4618,9 @@ Good question! @cindex Keys, swapping @cindex @code{keyboard-translate} -In Emacs 19, you can swap two keys (or key sequences) by using the -@code{keyboard-translate} function. For example, to turn @kbd{C-h} into -@key{DEL} and @key{DEL} to @kbd{C-h}, use +You can swap two keys (or key sequences) by using the +@code{keyboard-translate} function. For example, to turn @kbd{C-h} +into @key{DEL} and @key{DEL} to @kbd{C-h}, use @lisp (keyboard-translate ?\C-h ?\C-?) ; translate `C-h' to DEL @@ -4651,6 +4632,11 @@ The first key sequence of the pair after the function identifies what is produced by the keyboard; the second, what is matched for in the keymaps. +However, in the specific case of @kbd{C-h} and @key{DEL}, you should +toggle @code{normal-erase-is-backspace-mode} instead of calling +@code{keyboard-translate}. @inforef{DEL Does Not Delete, DEL Does Not Delete, +emacs}. + Keyboard translations are not the same as key bindings in keymaps. Emacs contains numerous keymaps that apply in different situations, but there is only one set of keyboard translations, and it applies to every @@ -4659,8 +4645,6 @@ take place at the lowest level of input processing; the keys that are looked up in keymaps contain the characters that result from keyboard translation. -@inforef{Keyboard Translations, Keyboard Translations, emacs}. - @node Producing C-XXX with the keyboard, No Meta key, Swapping keys, Key bindings @section How do I produce C-XXX with my keyboard? @cindex Producing control characters diff --git a/man/files.texi b/man/files.texi index bc217de7b18..912fc6f7bf9 100644 --- a/man/files.texi +++ b/man/files.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2004, 2005 Free Software Foundation, Inc. +@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Files, Buffers, Keyboard Macros, Top @chapter File Handling @@ -2907,7 +2907,7 @@ string; the default is @code{"-c"} to specify a context diff. @findex diff-goto-source After running @kbd{M-x diff}, you can use @kbd{C-x `} to visit successive changed locations in the two source files, as in -Compilation mode (@pxref{Compilation}.) In the @samp{*diff*} buffer, +Compilation mode (@pxref{Compilation Mode}.) In the @samp{*diff*} buffer, you can move to a particular hunk of changes and type @kbd{C-c C-c} (@code{diff-goto-source}) to visit the corresponding source location. @@ -2918,15 +2918,19 @@ recent backup. If you specify the name of a backup file, of. @findex compare-windows - The command @kbd{M-x compare-windows} compares the text in the current -window with that in the next window. Comparison starts at point in each -window, and each starting position is pushed on the mark ring in its -respective buffer. Then point moves forward in each window, a character -at a time, until a mismatch between the two windows is reached. Then -the command is finished. Another invocation of this command with -points on mismatching positions tries to skip non-matching text and -move points forward, until a match between the two windows is reached. -For more information about windows in Emacs, @ref{Windows}. + The command @kbd{M-x compare-windows} compares the text in the +current window with that in the next window. (For more information +about windows in Emacs, @ref{Windows}.) Comparison starts at point in +each window, after pushing each initial point value on the mark ring +in its respective buffer. Then it moves point forward in each window, +one character at a time, until it reaches characters that don't match. +Then the command exits. + + If point in the two windows is followed by non-matching text when +the command starts, it tries heuristically to advance up to matching +text in the two windows, and then exits. So if you use @kbd{M-x +compare-windows} repeatedly, each time it either skips one matching +range or finds the start of another. @vindex compare-ignore-case @vindex compare-ignore-whitespace diff --git a/man/fixit.texi b/man/fixit.texi index 08c5eeee2ec..f58d3c835a6 100644 --- a/man/fixit.texi +++ b/man/fixit.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Fixit, Keyboard Macros, Search, Top @chapter Commands for Fixing Typos diff --git a/man/flymake.texi b/man/flymake.texi index 7a9ca11f4d5..4f5223e3bd9 100644 --- a/man/flymake.texi +++ b/man/flymake.texi @@ -11,7 +11,7 @@ This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}), which is a universal on-the-fly syntax checker for GNU Emacs. -Copyright @copyright{} 2004 Free Software Foundation, Inc. +Copyright @copyright{} 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/forms.texi b/man/forms.texi index 74876760ccc..adc3fe8a0b2 100644 --- a/man/forms.texi +++ b/man/forms.texi @@ -18,7 +18,8 @@ @copying This file documents Forms mode, a form-editing major mode for GNU Emacs. -Copyright 1989, 1997, 2001, 2002 Free Software Foundation, Inc. +Copyright (C) 1989, 1997, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/frames.texi b/man/frames.texi index 742091082c1..8e058867fcd 100644 --- a/man/frames.texi +++ b/man/frames.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 99, 2000, 2001, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, +@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Frames, International, Windows, Top @chapter Frames and X Windows diff --git a/man/glossary.texi b/man/glossary.texi index 78abbfb30b7..bab69b2c4dc 100644 --- a/man/glossary.texi +++ b/man/glossary.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,1997,2001 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Glossary, Key Index, Intro, Top @unnumbered Glossary @@ -681,7 +682,7 @@ keymap binds the character @kbd{C-n} to the command function @item Keyboard Translation Table The keyboard translation table is an array that translates the character codes that come from the terminal into the character codes that make up -key sequences. @xref{Keyboard Translations}. +key sequences. @item Kill Ring The kill ring is where all text you have killed recently is saved. diff --git a/man/gnu.texi b/man/gnu.texi index 43d4ab0cacd..51e1a5615ff 100644 --- a/man/gnu.texi +++ b/man/gnu.texi @@ -1,11 +1,13 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 1986, 1987, 1993, 1995 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @ifclear justgnu @node Manifesto,, MS-DOS, Top @unnumbered The GNU Manifesto @end ifclear @ifset justgnu -Copyright (C) 1985, 1993, 2001 Free Software Foundation, Inc. +Copyright (C) 1985, 1993, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or diff --git a/man/gnus.texi b/man/gnus.texi index 3317b85e3e3..131a92fae64 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -7,9 +7,8 @@ @syncodeindex pg cp @copying -Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -9407,7 +9406,7 @@ newsreaders and mailers that do not understand or use @acronym{MIME}, and just send out messages without saying what character sets they use. To help a bit with this, some local news hierarchies have policies that say what character set is the default. For instance, the @samp{fj} -hierarchy uses @code{iso-2022-jp-2}. +hierarchy uses @code{iso-2022-jp}. @vindex gnus-group-charset-alist This knowledge is encoded in the @code{gnus-group-charset-alist} diff --git a/man/help.texi b/man/help.texi index 29c06b499df..bcae911d55f 100644 --- a/man/help.texi +++ b/man/help.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 2000, 2001, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Help, Mark, M-x, Top @chapter Help diff --git a/man/idlwave.texi b/man/idlwave.texi index 8226c0ac63f..f9e167893a0 100644 --- a/man/idlwave.texi +++ b/man/idlwave.texi @@ -29,8 +29,8 @@ Emacs, and interacting with an IDL shell run as a subprocess. This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE @value{VERSION} -Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software -Foundation, Inc. +Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -60,8 +60,8 @@ license to the document, as described in section 6 of the license. This is edition @value{EDITION} of the @cite{IDLWAVE User Manual} for IDLWAVE version @value{VERSION}, @value{DATE}. @sp 2 -Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software -Foundation, Inc. +Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @sp 2 @cindex Copyright, of IDLWAVE Permission is granted to copy, distribute and/or modify this document diff --git a/man/indent.texi b/man/indent.texi index 48a54747714..c748f5010b1 100644 --- a/man/indent.texi +++ b/man/indent.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997, 2004 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Indentation, Text, Major Modes, Top @chapter Indentation diff --git a/man/info.texi b/man/info.texi index e6c508b4b49..3a0ba2b3947 100644 --- a/man/info.texi +++ b/man/info.texi @@ -14,8 +14,8 @@ This file describes how to use Info, the on-line, menu-driven GNU documentation system. -Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. +Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -238,7 +238,7 @@ line says that this is node @samp{Help} in the file @file{info}. (look at it now) says that the @samp{Next} node after this one is the node called @samp{Help-P}. An advanced Info command lets you go to any node whose name you know. In the stand-alone Info reader program, -the header line shows the names of this node and the info file as +the header line shows the names of this node and the Info file as well. In Emacs, the header line is duplicated in a special typeface, and the duplicate remains at the top of the window all the time even if you scroll through the node. @@ -284,7 +284,7 @@ node, @samp{Help-^L}. If you read this in Emacs, you will see an @samp{Info} item in the menu bar, close to its right edge. Clicking the mouse on the @samp{Info} menu-bar item opens a menu of commands which include -@samp{Next} and @samp{Prev} (and also some others which you didn't yet +@samp{Next} and @samp{Previous} (and also some others which you didn't yet learn about). This all probably seems insultingly simple so far, but @emph{please @@ -671,10 +671,12 @@ mistake. Another way to move to the menu subtopic lines and between them is to type @key{TAB}. Each time you type a @key{TAB}, you move to the -next subtopic line. To move to a previous subtopic line, type -@kbd{M-@key{TAB}}---that is, press and hold the @key{META} key and then -press @key{TAB}. (On some keyboards, the @key{META} key might be labeled -@samp{Alt}.) +next subtopic line. To move to a previous subtopic line in the +stand-alone reader, type @kbd{M-@key{TAB}}---that is, press and hold +the @key{META} key and then press @key{TAB}. (On some keyboards, the +@key{META} key might be labeled @samp{Alt}.) In Emacs Info, type +@kbd{S-@key{TAB}} to move to a previous subtopic line (press and hold +the @key{Shift} key and then press @key{TAB}). Once you move cursor to a subtopic line, press @key{RET} to go to that subtopic's node. @@ -727,7 +729,8 @@ usually used to ``stay on the same level but go backwards''. @code{Info-up}). That puts you at the @emph{front} of the node---to get back to where you were reading you have to type some @key{SPC}s. (Some Info readers, such as the one built into Emacs, put you at the -same place where you were reading in @samp{Help-M}.) +menu subtopic line which points to the subnode that the @kbd{u} command +brought you from.) Another way to go Up is to click @kbd{Mouse-2} on the @samp{Up} pointer shown in the header line (provided that you have a mouse). @@ -785,8 +788,14 @@ to cancel the @kbd{f}. type a @kbd{Control-g} and see how the @samp{f} gives up. @end format - The @key{TAB} and @kbd{M-@key{TAB}} key, which move between menu -items in a menu, also move between cross references outside of menus. + The @key{TAB}, @kbd{M-@key{TAB}} and @kbd{S-@key{TAB}} keys, +which move between menu items in a menu, also move between cross +references outside of menus. + + Clicking @kbd{Mouse-2} on or near a cross reference also follows the +reference. You can see that the cross reference is mouse-sensitive by +moving the mouse pointer to the reference and watching how the +underlying text and the mouse pointer change in response. Sometimes a cross reference (or a node) can lead to another file (in other words another ``manual''), or, on occasion, even a file on a @@ -795,36 +804,22 @@ stand-alone Info avoid using remote links). Such a cross reference looks like this: @xref{Top,, Overview of Texinfo, texinfo, Texinfo: The GNU Documentation Format}. (After following this link, type @kbd{l} to get back to this node.) Here the name @samp{texinfo} -between parentheses (shown in the stand-alone version) refers to the -file name. This file name appears in cross references and node names -if it differs from the current file. In Emacs, the file name is -hidden (along with other text). (Use @kbd{M-x visible-mode} to show -or hide it.) - - The remainder of this node applies only to the Emacs version. If -you use the stand-alone version, you can type @kbd{n} immediately. - - To some users, switching manuals is a much bigger switch than -switching sections. These users like to know that they are going to -be switching to another manual (and which one) before actually doing -so, especially given that, if one does not notice, Info commands like -@kbd{t} (see the next node) can have confusing results. - - If you put your mouse over the cross reference and if the cross -reference leads to a different manual, then the information appearing -in a separate box (tool tip) or in the echo area, will mention the -file the cross reference will carry you to (between parentheses). -This is also true for menu subtopic names. If you have a mouse, just -leave it over the @samp{Overview} cross reference above and watch what -happens. - - If you always like to have that information available without having -to move your mouse over the cross reference, set -@code{Info-hide-note-references} to a value other than @code{t} -(@pxref{Emacs Info Variables}). You might also want to do that if you -have a lot of cross references to files on remote machines and have -non-permanent or slow access, since otherwise you might not be able to -distinguish between local and remote links. +between parentheses refers to the file name. This file name appears +in cross references and node names if it differs from the current +file, so you can always know that you are going to be switching to +another manual and which one. + +However, Emacs normally hides some other text in cross-references. +If you put your mouse over the cross reference, then the information +appearing in a separate box (tool tip) or in the echo area will show +the full cross-reference including the file name and the node name of +the cross reference. If you have a mouse, just leave it over the +cross reference @xref{Top,, Overview of Texinfo, texinfo, Texinfo: +The GNU Documentation Format}, and watch what happens. If you +always like to have that information visible without having to move +your mouse over the cross reference, use @kbd{M-x visible-mode}, or +set @code{Info-hide-note-references} to a value other than @code{t} +(@pxref{Emacs Info Variables}). @format >> Now type @kbd{n} to learn more commands. @@ -845,8 +840,9 @@ This allows Info readers to go to the exact line of an entry, not just the start of the containing node.) You can get to the index from the main menu of the file with the -@kbd{m} command; then you can use the @kbd{m} command again in the -index node to go to the node that describes the topic you want. +@kbd{m} command and the name of the index node; then you can use the +@kbd{m} command again in the index node to go to the node that +describes the topic you want. There is also a short-cut Info command, @kbd{i}, which does all of that for you. It searches the index for a given topic (a string) and @@ -854,8 +850,8 @@ goes to the node which is listed in the index for that topic. @xref{Info Search}, for a full explanation. @kindex l @r{(Info mode)} -@findex Info-last -@cindex going back in Info mode +@findex Info-history-back +@cindex going back in Info history If you have been moving around to different nodes and wish to retrace your steps, the @kbd{l} command (@kbd{l} for @dfn{last}) will do that, one node-step at a time. As you move from node to node, Info @@ -863,7 +859,7 @@ records the nodes where you have been in a special history list. The @kbd{l} command revisits nodes in the history list; each successive @kbd{l} command moves one step back through the history. - In Emacs, @kbd{l} runs the command @code{Info-last}. + In Emacs, @kbd{l} runs the command @code{Info-history-back}. @format >> Try typing @kbd{p p n} and then three @kbd{l}'s, pausing in between @@ -875,6 +871,13 @@ where @emph{you} last were, whereas @kbd{p} always moves to the node which the header says is the @samp{Previous} node (from this node, the @samp{Prev} link leads to @samp{Help-Xref}). +@kindex r @r{(Info mode)} +@findex Info-history-forward +@cindex going forward in Info history + You can use the @kbd{r} command (@code{Info-history-forward} in Emacs) +to revisit nodes in the history list in the forward direction, so that +@kbd{r} will return you to the node you came from by typing @kbd{l}. + @kindex d @r{(Info mode)} @findex Info-directory @cindex go to Directory node @@ -898,11 +901,6 @@ This is useful if you want to browse the manual's main menu, or select some specific top-level menu item. The Emacs command run by @kbd{t} is @code{Info-top-node}. - Clicking @kbd{Mouse-2} on or near a cross reference also follows the -reference. You can see that the cross reference is mouse-sensitive by -moving the mouse pointer to the reference and watching how the -underlying text and the mouse pointer change in response. - @format >> Now type @kbd{n} to see the last node of the course. @end format @@ -935,7 +933,7 @@ Documentation Format}. * Menus:: How to add to or create menus in Info nodes. * Cross-refs:: How to add cross-references to Info nodes. * Tags:: How to make tags tables for Info files. -* Checking:: Checking an Info File +* Checking:: Checking an Info File. * Emacs Info Variables:: Variables modifying the behavior of Emacs Info. @end menu @@ -969,7 +967,7 @@ the node @samp{Top} in the Info file @file{dir}. Likewise, The node name @samp{*} specifies the whole file. So you can look at all of the current file by typing @kbd{g*@key{RET}} or all of any -other file with @kbd{g(@var{filename})@key{RET}}. +other file with @kbd{g(@var{filename})*@key{RET}}. @subheading @kbd{1}--@kbd{9} choose a menu subtopic by its number @@ -1017,7 +1015,7 @@ current node. @findex clone-buffer @cindex multiple Info buffers If you are reading Info in Emacs, you can select a new independent -Info buffer in another window by typing @kbd{M-n}. The new buffer +Info buffer in the same window by typing @kbd{M-n}. The new buffer starts out as an exact copy of the old one, but you will be able to move independently between nodes in the two buffers. (In Info mode, @kbd{M-n} runs the Emacs command @code{clone-buffer}.) @@ -1028,6 +1026,11 @@ m} and @kbd{C-u g} go to a new node in exactly the same way that @kbd{m} and @kbd{g} do, but they do so in a new Info buffer which they select in another window. + Another way to produce new Info buffers in Emacs is to use a numeric +prefix argument for the @kbd{C-h i} command (@code{info}) which +switches to the Info buffer with that number. Thus, @kbd{C-u 2 C-h i} +switches to the buffer @samp{*info*<2>}, creating it if necessary. + @node Info Search, Add, Advanced, Expert Info @comment node-name, next, previous, up @section How to search Info documents for specific subjects @@ -1083,10 +1086,12 @@ you type inside Emacs to run the command bound to @kbd{C-f}. In Emacs, @kbd{i} runs the command @code{Info-index}. @findex info-apropos +@findex index-apropos If you don't know what manual documents something, try the @kbd{M-x -info-apropos} command. It prompts for a string and then looks up that -string in all the indices of all the Info documents installed on your -system. +info-apropos} command in Emacs, or the @kbd{M-x index-apropos} command +in the stand-alone reader. It prompts for a string and then looks up +that string in all the indices of all the Info documents installed on +your system. @kindex s @r{(Info mode)} @findex Info-search @@ -1095,10 +1100,10 @@ It switches to the next node if and when that is necessary. You type @kbd{s} followed by the string to search for, terminated by @key{RET}. To search for the same string again, just @kbd{s} followed by @key{RET} will do. The file's nodes are scanned in the order -they are in in the file, which has no necessary relationship to the +they are in the file, which has no necessary relationship to the order that they may be in the tree structure of menus and @samp{next} pointers. But normally the two orders are not very different. In any -case, you can always do a @kbd{b} to find out what node you have +case, you can always look at the echo area to find out what node you have reached, if the header is not visible (this can happen, because @kbd{s} puts your cursor at the occurrence of the string, not at the beginning of the node). @@ -1109,6 +1114,15 @@ compatibility with other GNU packages that use @kbd{M-s} for a similar kind of search command. Both @kbd{s} and @kbd{M-s} run in Emacs the command @code{Info-search}. +@kindex C-s @r{(Info mode)} +@kindex C-r @r{(Info mode)} +@findex isearch + Instead of using @kbd{s} in Emacs Info and in the stand-alone Info, +you can use an incremental search started with @kbd{C-s} or @kbd{C-r}. +It can search through multiple Info nodes. @xref{Incremental Search,,, +emacs, The GNU Emacs Manual}. In Emacs, this behavior is enabled only +if the variable @code{Info-isearch-search} is non-@code{nil} +(@pxref{Emacs Info Variables}). @node Add, Menus, Info Search, Expert Info @comment node-name, next, previous, up @@ -1245,9 +1259,9 @@ the nodes in a file to form a connected structure. In fact, this file has two connected components. You are in one of them, which is under the node @samp{Top}; the other contains the node @samp{Help} which the @kbd{h} command goes to. In fact, since there is no garbage -collector, nothing terrible happens if a substructure is not pointed -to, but such a substructure is rather useless since nobody can -ever find out that it exists. +collector on the node graph, nothing terrible happens if a substructure +is not pointed to, but such a substructure is rather useless since nobody +can ever find out that it exists. @node Cross-refs, Tags, Menus, Expert Info @comment node-name, next, previous, up @@ -1328,7 +1342,7 @@ manner. @comment node-name, next, previous, up @section Tags Tables for Info Files -@cindex tags tables in info files +@cindex tags tables in Info files You can speed up the access to nodes of a large Info file by giving it a tags table. Unlike the tags table for a program, the tags table for an Info file lives inside the file itself and is used @@ -1408,22 +1422,30 @@ initialize it, or @code{Info-default-directory-list} if there is no @env{INFOPATH} variable in the environment. If you wish to customize the Info directory search list for both Emacs -info and stand-alone Info, it is best to set the @env{INFOPATH} +Info and stand-alone Info, it is best to set the @env{INFOPATH} environment variable, since that applies to both programs. @item Info-additional-directory-list A list of additional directories to search for Info documentation files. These directories are not searched for merging the @file{dir} file. -@item Info-fontify -When set to a non-@code{nil} value, enables highlighting of Info -files. The default is @code{t}. You can change how the highlighting -looks by customizing the faces @code{info-node}, @code{info-xref}, -@code{info-header-xref}, @code{info-header-node}, @code{info-menu-5}, -@code{info-menu-header}, and @code{info-title-@var{n}-face} (where -@var{n} is the level of the section, a number between 1 and 4). To -customize a face, type @kbd{M-x customize-face @key{RET} @var{face} -@key{RET}}, where @var{face} is one of the face names listed here. +@item Info-mode-hook +Hooks run when @code{Info-mode} is called. By default, it contains +the hook @code{turn-on-font-lock} which enables highlighting of Info +files. You can change how the highlighting looks by customizing the +faces @code{info-node}, @code{info-xref}, @code{info-xref-visited}, +@code{info-header-xref}, @code{info-header-node}, @code{info-menu-header}, +@code{info-menu-star}, and @code{info-title-@var{n}} (where @var{n} +is the level of the section, a number between 1 and 4). To customize +a face, type @kbd{M-x customize-face @key{RET} @var{face} @key{RET}}, +where @var{face} is one of the face names listed here. + +@item Info-fontify-maximum-menu-size +Maximum size of menu to fontify if @code{font-lock-mode} is non-@code{nil}. + +@item Info-fontify-visited-nodes +If non-@code{nil}, menu items and cross-references pointing to visited +nodes are displayed in the @code{info-xref-visited} face. @item Info-use-header-line If non-@code{nil}, Emacs puts in the Info buffer a header line showing @@ -1449,6 +1471,9 @@ subnode indicated by the following menu item. Setting this option to program, which visits the first subnode from the menu only when you hit the end of the current node. The default is @code{nil}. +@item Info-isearch-search +If non-@code{nil}, isearch in Info searches through multiple nodes. + @item Info-enable-active-nodes When set to a non-@code{nil} value, allows Info to execute Lisp code associated with nodes. The Lisp code is executed when the node is diff --git a/man/killing.texi b/man/killing.texi index 006af200c06..bcb170ac265 100644 --- a/man/killing.texi +++ b/man/killing.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001,2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Killing, Yanking, Mark, Top diff --git a/man/kmacro.texi b/man/kmacro.texi index e19c1434813..0693eefca54 100644 --- a/man/kmacro.texi +++ b/man/kmacro.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Keyboard Macros, Files, Fixit, Top @chapter Keyboard Macros diff --git a/man/m-x.texi b/man/m-x.texi index 5a33bab0737..46d3fab046e 100644 --- a/man/m-x.texi +++ b/man/m-x.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node M-x, Help, Minibuffer, Top @chapter Running Commands by Name diff --git a/man/macos.texi b/man/macos.texi index 9451f35f4a5..bcb25a7e52e 100644 --- a/man/macos.texi +++ b/man/macos.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. +@c Copyright (C) 2000, 2001, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mac OS, MS-DOS, Antinews, Top @appendix Emacs and the Mac OS diff --git a/man/maintaining.texi b/man/maintaining.texi index b11ae6b6cdd..2af47f6ecaf 100644 --- a/man/maintaining.texi +++ b/man/maintaining.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2005 Free Software Foundation, Inc. +@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Maintaining, Abbrevs, Building, Top @chapter Maintaining Programs @@ -849,7 +849,7 @@ continue to exist. Emacs and have Emacs show you the matching lines one by one. This works much like running a compilation; finding the source locations of the @code{grep} matches works like finding the compilation errors. -@xref{Compilation}. +@xref{Grep Searching}. @node List Tags @subsection Tags Table Inquiries diff --git a/man/major.texi b/man/major.texi index 23e0f8e116f..74613a24321 100644 --- a/man/major.texi +++ b/man/major.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 2000 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Major Modes, Indentation, International, Top @chapter Major Modes diff --git a/man/makefile.w32-in b/man/makefile.w32-in index 1792933e705..a5543a8c440 100644 --- a/man/makefile.w32-in +++ b/man/makefile.w32-in @@ -1,7 +1,6 @@ #### -*- Makefile -*- for the Emacs Manual and other documentation. -# Copyright (C) 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/man/mark.texi b/man/mark.texi index 5f4c44de9e1..eb21a51cb27 100644 --- a/man/mark.texi +++ b/man/mark.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,1997,2001 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mark, Killing, Help, Top @chapter The Mark and the Region diff --git a/man/message.texi b/man/message.texi index ce78e1bb68b..7e4ffb84d72 100644 --- a/man/message.texi +++ b/man/message.texi @@ -8,8 +8,8 @@ @copying This file documents Message, the Emacs message composition mode. -Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/mh-e.texi b/man/mh-e.texi index 7f95178fde1..babe1a15aa0 100644 --- a/man/mh-e.texi +++ b/man/mh-e.texi @@ -15,7 +15,8 @@ This is Edition @value{EDITION}, last updated @value{UPDATED}, of @cite{mh-e, The Emacs Interface to MH}, for mh-e, Version @value{VERSION}. -Copyright 1995, 2001, 2002, 2004 Free Software Foundation, Inc. +Copyright (C) 1995, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/mini.texi b/man/mini.texi index 47daebc1e75..3797260f9cc 100644 --- a/man/mini.texi +++ b/man/mini.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 00, 2001 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Minibuffer, M-x, Basic, Top @chapter The Minibuffer diff --git a/man/misc.texi b/man/misc.texi index b52264e1f57..baebc6bf4d0 100644 --- a/man/misc.texi +++ b/man/misc.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2004, 2005 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Miscellaneous Commands diff --git a/man/msdog.texi b/man/msdog.texi index a5aea27f161..782a239ed42 100644 --- a/man/msdog.texi +++ b/man/msdog.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,1997,2000,2001 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node MS-DOS, Manifesto, Mac OS, Top @appendix Emacs and MS-DOS @@ -583,6 +583,12 @@ However, due to incompatibilities between MS-DOS/MS-Windows and other systems, there are several DOS-specific aspects of this support that you should be aware of. This section describes these aspects. + The description below is largely specific to the MS-DOS port of +Emacs, especially where it talks about practical implications for +Emacs users. For other operating systems, see the @file{code-pages.el} +package, which implements support for MS-DOS- and MS-Windows-specific +encodings for all platforms other than MS-DOS. + @table @kbd @item M-x dos-codepage-setup Set up Emacs display and coding systems as appropriate for the current @@ -721,7 +727,8 @@ DOS codepages for the same locale. For example, DOS codepage 850 supports the same character set as Windows codepage 1252; DOS codepage 855 supports the same character set as Windows codepage 1251, etc. The MS-Windows version of Emacs uses the current codepage for display -when invoked with the @samp{-nw} option. +when invoked with the @samp{-nw} option. Support for codepages in the +Windows port of Emacs is part of the @file{code-pages.el} package. @node MS-DOS Processes @section Subprocesses on MS-DOS diff --git a/man/mule.texi b/man/mule.texi index 7156c814f71..fa5e1246f25 100644 --- a/man/mule.texi +++ b/man/mule.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1997, 1999, 2000, 2001, 2005 Free Software Foundation, Inc. +@c Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, +@c 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node International, Major Modes, Frames, Top @chapter International Character Set Support @@ -592,12 +593,15 @@ coding systems @code{no-conversion}, @code{raw-text} and @cindex international files from DOS/Windows systems A special class of coding systems, collectively known as @dfn{codepages}, is designed to support text encoded by MS-Windows and -MS-DOS software. To use any of these systems, you need to create it -with @kbd{M-x codepage-setup}. @xref{MS-DOS and MULE}. After -creating the coding system for the codepage, you can use it as any -other coding system. For example, to visit a file encoded in codepage -850, type @kbd{C-x @key{RET} c cp850 @key{RET} C-x C-f @var{filename} -@key{RET}}. +MS-DOS software. The names of these coding systems are +@code{cp@var{nnnn}}, where @var{nnnn} is a 3- or 4-digit number of the +codepage. You can use these encodings just like any other coding +system; for example, to visit a file encoded in codepage 850, type +@kbd{C-x @key{RET} c cp850 @key{RET} C-x C-f @var{filename} +@key{RET}}@footnote{ +In the MS-DOS port of Emacs, you need to create a @code{cp@var{nnn}} +coding system with @kbd{M-x codepage-setup}, before you can use it. +@xref{MS-DOS and MULE}.}. In addition to converting various representations of non-@acronym{ASCII} characters, a coding system can perform end-of-line conversion. Emacs diff --git a/man/org.texi b/man/org.texi index 61c2eb5e7ad..e214927df5f 100644 --- a/man/org.texi +++ b/man/org.texi @@ -35,7 +35,7 @@ @copying This manual is for Org-mode (version @value{VERSION}). -Copyright @copyright{} 2004, 2005 Free Software Foundation +Copyright @copyright{} 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/pcl-cvs.texi b/man/pcl-cvs.texi index de9b962e4a5..26ca071d2e4 100644 --- a/man/pcl-cvs.texi +++ b/man/pcl-cvs.texi @@ -7,7 +7,7 @@ @copying Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -1999, 2000, 2002, 2004 Free Software Foundation, Inc. + 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/pgg.texi b/man/pgg.texi index 8593a9e64a2..203f0cda371 100644 --- a/man/pgg.texi +++ b/man/pgg.texi @@ -8,7 +8,7 @@ @copying This file describes the PGG. -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. Copyright (C) 2001 Daiki Ueno. @quotation diff --git a/man/picture.texi b/man/picture.texi index 465c35143cc..46a735122df 100644 --- a/man/picture.texi +++ b/man/picture.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Picture, Sending Mail, Abbrevs, Top @chapter Editing Pictures diff --git a/man/programs.texi b/man/programs.texi index 83d8d6aa0b8..d5b608a288c 100644 --- a/man/programs.texi +++ b/man/programs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2005 Free Software Foundation, Inc. +@c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Programs, Building, Text, Top @chapter Editing Programs @@ -1016,7 +1016,7 @@ for example, in C mode the value of the variable is after the @samp{/*} itself, and accepts C++ style comments also. (Note that @samp{\\} is needed in Lisp syntax to include a @samp{\} in the string, which is needed to deny the first star its special meaning -in regexp syntax. @xref{Regexps}.) +in regexp syntax. @xref{Regexp Backslash}.) @vindex comment-start @vindex comment-end diff --git a/man/reftex.texi b/man/reftex.texi index f6e5a6da082..12c4ce6e416 100644 --- a/man/reftex.texi +++ b/man/reftex.texi @@ -25,7 +25,8 @@ citations and indices for LaTeX documents with Emacs. This is edition @value{EDITION} of the @b{Ref@TeX{}} User Manual for @b{Ref@TeX{}} @value{VERSION} -Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/regs.texi b/man/regs.texi index 41b2e639855..0e3c9073ac7 100644 --- a/man/regs.texi +++ b/man/regs.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Registers, Display, Rectangles, Top @chapter Registers diff --git a/man/rmail.texi b/man/rmail.texi index 091d1e60b74..71181b0db34 100644 --- a/man/rmail.texi +++ b/man/rmail.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,1997,2001 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Rmail, Dired, Sending Mail, Top @chapter Reading Mail with Rmail diff --git a/man/sc.texi b/man/sc.texi index 95ce7f9e5d1..2189539476c 100644 --- a/man/sc.texi +++ b/man/sc.texi @@ -15,7 +15,8 @@ This document describes the Supercite Version 3.1 package for citing and attributing the replies for various GNU Emacs mail and news reading subsystems. -Copyright @copyright{} 1993, 2001, 2002 Free Software Foundation, Inc. +Copyright @copyright{} 1993, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/screen.texi b/man/screen.texi index a2f20e1721d..cd8224a6db2 100644 --- a/man/screen.texi +++ b/man/screen.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,1997,2001 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Screen, User Input, Acknowledgments, Top @chapter The Organization of the Screen diff --git a/man/search.texi b/man/search.texi index e0bd00d7beb..0233f7ce8de 100644 --- a/man/search.texi +++ b/man/search.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2004, 2005 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Search, Fixit, Display, Top @chapter Searching and Replacement @@ -24,6 +24,8 @@ asks interactively which occurrences to replace. * Word Search:: Search for sequence of words. * Regexp Search:: Search for match for a regexp. * Regexps:: Syntax of regular expressions. +* Regexp Backslash:: Regular expression constructs starting with `\'. +* Regexp Example:: A complex regular expression explained. * Search Case:: To ignore case while searching, or not. * Replace:: Search, and replace some or all matches. * Other Repeating Search:: Operating on all matches for some regexp. @@ -210,7 +212,7 @@ of bindings, look at the documentation of @code{isearch-mode} with @cindex searching for non-@acronym{ASCII} characters @cindex input method, during incremental search - To enter non-@acronym{ASCII} characters in an incrementral search, + To enter non-@acronym{ASCII} characters in an incremental search, you must use an input method (@pxref{Input Methods}). If an input method is enabled in the current buffer when you start the search, you can use it while you type the search string also. Emacs indicates @@ -669,20 +671,26 @@ has two functions: it quotes the special characters (including Because @samp{\} quotes special characters, @samp{\$} is a regular expression that matches only @samp{$}, and @samp{\[} is a regular expression that matches only @samp{[}, and so on. + +See the following section for the special constructs that begin +with @samp{\}. @end table -Note: for historical compatibility, special characters are treated as + Note: for historical compatibility, special characters are treated as ordinary ones if they are in contexts where their special meanings make no sense. For example, @samp{*foo} treats @samp{*} as ordinary since there is no preceding expression on which the @samp{*} can act. It is poor practice to depend on this behavior; it is better to quote the special character anyway, -regardless of where it appears.@refill +regardless of where it appears. + +@node Regexp Backslash +@section Backslash in Regular Expressions -For the most part, @samp{\} followed by any character matches only that -character. However, there are several exceptions: two-character -sequences starting with @samp{\} that have special meanings. The second -character in the sequence is always an ordinary character when used on -its own. Here is a table of @samp{\} constructs. + For the most part, @samp{\} followed by any character matches only +that character. However, there are several exceptions: two-character +sequences starting with @samp{\} that have special meanings. The +second character in the sequence is always an ordinary character when +used on its own. Here is a table of @samp{\} constructs. @table @kbd @item \| @@ -836,8 +844,11 @@ matches any character that does @emph{not} belong to category The constructs that pertain to words and syntax are controlled by the setting of the syntax table (@pxref{Syntax}). - Here is a complicated regexp. It is a simplified version of the -regexp that Emacs uses, by default, to recognize the end of a sentence +@node Regexp Example +@section Regular Expression Example + + Here is a complicated regexp---a simplified version of the regexp +that Emacs uses, by default, to recognize the end of a sentence together with any whitespace that follows. We show its Lisp syntax to distinguish the spaces from the tab characters. In Lisp syntax, the string constant begins and ends with a double-quote. @samp{\"} stands @@ -864,27 +875,6 @@ for Lisp syntax. In commands that use ordinary minibuffer input to read a regexp, you would quote the @kbd{C-j} by preceding it with a @kbd{C-q} to prevent @kbd{C-j} from exiting the minibuffer. -@ignore -@c I commented this out because it is missing vital information -@c and therefore useless. For instance, what do you do to *use* the -@c regular expression when it is finished? What jobs is this good for? -@c -- rms - -@findex re-builder -@cindex authoring regular expressions - For convenient interactive development of regular expressions, you -can use the @kbd{M-x re-builder} command. It provides a convenient -interface for creating regular expressions, by giving immediate visual -feedback. The buffer from which @code{re-builder} was invoked becomes -the target for the regexp editor, which pops in a separate window. At -all times, all the matches in the target buffer for the current -regular expression are highlighted. Each parenthesized sub-expression -of the regexp is shown in a distinct face, which makes it easier to -verify even very complex regexps. (On displays that don't support -colors, Emacs blinks the cursor around the matched text, as it does -for matching parens.) -@end ignore - @node Search Case @section Searching and Case @@ -927,7 +917,7 @@ searches also, including those performed by the replace commands Global search-and-replace operations are not needed often in Emacs, but they are available. In addition to the simple @kbd{M-x replace-string} command which replaces all occurrences, -there is a @kbd{M-x query-replace} command which finds each occurrence +there is @kbd{M-%} (@code{query-replace}), which presents each occurrence of the pattern and asks you whether to replace it. The replace commands normally operate on the text from point to the diff --git a/man/sending.texi b/man/sending.texi index e63e5bb9c4c..6fa5c1b0485 100644 --- a/man/sending.texi +++ b/man/sending.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001, 2003 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Sending Mail, Rmail, Picture, Top @chapter Sending Mail diff --git a/man/ses.texi b/man/ses.texi index 9667161f673..1cb2ef3cad1 100644 --- a/man/ses.texi +++ b/man/ses.texi @@ -8,7 +8,7 @@ @copying This file documents SES: the Simple Emacs Spreadsheet. -Copyright @copyright{} 2002, 2005 Free Software Foundation, Inc. +Copyright @copyright{} 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/sieve.texi b/man/sieve.texi index a41463c5316..21da1f22c1b 100644 --- a/man/sieve.texi +++ b/man/sieve.texi @@ -9,7 +9,7 @@ @copying This file documents the Emacs Sieve package. -Copyright (C) 2001 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/smtpmail.texi b/man/smtpmail.texi index f75b48dddd4..847d7c7d74c 100644 --- a/man/smtpmail.texi +++ b/man/smtpmail.texi @@ -3,7 +3,7 @@ @settitle Emacs SMTP Library @syncodeindex vr fn @copying -Copyright @copyright{} 2003, 2004 Free Software Foundation, Inc. +Copyright @copyright{} 2003, 2004, 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/speedbar.texi b/man/speedbar.texi index 3fea2c33c3d..58dd4b435e1 100644 --- a/man/speedbar.texi +++ b/man/speedbar.texi @@ -5,7 +5,8 @@ @syncodeindex fn cp @copying -Copyright @copyright{} 1999, 2000, 2002, 2004 Free Software Foundation, Inc. +Copyright @copyright{} 1999, 2000, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/texinfo.tex b/man/texinfo.tex index ef68971341a..eb7ea101e61 100644 --- a/man/texinfo.tex +++ b/man/texinfo.tex @@ -3,10 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2005-02-08.10} +\def\texinfoversion{2005-08-10.17} % -% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, -% 2000, 01, 02 Free Software Foundation, Inc. +% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, +% 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +% 2005 Free Software Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or % modify it under the terms of the GNU General Public License as diff --git a/man/text.texi b/man/text.texi index 89fb79eece1..01cacc1a62e 100644 --- a/man/text.texi +++ b/man/text.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001, 2002, 2004 -@c Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Text, Programs, Indentation, Top @chapter Commands for Human Languages @@ -228,7 +228,7 @@ normally similar to the following regexp: @end example @noindent -This example is explained in the section on regexps. @xref{Regexps}. +This example is explained in the section on regexps. @xref{Regexp Example}. If you want to use just one space between sentences, you should set @code{sentence-end} to this value: diff --git a/man/tramp.texi b/man/tramp.texi index 756b467157c..b28292cff87 100644 --- a/man/tramp.texi +++ b/man/tramp.texi @@ -25,8 +25,8 @@ @end macro @copying -Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free -Software Foundation, Inc. +Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -218,10 +218,10 @@ How file names, directories and localnames are mangled and managed @chapter An overview of @value{tramp} @cindex overview -After the installation of @value{tramp} into your @value{emacsname}, you -will be able to access files on remote machines as though they were -local. Access to the remote file system for editing files, version -control, and @command{dired} are transparently enabled. +After the installation of @value{tramp} into your @value{emacsname}, +you will be able to access files on remote machines as though they +were local. Access to the remote file system for editing files, +version control, and @code{dired} are transparently enabled. Your access to the remote machine can be with the @command{rsh}, @command{rlogin}, @command{telnet} programs or with any similar @@ -289,9 +289,9 @@ Communication with this process happens through an goes into a buffer. @item -The remote host may prompt for a login name (for @command{telnet}). The -login name is given in the file name, so @value{tramp} sends the login name and -a newline. +The remote host may prompt for a login name (for @command{telnet}). +The login name is given in the file name, so @value{tramp} sends the +login name and a newline. @item The remote host may prompt for a password or pass phrase (for @@ -365,7 +365,6 @@ you are finished, you type @kbd{C-x C-s} to save the buffer. Again, @value{tramp} transfers the file contents to the remote host either inline or out-of-band. This is the reverse of what happens when reading the file. - @end itemize I hope this has provided you with a basic overview of what happens @@ -653,7 +652,6 @@ easy to implement, so I haven't got around to it, yet. @item @option{sshx} @cindex method sshx @cindex sshx method -@cindex Cygwin (with sshx method) As you would expect, this is similar to @option{ssh}, only a little different. Whereas @option{ssh} opens a normal interactive shell on @@ -674,9 +672,9 @@ in without such questions. This is also useful for Windows users where @command{ssh}, when invoked from an @value{emacsname} buffer, tells them that it is not allocating a pseudo tty. When this happens, the login shell is wont -to not print any shell prompt, which confuses @value{tramp} mightily. For -reasons unknown, some Windows ports for @command{ssh} (maybe the -Cygwin one) require the doubled @samp{-t} option. +to not print any shell prompt, which confuses @value{tramp} mightily. +For reasons unknown, some Windows ports for @command{ssh} require the +doubled @samp{-t} option. This supports the @samp{-p} kludge. @@ -817,7 +815,6 @@ This method supports the @samp{-p} hack. @cindex scpx method @cindex scp (with scpx method) @cindex ssh (with scpx method) -@cindex Cygwin (with scpx method) As you would expect, this is similar to @option{scp}, only a little different. Whereas @option{scp} opens a normal interactive shell on @@ -832,7 +829,6 @@ This is also useful for Windows users where @command{ssh}, when invoked from an @value{emacsname} buffer, tells them that it is not allocating a pseudo tty. When this happens, the login shell is wont to not print any shell prompt, which confuses @value{tramp} mightily. -Maybe this applies to the Cygwin port of SSH. This method supports the @samp{-p} hack. @@ -1025,7 +1021,7 @@ For example: '("sshf" tramp-multi-connect-rlogin "ssh %h -l %u -p 4400%n")) @end lisp -Now you can use an @code{sshf} hop which connects to port 4400 instead of +Now you can use an @option{sshf} hop which connects to port 4400 instead of the standard port. @@ -1074,16 +1070,16 @@ Another consideration with the selection of transfer methods is the environment you will use them in and, especially when used over the Internet, the security implications of your preferred method. -The @command{rsh} and @command{telnet} methods send your password as -plain text as you log in to the remote machine, as well as transferring -the files in such a way that the content can easily be read from other -machines. +The @option{rsh} and @option{telnet} methods send your password as +plain text as you log in to the remote machine, as well as +transferring the files in such a way that the content can easily be +read from other machines. If you need to connect to remote systems that are accessible from the -Internet, you should give serious thought to using @command{ssh} based +Internet, you should give serious thought to using @option{ssh} based methods to connect. These provide a much higher level of security, -making it a non-trivial exercise for someone to obtain your password or -read the content of the files you are editing. +making it a non-trivial exercise for someone to obtain your password +or read the content of the files you are editing. @subsection Which method is the right one for me? @@ -1101,28 +1097,29 @@ methods might be more efficient, but I guess that most people will want to edit mostly small files. I guess that these days, most people can access a remote machine by -using @code{ssh}. So I suggest that you use the @code{ssh} method. -So, type @kbd{C-x C-f +using @command{ssh}. So I suggest that you use the @option{ssh} +method. So, type @kbd{C-x C-f @value{prefix}ssh@value{postfixsinglehop}root@@otherhost@value{postfix}/etc/motd @key{RET}} to edit the @file{/etc/motd} file on the other host. -If you can't use @code{ssh} to log in to the remote host, then select a -method that uses a program that works. For instance, Windows users -might like the @code{plink} method which uses the PuTTY implementation -of @code{ssh}. Or you use Kerberos and thus like @code{krlogin}. +If you can't use @option{ssh} to log in to the remote host, then +select a method that uses a program that works. For instance, Windows +users might like the @option{plink} method which uses the PuTTY +implementation of @command{ssh}. Or you use Kerberos and thus like +@option{krlogin}. For the special case of editing files on the local host as another -user, see the @code{su} or @code{sudo} method. It offers shortened -syntax for the @samp{root} account, like +user, see the @option{su} or @option{sudo} methods. They offer +shortened syntax for the @samp{root} account, like @file{@value{prefix}su@value{postfixsinglehop}@value{postfix}/etc/motd}. -People who edit large files may want to consider @code{scp} instead of -@code{ssh}, or @code{pscp} instead of @code{plink}. These out-of-band -methods are faster than inline methods for large files. Note, however, -that out-of-band methods suffer from some limitations. Please try -first whether you really get a noticeable speed advantage from using an -out-of-band method! Maybe even for large files, inline methods are -fast enough. +People who edit large files may want to consider @option{scp} instead +of @option{ssh}, or @option{pscp} instead of @option{plink}. These +out-of-band methods are faster than inline methods for large files. +Note, however, that out-of-band methods suffer from some limitations. +Please try first whether you really get a noticeable speed advantage +from using an out-of-band method! Maybe even for large files, inline +methods are fast enough. @node Customizing Methods @@ -1365,16 +1362,16 @@ the remote host such that it behaves like @value{tramp} expects. This might be inconvenient because you have to invest a lot of effort into shell setup before you can begin to use @value{tramp}. -The package, therefore, pursues a combined approach. It tries to figure -out some of the more common setups, and only requires you to avoid -really exotic stuff. For example, it looks through a list of +The package, therefore, pursues a combined approach. It tries to +figure out some of the more common setups, and only requires you to +avoid really exotic stuff. For example, it looks through a list of directories to find some programs on the remote host. And also, it knows that it is not obvious how to check whether a file exists, and -therefore it tries different possibilities. (On some hosts and shells, -the command @code{test -e} does the trick, on some hosts the shell -builtin doesn't work but the program @code{/usr/bin/test -e} or -@code{/bin/test -e} works. And on still other hosts, @code{ls -d} is -the right way to do this.) +therefore it tries different possibilities. (On some hosts and +shells, the command @command{test -e} does the trick, on some hosts +the shell builtin doesn't work but the program @command{/usr/bin/test +-e} or @command{/bin/test -e} works. And on still other hosts, +@command{ls -d} is the right way to do this.) Below you find a discussion of a few things that @value{tramp} does not deal with, and that you therefore have to set up correctly. @@ -1409,11 +1406,11 @@ different user. The default value of @code{shell-prompt-pattern}, which is reported to work well in many circumstances. -@item @code{tset} and other questions +@item @command{tset} and other questions @cindex Unix command tset @cindex tset Unix command -Some people invoke the @code{tset} program from their shell startup +Some people invoke the @command{tset} program from their shell startup scripts which asks the user about the terminal type of the shell. Maybe some shells ask other questions when they are started. @value{tramp} does not know how to answer these questions. There are two approaches @@ -1443,20 +1440,21 @@ This weird effect was actually reported by a @value{tramp} user! @item Non-Bourne commands in @file{.profile} After logging in to the remote host, @value{tramp} issues the command -@code{exec /bin/sh}. (Actually, the command is slightly different.) -When @code{/bin/sh} is executed, it reads some init files, such as -@file{~/.shrc} or @file{~/.profile}. +@command{exec /bin/sh}. (Actually, the command is slightly +different.) When @command{/bin/sh} is executed, it reads some init +files, such as @file{~/.shrc} or @file{~/.profile}. Now, some people have a login shell which is not @code{/bin/sh} but a Bourne-ish shell such as bash or ksh. Some of these people might put -their shell setup into the files @code{~/.shrc} or @code{~/.profile}. +their shell setup into the files @file{~/.shrc} or @file{~/.profile}. This way, it is possible for non-Bourne constructs to end up in those -files. Then, @code{exec /bin/sh} might cause the Bourne shell to barf -on those constructs. +files. Then, @command{exec /bin/sh} might cause the Bourne shell to +barf on those constructs. -As an example, imagine somebody putting @code{export FOO=bar} into the -file @file{~/.profile}. The standard Bourne shell does not understand -this syntax and will emit a syntax error when it reaches this line. +As an example, imagine somebody putting @command{export FOO=bar} into +the file @file{~/.profile}. The standard Bourne shell does not +understand this syntax and will emit a syntax error when it reaches +this line. Another example is the tilde (@code{~}) character, say when adding @file{~/bin} to @code{$PATH}. Many Bourne shells will not expand this @@ -1467,8 +1465,8 @@ What can you do about this? Well, one possibility is to make sure that everything in @file{~/.shrc} and @file{~/.profile} on all remote hosts is Bourne-compatible. In the -above example, instead of @code{export FOO=bar}, you might use -@code{FOO=bar; export FOO} instead. +above example, instead of @command{export FOO=bar}, you might use +@command{FOO=bar; export FOO} instead. The other possibility is to put your non-Bourne shell setup into some other files. For example, bash reads the file @file{~/.bash_profile} @@ -1476,14 +1474,15 @@ instead of @file{~/.profile}, if the former exists. So bash aficionados just rename their @file{~/.profile} to @file{~/.bash_profile} on all remote hosts, and Bob's your uncle. -The @value{tramp} developers would like to circumvent this problem, so if you -have an idea about it, please tell us. However, we are afraid it is not -that simple: before saying @code{exec /bin/sh}, @value{tramp} does not know -which kind of shell it might be talking to. It could be a Bourne-ish -shell like ksh or bash, or it could be a csh derivative like tcsh, or -it could be zsh, or even rc. If the shell is Bourne-ish already, then -it might be prudent to omit the @code{exec /bin/sh} step. But how to -find out if the shell is Bourne-ish? +The @value{tramp} developers would like to circumvent this problem, so +if you have an idea about it, please tell us. However, we are afraid +it is not that simple: before saying @command{exec /bin/sh}, +@value{tramp} does not know which kind of shell it might be talking +to. It could be a Bourne-ish shell like ksh or bash, or it could be a +csh derivative like tcsh, or it could be zsh, or even rc. If the +shell is Bourne-ish already, then it might be prudent to omit the +@command{exec /bin/sh} step. But how to find out if the shell is +Bourne-ish? @end table @@ -1630,38 +1629,44 @@ This section needs a lot of work! Please help. @cindex method sshx with Cygwin @cindex sshx method with Cygwin -If you use the Cygwin installation of ssh (you have to explicitly select -it in the installer), then it should work out of the box to just select -@code{sshx} as the connection method. You can find information about -setting up Cygwin in their FAQ at @uref{http://cygwin.com/faq/}. +The recent Cygwin installation of @command{ssh} works only with a +Cygwinized @value{emacsname}. You can check it by typing @kbd{M-x +eshell}, and starting @kbd{ssh test.machine}. The problem is evident +if you see a message like this: + +@example +Pseudo-terminal will not be allocated because stdin is not a terminal. +@end example + +Older @command{ssh} versions of Cygwin are told to cooperate with +@value{tramp} selecting @option{sshx} as the connection method. You +can find information about setting up Cygwin in their FAQ at +@uref{http://cygwin.com/faq/}. @cindex method scpx with Cygwin @cindex scpx method with Cygwin -If you wish to use the @code{scpx} connection method, then you might -have the problem that @value{emacsname} calls @code{scp} with a +If you wish to use the @option{scpx} connection method, then you might +have the problem that @value{emacsname} calls @command{scp} with a Windows filename such as @code{c:/foo}. The Cygwin version of -@code{scp} does not know about Windows filenames and interprets this +@command{scp} does not know about Windows filenames and interprets this as a remote filename on the host @code{c}. -One possible workaround is to write a wrapper script for @code{scp} +One possible workaround is to write a wrapper script for @option{scp} which converts the Windows filename to a Cygwinized filename. -I guess that another workaround is to run @value{emacsname} under -Cygwin, or to run a Cygwinized @value{emacsname}. - @cindex Cygwin and ssh-agent @cindex SSH_AUTH_SOCK and @value{emacsname} on Windows -If you want to use either @code{ssh} based method on Windows, then you -might encounter problems with @code{ssh-agent}. Using this program, -you can avoid typing the pass-phrase every time you log in. However, -if you start @value{emacsname} from a desktop shortcut, then the -environment variable @code{SSH_AUTH_SOCK} is not set and so -@value{emacsname} and thus @value{tramp} and thus @code{ssh} and -@code{scp} started from @value{tramp} cannot communicate with -@code{ssh-agent}. It works better to start @value{emacsname} from +If you want to use either @option{ssh} based method on Windows, then +you might encounter problems with @command{ssh-agent}. Using this +program, you can avoid typing the pass-phrase every time you log in. +However, if you start @value{emacsname} from a desktop shortcut, then +the environment variable @code{SSH_AUTH_SOCK} is not set and so +@value{emacsname} and thus @value{tramp} and thus @command{ssh} and +@command{scp} started from @value{tramp} cannot communicate with +@command{ssh-agent}. It works better to start @value{emacsname} from the shell. -If anyone knows how to start @code{ssh-agent} under Windows in such a +If anyone knows how to start @command{ssh-agent} under Windows in such a way that desktop shortcuts can profit, please holler. I don't really know anything at all about Windows@dots{} @@ -2108,10 +2113,10 @@ remote host. There's this @file{~/.sh_history} file on the remote host which keeps growing and growing. What's that? -Sometimes, @value{tramp} starts @code{ksh} on the remote host for tilde -expansion. Maybe @code{ksh} saves the history by default. @value{tramp} -tries to turn off saving the history, but maybe you have to help. For -example, you could put this in your @file{.kshrc}: +Sometimes, @value{tramp} starts @command{ksh} on the remote host for +tilde expansion. Maybe @command{ksh} saves the history by default. +@value{tramp} tries to turn off saving the history, but maybe you have +to help. For example, you could put this in your @file{.kshrc}: @example if [ -f $HOME/.sh_history ] ; then @@ -2316,18 +2321,18 @@ effect while preserving the @value{tramp} file name information. @itemize @bullet @item The uuencode method does not always work. -Due to the design of @value{tramp}, the encoding and decoding programs need to -read from stdin and write to stdout. On some systems, @code{uudecode -o --} will read stdin and write the decoded file to stdout, on other -systems @code{uudecode -p} does the same thing. But some systems have -uudecode implementations which cannot do this at all---it is not -possible to call these uudecode implementations with suitable parameters -so that they write to stdout. +Due to the design of @value{tramp}, the encoding and decoding programs +need to read from stdin and write to stdout. On some systems, +@command{uudecode -o -} will read stdin and write the decoded file to +stdout, on other systems @command{uudecode -p} does the same thing. +But some systems have uudecode implementations which cannot do this at +all---it is not possible to call these uudecode implementations with +suitable parameters so that they write to stdout. Of course, this could be circumvented: the @code{begin foo 644} line could be rewritten to put in some temporary file name, then -@code{uudecode} could be called, then the temp file could be printed and -deleted. +@command{uudecode} could be called, then the temp file could be +printed and deleted. But I have decided that this is too fragile to reliably work, so on some systems you'll have to do without the uuencode methods. @@ -2368,13 +2373,12 @@ to the files @file{.../xemacs-packages/lisp/tramp/auto-autoloads.el*}. In case of unified filenames, all @value{emacsname} download sites are added to @code{tramp-default-method-alist} with default method -@code{ftp} @xref{Default Method}. These settings shouldn't be touched +@option{ftp} @xref{Default Method}. These settings shouldn't be touched for proper working of the @value{emacsname} package system. The syntax for unified filenames is described in the @value{tramp} manual for @value{emacsothername}. @end ifset - @end itemize @node Concept Index diff --git a/man/trampver.texi b/man/trampver.texi index 33a0aacbb9e..a77ae82d49b 100644 --- a/man/trampver.texi +++ b/man/trampver.texi @@ -4,7 +4,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.0.49 +@set trampver 2.0.50 @c Other flags from configuration @set prefix /usr/local diff --git a/man/trouble.texi b/man/trouble.texi index 1cd3aa4db12..f9d56d22194 100644 --- a/man/trouble.texi +++ b/man/trouble.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,1997,2001,2004 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, +@c 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Dealing with Common Problems @@ -303,8 +304,7 @@ the following in your @file{.emacs} file: When flow control is enabled, you must type @kbd{C-\} to get the effect of a @kbd{C-s}, and type @kbd{C-^} to get the effect of a -@kbd{C-q}. (These aliases work by means of keyboard translations; see -@ref{Keyboard Translations}.) +@kbd{C-q}. @node Memory Full @subsection Running out of Memory diff --git a/man/url.texi b/man/url.texi index 47b4c4305a9..f60890afb26 100644 --- a/man/url.texi +++ b/man/url.texi @@ -21,7 +21,8 @@ @ifnottex This file documents the URL loading package. -Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation +Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004, + 2005 Free Software Foundation, Inc. Copyright (C) 1993, 1994, 1995, 1996 William M. Perry Permission is granted to copy, distribute and/or modify this document @@ -50,7 +51,8 @@ License.'' @page @vskip 0pt plus 1filll Copyright @copyright{} 1993, 1994, 1995, 1996 William M. Perry@* -Copyright @copyright{} 1996, 1997, 1998, 1999, 2002 Free Software Foundation +Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or diff --git a/man/vip.texi b/man/vip.texi index cba1998f011..5bc1e23da3c 100644 --- a/man/vip.texi +++ b/man/vip.texi @@ -4,7 +4,8 @@ @settitle VIP @copying -Copyright @copyright{} 1987, 2001, 2002 Free Software Foundation, Inc. +Copyright @copyright{} 1987, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/viper.texi b/man/viper.texi index 0156c4c6387..4e71eaee296 100644 --- a/man/viper.texi +++ b/man/viper.texi @@ -7,8 +7,8 @@ @setfilename ../info/viper @copying -Copyright @copyright{} 1995, 1996, 1997, 2001, 2002 Free Software -Foundation, Inc. +Copyright @copyright{} 1995, 1996, 1997, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -507,9 +507,8 @@ modes designed for editing files, such as cc-mode or latex-mode, use key sequences that begin with @kbd{C-x} and @kbd{C-c}. There is also a key that lets you temporarily escape to Vi command state -from Emacs or Insert states: typing @kbd{C-c \} will let you execute a -single Vi command while staying in Viper's Emacs or Insert state. -In Insert state, the same can also be achieved by typing @kbd{C-z}. +from the Insert state: typing @kbd{C-z} will let you execute a +single Vi command while staying in Viper's Insert state. @node Vi State, Insert State, Emacs State, States in Viper diff --git a/man/windows.texi b/man/windows.texi index 092a678901b..023b96340ff 100644 --- a/man/windows.texi +++ b/man/windows.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001,2004 Free Software Foundation, Inc. +@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, +@c 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Windows, Frames, Buffers, Top @chapter Multiple Windows @@ -94,7 +95,8 @@ numeric argument specifies how many lines to give to the top window. @kbd{C-x 3} (@code{split-window-horizontally}) breaks the selected window into two side-by-side windows. A numeric argument specifies how many columns to give the one on the left. If you are not using -scrollbars, a line of vertical bars separates the two windows. +scrollbars, a vertical line separates the two windows. +You can customize its color with the face @code{vertical-border}. Windows that are not the full width of the screen have mode lines, but they are truncated. On terminals where Emacs does not support highlighting, truncated mode lines sometimes do not appear in inverse diff --git a/man/woman.texi b/man/woman.texi index fdcc8901339..0d827ef34c3 100644 --- a/man/woman.texi +++ b/man/woman.texi @@ -17,7 +17,8 @@ This file documents WoMan: A program to browse Unix manual pages `W.O. (without) man'. -Copyright @copyright{} 2001, 2002, 2004 Free Software Foundation, Inc. +Copyright @copyright{} 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/man/xresources.texi b/man/xresources.texi index 7f7d9aaf82c..1e0783eac61 100644 --- a/man/xresources.texi +++ b/man/xresources.texi @@ -1,5 +1,6 @@ @c This is part of the Emacs manual. -@c Copyright (C) 1987,93,94,95,1997,2001,03 Free Software Foundation, Inc. +@c Copyright (C) 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003, +@c 2004, 2005 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node X Resources, Antinews, Emacs Invocation, Top @appendix X Options and Resources |