diff options
Diffstat (limited to 'doc/emacs')
49 files changed, 1415 insertions, 753 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a4f9985ad85..71014647c1f 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,8 +1,293 @@ +2012-12-15 Juri Linkov <juri@jurta.org> + + * misc.texi (Recursive Edit): Add a link to "Query Replace". + (Bug#13181) + +2012-12-10 Dani Moncayo <dmoncayo@gmail.com> + + * killing.texi (Deletion): Doc fix (Bug#12748). + +2012-12-06 Paul Eggert <eggert@cs.ucla.edu> + + * doclicense.texi, gpl.texi: Update to latest version from FSF. + These are just minor editorial changes. + +2012-12-06 Juanma Barranquero <lekktu@gmail.com> + + * vc1-xtra.texi (General VC Options): Remove obsolete reference + to `vc-path'. + +2012-12-03 Chong Yidong <cyd@gnu.org> + + * custom.texi (Init Rebinding): kbd is now a function (Bug#13052). + +2012-12-02 Kevin Ryde <user42@zip.com.au> + + * maintaining.texi (Tag Syntax): Mention (defvar foo) handling. + +2012-12-01 Kevin Ryde <user42@zip.com.au> + + * maintaining.texi (Tag Syntax): Mention Perl's "use constant". + +2012-11-24 Paul Eggert <eggert@cs.ucla.edu> + + * doclicense.texi, gpl.texi: Update to latest version from FSF. + These are just minor editorial changes. + +2012-11-21 Dani Moncayo <dmoncayo@gmail.com> + + * display.texi (Auto Scrolling): Fix some inaccuracies, plus + clarifications (Bug#12865). + (Horizontal Scrolling): Clarifications. + +2012-11-18 Dani Moncayo <dmoncayo@gmail.com> + + * mark.texi (Disabled Transient Mark): Doc fixes (Bug#12746). + +2012-11-16 Eli Zaretskii <eliz@gnu.org> + + * trouble.texi (Crashing): Add information about MS-Windows and + the emacs_backtrace.txt file. (Bug#12908) + +2012-11-13 Chong Yidong <cyd@gnu.org> + + * building.texi (Multithreaded Debugging): gdb-stopped-hooks is + actually named gdb-stopped-functions. + +2012-11-13 Glenn Morris <rgm@gnu.org> + + * misc.texi (Single Shell): Mention async-shell-command-buffer. + +2012-11-10 Glenn Morris <rgm@gnu.org> + + * misc.texi (Terminal emulator): Rename `term-face' to `term'. + + * emacs.texi (Acknowledgments): Add profiler author. + * ack.texi (Acknowledgments): Add some recent contributions. + +2012-11-10 Chong Yidong <cyd@gnu.org> + + * files.texi (Diff Mode): Doc fixes for + diff-delete-trailing-whitespace (Bug#12831). + + * trouble.texi (Crashing): Copyedits. + +2012-11-10 Glenn Morris <rgm@gnu.org> + + * files.texi (Diff Mode): Trailing whitespace updates. + +2012-11-10 Chong Yidong <cyd@gnu.org> + + * misc.texi (Terminal emulator): Document Term mode faces. + + * mini.texi (Basic Minibuffer): New node. Document + minibuffer-electric-default-mode. + + * display.texi (Visual Line Mode): Fix index entry. + + * buffers.texi (Several Buffers): List Buffer Menu command anmes, + and index the keybindings. Document tabulated-list-sort. + (Kill Buffer): Capitalize Buffer Menu. + + * trouble.texi (Memory Full): Capitalize Buffer Menu. + +2012-11-10 Eli Zaretskii <eliz@gnu.org> + + * display.texi (Auto Scrolling): Clarify that scroll-step is + ignored when scroll-conservatively is set to a non-zero value. + (Bug#12801) + +2012-11-10 Chong Yidong <cyd@gnu.org> + + * dired.texi (Dired Updating): Doc fix (Bug#11744). + +2012-10-30 Michael Albinus <michael.albinus@gmx.de> + + * trouble.texi (Known Problems): Mention command `debbugs-gnu-usertags'. + +2012-10-29 Chong Yidong <cyd@gnu.org> + + * dired.texi (Shell Commands in Dired): Document changes to the + dired-do-async-shell-command. + +2012-10-28 Glenn Morris <rgm@gnu.org> + + * ack.texi (Acknowledgments): Mention gv.el. + +2012-10-27 Bastien Guerry <bzg@gnu.org> + + * screen.texi (Menu Bar): Fix typo. + +2012-10-27 Chong Yidong <cyd@gnu.org> + + * frames.texi (Mouse Avoidance): Mention new variable + mouse-avoidance-banish-position. + + * programs.texi (Which Function): Which Function mode now works in + all major modes by default. + + * mule.texi (Recognize Coding): Remove an unreferenced vindex. + + * files.texi (Misc File Ops): Symbolic links on Windows only work + on Vista and later. + + * building.texi (Compilation): Document compilation-always-kill. + + * search.texi (Symbol Search): New node. + + * package.texi (Package Menu): Document the "new" status. + + * windows.texi (Window Choice): Don't refer to the obsolete + special-display feature. + +2012-10-24 Chong Yidong <cyd@gnu.org> + + * mule.texi (Text Coding): set-buffer-file-coding-system can now + be invoked from the mode line. + + * dired.texi (Dired Deletion, Marks vs Flags): Document Emacs 24.3 + changes to the mark and unmark commands. + (Comparison in Dired): Document chages to dired-diff. Remove M-=, + which is no longer bound to dired-backup-diff. + +2012-10-23 Bastien Guerry <bzg@gnu.org> + + * text.texi (Org Authoring): Use a comma after @ref to avoid the + insertion of a period in the Info output. + +2012-10-23 Stefan Monnier <monnier@iro.umontreal.ca> + + * custom.texi (Hooks): Clarify that -hooks is deprecated. + +2012-10-23 Chong Yidong <cyd@gnu.org> + + * kmacro.texi (Edit Keyboard Macro): Fix typo. + +2012-10-18 Dani Moncayo <dmoncayo@gmail.com> + + * mini.texi (Completion Options): Fix off-by-one error. (Bug#12644) + +2012-10-17 Glenn Morris <rgm@gnu.org> + + * mini.texi (Repetition): Further copyedit. + +2012-10-17 Dani Moncayo <dmoncayo@gmail.com> + + * mini.texi (Repetition): Copyedit. + +2012-10-16 Juri Linkov <juri@jurta.org> + + * search.texi (Query Replace): Document multi-buffer replacement + keys. (Bug#12655) + + * maintaining.texi (Tags Search): Change link "Replace" to + "Query Replace". + +2012-10-13 Chong Yidong <cyd@gnu.org> + + * files.texi (File Conveniences): ImageMagick enabled by default. + +2012-10-10 Dani Moncayo <dmoncayo@gmail.com> + + * basic.texi (Arguments): Fix typos. + +2012-10-08 Glenn Morris <rgm@gnu.org> + + * cal-xtra.texi (Calendar Customizing): Mention calendar-month-header. + + * calendar.texi (Writing Calendar Files): Mention cal-html-holidays. + +2012-10-06 Glenn Morris <rgm@gnu.org> + + * calendar.texi (Writing Calendar Files): Tweak week descriptions. + Mention cal-tex-cursor-week2-summary. + +2012-10-06 Chong Yidong <cyd@gnu.org> + + * mini.texi (Passwords): Fix typo. + +2012-10-02 Glenn Morris <rgm@gnu.org> + + * maintaining.texi (VC Directory Commands): + Remove duplicate `q' entry. (Bug#12553) + +2012-09-30 Chong Yidong <cyd@gnu.org> + + * killing.texi (Rectangles): Document copy-rectangle-as-kill. + + * search.texi (Special Isearch): Document the lax space search + feature and M-s SPC. + (Regexp Search): Move main search-whitespace-regexp description to + Special Isearch. + (Replace): Document replace-lax-whitespace. + + * basic.texi (Position Info): Document C-u M-=. + (Moving Point): Document move-to-column. + + * display.texi (Useless Whitespace): Add delete-trailing-lines. + + * misc.texi (emacsclient Options): Document the effect of + initial-buffer-choice on client frames. Document server-auth-dir. + Do not document server-host, which is bad security practice. + + * building.texi (Lisp Libraries): Docstring lookups can trigger + autoloading. Document help-enable-auto-load. + + * mini.texi (Yes or No Prompts): New node. + + * ack.texi (Acknowledgments): Remove obsolete packages. + +2012-09-27 Glenn Morris <rgm@gnu.org> + + * cal-xtra.texi (Advanced Calendar/Diary Usage): + Rename the section to be more general. + * emacs.texi: Update menu. + +2012-09-23 Chong Yidong <cyd@gnu.org> + + * buffers.texi (Misc Buffer): Replace toggle-read-only with + read-only-mode. + + * files.texi (Visiting): Likewise. + +2012-09-22 Paul Eggert <eggert@cs.ucla.edu> + + * trouble.texi (Crashing): Document ulimit -c. + +2012-09-21 Paul Eggert <eggert@cs.ucla.edu> + + * trouble.texi (Crashing): Document addr2line. + +2012-09-19 Chong Yidong <cyd@gnu.org> + + * killing.texi (Yanking): Minor clarification (Bug#12469). + +2012-09-17 Chong Yidong <cyd@gnu.org> + + * building.texi (GDB User Interface Layout): Remove reference to + removed variable gdb-use-separate-io-buffer (Bug#12454). + +2012-09-08 Jambunathan K <kjambunathan@gmail.com> + + * regs.texi (Text Registers): `C-x r +' can now be used instead of + M-x append-to-register. New option `register-separator'. + (Number Registers): Mention that `C-x r +' is polymorphic. + +2012-09-07 Chong Yidong <cyd@gnu.org> + + * windows.texi (Window Choice): Don't mention obsolete + display-buffer-reuse-frames. + +2012-09-04 Paul Eggert <eggert@cs.ucla.edu> + + Give more-useful info on a fatal error (Bug#12328). + * trouble.texi (Crashing): New section, documenting this. + 2012-08-24 Michael Albinus <michael.albinus@gmx.de> - * cmdargs.texi (General Variables): Setting - $DBUS_SESSION_BUS_ADDRESS to a dummy value suppresses connections - to the D-Bus session bus. (Bug#12112) + * cmdargs.texi (General Variables): + Setting $DBUS_SESSION_BUS_ADDRESS to a dummy value suppresses + connections to the D-Bus session bus. (Bug#12112) 2012-08-14 Eli Zaretskii <eliz@gnu.org> @@ -333,7 +618,7 @@ * misc.texi (emacsclient Options): Add cross-reference to "Windows Startup". (Bug#11091) -2012-04-02 Dani Moncayo <dmoncayo@gmail.com> (tiny change) +2012-04-02 Dani Moncayo <dmoncayo@gmail.com> * custom.texi (Changing a Variable): Fix example. @@ -366,7 +651,7 @@ * mule.texi (International Chars): etc/HELLO is for character demonstration. -2012-03-15 Dani Moncayo <dmoncayo@gmail.com> (tiny change) +2012-03-15 Dani Moncayo <dmoncayo@gmail.com> * dired.texi (Shell Commands in Dired): Fix typo. @@ -393,7 +678,7 @@ * macos.texi (Mac / GNUstep Customization): Remove text about ns-find-file and ns-drag-file (Bug#5855, Bug#10050). -2012-02-25 Dani Moncayo <dmoncayo@gmail.com> (tiny change) +2012-02-25 Dani Moncayo <dmoncayo@gmail.com> * buffers.texi (Select Buffer): Mention that saving in a new file name can switch to a different major mode. diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index d3c914d92b0..0aeb74eabd6 100644 --- a/doc/emacs/abbrevs.texi +++ b/doc/emacs/abbrevs.texi @@ -141,7 +141,7 @@ abbrev definitions, both global and local. When Abbrev mode is enabled, an abbrev expands whenever it is present in the buffer just before point and you type a self-inserting -whitespace or punctuation character (@key{SPC}, comma, etc.@:). More +whitespace or punctuation character (@key{SPC}, comma, etc.). More precisely, any character that is not a word constituent expands an abbrev, and any word-constituent character can be part of an abbrev. The most common way to use an abbrev is to insert it and then insert a diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 487e3c19c16..debf173635f 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -44,7 +44,7 @@ Tomas Abrahamsson wrote @file{artist.el}, a package for producing @acronym{ASCII} art with a mouse or with keyboard keys. @item -Jay K.@: Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el}, +Jay K. Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el}, providing automatic decompression and recompression for compressed files. @@ -96,13 +96,13 @@ Eli Barzilay wrote @file{calculator.el}, a desktop calculator for Emacs. @item -Steven L.@: Baur wrote @file{footnote.el} which lets you include +Steven L. Baur wrote @file{footnote.el} which lets you include footnotes in email messages; and @file{gnus-audio.el} and @file{earcon.el}, which provide sound effects for Gnus. He also wrote @file{gnus-setup.el}. @item -Alexander L.@: Belikoff, Sergey Berezin, Sacha Chua, David Edmondson, +Alexander L. Belikoff, Sergey Berezin, Sacha Chua, David Edmondson, Noah Friedman, Andreas Fuchs, Mario Lang, Ben Mesander, Lawrence Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Schaefer, Alex Schroeder, and Tom Tromey wrote ERC, an advanced Internet Relay @@ -115,7 +115,7 @@ Christian Limpach and Adrian Robert developed and maintained the NeXTstep port of Emacs. @item -Anna M.@: Bigatti wrote @file{cal-html.el}, which produces HTML calendars. +Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars. @item Ray Blaak and Simon South wrote @file{delphi.el}, a mode for editing @@ -130,14 +130,14 @@ Jim Blandy wrote Emacs 19's input system, brought its configuration and build process up to the GNU coding standards, and contributed to the frame support and multi-face support. Jim also wrote @file{tvi970.el}, terminal support for the TeleVideo 970 terminals; and co-wrote -@file{wyse50.el} (q.v.@:). +@file{wyse50.el} (q.v.). @item Per Bothner wrote @file{term.el}, a terminal emulator in an Emacs buffer. @item -Terrence M.@: Brannon wrote @file{landmark.el}, a neural-network robot +Terrence M. Brannon wrote @file{landmark.el}, a neural-network robot that learns landmarks. @item @@ -162,7 +162,7 @@ Kevin Broadey wrote @file{foldout.el}, providing folding extensions to Emacs's outline modes. @item -David M.@: Brown wrote @file{array.el}, for editing arrays and other +David M. Brown wrote @file{array.el}, for editing arrays and other tabular data. @item @@ -184,7 +184,7 @@ Emacs Lisp functions; and @file{trace.el}, a tracing facility for Emacs Lisp. @item -Chris Chase, Carsten Dominik, and J.@: D.@: Smith wrote IDLWAVE mode, +Chris Chase, Carsten Dominik, and J. D. Smith wrote IDLWAVE mode, for editing IDL and WAVE CL. @item @@ -244,8 +244,9 @@ files as ``thumbnails''. @item Julien Danjou wrote an implementation of ``Desktop Notifications'' -(@file{notifications.el}); and @file{color.el}, a library for general -color manipulation. He also made various contributions to Gnus. +(@file{notifications.el}, and related packages for ERC and Gnus); +and @file{color.el}, a library for general color manipulation. +He also made various contributions to Gnus. @item Vivek Dasmohapatra wrote @file{htmlfontify.el}, to convert a buffer or @@ -265,10 +266,10 @@ He also wrote @file{dynamic-setting.el}. @item Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and cross-references in @LaTeX{} documents; and co-wrote IDLWAVE mode -(q.v.@:). He was the original author of Org mode, for maintaining notes, +(q.v.). He was the original author of Org mode, for maintaining notes, todo lists, and project planning. Bastien Guerry subsequently took over maintainership. Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart -Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S.@: Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip +Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S. Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte, Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize, Piotr Zielinski, and others also wrote various Org mode components. @@ -428,7 +429,7 @@ characters used by @TeX{} and net tradition. @item Bastien Guerry wrote @file{gnus-bookmark.el}, bookmark support for Gnus; -as well as helping to maintain Org mode (q.v.@:). +as well as helping to maintain Org mode (q.v.). @item Henry Guillaume wrote @file{find-file.el}, a package to visit files @@ -455,7 +456,7 @@ Jesper Harder wrote @file{yenc.el}, for decoding yenc encoded messages. Alexandru Harsanyi wrote a library for accessing SOAP web services. @item -K.@: Shane Hartman wrote @file{chistory.el} and @file{echistory.el}, +K. Shane Hartman wrote @file{chistory.el} and @file{echistory.el}, packages for browsing command history lists; @file{electric.el} and @file{helper.el}, which provide an alternative command loop and appropriate help facilities; @file{emacsbug.el}, a package for @@ -616,7 +617,7 @@ Pavel Kobyakov wrote @file{flymake.el}, a minor mode for performing on-the-fly syntax checking. @item -David M.@: Koppelman wrote @file{hi-lock.el}, a minor mode for +David M. Koppelman wrote @file{hi-lock.el}, a minor mode for interactive automatic highlighting of parts of the buffer text. @item @@ -629,7 +630,7 @@ menu support. @item Sebastian Kremer wrote @code{dired-mode}, with contributions by Lawrence -R.@: Dodd. He also wrote @file{ls-lisp.el}, a Lisp emulation of the +R. Dodd. He also wrote @file{ls-lisp.el}, a Lisp emulation of the @code{ls} command for platforms that don't have @code{ls} as a standard program. @@ -644,10 +645,9 @@ statically scoped Emacs lisp. @item Daniel LaLiberte wrote @file{edebug.el}, a source-level debugger for Emacs Lisp; @file{cl-specs.el}, specifications to help @code{edebug} -debug code written using David Gillespie's Common Lisp support; -@file{cust-print.el}, a customizable package for printing lisp -objects; and @file{isearch.el}, Emacs's incremental search minor mode. -He also co-wrote @file{hideif.el} (q.v.@:). +debug code written using David Gillespie's Common Lisp support; and +@file{isearch.el}, Emacs's incremental search minor mode. He also +co-wrote @file{hideif.el} (q.v.). @item Karl Landstrom and Daniel Colascione wrote @file{js.el}, a mode for @@ -673,7 +673,7 @@ Emacs Lisp programs. @item Lars Lindberg wrote @file{msb.el}, which provides more flexible menus -for buffer selection; co-wrote @file{imenu.el} (q.v.@:); and rewrote +for buffer selection; co-wrote @file{imenu.el} (q.v.); and rewrote @file{dabbrev.el}, originally written by Don Morrison. @item @@ -752,11 +752,11 @@ maintained CC Mode from Emacs 22 onwards. Michael McNamara and Wilson Snyder wrote Verilog mode. @item -Christopher J.@: Madsen wrote @file{decipher.el}, a package for cracking +Christopher J. Madsen wrote @file{decipher.el}, a package for cracking simple substitution ciphers. @item -Neil M.@: Mager wrote @file{appt.el}, functions to notify users of their +Neil M. Mager wrote @file{appt.el}, functions to notify users of their appointments. It finds appointments recorded in the diary files used by the @code{calendar} package. @@ -791,6 +791,9 @@ mode-sensitive insertion of text into new files. Yukihiro Matsumoto and Nobuyoshi Nakada wrote Ruby-mode. @item +Tomohiro Matsuyama wrote the native Elisp profiler. + +@item Thomas May wrote @file{blackbox.el}, a version of the traditional blackbox game. @@ -836,8 +839,9 @@ diffs; @file{css-mode.el} for Cascading Style Sheets; client for the ``Music Player Daemon''; @file{smie.el}, a generic indentation engine; and @file{pcase.el}, implementing ML-style pattern matching. In Emacs 24, he integrated the lexical binding code, -and cleaned up the CL namespace (making it acceptable to use CL -functions at runtime). +cleaned up the CL namespace (making it acceptable to use CL +functions at runtime), and added generalized variables to core Emacs +Lisp. @item Morioka Tomohiko wrote several packages for MIME support in Gnus and @@ -855,7 +859,7 @@ Erik Naggum wrote the time-conversion functions. He also wrote @file{parse-time.el}, for parsing time strings. @item -Takahashi Naoto co-wrote @file{quail.el} (q.v.@:), and wrote +Takahashi Naoto co-wrote @file{quail.el} (q.v.), and wrote @file{robin.el}, another input method. @item @@ -904,7 +908,7 @@ Takaaki Ota wrote @file{table.el}, a package for creating and editing embedded text-based tables. @item -Pieter E.@: J.@: Pareit wrote @file{mixal-mode.el}, an editing mode for +Pieter E. J. Pareit wrote @file{mixal-mode.el}, an editing mode for the MIX assembly language. @item @@ -920,7 +924,7 @@ Damon Anton Permezel wrote @file{hanoi.el}, an animated demonstration of the ``Towers of Hanoi'' puzzle. @item -William M.@: Perry wrote @file{mailcap.el} (with Lars Magne +William M. Perry wrote @file{mailcap.el} (with Lars Magne Ingebrigtsen), a MIME media types configuration facility; @file{mwheel.el}, a package for supporting mouse wheels; co-wrote (with Dave Love) @file{socks.el}, a Socks v5 client; and developed the URL @@ -949,7 +953,7 @@ support for Wyse 50 terminals. He also co-wrote @file{compile.el} (q.v.@:) and @file{ada-stmt.el}. @item -Richard L.@: Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC +Richard L. Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC 1460) interface for Emacs. @item @@ -972,12 +976,12 @@ minor mode for displaying a ruler in the header line; and structures. @item -Francesco A.@: Potorti wrote @file{cmacexp.el}, providing a command which +Francesco A. Potorti wrote @file{cmacexp.el}, providing a command which runs the C preprocessor on a region of a file and displays the results. He also expanded and redesigned the @code{etags} program. @item -Michael D.@: Prange and Steven A.@: Wood wrote @file{fortran.el}, a mode +Michael D. Prange and Steven A. Wood wrote @file{fortran.el}, a mode for editing Fortran code. @item @@ -985,7 +989,7 @@ Ashwin Ram wrote @file{refer.el}, commands to look up references in bibliography files by keyword. @item -Eric S.@: Raymond wrote @file{vc.el}, an interface to the RCS and SCCS +Eric S. Raymond wrote @file{vc.el}, an interface to the RCS and SCCS source code version control systems, with Paul Eggert; @file{gud.el}, a package for running source-level debuggers like GDB and SDB in Emacs; @file{asm-mode.el}, a mode for editing assembly language code; @@ -1001,14 +1005,14 @@ used in Emacs Lisp library files; and code to set and make use of the which each lisp function loaded into Emacs came. @item -Edward M.@: Reingold wrote the calendar and diary support, +Edward M. Reingold wrote the calendar and diary support, with contributions from Stewart Clamen (@file{cal-mayan.el}), Nachum Dershowitz (@file{cal-hebrew.el}), Paul Eggert (@file{cal-dst.el}), Steve Fisk (@file{cal-tex.el}), Michael Kifer (@file{cal-x.el}), Lara -Rios (@file{cal-menu.el}), and Denis B.@: Roegel (@file{solar.el}). +Rios (@file{cal-menu.el}), and Denis B. Roegel (@file{solar.el}). Andy Oram contributed to its documentation. Reingold also contributed to @file{tex-mode.el}, a mode for editing @TeX{} files, as did William -F.@: Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob +F. Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob Gore. @item @@ -1027,7 +1031,7 @@ VT line of terminals. @item Nick Roberts wrote @file{t-mouse.el}, for mouse support in text -terminals; and @file{gdb-ui.el}, a graphical user interface to GDB. +terminals; and @file{gdb-ui.el}, a graphical user interface to GDB@. Together with Dmitry Dzhus, he wrote @file{gdb-mi.el}, the successor to @file{gdb-ui.el}. @@ -1039,7 +1043,7 @@ into ``handwriting''. Markus Rost wrote @file{cus-test.el}, a testing framework for customize. @item -Guillermo J.@: Rozas wrote @file{scheme.el}, a mode for editing Scheme and +Guillermo J. Rozas wrote @file{scheme.el}, a mode for editing Scheme and DSSSL code. @item @@ -1063,7 +1067,7 @@ Kevin Ryde wrote @file{info-xref.el}, a library for checking references in Info files. @item -James B.@: Salem and Brewster Kahle wrote @file{completion.el}, providing +James B. Salem and Brewster Kahle wrote @file{completion.el}, providing dynamic word completion. @item @@ -1087,7 +1091,7 @@ Michael Schmidt and Tom Perrine wrote @file{modula2.el}, a mode for editing Modula-2 code, based on work by Mick Jordan and Peter Robinson. @item -Ronald S.@: Schnell wrote @file{dunnet.el}, a text adventure game. +Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game. @item Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played @@ -1107,7 +1111,7 @@ for interactively running an SQL interpreter in an Emacs buffer; @file{cus-theme.el}, an interface for custom themes; @file{master.el}, a package for making a buffer @samp{master} over another; and @file{spam-stat.el}, for statistical detection of junk email. He also -wrote parts of the IRC client ERC (q.v.@:). +wrote parts of the IRC client ERC (q.v.). @item Randal Schwartz wrote @file{pp.el}, a pretty-printer for lisp objects. @@ -1158,7 +1162,7 @@ David Smith wrote @file{ielm.el}, a mode for interacting with the Emacs Lisp interpreter as a subprocess. @item -Paul D.@: Smith wrote @file{snmp-mode.el}. +Paul D. Smith wrote @file{snmp-mode.el}. @item William Sommerfeld wrote @file{scribe.el}, a mode for editing Scribe @@ -1200,7 +1204,7 @@ cursor'' that you can move with the keyboard and use for copying text. Ken Stevens wrote @file{ispell.el}, a spell-checker interface. @item -Kim F.@: Storm made many improvements to the Emacs display engine, +Kim F. Storm made many improvements to the Emacs display engine, process support, and networking support. He also wrote @file{bindat.el}, a package for encoding and decoding binary data; CUA mode, which allows Emacs to emulate the standard CUA key @@ -1274,12 +1278,12 @@ for Gnus; and @file{timezone.el}, providing functions for dealing with time zones. @item -Neil W.@: Van Dyke wrote @file{webjump.el}, a ``hot links'' package. +Neil W. Van Dyke wrote @file{webjump.el}, a ``hot links'' package. @item Didier Verna wrote @file{rect.el}, a package of functions for operations on rectangle regions of text. He also contributed to Gnus -(q.v.@:). +(q.v.). @item Joakim Verona implemented ImageMagick support. @@ -1301,15 +1305,14 @@ providing electric accent keys. Colin Walters wrote Ibuffer, an enhanced buffer menu. @item -Barry Warsaw wrote @file{assoc.el}, a set of utility functions for -working with association lists; @file{cc-mode.el}, a mode for editing -C, C@t{++}, and Java code, based on earlier work by Dave Detlefs, -Stewart Clamen, and Richard Stallman; @file{elp.el}, a profiler for -Emacs Lisp programs; @file{man.el}, a mode for reading Unix manual -pages; @file{regi.el}, providing an AWK-like functionality for use in -lisp programs; @file{reporter.el}, providing customizable bug -reporting for lisp packages; and @file{supercite.el}, a minor mode for -quoting sections of mail messages and news articles. +Barry Warsaw wrote @file{cc-mode.el}, a mode for editing C, C@t{++}, +and Java code, based on earlier work by Dave Detlefs, Stewart Clamen, +and Richard Stallman; @file{elp.el}, a profiler for Emacs Lisp +programs; @file{man.el}, a mode for reading Unix manual pages; +@file{regi.el}, providing an AWK-like functionality for use in lisp +programs; @file{reporter.el}, providing customizable bug reporting for +lisp packages; and @file{supercite.el}, a minor mode for quoting +sections of mail messages and news articles. @item Christoph Wedler wrote @file{antlr-mode.el}, a major mode for ANTLR @@ -1329,7 +1332,7 @@ the shift key and motion commands; and @file{dos-fns.el}, functions for use under MS-DOS. @item -Joe Wells wrote the original version of @file{apropos.el} (q.v.@:); +Joe Wells wrote the original version of @file{apropos.el} (q.v.); @file{resume.el}, support for processing command-line arguments after resuming a suspended Emacs job; and @file{mail-extr.el}, a package for extracting names and addresses from mail headers, with contributions @@ -1348,28 +1351,27 @@ time spent on projects; the Bahá'í calendar support; @file{remember.el}, a mode for jotting down things to remember; @file{eudcb-mab.el}, an address book backend for the Emacs Unified Directory Client; and @code{eshell}, a command shell implemented -entirely in Emacs Lisp. He also contributed to Org mode (q.v.@:). +entirely in Emacs Lisp. He also contributed to Org mode (q.v.). @item -Mike Williams wrote @file{mouse-sel.el}, providing enhanced mouse -selection; and @file{thingatpt.el}, a library of functions for finding -the ``thing'' (word, line, s-expression) containing point. +Mike Williams wrote @file{thingatpt.el}, a library of functions for +finding the ``thing'' (word, line, s-expression) at point. @item Roland Winkler wrote @file{proced.el}, a system process editor. @item Bill Wohler wrote MH-E, the Emacs interface to the MH mail system; -making use of earlier work by James R.@: Larus. Satyaki Das, Peter S.@: -Galbraith, Stephen Gildea, and Jeffrey C.@: Honig also wrote various +making use of earlier work by James R. Larus. Satyaki Das, Peter S. +Galbraith, Stephen Gildea, and Jeffrey C. Honig also wrote various MH-E components. @item -Dale R.@: Worley wrote @file{emerge.el}, a package for interactively +Dale R. Worley wrote @file{emerge.el}, a package for interactively merging two versions of a file. @item -Francis J.@: Wright wrote @file{woman.el}, a package for browsing +Francis J. Wright wrote @file{woman.el}, a package for browsing manual pages without the @code{man} command. @item @@ -1427,13 +1429,13 @@ messages; @file{rfc1843.el}, an HZ decoding package; other Gnus components. @item -Ian T.@: Zimmerman wrote @file{gametree.el}. +Ian T. Zimmerman wrote @file{gametree.el}. @item Reto Zimmermann wrote @file{vera-mode.el}. @item -Neal Ziring and Felix S.@: T.@: Wu wrote @file{vi.el}, an emulation of the +Neal Ziring and Felix S. T. Wu wrote @file{vi.el}, an emulation of the VI text editor. @item diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi index 5a957b02843..62348e6d2e2 100644 --- a/doc/emacs/arevert-xtra.texi +++ b/doc/emacs/arevert-xtra.texi @@ -40,7 +40,7 @@ explained in the corresponding sections. @menu * Auto Reverting the Buffer Menu:: Auto Revert of the Buffer Menu. * Auto Reverting Dired:: Auto Revert of Dired buffers. -* Supporting additional buffers:: How to add more Auto Revert support. +* Supporting additional buffers:: How to add more Auto Revert support. @end menu @node Auto Reverting the Buffer Menu @@ -66,9 +66,9 @@ operating systems. It may not work satisfactorily on some other systems. Dired buffers only auto-revert when the file list of the buffer's main -directory changes (e.g. when a new file is added). They do not +directory changes (e.g., when a new file is added). They do not auto-revert when information about a particular file changes -(e.g. when the size changes) or when inserted subdirectories change. +(e.g., when the size changes) or when inserted subdirectories change. To be sure that @emph{all} listed information is up to date, you have to manually revert using @kbd{g}, @emph{even} if auto-reverting is enabled in the Dired buffer. Sometimes, you might get the impression diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 16ccdba0866..4d61df09669 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -107,7 +107,7 @@ just like digits. Case is ignored. of a character, using the minibuffer. If you enter a name, the command provides completion (@pxref{Completion}). If you enter a code-point, it should be as a hexadecimal number (the convention for -Unicode), or a number with a specified radix, e.g.@: @code{#o23072} +Unicode), or a number with a specified radix, e.g., @code{#o23072} (octal); @xref{Integer Basics,,, elisp, The Emacs Lisp Reference Manual}. The command then inserts the corresponding character into the buffer. For example, both of the following insert the infinity @@ -267,7 +267,8 @@ necessary (@code{scroll-up-command}). @xref{Scrolling}. Scroll one screen backward, and move point onscreen if necessary (@code{scroll-down-command}). @xref{Scrolling}. -@item M-x goto-char +@item M-g c +@kindex M-g c @findex goto-char Read a number @var{n} and move point to buffer position @var{n}. Position 1 is the beginning of the buffer. @@ -285,6 +286,13 @@ also specify @var{n} by giving @kbd{M-g M-g} a numeric prefix argument. @xref{Select Buffer}, for the behavior of @kbd{M-g M-g} when you give it a plain prefix argument. +@item M-g @key{TAB} +@kindex M-g TAB +@findex move-to-column +Read a number @var{n} and move to column @var{n} in the current line. +Column 0 is the leftmost column. If called with a prefix argument, +move to the column number specified by the argument's numeric value. + @item C-x C-n @kindex C-x C-n @findex set-goal-column @@ -377,7 +385,7 @@ On some text terminals, Emacs may not recognize the @key{DEL} key properly. @xref{DEL Does Not Delete}, if you encounter this problem. The @key{delete} (@code{delete-forward-char}) command deletes in the -``opposite direction'': it deletes the character after point, i.e. the +``opposite direction'': it deletes the character after point, i.e., the character under the cursor. If point was at the end of a line, this joins the following line onto this one. Like @kbd{@key{DEL}}, it deletes the text in the region if the region is active (@pxref{Mark}). @@ -619,12 +627,16 @@ narrowed region and the line number relative to the whole buffer. @kindex M-= @findex count-words-region -@findex count-words @kbd{M-=} (@code{count-words-region}) displays a message reporting -the number of lines, words, and characters in the region. @kbd{M-x -count-words} displays a similar message for the entire buffer, or for -the region if the region is @dfn{active}. @xref{Mark}, for an -explanation of the region. +the number of lines, words, and characters in the region +(@pxref{Mark}, for an explanation of the region). With a prefix +argument, @kbd{C-u M-=}, the command displays a count for the entire +buffer. + +@findex count-words + The command @kbd{M-x count-words} does the same job, but with a +different calling convention. It displays a count for the region if +the region is active, and for the buffer otherwise. @kindex C-x = @findex what-cursor-position @@ -745,7 +757,8 @@ the character @samp{1}. value. For example, the command @kbd{M-q} (@code{fill-paragraph}) fills text; with an argument, it justifies the text as well. (@xref{Filling}, for more information on @kbd{M-q}.) For these -commands, it is enough to the argument with a single @kbd{C-u}. +commands, it is enough to specify the argument with a single +@kbd{C-u}. Some commands use the value of the argument as a repeat count, but do something special when there is no argument. For example, the @@ -764,10 +777,10 @@ described when they come up; they exist to make an individual command more convenient, and they are documented in that command's documentation string. - We use the term ``prefix argument'' as well as ``numeric argument'', -to emphasize that you type these argument before the command, and to -distinguish them from minibuffer arguments that come after the -command. + We use the term @dfn{prefix argument} to emphasize that you type +such arguments before the command, and to distinguish them from +minibuffer arguments (@pxref{Minibuffer}), which are entered after +invoking the command. @node Repeating @section Repeating a Command diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 24bb0e83778..6940a0698f8 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -44,8 +44,8 @@ variables}---variables that can have a different value in each buffer. by the largest buffer position representable by @dfn{Emacs integers}. This is because Emacs tracks buffer positions using that data type. For typical 64-bit machines, this maximum buffer size is @math{2^61 - -2} bytes, or about 2 EiB. For typical 32-bit machines, the maximum is -usually @math{2^29 - 2} bytes, or about 512 MiB. Buffer sizes are +2} bytes, or about 2 EiB@. For typical 32-bit machines, the maximum is +usually @math{2^29 - 2} bytes, or about 512 MiB@. Buffer sizes are also limited by the amount of memory in the system. @menu @@ -212,7 +212,7 @@ unless they visit files: such buffers are used internally by Emacs. @table @kbd @item C-x C-q -Toggle read-only status of buffer (@code{toggle-read-only}). +Toggle read-only status of buffer (@code{read-only-mode}). @item M-x rename-buffer @key{RET} @var{name} @key{RET} Change the name of the current buffer. @item M-x rename-uniquely @@ -231,9 +231,9 @@ buffers are usually made by subsystems such as Dired and Rmail that have special commands to operate on the text; also by visiting a file whose access control says you cannot write it. -@findex toggle-read-only +@findex read-only-mode @vindex view-read-only - The command @kbd{C-x C-q} (@code{toggle-read-only}) makes a read-only + The command @kbd{C-x C-q} (@code{read-only-mode}) makes a read-only buffer writable, and makes a writable buffer read-only. This works by setting the variable @code{buffer-read-only}, which has a local value in each buffer and makes the buffer read-only if its value is @@ -309,7 +309,7 @@ whose names begin with a space, which are used internally by Emacs. To kill internal buffers as well, call @code{kill-matching-buffers} with a prefix argument. - The buffer menu feature is also convenient for killing various + The Buffer Menu feature is also convenient for killing various buffers. @xref{Several Buffers}. @vindex kill-buffer-hook @@ -339,7 +339,7 @@ the Customization buffer to set the variable @code{midnight-mode} to @node Several Buffers @section Operating on Several Buffers -@cindex buffer menu +@cindex Buffer Menu @table @kbd @item M-x buffer-menu @@ -348,7 +348,7 @@ Begin editing a buffer listing all Emacs buffers. Similar, but do it in another window. @end table - The @dfn{buffer menu} opened by @kbd{C-x C-b} (@pxref{List Buffers}) + The @dfn{Buffer Menu} opened by @kbd{C-x C-b} (@pxref{List Buffers}) does not merely list buffers. It also allows you to perform various operations on buffers, through an interface similar to Dired (@pxref{Dired}). You can save buffers, kill them (here called @@ -356,106 +356,169 @@ operations on buffers, through an interface similar to Dired @findex buffer-menu @findex buffer-menu-other-window - To use the buffer menu, type @kbd{C-x C-b} and switch to the window + To use the Buffer Menu, type @kbd{C-x C-b} and switch to the window displaying the @file{*Buffer List*} buffer. You can also type -@kbd{M-x buffer-menu} to open the buffer menu in the selected window. +@kbd{M-x buffer-menu} to open the Buffer Menu in the selected window. Alternatively, the command @kbd{M-x buffer-menu-other-window} opens -the buffer menu in another window, and selects that window. +the Buffer Menu in another window, and selects that window. - The buffer menu is a read-only buffer, and can be changed only + The Buffer Menu is a read-only buffer, and can be changed only through the special commands described in this section. The usual -cursor motion commands can be used in this buffer. The -following commands apply to the buffer described on the current line: +cursor motion commands can be used in this buffer. The following +commands apply to the buffer described on the current line: @table @kbd @item d -Request to delete (kill) the buffer, then move down. The request -shows as a @samp{D} on the line, before the buffer name. Requested -deletions take place when you type the @kbd{x} command. +@findex Buffer-menu-delete +@kindex d @r{(Buffer Menu)} +Flag the buffer for deletion (killing), then move point to the next +line (@code{Buffer-menu-delete}). The deletion flag is indicated by +the character @samp{D} on the line, before the buffer name. The +deletion occurs only when you type the @kbd{x} command (see below). + @item C-d -Like @kbd{d} but move up afterwards instead of down. +@findex Buffer-menu-delete-backwards +@kindex C-d @r{(Buffer Menu)} +Like @kbd{d}, but move point up instead of down +(@code{Buffer-menu-delete-backwards}). + @item s -Request to save the buffer. The request shows as an @samp{S} on the -line. Requested saves take place when you type the @kbd{x} command. -You may request both saving and deletion for the same buffer. +@findex Buffer-menu-save +@kindex s @r{(Buffer Menu)} +Flag the buffer for saving (@code{Buffer-menu-save}). The save flag +is indicated by the character @samp{S} on the line, before the buffer +name. The saving occurs only when you type @kbd{x}. You may request +both saving and deletion for the same buffer. + @item x -Perform previously requested deletions and saves. +@findex Buffer-menu-execute +@kindex x @r{(Buffer Menu)} +Perform all flagged deletions and saves (@code{Buffer-menu-execute}). + @item u -Remove any request made for the current line, and move down. +@findex Buffer-menu-unmark +@kindex u @r{(Buffer Menu)} +Remove all flags from the current line, and move down +(@code{Buffer-menu-unmark}). + @item @key{DEL} -Move to previous line and remove any request made for that line. +@findex Buffer-menu-backup-unmark +@kindex DEL @r{(Buffer Menu)} +Move to the previous line and remove all flags on that line +(@code{Buffer-menu-backup-unmark}). @end table - The @kbd{d}, @kbd{C-d}, @kbd{s} and @kbd{u} commands to add or remove -flags also move down (or up) one line. They accept a numeric argument -as a repeat count. +@noindent +The commands for adding or removing flags, @kbd{d}, @kbd{C-d}, @kbd{s} +and @kbd{u}, all accept a numeric argument as a repeat count. - These commands operate immediately on the buffer listed on the current -line: + The following commands operate immediately on the buffer listed on +the current line. They also accept a numeric argument as a repeat +count. @table @kbd @item ~ -Mark the buffer ``unmodified''. The command @kbd{~} does this -immediately when you type it. +@findex Buffer-menu-not-modified +@kindex ~ @r{(Buffer Menu)} +Mark the buffer as unmodified (@code{Buffer-menu-not-modified}). +@xref{Save Commands}. + @item % -Toggle the buffer's read-only flag. The command @kbd{%} does -this immediately when you type it. +@findex Buffer-menu-toggle-read-only +@kindex % @r{(Buffer Menu)} +Toggle the buffer's read-only status +(@code{Buffer-menu-toggle-read-only}). @xref{Misc Buffer}. + @item t -Visit the buffer as a tags table. @xref{Select Tags Table}. +@findex Buffer-menu-visit-tags-table +@kindex % @r{(Buffer Menu)} +Visit the buffer as a tags table +(@code{Buffer-menu-visit-tags-table}). @xref{Select Tags Table}. @end table - There are also commands to select another buffer or buffers: + The following commands are used to select another buffer or buffers: @table @kbd @item q -Quit the buffer menu---immediately display the most recent formerly -visible buffer in its place. +@findex quit-window +@kindex q @r{(Buffer Menu)} +Quit the Buffer Menu (@code{quit-window}). The most recent formerly +visible buffer is displayed in its place. + @item @key{RET} @itemx f -Immediately select this line's buffer in place of the @file{*Buffer -List*} buffer. +@findex Buffer-menu-this-window +@kindex f @r{(Buffer Menu)} +@kindex RET @r{(Buffer Menu)} +Select this line's buffer, replacing the @file{*Buffer List*} buffer +in its window (@code{Buffer-menu-this-window}). + @item o -Immediately select this line's buffer in another window as if by -@kbd{C-x 4 b}, leaving @file{*Buffer List*} visible. +@findex Buffer-menu-other-window +@kindex o @r{(Buffer Menu)} +Select this line's buffer in another window, as if by @kbd{C-x 4 b}, +leaving @file{*Buffer List*} visible +(@code{Buffer-menu-other-window}). + @item C-o -Immediately display this line's buffer in another window, but don't -select the window. +@findex Buffer-menu-switch-other-window +@kindex C-o @r{(Buffer Menu)} +Display this line's buffer in another window, without selecting it +(@code{Buffer-menu-switch-other-window}). + @item 1 -Immediately select this line's buffer in a full-screen window. +@findex Buffer-menu-1-window +@kindex 1 @r{(Buffer Menu)} +Select this line's buffer in a full-frame window +(@code{Buffer-menu-1-window}). + @item 2 -Immediately set up two windows, with this line's buffer selected in -one, and the previously current buffer (aside from the buffer -@file{*Buffer List*}) displayed in the other. +@findex Buffer-menu-2-window +@kindex 2 @r{(Buffer Menu)} +Set up two windows on the current frame, with this line's buffer +selected in one, and a previously current buffer (aside from +@file{*Buffer List*}) in the other (@code{Buffer-menu-2-window}). + @item b -Bury the buffer listed on this line. +@findex Buffer-menu-bury +@kindex b @r{(Buffer Menu)} +Bury this line's buffer (@code{Buffer-menu-bury}). + @item m +@findex Buffer-menu-mark +@kindex m @r{(Buffer Menu)} Mark this line's buffer to be displayed in another window if you exit -with the @kbd{v} command. The request shows as a @samp{>} at the -beginning of the line. (A single buffer may not have both a delete -request and a display request.) +with the @kbd{v} command (@code{Buffer-menu-mark}). The display flag +is indicated by the character @samp{>} at the beginning of the line. +(A single buffer may not have both deletion and display flags.) + @item v -Immediately select this line's buffer, and also display in other windows -any buffers previously marked with the @kbd{m} command. If you have not -marked any buffers, this command is equivalent to @kbd{1}. +@findex Buffer-menu-select +@kindex v @r{(Buffer Menu)} +Select this line's buffer, and also display in other windows any +buffers flagged with the @kbd{m} command (@code{Buffer-menu-select}). +If you have not flagged any buffers, this command is equivalent to +@kbd{1}. @end table - There is also a command that affects the entire buffer list: + The following commands affect the entire buffer list: @table @kbd +@item S +@findex tabulated-list-sort +@kindex S @r{(Buffer Menu)} +Sort the Buffer Menu entries according to their values in the column +at point. With a numeric prefix argument @var{n}, sort according to +the @var{n}-th column (@code{tabulated-list-sort}). + @item T -Delete, or reinsert, lines for non-file buffers. This command toggles -the inclusion of such buffers in the buffer list. +@findex Buffer-menu-toggle-files-only +@kindex T @r{(Buffer Menu)} +Delete, or reinsert, lines for non-file buffers +@code{Buffer-menu-toggle-files-only}). This command toggles the +inclusion of such buffers in the buffer list. @end table - What @code{buffer-menu} actually does is create and switch to a -suitable buffer, and turn on Buffer Menu mode in it. Everything else -described above is implemented by the special commands provided in -Buffer Menu mode. One consequence of this is that you can switch from -the @file{*Buffer List*} buffer to another Emacs buffer, and edit -there. You can reselect the @file{*Buffer List*} buffer later, to -perform the operations already requested, or you can kill it, or pay -no further attention to it. - Normally, the buffer @file{*Buffer List*} is not updated automatically when buffers are created and killed; its contents are just text. If you have created, deleted or renamed buffers, the way @@ -551,7 +614,7 @@ names (all but one of them). @vindex uniquify-buffer-name-style Other methods work by adding parts of each file's directory to the -buffer name. To select one, load the library @file{uniquify} (e.g. +buffer name. To select one, load the library @file{uniquify} (e.g., using @code{(require 'uniquify)}), and customize the variable @code{uniquify-buffer-name-style} (@pxref{Easy Customization}). @@ -633,7 +696,6 @@ C-b}. To customize this buffer list, use the @code{bs} Custom group @findex msb-mode @cindex mode, MSB @cindex MSB mode -@cindex buffer menu @findex mouse-buffer-menu @kindex C-Down-Mouse-1 MSB global minor mode (``MSB'' stands for ``mouse select buffer'') diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index 05ea667e5f7..7d6e7c9d6f4 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -108,11 +108,14 @@ directory, which is the directory in which the previous compilation was started. @findex kill-compilation +@vindex compilation-always-kill Starting a new compilation also kills any compilation already running in @file{*compilation*}, as the buffer can only handle one compilation at any time. However, @kbd{M-x compile} asks for -confirmation before actually killing a compilation that is running. -You can also kill the compilation process with @kbd{M-x +confirmation before actually killing a compilation that is running; to +always automatically kill the compilation without asking, change the +variable @code{compilation-always-kill} to @code{t}. You can also +kill a compilation process with the command @kbd{M-x kill-compilation}. To run two compilations at once, start the first one, then rename @@ -258,7 +261,7 @@ or previous error message for a different source file. @findex next-error-follow-minor-mode You can type @kbd{C-c C-f} to toggle Next Error Follow mode. In this minor mode, ordinary cursor motion in the compilation buffer -automatically updates the source buffer, i.e.@: moving the cursor over +automatically updates the source buffer, i.e., moving the cursor over an error message causes the locus of that error to be displayed. The features of Compilation mode are also available in a minor mode @@ -321,7 +324,7 @@ nohup @var{command}; sleep 1 @ifnottex On the MS-DOS ``operating system'', asynchronous subprocesses are not supported, so @kbd{M-x compile} runs the compilation command -synchronously (i.e.@: you must wait until the command finishes before +synchronously (i.e., you must wait until the command finishes before you can do anything else in Emacs). @xref{MS-DOS}. @end ifnottex @@ -586,7 +589,7 @@ to recompile and restart the program. @findex gud-tooltip-mode @vindex gud-tooltip-echo-area GUD Tooltip mode is a global minor mode that adds tooltip support to -GUD. To toggle this mode, type @kbd{M-x gud-tooltip-mode}. It is +GUD@. To toggle this mode, type @kbd{M-x gud-tooltip-mode}. It is disabled by default. If enabled, you can move the mouse cursor over a variable, a function, or a macro (collectively called @dfn{identifiers}) to show their values in tooltips @@ -622,7 +625,7 @@ Set a breakpoint on the source line that point is on. @kbd{C-x @key{SPC}} (@code{gud-break}), when called in a source buffer, sets a debugger breakpoint on the current source line. This -command is available only after starting GUD. If you call it in a +command is available only after starting GUD@. If you call it in a buffer that is not associated with any debugger subprocess, it signals a error. @@ -753,7 +756,7 @@ This key is available only in the GUD interaction buffer. that makes sense. Because @key{TAB} serves as a completion command, you can't use it to -enter a tab as input to the program you are debugging with GDB. +enter a tab as input to the program you are debugging with GDB@. Instead, type @kbd{C-q @key{TAB}} to enter a tab. @node GUD Customization @@ -771,7 +774,7 @@ Instead, type @kbd{C-q @key{TAB}} to enter a tab. you are using DBX; @code{sdb-mode-hook}, if you are using SDB; @code{xdb-mode-hook}, if you are using XDB; @code{perldb-mode-hook}, for Perl debugging mode; @code{pdb-mode-hook}, for PDB; -@code{jdb-mode-hook}, for JDB. @xref{Hooks}. +@code{jdb-mode-hook}, for JDB@. @xref{Hooks}. The @code{gud-def} Lisp macro (@pxref{Defining Macros,,, elisp, the Emacs Lisp Reference Manual}) provides a convenient way to define an @@ -888,10 +891,6 @@ displays the following frame layout: @end group @end smallexample - However, if @code{gdb-use-separate-io-buffer} is @code{nil}, the I/O -buffer does not appear and the primary source buffer occupies the full -width of the frame. - @findex gdb-restore-windows @findex gdb-many-windows If you ever change the window layout, you can restore the ``many @@ -1245,8 +1244,8 @@ depending on the reason which caused the stop. Customize the variable @code{gdb-switch-reasons} to select the stop reasons which will cause a thread switch. -@vindex gdb-stopped-hooks - The variable @code{gdb-stopped-hooks} allows you to execute your +@vindex gdb-stopped-functions + The variable @code{gdb-stopped-functions} allows you to execute your functions whenever some thread stops. In non-stop mode, you can switch between different modes for GUD @@ -1397,13 +1396,21 @@ putting a line like this in your init file (@pxref{Init File}): @end example @cindex autoload - Some commands are @dfn{autoloaded}: when you run them, Emacs + Some commands are @dfn{autoloaded}; when you run them, Emacs automatically loads the associated library first. For instance, the @kbd{M-x compile} command (@pxref{Compilation}) is autoloaded; if you call it, Emacs automatically loads the @code{compile} library first. In contrast, the command @kbd{M-x recompile} is not autoloaded, so it is unavailable until you load the @code{compile} library. +@vindex help-enable-auto-load + Automatic loading can also occur when you look up the documentation +of an autoloaded command (@pxref{Name Help}), if the documentation +refers to other functions and variables in its library (loading the +library lets Emacs properly set up the hyperlinks in the @file{*Help*} +buffer). To disable this feature, change the variable +@code{help-enable-auto-load} to @code{nil}. + @vindex load-dangerous-libraries @cindex Lisp files byte-compiled by XEmacs By default, Emacs refuses to load compiled Lisp files which were diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index 45760afd7a6..35b91b5a24f 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -7,10 +7,12 @@ @c Moved here from the Emacs Lisp Reference Manual, 2005-03-26. @node Advanced Calendar/Diary Usage -@section Customizing the Calendar and Diary +@section More advanced features of the Calendar and Diary - There are many ways in which you can customize the calendar and -diary to suit your personal tastes. + This section describes some of the more advanced/specialized +features of the calendar and diary. It starts with some of the +many ways in which you can customize the calendar and diary to suit +your personal tastes. @menu * Calendar Customizing:: Calendar layout and hooks. @@ -39,6 +41,11 @@ To display text @emph{between} the months, for example week numbers, customize the variables @code{calendar-intermonth-header} and @code{calendar-intermonth-text} as described in their documentation. +@vindex calendar-month-header + The variable @code{calendar-month-header} controls the text that +appears above each month in the calendar. By default, it shows the +month and year. + @vindex calendar-holiday-marker @vindex diary-entry-marker @vindex calendar-today-marker @@ -96,7 +103,7 @@ knows about. These are: @code{holiday-general-holidays}, @code{holiday-bahai-holidays}, @code{holiday-christian-holidays}, @code{holiday-hebrew-holidays}, @code{holiday-islamic-holidays}, @code{holiday-oriental-holidays}, and @code{holiday-other-holidays}. -The names should be self-explanatory; e.g.@: @code{holiday-solar-holidays} +The names should be self-explanatory; e.g., @code{holiday-solar-holidays} lists sun- and moon-related holidays. You can customize these lists of holidays to your own needs, deleting or @@ -621,7 +628,7 @@ of the diary entries, or add items. variables @code{diary-comment-start} and @code{diary-comment-end} to strings that delimit comments. The fancy display does not print comments. You might want to put meta-data for the use of other packages -(e.g.@: the appointment package, +(e.g., the appointment package, @iftex @pxref{Appointments,,,emacs, the Emacs Manual}) @end iftex diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index fdf1c65fcd6..cf13b787962 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -349,11 +349,12 @@ calendar deletes or iconifies that frame depending on the value of @cindex calendar and HTML The Calendar HTML commands produce files of HTML code that contain -calendar and diary entries. Each file applies to one month, and has a -name of the format @file{@var{yyyy}-@var{mm}.html}, where @var{yyyy} and -@var{mm} are the four-digit year and two-digit month, respectively. The -variable @code{cal-html-directory} specifies the default output -directory for the HTML files. +calendar, holiday, and diary entries. Each file applies to one month, +and has a name of the format @file{@var{yyyy}-@var{mm}.html}, where +@var{yyyy} and @var{mm} are the four-digit year and two-digit month, +respectively. The variable @code{cal-html-directory} specifies the +default output directory for the HTML files. To prevent holidays +from being shown, customize @code{cal-html-holidays}. @vindex cal-html-css-default Diary entries enclosed by @code{<} and @code{>} are interpreted as @@ -396,17 +397,20 @@ Generate a sideways-printing one-month calendar Generate a one-day calendar (@code{cal-tex-cursor-day}). @item t w 1 -Generate a one-page calendar for one week +Generate a one-page calendar for one week, with hours (@code{cal-tex-cursor-week}). @item t w 2 -Generate a two-page calendar for one week +Generate a two-page calendar for one week, with hours (@code{cal-tex-cursor-week2}). @item t w 3 -Generate an ISO-style calendar for one week +Generate an ISO-style calendar for one week, without hours (@code{cal-tex-cursor-week-iso}). @item t w 4 -Generate a calendar for one Monday-starting week +Generate a calendar for one Monday-starting week, with hours (@code{cal-tex-cursor-week-monday}). +@item t w W +Generate a two-page calendar for one week, without hours +(@code{cal-tex-cursor-week2-summary}). @item t f w Generate a Filofax-style two-weeks-at-a-glance calendar (@code{cal-tex-cursor-filofax-2week}). @@ -1547,7 +1551,7 @@ diary file and iCalendar files, which are defined in ``RFC 2445---Internet Calendaring and Scheduling Core Object Specification (iCalendar)'' (as well as the earlier vCalendar format). -@c Importing works for ``ordinary'' (i.e. non-recurring) events, but +@c Importing works for ``ordinary'' (i.e., non-recurring) events, but @c (at present) may not work correctly (if at all) for recurring events. @c Exporting of diary files into iCalendar files should work correctly @c for most diary entries. This feature is a work in progress, so the diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index d4573eed5a8..ebde2382c34 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -576,7 +576,7 @@ Emacs tries @env{TEMP}, then @env{TMPDIR}, then @env{TMP}, and finally This specifies the current time zone and possibly also daylight saving time information. On MS-DOS, if @env{TZ} is not set in the environment when Emacs starts, Emacs defines a default value as -appropriate for the country code returned by DOS. On MS-Windows, Emacs +appropriate for the country code returned by DOS@. On MS-Windows, Emacs does not use @env{TZ} at all. @item USER The user's login name. See also @env{LOGNAME}. On MS-DOS, this @@ -747,7 +747,7 @@ Use @var{font} as the default font. When passing a font name to Emacs on the command line, you may need to ``quote'' it, by enclosing it in quotation marks, if it contains -characters that the shell treats specially (e.g.@: spaces). For +characters that the shell treats specially (e.g., spaces). For example: @smallexample @@ -839,7 +839,7 @@ otherwise use an appropriate standard mode for @var{num} colors. Depending on your terminal's capabilities, Emacs might be able to turn on a color mode for 8, 16, 88, or 256 as the value of @var{num}. If there is no mode that supports @var{num} colors, Emacs acts as if -@var{num} were 0, i.e.@: it uses the terminal's default color support +@var{num} were 0, i.e., it uses the terminal's default color support mode. @end table If @var{mode} is omitted, it defaults to @var{ansi8}. @@ -1070,7 +1070,7 @@ it. By default, Emacs uses an icon containing the Emacs logo. On desktop environments such as Gnome, this icon is also displayed in -other contexts, e.g.@: when switching into an Emacs frame. The +other contexts, e.g., when switching into an Emacs frame. The @samp{-nbi} or @samp{--no-bitmap-icon} option tells Emacs to let the window manager choose what sort of icon to use---usually just a small rectangle containing the frame's title. diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index e63a98a9722..5c5493884b6 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -53,7 +53,7 @@ holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer to this as @kbd{C-a} for short. Similarly @kbd{Meta-a}, or @kbd{M-a} for short, is entered by holding down the @key{Alt} key and pressing @kbd{a}. Modifier keys can also be applied to non-alphanumerical -characters, e.g. @kbd{C-@key{F1}} or @kbd{M-@key{left}}. +characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{left}}. @cindex @key{ESC} replacing @key{Meta} key You can also type Meta characters using two-character sequences diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 68219d7890f..dd8da41d0cb 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -610,10 +610,10 @@ always considered safe. @vindex custom-enabled-themes Setting or saving Custom themes actually works by customizing the variable @code{custom-enabled-themes}. The value of this variable is -a list of Custom theme names (as Lisp symbols, e.g.@: @code{tango}). +a list of Custom theme names (as Lisp symbols, e.g., @code{tango}). Instead of using the @file{*Custom Themes*} buffer to set @code{custom-enabled-themes}, you can customize the variable using the -usual customization interface, e.g.@: with @kbd{M-x customize-option}. +usual customization interface, e.g., with @kbd{M-x customize-option}. Note that Custom themes are not allowed to set @code{custom-enabled-themes} themselves. @@ -838,7 +838,8 @@ is a normal hook. @cindex abnormal hook A few hooks are @dfn{abnormal hooks}. Their names end in -@samp{-hooks} or @samp{-functions}, instead of @samp{-hook}. What +@samp{-functions}, instead of @samp{-hook} (some old code may also use +the deprecated suffix @samp{-hooks}). What makes these hooks abnormal is the way its functions are called---perhaps they are given arguments, or perhaps the values they return are used in some way. For example, @@ -1647,7 +1648,7 @@ you can specify them in your initialization file by writing Lisp code. @findex kbd There are several ways to write a key binding using Lisp. The -simplest is to use the @code{kbd} macro, which converts a textual +simplest is to use the @code{kbd} function, which converts a textual representation of a key sequence---similar to how we have written key sequences in this manual---into a form that can be passed as an argument to @code{global-set-key}. For example, here's how to bind @@ -1675,11 +1676,11 @@ and mouse events: (global-set-key (kbd "<mouse-2>") 'mouse-save-then-kill) @end example - Instead of using the @code{kbd} macro, you can use a Lisp string or -vector to specify the key sequence. Using a string is simpler, but -only works for @acronym{ASCII} characters and Meta-modified -@acronym{ASCII} characters. For example, here's how to bind @kbd{C-x -M-l} to @code{make-symbolic-link} (@pxref{Misc File Ops}): + Instead of using @code{kbd}, you can use a Lisp string or vector to +specify the key sequence. Using a string is simpler, but only works +for @acronym{ASCII} characters and Meta-modified @acronym{ASCII} +characters. For example, here's how to bind @kbd{C-x M-l} to +@code{make-symbolic-link} (@pxref{Misc File Ops}): @example (global-set-key "\C-x\M-l" 'make-symbolic-link) @@ -1735,11 +1736,11 @@ and @kbd{C-c p} in Texinfo mode: @example (add-hook 'texinfo-mode-hook - '(lambda () - (define-key texinfo-mode-map "\C-cp" - 'backward-paragraph) - (define-key texinfo-mode-map "\C-cn" - 'forward-paragraph))) + (lambda () + (define-key texinfo-mode-map "\C-cp" + 'backward-paragraph) + (define-key texinfo-mode-map "\C-cn" + 'forward-paragraph))) @end example @node Modifier Keys @@ -2328,7 +2329,7 @@ Here a full file name is used, so no searching is done. @cindex loading Lisp libraries automatically @cindex autoload Lisp libraries Tell Emacs to find the definition for the function @code{myfunction} -by loading a Lisp library named @file{mypackage} (i.e.@: a file +by loading a Lisp library named @file{mypackage} (i.e., a file @file{mypackage.elc} or @file{mypackage.el}): @example @@ -2495,7 +2496,7 @@ editor customizations even if you are running as the super user. More precisely, Emacs first determines which user's init file to use. It gets your user name from the environment variables @env{LOGNAME} and -@env{USER}; if neither of those exists, it uses effective user-ID. +@env{USER}; if neither of those exists, it uses effective user-ID@. If that user name matches the real user-ID, then Emacs uses @env{HOME}; otherwise, it looks up the home directory corresponding to that user name in the system's data base of users. diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 0dcded78364..3b461b443c0 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -167,13 +167,14 @@ deletion, then delete the files that were flagged. @table @kbd @item d -Flag this file for deletion. +Flag this file for deletion (@code{dired-flag-file-deletion}). @item u -Remove deletion flag on this line. +Remove the deletion flag (@code{dired-unmark}). @item @key{DEL} -Move point to previous line and remove the deletion flag on that line. +Move point to previous line and remove the deletion flag on that line +(@code{dired-unmark-backward}). @item x -Delete the files that are flagged for deletion. +Delete files flagged for deletion (@code{dired-do-flagged-delete}). @end table @kindex d @r{(Dired)} @@ -182,8 +183,12 @@ Delete the files that are flagged for deletion. the file and typing @kbd{d} (@code{dired-flag-file-deletion}). The deletion flag is visible as a @samp{D} at the beginning of the line. This command moves point to the next line, so that repeated @kbd{d} -commands flag successive files. A numeric argument serves as a repeat -count. +commands flag successive files. A numeric prefix argument serves as a +repeat count; a negative count means to flag preceding files. + + If the region is active, the @kbd{d} command flags all files in the +region for deletion; in this case, the command does not move point, +and ignores any prefix argument. @kindex u @r{(Dired deletion)} @kindex DEL @r{(Dired)} @@ -194,14 +199,17 @@ can remove deletion flags using the commands @kbd{u} and @key{DEL}. @kbd{u} (@code{dired-unmark}) works just like @kbd{d}, but removes flags rather than making flags. @key{DEL} (@code{dired-unmark-backward}) moves upward, removing flags; it is -like @kbd{u} with argument @minus{}1. +like @kbd{u} with argument @minus{}1. A numeric prefix argument to +either command serves as a repeat count, with a negative count meaning +to unflag in the opposite direction. If the region is active, these +commands instead unflag all files in the region, without moving point. @kindex x @r{(Dired)} @findex dired-do-flagged-delete - To delete the flagged files, type @kbd{x} -(@code{dired-do-flagged-delete}). This command first displays a list -of all the file names flagged for deletion, and requests confirmation -with @kbd{yes}. If you confirm, Dired deletes the flagged files, then + To delete flagged files, type @kbd{x} +(@code{dired-do-flagged-delete}). This command displays a list of all +the file names flagged for deletion, and requests confirmation with +@kbd{yes}. If you confirm, Dired deletes the flagged files, then deletes their lines from the text of the Dired buffer. The Dired buffer, with somewhat fewer lines, remains selected. @@ -387,10 +395,11 @@ and unflag files.) @kindex m @r{(Dired)} @kindex * m @r{(Dired)} @findex dired-mark -Mark the current file with @samp{*} (@code{dired-mark}). With a numeric -argument @var{n}, mark the next @var{n} files starting with the current -file. (If @var{n} is negative, mark the previous @minus{}@var{n} -files.) +Mark the current file with @samp{*} (@code{dired-mark}). If the +region is active, mark all files in the region instead; otherwise, if +a numeric argument @var{n} is supplied, mark the next @var{n} files +instead, starting with the current file (if @var{n} is negative, mark +the previous @minus{}@var{n} files). @item * * @kindex * * @r{(Dired)} @@ -426,7 +435,11 @@ and @file{..} (@code{dired-mark-subdir-files}). @kindex u @r{(Dired)} @kindex * u @r{(Dired)} @findex dired-unmark -Remove any mark on this line (@code{dired-unmark}). +Remove any mark on this line (@code{dired-unmark}). If the region is +active, unmark all files in the region instead; otherwise, if a +numeric argument @var{n} is supplied, unmark the next @var{n} files +instead, starting with the current file (if @var{n} is negative, +unmark the previous @minus{}@var{n} files). @item @key{DEL} @itemx * @key{DEL} @@ -434,7 +447,11 @@ Remove any mark on this line (@code{dired-unmark}). @findex dired-unmark-backward @cindex unmarking files (in Dired) Move point to previous line and remove any mark on that line -(@code{dired-unmark-backward}). +(@code{dired-unmark-backward}). If the region is active, unmark all +files in the region instead; otherwise, if a numeric argument @var{n} +is supplied, unmark the @var{n} preceding files instead, starting with +the current file (if @var{n} is negative, unmark the next +@minus{}@var{n} files). @item * ! @itemx U @@ -782,15 +799,20 @@ more matches. @xref{Tags Search}. @kindex ! @r{(Dired)} @kindex X @r{(Dired)} The Dired command @kbd{!} (@code{dired-do-shell-command}) reads a -shell command string in the minibuffer and runs that shell command on +shell command string in the minibuffer, and runs that shell command on one or more files. The files that the shell command operates on are determined in the usual way for Dired commands (@pxref{Operating on Files}). The command @kbd{X} is a synonym for @kbd{!}. The command @kbd{&} (@code{dired-do-async-shell-command}) does the -same, except that it runs the shell command asynchronously. You can +same, except that it runs the shell command asynchronously. (You can also do this with @kbd{!}, by appending a @samp{&} character to the -end of the shell command. +end of the shell command.) When the command operates on more than one +file, it runs multiple parallel copies of the specified shell command, +one for each file. As an exception, if the specified shell command +ends in @samp{;} or @samp{;&}, the shell command is run in the +background on each file sequentially; Emacs waits for each invoked +shell command to terminate before running the next one. For both @kbd{!} and @kbd{&}, the working directory for the shell command is the top-level directory of the Dired buffer. @@ -936,32 +958,19 @@ default. @cindex file comparison (in Dired) @cindex compare files (in Dired) - Here are two Dired commands that compare specified files using -@code{diff}. They show the output in a buffer using Diff mode -(@pxref{Comparing Files}). - -@table @kbd -@item = @findex dired-diff @kindex = @r{(Dired)} -Compare the current file (the file at point) with another file (the -file at the mark) using the @code{diff} program (@code{dired-diff}). -The file at the mark is the first argument of @code{diff}, and the -file at point is the second argument. This refers to the ordinary -Emacs mark, not Dired marks; use @kbd{C-@key{SPC}} -(@code{set-mark-command}) to set the mark at the first file's line -(@pxref{Setting Mark}). - -@findex dired-backup-diff -@kindex M-= @r{(Dired)} -@item M-= -Compare the current file with its latest backup file -(@code{dired-backup-diff}). If the current file is itself a backup, -compare it with the file it is a backup of; this way, you can compare -a file with any one of its backups. - -The backup file is the first file given to @code{diff}. -@end table + The @kbd{=} (@code{dired-diff}) command compares the current file +(the file at point) with another file (read using the minibuffer) +using the @command{diff} program. The file specified with the +minibuffer is the first argument of @command{diff}, and file at point +is the second argument. The output of the @command{diff} program is +shown in a buffer using Diff mode (@pxref{Comparing Files}). + + If the region is active, the default for the file read using the +minibuffer is the file at the mark (i.e., the ordinary Emacs mark, +not a Dired mark; @pxref{Setting Mark}). Otherwise, if the file at +point has a backup file (@pxref{Backup}), that is the default. @node Subdirectories in Dired @section Subdirectories in Dired @@ -1161,17 +1170,17 @@ automatically when you revisit it, by setting the variable @kindex k @r{(Dired)} @findex dired-do-kill-lines - To delete the specified @emph{file lines} from the buffer---not -delete the files---type @kbd{k} (@code{dired-do-kill-lines}). Like + To delete @emph{file lines} from the buffer---without actually +deleting the files---type @kbd{k} (@code{dired-do-kill-lines}). Like the file-operating commands, this command operates on the next @var{n} -files, or on the marked files if any; but it does not operate on the -current file as a last resort. - - If you use @kbd{k} with a numeric prefix argument to kill the line -for a file that is a directory, which you have inserted in the Dired -buffer as a subdirectory, it removed that subdirectory line from the -buffer as well. Typing @kbd{C-u k} on the header line for a -subdirectory also removes the subdirectory line from the Dired buffer. +files, or on the marked files if any. However, it does not operate on +the current file, since otherwise mistyping @kbd{k} could be annoying. + + If you use @kbd{k} to kill the line for a directory file which you +had inserted in the Dired buffer as a subdirectory +(@pxref{Subdirectories in Dired}), it removes the subdirectory listing +as well. Typing @kbd{C-u k} on the header line for a subdirectory +also removes the subdirectory line from the Dired buffer. The @kbd{g} command brings back any individual lines that you have killed in this way, but not subdirectories---you must use @kbd{i} to diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 2238570eaa9..8dc82d4b70d 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -213,52 +213,62 @@ entire current defun onto the screen if possible. @node Auto Scrolling @section Automatic Scrolling +@cindex automatic scrolling Emacs performs @dfn{automatic scrolling} when point moves out of the -visible portion of the text. +visible portion of the text. Normally, automatic scrolling centers +point vertically in the window, but there are several ways to alter +this behavior. @vindex scroll-conservatively - Normally, this centers point vertically within the window. However, -if you set @code{scroll-conservatively} to a small number @var{n}, -then if you move point just a little off the screen (less than @var{n} -lines), Emacs scrolls the text just far enough to bring point back on -screen. By default, @code{scroll-conservatively} is@tie{}0. If you -set @code{scroll-conservatively} to a large number (larger than 100), -Emacs will never center point as result of scrolling, even if point -moves far away from the text previously displayed in the window. With -such a large value, Emacs will always scroll text just enough for -bringing point into view, so point will end up at the top or bottom of -the window, depending on the scroll direction. + If you set @code{scroll-conservatively} to a small number @var{n}, +then moving point just a little off the screen (no more than @var{n} +lines) causes Emacs to scroll just enough to bring point back on +screen; if doing so fails to make point visible, Emacs scrolls just +far enough to center point in the window. If you set +@code{scroll-conservatively} to a large number (larger than 100), +automatic scrolling never centers point, no matter how far point +moves; Emacs always scrolls text just enough to bring point into view, +either at the top or bottom of the window depending on the scroll +direction. By default, @code{scroll-conservatively} is@tie{}0, which +means to always center point in the window. @vindex scroll-step - The variable @code{scroll-step} determines how many lines to scroll -the window when point moves off the screen. If moving by that number -of lines fails to bring point back into view, point is centered -instead. The default value is zero, which causes point to always be -centered after scrolling. + Another way to control automatic scrolling is to customize the +variable @code{scroll-step}. Its value determines the number of lines +by which to automatically scroll, when point moves off the screen. If +scrolling by that number of lines fails to bring point back into view, +point is centered instead. The default value is zero, which (by +default) causes point to always be centered after scrolling. @cindex aggressive scrolling @vindex scroll-up-aggressively @vindex scroll-down-aggressively - When the window does scroll by a distance longer than -@code{scroll-step}, you can control how aggressively it scrolls by -setting the variables @code{scroll-up-aggressively} and -@code{scroll-down-aggressively}. The value of -@code{scroll-up-aggressively} should be either @code{nil}, or a -fraction @var{f} between 0 and 1. A fraction specifies where on the -screen to put point when scrolling upward, i.e.@: forward. When point -goes off the window end, the new start position is chosen to put point -@var{f} parts of the window height from the bottom margin. Thus, -larger @var{f} means more aggressive scrolling: more new text is -brought into view. The default value, @code{nil}, is equivalent to -0.5. - - Likewise, @code{scroll-down-aggressively} is used for scrolling -down, i.e.@: backward. The value specifies how far point should be -placed from the top margin of the window; thus, as with -@code{scroll-up-aggressively}, a larger value is more aggressive. - - These two variables are ignored if either @code{scroll-step} or -@code{scroll-conservatively} are set to a non-zero value. + A third way to control automatic scrolling is to customize the +variables @code{scroll-up-aggressively} and +@code{scroll-down-aggressively}, which directly specify the vertical +position of point after scrolling. The value of +@code{scroll-up-aggressively} should be either @code{nil} (the +default), or a floating point number @var{f} between 0 and 1. The +latter means that when point goes below the bottom window edge (i.e., +scrolling forward), Emacs scrolls the window so that point is @var{f} +parts of the window height from the bottom window edge. Thus, larger +@var{f} means more aggressive scrolling: more new text is brought into +view. The default value, @code{nil}, is equivalent to 0.5. + + Likewise, @code{scroll-down-aggressively} is used when point goes +above the bottom window edge (i.e., scrolling backward). The value +specifies how far point should be from the top margin of the window +after scrolling. Thus, as with @code{scroll-up-aggressively}, a +larger value is more aggressive. + + Note that the variables @code{scroll-conservatively}, +@code{scroll-step}, and @code{scroll-up-aggressively} / +@code{scroll-down-aggressively} control automatic scrolling in +contradictory ways. Therefore, you should pick no more than one of +these methods to customize automatic scrolling. In case you customize +multiple variables, the order of priority is: +@code{scroll-conservatively}, then @code{scroll-step}, and finally +@code{scroll-up-aggressively} / @code{scroll-down-aggressively}. @vindex scroll-margin The variable @code{scroll-margin} restricts how close point can come @@ -288,10 +298,10 @@ the cursor is left at the edge instead.) @vindex hscroll-margin The variable @code{hscroll-margin} controls how close point can get -to the window's edges before automatic scrolling occurs. It is -measured in columns. For example, if the value is 5, then moving -point within 5 columns of an edge causes horizontal scrolling away -from that edge. +to the window's left and right edges before automatic scrolling +occurs. It is measured in columns. For example, if the value is 5, +then moving point within 5 columns of an edge causes horizontal +scrolling away from that edge. @vindex hscroll-step The variable @code{hscroll-step} determines how many columns to @@ -1044,9 +1054,9 @@ the left fringe, but no arrow bitmaps, use @code{((top . left) @cindex whitespace, trailing @vindex show-trailing-whitespace It is easy to leave unnecessary spaces at the end of a line, or -empty lines at the end of a file, without realizing it. In most -cases, this @dfn{trailing whitespace} has no effect, but there are -special circumstances where it matters, and it can be a nuisance. +empty lines at the end of a buffer, without realizing it. In most +cases, this @dfn{trailing whitespace} has no effect, but sometimes it +can be a nuisance. You can make trailing whitespace at the end of a line visible by setting the buffer-local variable @code{show-trailing-whitespace} to @@ -1061,9 +1071,13 @@ the location of point is enough to show you that the spaces are present. @findex delete-trailing-whitespace +@vindex delete-trailing-lines Type @kbd{M-x delete-trailing-whitespace} to delete all trailing -whitespace within the buffer. If the region is active, it deletes all -trailing whitespace in the region instead. +whitespace. This command deletes all extra spaces at the end of each +line in the buffer, and all empty lines at the end of the buffer; to +ignore the latter, change the variable @code{delete-trailing-lines} to +@code{nil}. If the region is active, the command instead deletes +extra spaces at the end of each line in the region. @vindex indicate-empty-lines @cindex unused lines @@ -1075,7 +1089,7 @@ buffer text, so blank lines at the end of the buffer stand out because they lack this image. To enable this feature, set the buffer-local variable @code{indicate-empty-lines} to a non-@code{nil} value. You can enable or disable this feature for all new buffers by setting the -default value of this variable, e.g.@: @code{(setq-default +default value of this variable, e.g., @code{(setq-default indicate-empty-lines t)}. @cindex Whitespace mode @@ -1244,7 +1258,7 @@ line looks like this: Here @var{hh} and @var{mm} are the hour and minute, followed always by @samp{am} or @samp{pm}. @var{l.ll} is the average number, collected for the last few minutes, of processes in the whole system that were -either running or ready to run (i.e.@: were waiting for an available +either running or ready to run (i.e., were waiting for an available processor). (Some fields may be missing if your operating system cannot support them.) If you prefer time display in 24-hour format, set the variable @code{display-time-24hr-format} to @code{t}. @@ -1355,7 +1369,7 @@ as octal escape sequences instead of caret escape sequences. Some non-@acronym{ASCII} characters have the same appearance as an @acronym{ASCII} space or hyphen (minus) character. Such characters can cause problems if they are entered into a buffer without your -realization, e.g.@: by yanking; for instance, source code compilers +realization, e.g., by yanking; for instance, source code compilers typically do not treat non-@acronym{ASCII} spaces as whitespace characters. To deal with this problem, Emacs displays such characters specially: it displays @code{U+00A0} (no-break space) with the @@ -1489,6 +1503,7 @@ attempts to wrap the line at word boundaries near the right window edge. This makes the text easier to read, as wrapping does not occur in the middle of words. +@cindex mode, Visual Line @cindex Visual Line mode @findex visual-line-mode @findex global-visual-line-mode diff --git a/doc/emacs/doclicense.texi b/doc/emacs/doclicense.texi index 51342e96d60..9c3bbe56e91 100644 --- a/doc/emacs/doclicense.texi +++ b/doc/emacs/doclicense.texi @@ -1,4 +1,3 @@ -@c -*-texinfo-*- @c The GNU Free Documentation License. @center Version 1.3, 3 November 2008 @@ -6,7 +5,7 @@ @c hence no sectioning command or @node. @display -Copyright @copyright{} 2000, 2001, 2002, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. @uref{http://fsf.org/} Everyone is permitted to copy and distribute verbatim copies @@ -93,16 +92,16 @@ An image format is not Transparent if used for any substantial amount of text. A copy that is not ``Transparent'' is called ``Opaque''. Examples of suitable formats for Transparent copies include plain -@sc{ascii} without markup, Texinfo input format, La@TeX{} input -format, @acronym{SGML} or @acronym{XML} using a publicly available -@acronym{DTD}, and standard-conforming simple @acronym{HTML}, -PostScript or @acronym{PDF} designed for human modification. Examples -of transparent image formats include @acronym{PNG}, @acronym{XCF} and -@acronym{JPG}. Opaque formats include proprietary formats that can be -read and edited only by proprietary word processors, @acronym{SGML} or -@acronym{XML} for which the @acronym{DTD} and/or processing tools are -not generally available, and the machine-generated @acronym{HTML}, -PostScript or @acronym{PDF} produced by some word processors for +ASCII without markup, Texinfo input format, La@TeX{} input +format, SGML or XML using a publicly available +DTD, and standard-conforming simple HTML, +PostScript or PDF designed for human modification. Examples +of transparent image formats include PNG, XCF and +JPG@. Opaque formats include proprietary formats that can be +read and edited only by proprietary word processors, SGML or +XML for which the DTD and/or processing tools are +not generally available, and the machine-generated HTML, +PostScript or PDF produced by some word processors for output purposes only. The ``Title Page'' means, for a printed book, the title page itself, @@ -482,7 +481,7 @@ license notices just after the title page: @end smallexample If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with@dots{}Texts.'' line with this: +replace the ``with@dots{}Texts.''@: line with this: @smallexample @group @@ -501,8 +500,6 @@ recommend releasing these examples in parallel under your choice of free software license, such as the GNU General Public License, to permit their use in free software. - @c Local Variables: @c ispell-local-pdict: "ispell-dict" @c End: - diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 6357aebc6ff..423435ae111 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -261,12 +261,14 @@ Basic Editing Commands The Minibuffer +* Basic Minibuffer:: Basic usage of the minibuffer. * Minibuffer File:: Entering file names with the minibuffer. * Minibuffer Edit:: How to edit in the minibuffer. * Completion:: An abbreviation facility for minibuffer input. * Minibuffer History:: Reusing recent minibuffer arguments. * Repetition:: Re-executing commands that used the minibuffer. * Passwords:: Entering passwords in the echo area. +* Yes or No Prompts:: Replying yes or no in the echo area. Completion @@ -372,6 +374,7 @@ Searching and Replacement * Incremental Search:: Search happens as you type the string. * Nonincremental Search:: Specify entire string and then search. * Word Search:: Search for sequence of words. +* Symbol Search:: Search for a source code symbol. * Regexp Search:: Search for match for a regexp. * Regexps:: Syntax of regular expressions. * Regexp Backslash:: Regular expression constructs starting with `\'. @@ -953,7 +956,7 @@ The Diary * Special Diary Entries:: Anniversaries, blocks of dates, cyclic entries, etc. @ifnottex -Customizing the Calendar and Diary +More advanced features of the Calendar and Diary * Calendar Customizing:: Calendar layout and hooks. * Holiday Customizing:: Defining your own holidays. @@ -1136,6 +1139,7 @@ Dealing with Emacs Trouble * Screen Garbled:: Garbage on the screen. * Text Garbled:: Garbage in the text. * Memory Full:: How to cope when you run out of memory. +* Crashing:: What Emacs does when it crashes. * After a Crash:: Recovering editing in an Emacs session that crashed. * Emergency Escape:: What to do if Emacs stops responding. @@ -1319,13 +1323,13 @@ when you get it, not just free for the manufacturer. If you find GNU Emacs useful, please @strong{send a donation} to the Free Software Foundation to support our work. Donations to the Free -Software Foundation are tax deductible in the US. If you use GNU Emacs -at your workplace, please suggest that the company make a donation. +Software Foundation are tax deductible in the US@. If you use GNU Emacs +at your workplace, please suggest that the company make a donation. For more information on how you can help, see @url{http://www.gnu.org/help/help.html}. We also sell hardcopy versions of this manual and @cite{An -Introduction to Programming in Emacs Lisp}, by Robert J.@: Chassell. +Introduction to Programming in Emacs Lisp}, by Robert J. Chassell. You can visit our online store at @url{http://shop.fsf.org/}. The income from sales goes to support the foundation's purpose: the development of new free software, and improvements to our existing @@ -1346,15 +1350,15 @@ USA @unnumberedsec Acknowledgments Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas -Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy +Abrahamsson, Jay K. Adams, Alon Albert, Michael Albinus, Nagy Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Åström, Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas -Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff, +Baumann, Steven L. Baur, Jay Belanger, Alexander L. Belikoff, Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl -Berry, Anna M.@: Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan +Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner, Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin -Broadey, Vincent Broman, Michael Brouwer, David M.@: Brown, Stefan Bruda, +Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Stefan Bruda, Georges Brun-Cottan, Joe Buehler, Scott Byer, W@l{}odek Bzyl, Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James @@ -1363,44 +1367,44 @@ Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag, Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eri -Ding, Jan Djärv, Lawrence R.@: Dodd, Carsten Dominik, Scott Draves, +Ding, Jan Djärv, Lawrence R. Dodd, Carsten Dominik, Scott Draves, Benjamin Drieu, Viktor Dukhovni, Jacques Duthen, Dmitry Dzhus, John Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen Eglen, Christian Egli, Torbjörn Einarsson, Tsugutomo Enami, David Engster, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, Frederick Farnbach, Oscar Figueiredo, Fred Fish, Steve Fisk, Karl Fogel, Gary -Foster, Eric S.@: Fraga, Romain Francoise, Noah Friedman, Andreas -Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S.@: +Foster, Eric S. Fraga, Romain Francoise, Noah Friedman, Andreas +Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S. Galbraith, Kevin Gallagher, Kevin Gallo, Juan León Lahoz García, Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David Gillespie, Bob Glickstein, Deepak Goel, David De La Harpe Golden, Boris Goldowsky, David Goodger, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd Gripenstam, Kai Großjohann, Michael Gschwind, Bastien Guerry, Henry Guillaume, Doug Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris -Hanson, Jesper Harder, Alexandru Harsanyi, K.@: Shane Hartman, John -Heidemann, Jon K.@: Hellan, Magnus Henoch, Markus Heritsch, Dirk +Hanson, Jesper Harder, Alexandru Harsanyi, K. Shane Hartman, John +Heidemann, Jon K. Hellan, Magnus Henoch, Markus Heritsch, Dirk Herrmann, Karl Heuer, Manabu Higashida, Konrad Hinsen, Anders Holst, -Jeffrey C.@: Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim +Jeffrey C. Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue, Philip Jackson, Martyn Jago, Pavel Janik, Paul Jarc, Ulf Jasper, -Thorsten Jolitz, Michael K.@: Johnson, Kyle Jones, Terry Jones, Simon +Thorsten Jolitz, Michael K. Johnson, Kyle Jones, Terry Jones, Simon Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani, Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Ivan Kanis, David Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi, Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel -Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K.@: Kolodney, David -M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer, +Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David +M. Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer, Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl -Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius Jose +Landstrom, Mario Lang, Aaron Larson, James R. Larus, Vinicius Jose Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link, -Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C.@: Lopes, +Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C. Lopes, Martin Lorentzon, Dave Love, Eric Ludlam, Károly L@H{o}rentey, Sascha Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie, -Christopher J.@: Madsen, Neil M.@: Mager, Ken Manheimer, Bill Mann, +Christopher J. Madsen, Neil M. Mager, Ken Manheimer, Bill Mann, Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin, -Yukihiro Matsumoto, David Maus, Thomas May, Will Mengarini, David -Megginson, Stefan Merten, Ben A.@: Mesander, Wayne Mesard, Brad +Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David +Megginson, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Moellmann, Stefan Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris, Don Morrison, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum, @@ -1408,44 +1412,44 @@ Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen, Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Niksic, Jeff Norden, Andrew Norman, Kentaro Ohkouchi, Christian Ohler, Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota, -Pieter E.@: J.@: Pareit, Ross Patterson, David Pearson, Juan Pechiar, -Jeff Peck, Damon Anton Permezel, Tom Perrine, William M.@: Perry, Per -Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L.@: +Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar, +Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per +Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L. Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian -Plaunt, Alexander Pohoyda, David Ponce, Francesco A.@: Potorti, -Michael D.@: Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin -Ram, Eric S.@: Raymond, Paul Reilly, Edward M.@: Reingold, David +Plaunt, Alexander Pohoyda, David Ponce, Francesco A. Potorti, +Michael D. Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin +Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick -Roberts, Roland B.@: Roberts, John Robinson, Denis B.@: Roegel, Danny +Roberts, Roland B. Roberts, John Robinson, Denis B. Roegel, Danny Roozendaal, Sebastian Rose, William Rosenblatt, Markus Rost, Guillermo -J.@: Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang -Rupprecht, Benjamin Rutt, Kevin Ryde, James B.@: Salem, Masahiko Sato, +J. Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang +Rupprecht, Benjamin Rutt, Kevin Ryde, James B. Salem, Masahiko Sato, Timo Savola, Jorgen Schaefer, Holger Schauer, William Schelter, Ralph -Schleicher, Gregor Schmid, Michael Schmidt, Ronald S.@: Schnell, +Schleicher, Gregor Schmid, Michael Schmidt, Ronald S. Schnell, Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Stefan Schoef, Rainer Schoepf, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel, Manuel Serrano, Paul Sexton, Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor @v{S}imko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith, -David Smith, Paul D.@: Smith, Wilson Snyder, William Sommerfeld, Simon +David Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon South, Andre Spiegel, Michael Staats, Thomas Steffen, Ulf Stegemann, Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken -Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.@: +Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F. Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto Takahashi, Steven Tamm, Luc Teirlinck, Jean-Philippe Theberge, Jens -T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Toru Tomabechi, +T. Berger Thielemann, Spencer Thomas, Jim Thompson, Toru Tomabechi, David O'Toole, Markus Triska, Tom Tromey, Enami Tsugutomo, Eli Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil -W.@: Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey +W. Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey Voelker, Johan Vromans, Inge Wallin, John Paul Wallington, Colin Walters, Barry Warsaw, Christoph Wedler, Ilja Weis, Zhang Weize, Morten Welinder, Joseph Brian Wells, Rodney Whitby, John Wiegley, Sascha Wilde, Ed Wilkinson, Mike Williams, Roland Winkler, Bill -Wohler, Steven A.@: Wood, Dale R.@: Worley, Francis J.@: Wright, Felix -S.@: T.@: Wu, Tom Wurgler, Yamamoto Mitsuharu, Katsumi Yamaoka, +Wohler, Steven A. Wood, Dale R. Worley, Francis J. Wright, Felix +S. T. Wu, Tom Wurgler, Yamamoto Mitsuharu, Katsumi Yamaoka, Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya Zakharevich, Milan Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Andrew Zhilin, -Shenghuo Zhu, Piotr Zielinski, Ian T.@: Zimmermann, Reto Zimmermann, +Shenghuo Zhu, Piotr Zielinski, Ian T. Zimmermann, Reto Zimmermann, Neal Ziring, Teodor Zlatanov, and Detlev Zundel. @end iftex diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index 3b54719ad77..408d6612d58 100644 --- a/doc/emacs/emacsver.texi +++ b/doc/emacs/emacsver.texi @@ -1,4 +1,4 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.2.50 +@set EMACSVER 24.3.50 diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi index 552580ef851..66b1066e888 100644 --- a/doc/emacs/emerge-xtra.texi +++ b/doc/emacs/emerge-xtra.texi @@ -186,12 +186,12 @@ haven't made a choice. All differences start in the default-A state which one alternative is ``preferred'' (see below). When you select a difference, its state changes from default-A or -default-B to plain A or B. Thus, the selected difference never has +default-B to plain A or B@. Thus, the selected difference never has state default-A or default-B, and these states are never displayed in the mode line. The command @kbd{d a} chooses default-A as the default state, and @kbd{d -b} chooses default-B. This chosen default applies to all differences +b} chooses default-B@. This chosen default applies to all differences that you have never selected and for which no alternative is preferred. If you are moving through the merge sequentially, the differences you haven't selected are those following the selected one. Thus, while @@ -375,7 +375,7 @@ While this example shows C preprocessor conditionals delimiting the two alternative versions, you can specify the strings to use by setting the variable @code{emerge-combine-versions-template} to a string of your choice. In the string, @samp{%a} says where to put version A, and -@samp{%b} says where to put version B. The default setting, which +@samp{%b} says where to put version B@. The default setting, which produces the results shown above, looks like this: @example diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index de143516ce8..224ab356d08 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -79,11 +79,6 @@ non-@code{nil} value. (In that case, even if you specify one or more files on the command line, Emacs opens but does not display them.) The value of @code{initial-buffer-choice} should be the name of the desired file or directory. -@ignore -@c I do not think this should be mentioned. AFAICS it is just a dodge -@c around inhibit-startup-screen not being settable on a site-wide basis. -or @code{t}, which means to display the @file{*scratch*} buffer. -@end ignore @node Exiting @section Exiting Emacs diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 422100e27b9..1845ba3eed1 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -72,7 +72,7 @@ directory into the minibuffer as the initial contents. You can inhibit this insertion by changing the variable @code{insert-default-directory} to @code{nil} (@pxref{Minibuffer File}). Regardless, Emacs always assumes that any relative file name -is relative to the default directory, e.g. entering a file name +is relative to the default directory, e.g., entering a file name without a directory specifies a file in the default directory. @findex cd @@ -246,7 +246,7 @@ Archives}, for more about these features. or that is marked read-only, Emacs makes the buffer read-only too, so that you won't go ahead and make changes that you'll have trouble saving afterward. You can make the buffer writable with @kbd{C-x C-q} -(@code{toggle-read-only}). @xref{Misc Buffer}. +(@code{read-only-mode}). @xref{Misc Buffer}. @kindex C-x C-r @findex find-file-read-only @@ -773,7 +773,7 @@ spurious, just use @kbd{p} to tell Emacs to go ahead anyway. multiple names, Emacs does not prevent two users from editing it simultaneously under different names. - A lock file cannot be written in some circumstances, e.g. if Emacs + A lock file cannot be written in some circumstances, e.g., if Emacs lacks the system permissions or the system does not support symbolic links. In these cases, Emacs can still detect the collision when you try to save a file, by checking the file's last-modification date. If @@ -1341,7 +1341,7 @@ contents of the hunk. You can edit a Diff mode buffer like any other buffer. (If it is read-only, you need to make it writable first. @xref{Misc Buffer}.) Whenever you change a hunk, Diff mode attempts to automatically -correct the line numbers in the hunk headers, to ensure that the diff +correct the line numbers in the hunk headers, to ensure that the patch remains ``correct''. To disable automatic line number correction, change the variable @code{diff-update-on-the-fly} to @code{nil}. @@ -1470,11 +1470,22 @@ name from the patch itself. This is useful for making log entries for functions that are deleted by the patch. @end table - By default, Diff mode highlights trailing whitespace on modified -lines, so that they are more obvious. This is done by enabling -Whitespace mode in the Diff buffer (@pxref{Useless Whitespace}). Diff -mode buffers are set up so that Whitespace mode avoids highlighting -trailing whitespace occurring in the diff context. +@c Trailing whitespace is NOT shown by default. +@c Emacs's dir-locals file enables this (for some reason). +@cindex trailing whitespace, in patches +@findex diff-delete-trailing-whitespace + Patches sometimes include trailing whitespace on modified lines, as +an unintentional and undesired change. There are two ways to deal +with this problem. Firstly, if you enable Whitespace mode in a Diff +buffer (@pxref{Useless Whitespace}), it automatically highlights +trailing whitespace in modified lines. Secondly, you can use the +command @kbd{M-x diff-delete-trailing-whitespace}, which searches for +trailing whitespace in the lines modified by the patch, and removes +that whitespace in both the patch and the patched source file(s). +This command does not save the modifications that it makes, so you can +decide whether to save the changes (the list of modified files is +displayed in the echo area). With a prefix argument, it tries to +modify the original source files rather than the patched source files. @node Misc File Ops @section Miscellaneous File Operations @@ -1564,9 +1575,8 @@ open file @var{linkname} will refer to whatever file is named @var{target} at the time the opening is done, or will get an error if the name @var{target} is nonexistent at that time. This command does not expand the argument @var{target}, so that it allows you to specify -a relative name as the target of the link. Not all systems support -symbolic links; on systems that don't support them, this command is -not defined. +a relative name as the target of the link. On MS-Windows, this +command works only on MS Windows Vista and later. @kindex C-x i @findex insert-file @@ -1931,15 +1941,22 @@ non-@code{nil}. Currently, Emacs only supports animation in GIF files. @cindex ImageMagick support - If your Emacs was compiled with ImageMagick support, it is possible -to view a much wider variety of image types in Image mode, by -rendering the images via ImageMagick. However, this feature is -currently disabled by default. To enable it, add the following line -to your init file: - -@example -(imagemagick-register-types) -@end example +@vindex imagemagick-enabled-types +@vindex imagemagick-types-inhibit + If Emacs was compiled with support for the ImageMagick library, it +can use ImageMagick to render a wide variety of images. The variable +@code{imagemagick-enabled-types} lists the image types that Emacs may +render using ImageMagick; each element in the list should be an +internal ImageMagick name for an image type, as a symbol or an +equivalent string (e.g., @code{BMP} for @file{.bmp} images). To +enable ImageMagick for all possible image types, change +@code{imagemagick-enabled-types} to @code{t}. The variable +@code{imagemagick-types-inhibit} lists the image types which should +never be rendered using ImageMagick, regardless of the value of +@code{imagemagick-enabled-types} (the default list includes types like +@code{C} and @code{HTML}, which ImageMagick can render as an ``image'' +but Emacs should not). To disable ImageMagick entirely, change +@code{imagemagick-types-inhibit} to @code{t}. @findex thumbs-mode @findex mode, thumbs diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi index 43e2e63863e..4a00090eba8 100644 --- a/doc/emacs/fortran-xtra.texi +++ b/doc/emacs/fortran-xtra.texi @@ -89,7 +89,7 @@ Move to the beginning of the next statement @item C-c C-p Move to the beginning of the previous statement (@code{fortran-previous-statement}/@code{f90-previous-statement}). -If there is no previous statement (i.e. if called from the first +If there is no previous statement (i.e., if called from the first statement in the buffer), move to the start of the buffer. @kindex C-c C-e @r{(F90 mode)} diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index e1b849e630e..79276438eb8 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -6,7 +6,7 @@ @chapter Frames and Graphical Displays @cindex frames - When Emacs is started on a graphical display, e.g.@: on the X Window + When Emacs is started on a graphical display, e.g., on the X Window System, it occupies a graphical system-level ``window''. In this manual, we call this a @dfn{frame}, reserving the word ``window'' for the part of the frame used for displaying a buffer. A frame initially @@ -246,8 +246,8 @@ Select the text you drag across, in the form of whole lines. @vindex mouse-highlight Some Emacs buffers include @dfn{buttons}, or @dfn{hyperlinks}: -pieces of text that perform some action (e.g.@: following a reference) -when activated (e.g.@: by clicking on them). Usually, a button's text +pieces of text that perform some action (e.g., following a reference) +when activated (e.g., by clicking on them). Usually, a button's text is visually highlighted: it is underlined, or a box is drawn around it. If you move the mouse over a button, the shape of the mouse cursor changes and the button lights up. If you change the variable @@ -631,7 +631,7 @@ Monospace Bold Italic 12 @cindex X Logical Font Description The third way to specify a font is to use an @dfn{XLFD} (@dfn{X Logical Font Description}). This is the traditional method for -specifying fonts under X. Each XLFD consists of fourteen words or +specifying fonts under X@. Each XLFD consists of fourteen words or numbers, separated by dashes, like this: @example @@ -644,7 +644,7 @@ characters (including none), and @samp{?} matches any single character. However, matching is implementation-dependent, and can be inaccurate when wildcards match dashes in a long name. For reliable results, supply all 14 dashes and use wildcards only within a field. -Case is insignificant in an XLFD. The syntax for an XLFD is as +Case is insignificant in an XLFD@. The syntax for an XLFD is as follows: @example @@ -659,7 +659,7 @@ The entries have the following meanings: @item maker The name of the font manufacturer. @item family -The name of the font family (e.g.@: @samp{courier}). +The name of the font family (e.g., @samp{courier}). @item weight The font weight---normally either @samp{bold}, @samp{medium} or @samp{light}. Some font names support other values. @@ -1067,7 +1067,7 @@ attributes of the tooltip text are specified by the @code{tooltip} face, and by X resources (@pxref{X Resources}). @dfn{GUD tooltips} are special tooltips that show the values of -variables when debugging a program with GUD. @xref{Debugger +variables when debugging a program with GUD@. @xref{Debugger Operation}. @node Mouse Avoidance @@ -1092,17 +1092,19 @@ to various values to move the mouse in several ways: @table @code @item banish -Move the mouse to the upper-right corner on any key-press; +Move the pointer to a corner of the frame on any key-press. You can +customize the variable @code{mouse-avoidance-banish-position} to +specify where the pointer goes when it is banished. @item exile -Move the mouse to the corner only if the cursor gets too close, -and allow it to return once the cursor is out of the way; +Banish the pointer only if the cursor gets too close, and allow it to +return once the cursor is out of the way. @item jump -If the cursor gets too close to the mouse, displace the mouse -a random distance & direction; +If the cursor gets too close to the pointer, displace the pointer by a +random distance and direction. @item animate -As @code{jump}, but shows steps along the way for illusion of motion; +As @code{jump}, but shows steps along the way for illusion of motion. @item cat-and-mouse -The same as @code{animate}; +The same as @code{animate}. @item proteus As @code{animate}, but changes the shape of the mouse pointer too. @end table diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index 0912cfe5311..c4f27a209fb 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -14,7 +14,7 @@ as an abbrev for a long phrase that you want to insert frequently. @xref{Abbrevs}. @item Aborting -Aborting means getting out of a recursive edit (q.v.@:). The +Aborting means getting out of a recursive edit (q.v.). The commands @kbd{C-]} and @kbd{M-x top-level} are used for this. @xref{Quitting}. @@ -62,7 +62,7 @@ function from those libraries. This is called `autoloading'. @item Backtrace A backtrace is a trace of a series of function calls showing how a program arrived at a certain point. It is used mainly for finding and -correcting bugs (q.v.@:). Emacs can display a backtrace when it signals +correcting bugs (q.v.). Emacs can display a backtrace when it signals an error or when you type @kbd{C-g} (@pxref{Glossary - Quitting}). @xref{Checklist}. @@ -83,14 +83,14 @@ delimiter for you (@pxref{Matching,,Matching Parens}). @item Balanced Expressions A balanced expression is a syntactically recognizable expression, such as a symbol, number, string constant, block, or parenthesized expression -in C. @xref{Expressions,Balanced Expressions}. +in C@. @xref{Expressions,Balanced Expressions}. @item Balloon Help @xref{Glossary - Tooltips}. @item Base Buffer A base buffer is a buffer whose text is shared by an indirect buffer -(q.v.@:). +(q.v.). @item Bidirectional Text Some human languages, such as English, are written from left to right. @@ -99,16 +99,16 @@ supports both of these forms, as well as any mixture of them---this is `bidirectional text'. @xref{Bidirectional Editing}. @item Bind -To bind a key sequence means to give it a binding (q.v.@:). +To bind a key sequence means to give it a binding (q.v.). @xref{Rebinding}. @anchor{Glossary - Binding} @item Binding A key sequence gets its meaning in Emacs by having a binding, which is a -command (q.v.@:), a Lisp function that is run when you type that +command (q.v.), a Lisp function that is run when you type that sequence. @xref{Commands,Binding}. Customization often involves rebinding a character to a different command function. The bindings of -all key sequences are recorded in the keymaps (q.v.@:). @xref{Keymaps}. +all key sequences are recorded in the keymaps (q.v.). @xref{Keymaps}. @item Blank Lines Blank lines are lines that contain only whitespace. Emacs has several @@ -126,13 +126,13 @@ external border, outside of everything including the menu bar, plus an internal border that surrounds the text windows, their scroll bars and fringes, and separates them from the menu bar and tool bar. You can customize both borders with options and resources (@pxref{Borders -X}). Borders are not the same as fringes (q.v.@:). +X}). Borders are not the same as fringes (q.v.). @item Buffer The buffer is the basic editing unit; one buffer corresponds to one text being edited. You normally have several buffers, but at any time you are editing only one, the `current buffer', though several can be visible -when you are using multiple windows or frames (q.v.@:). Most buffers +when you are using multiple windows or frames (q.v.). Most buffers are visiting (q.v.@:) some file. @xref{Buffers}. @item Buffer Selection History @@ -194,7 +194,7 @@ press a mouse button and release it without moving the mouse. @item Clipboard A clipboard is a buffer provided by the window system for transferring text between applications. On the X Window System, the clipboard is -provided in addition to the primary selection (q.v.@:); on MS-Windows and Mac, +provided in addition to the primary selection (q.v.); on MS-Windows and Mac, the clipboard is used @emph{instead} of the primary selection. @xref{Clipboard}. @@ -206,7 +206,7 @@ text to or from a variety of coding systems when reading or writing it. @item Command A command is a Lisp function specially defined to be able to serve as a -key binding in Emacs. When you type a key sequence (q.v.@:), its +key binding in Emacs. When you type a key sequence (q.v.), its binding (q.v.@:) is looked up in the relevant keymaps (q.v.@:) to find the command to run. @xref{Commands}. @@ -241,7 +241,7 @@ Reference Manual}) and programs in C and other languages A complete key is a key sequence that fully specifies one action to be performed by Emacs. For example, @kbd{X} and @kbd{C-f} and @kbd{C-x m} are complete keys. Complete keys derive their meanings from being bound -(q.v.@:) to commands (q.v.@:). Thus, @kbd{X} is conventionally bound to +(q.v.@:) to commands (q.v.). Thus, @kbd{X} is conventionally bound to a command to insert @samp{X} in the buffer; @kbd{C-x m} is conventionally bound to a command to begin composing a mail message. @xref{Keys}. @@ -261,7 +261,7 @@ normally (but see @ref{Glossary - Truncation}) takes up more than one screen line when displayed. We say that the text line is continued, and all screen lines used for it after the first are called continuation lines. @xref{Continuation Lines}. A related Emacs feature is -`filling' (q.v.@:). +`filling' (q.v.). @item Control Character A control character is a character that you type by holding down the @@ -358,7 +358,7 @@ key or the @key{BACKSPACE} key, whichever one is easy to type. @item Deletion Deletion means erasing text without copying it into the kill ring -(q.v.@:). The alternative is killing (q.v.@:). @xref{Killing,Deletion}. +(q.v.). The alternative is killing (q.v.). @xref{Killing,Deletion}. @anchor{Glossary - Deletion of Files} @item Deletion of Files @@ -401,7 +401,7 @@ confirmation. The usual reason for disabling a command is that it is confusing for beginning users. @xref{Disabling}. @item Down Event -Short for `button down event' (q.v.@:). +Short for `button down event' (q.v.). @item Drag Event A drag event is the kind of input event (q.v.@:) generated when you @@ -431,7 +431,7 @@ them. @item Electric We say that a character is electric if it is normally self-inserting -(q.v.@:), but the current major mode (q.v.@:) redefines it to do something +(q.v.), but the current major mode (q.v.@:) redefines it to do something else as well. For example, some programming language major modes define particular delimiter characters to reindent the line, or insert one or more newlines in addition to self-insertion. @@ -440,7 +440,7 @@ more newlines in addition to self-insertion. @item End Of Line End of line is a character or a sequence of characters that indicate the end of a text line. On GNU and Unix systems, this is a newline -(q.v.@:), but other systems have other conventions. @xref{Coding +(q.v.), but other systems have other conventions. @xref{Coding Systems,end-of-line}. Emacs can recognize several end-of-line conventions in files and convert between them. @@ -458,7 +458,7 @@ variables in the environment it passes to programs it invokes. An error occurs when an Emacs command cannot execute in the current circumstances. When an error occurs, execution of the command stops (unless the command has been programmed to do otherwise) and Emacs -reports the error by displaying an error message (q.v.@:). +reports the error by displaying an error message (q.v.). @c Not helpful? @c Type-ahead is discarded. Then Emacs is ready to read another @c editing command. @@ -510,11 +510,11 @@ directory, but an absolute file name refers to the same file regardless of which directory is current. On GNU and Unix systems, an absolute file name starts with a slash (the root directory) or with @samp{~/} or @samp{~@var{user}/} (a home directory). On MS-Windows/MS-DOS, an -absolute file name can also start with a drive letter and a colon, e.g. +absolute file name can also start with a drive letter and a colon, e.g., @samp{@var{d}:}. Some people use the term ``pathname'' for file names, but we do not; -we use the word ``path'' only in the term ``search path'' (q.v.@:). +we use the word ``path'' only in the term ``search path'' (q.v.). @item File-Name Component A file-name component names a file directly within a particular @@ -556,25 +556,25 @@ fontset, rather than changing each font separately. @xref{Fontsets}. @item Frame A frame is a rectangular cluster of Emacs windows. Emacs starts out with one frame, but you can create more. You can subdivide each frame -into Emacs windows (q.v.@:). When you are using a window system -(q.v.@:), more than one frame can be visible at the same time. +into Emacs windows (q.v.). When you are using a window system +(q.v.), more than one frame can be visible at the same time. @xref{Frames}. Some other editors use the term ``window'' for this, but in Emacs a window means something else. @item Free Software Free software is software that gives you the freedom to share, study and modify it. Emacs is free software, part of the GNU project -(q.v.@:), and distributed under a copyleft (q.v.@:) license called the +(q.v.), and distributed under a copyleft (q.v.@:) license called the GNU General Public License. @xref{Copying}. @anchor{Glossary - Free Software Foundation} @item Free Software Foundation The Free Software Foundation (FSF) is a charitable foundation -dedicated to promoting the development of free software (q.v.@:). +dedicated to promoting the development of free software (q.v.). For more information, see @uref{http://fsf.org/, the FSF website}. @item Fringe -On a graphical display (q.v.@:), there's a narrow portion of the frame +On a graphical display (q.v.), there's a narrow portion of the frame (q.v.@:) between the text area and the window's border. These ``fringes'' are used to display symbols that provide information about the buffer text (@pxref{Fringes}). Emacs displays the fringe using a @@ -585,7 +585,7 @@ special face (q.v.@:) called @code{fringe}. @xref{Faces,fringe}. @item FTP FTP is an acronym for File Transfer Protocol. This is one standard -method for retrieving remote files (q.v.@:). +method for retrieving remote files (q.v.). @item Function Key A function key is a key on the keyboard that sends input but does not @@ -593,7 +593,7 @@ correspond to any character. @xref{Function Keys}. @item Global Global means ``independent of the current environment; in effect -throughout Emacs''. It is the opposite of local (q.v.@:). Particular +throughout Emacs''. It is the opposite of local (q.v.). Particular examples of the use of `global' appear below. @item Global Abbrev @@ -604,7 +604,7 @@ modes that do not have local (q.v.@:) definitions for the same abbrev. @item Global Keymap The global keymap (q.v.@:) contains key bindings that are in effect everywhere, except when overridden by local key bindings in a major -mode's local keymap (q.v.@:). @xref{Keymaps}. +mode's local keymap (q.v.). @xref{Keymaps}. @item Global Mark Ring The global mark ring records the series of buffers you have recently @@ -624,7 +624,7 @@ that do not have their own local (q.v.@:) values for the variable. @item GNU GNU is a recursive acronym for GNU's Not Unix, and it refers to a -Unix-compatible operating system which is free software (q.v.@:). +Unix-compatible operating system which is free software (q.v.). @xref{Manifesto}. GNU is normally used with Linux as the kernel since Linux works better than the GNU kernel. For more information, see @uref{http://www.gnu.org/, the GNU website}. @@ -639,7 +639,7 @@ that character (in ordinary editing modes). @xref{Inserting Text}. @item Graphical Display A graphical display is one that can display images and multiple fonts. -Usually it also has a window system (q.v.@:). +Usually it also has a window system (q.v.). @item Highlighting Highlighting text means displaying it with a different foreground and/or @@ -664,7 +664,7 @@ Help echo is a short message displayed in the echo area (q.v.@:) when the mouse pointer is located on portions of display that require some explanations. Emacs displays help echo for menu items, parts of the mode line, tool-bar buttons, etc. On graphical displays, the messages -can be displayed as tooltips (q.v.@:). @xref{Tooltips}. +can be displayed as tooltips (q.v.). @xref{Tooltips}. @item Home Directory Your home directory contains your personal files. On a multi-user GNU @@ -712,7 +712,7 @@ commands to adjust indentation. @item Indirect Buffer An indirect buffer is a buffer that shares the text of another buffer, -called its base buffer (q.v.@:). @xref{Indirect Buffers}. +called its base buffer (q.v.). @xref{Indirect Buffers}. @item Info Info is the hypertext format used by the GNU project for writing @@ -726,7 +726,7 @@ frames. @xref{User Input}. @item Input Method An input method is a system for entering non-@acronym{ASCII} text characters by -typing sequences of @acronym{ASCII} characters (q.v.@:). @xref{Input Methods}. +typing sequences of @acronym{ASCII} characters (q.v.). @xref{Input Methods}. @item Insertion Insertion means adding text into the buffer, either from the keyboard @@ -761,8 +761,8 @@ Emacs calls ``binding a key sequence''. @xref{Glossary - Binding}. @item Key Sequence A key sequence (key, for short) is a sequence of input events (q.v.@:) that are meaningful as a single unit. If the key sequence is enough to -specify one action, it is a complete key (q.v.@:); if it is not enough, -it is a prefix key (q.v.@:). @xref{Keys}. +specify one action, it is a complete key (q.v.); if it is not enough, +it is a prefix key (q.v.). @xref{Keys}. @item Keymap The keymap is the data structure that records the bindings (q.v.@:) of @@ -778,14 +778,14 @@ key sequences. @item Kill Ring The kill ring is where all text you have killed (@pxref{Glossary - Killing}) recently is saved. You can reinsert any of the killed text still in -the ring; this is called yanking (q.v.@:). @xref{Yanking}. +the ring; this is called yanking (q.v.). @xref{Yanking}. @anchor{Glossary - Killing} @item Killing Killing means erasing text and saving it on the kill ring so it can be yanked (q.v.@:) later. Some other systems call this ``cutting''. Most Emacs commands that erase text perform killing, as opposed to -deletion (q.v.@:). @xref{Killing}. +deletion (q.v.). @xref{Killing}. @item Killing a Job Killing a job (such as, an invocation of Emacs) means making it cease @@ -794,7 +794,7 @@ to exist. Any data within it, if not saved in a file, is lost. @item Language Environment Your choice of language environment specifies defaults for the input -method (q.v.@:) and coding system (q.v.@:). @xref{Language +method (q.v.@:) and coding system (q.v.). @xref{Language Environments}. These defaults are relevant if you edit non-@acronym{ASCII} text (@pxref{International}). @@ -821,7 +821,7 @@ lists. @xref{Moving by Parens}. Local means ``in effect only in a particular context''; the relevant kind of context is a particular function execution, a particular buffer, or a particular major mode. It is the opposite of `global' -(q.v.@:). Specific uses of `local' in Emacs terminology appear below. +(q.v.). Specific uses of `local' in Emacs terminology appear below. @item Local Abbrev A local abbrev definition is effective only if a particular major mode @@ -844,7 +844,7 @@ one of the modifier keys that can accompany any character. @item @kbd{M-C-} @kbd{M-C-} in the name of a character is an abbreviation for -Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.@:). +Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.). @item @kbd{M-x} @kbd{M-x} is the key sequence that is used to call an Emacs command by @@ -875,14 +875,14 @@ fringe) and the window edge. @item Mark The mark points to a position in the text. It specifies one end of the -region (q.v.@:), point being the other end. Many commands operate on +region (q.v.), point being the other end. Many commands operate on all the text from point to the mark. Each buffer has its own mark. @xref{Mark}. @item Mark Ring The mark ring is used to hold several recent previous locations of the mark, in case you want to move back to them. Each buffer has its -own mark ring; in addition, there is a single global mark ring (q.v.@:). +own mark ring; in addition, there is a single global mark ring (q.v.). @xref{Mark Ring}. @item Menu Bar @@ -911,7 +911,7 @@ A Meta character is one whose character code includes the Meta bit. @item Minibuffer The minibuffer is the window that appears when necessary inside the -echo area (q.v.@:), used for reading arguments to commands. +echo area (q.v.), used for reading arguments to commands. @xref{Minibuffer}. @anchor{Glossary - Minibuffer History} @@ -923,8 +923,8 @@ again. @xref{Minibuffer History}. @item Minor Mode A minor mode is an optional feature of Emacs, which can be switched on or off independently of all other features. Each minor mode has a -command to turn it on or off. Some minor modes are global (q.v.@:), -and some are local (q.v.@:). @xref{Minor Modes}. +command to turn it on or off. Some minor modes are global (q.v.), +and some are local (q.v.). @xref{Minor Modes}. @item Minor Mode Keymap A minor mode keymap is a keymap that belongs to a minor mode and is @@ -933,7 +933,7 @@ over the buffer's local keymap, just as the local keymap takes precedence over the global keymap. @xref{Keymaps}. @item Mode Line -The mode line is the line at the bottom of each window (q.v.@:), giving +The mode line is the line at the bottom of each window (q.v.), giving status information on the buffer displayed in that window. @xref{Mode Line}. @@ -949,7 +949,7 @@ yanking (q.v.@:) it. @xref{Killing}. @item MULE MULE refers to the Emacs features for editing multilingual -non-@acronym{ASCII} text using multibyte characters (q.v.@:). +non-@acronym{ASCII} text using multibyte characters (q.v.). @xref{International}. @item Multibyte Character @@ -959,7 +959,7 @@ since the number of non-@acronym{ASCII} characters is much more than 256. @xref{International Chars, International Characters}. @item Named Mark -A named mark is a register (q.v.@:), in its role of recording a +A named mark is a register (q.v.), in its role of recording a location in text so that you can move point to that location. @xref{Registers}. @@ -1037,7 +1037,7 @@ specify a different file name. @xref{Rmail}. @end ignore @item Primary Selection -The primary selection is one particular X selection (q.v.@:); it is the +The primary selection is one particular X selection (q.v.); it is the selection that most X applications use for transferring text to and from other applications. @@ -1047,7 +1047,7 @@ uses the primary selection when appropriate. @xref{Killing}. @item Prompt A prompt is text used to ask you for input. Displaying a prompt is called prompting. Emacs prompts always appear in the echo area -(q.v.@:). One kind of prompting happens when the minibuffer is used to +(q.v.). One kind of prompting happens when the minibuffer is used to read an argument (@pxref{Minibuffer}); the echoing that happens when you pause in the middle of typing a multi-character key sequence is also a kind of prompting (@pxref{Echo Area}). @@ -1104,13 +1104,13 @@ correspond to changes that have been made in the text being edited. @xref{Glossary - Regular Expression}. @item Region -The region is the text between point (q.v.@:) and the mark (q.v.@:). +The region is the text between point (q.v.@:) and the mark (q.v.). Many commands operate on the text of the region. @xref{Mark,Region}. @item Register Registers are named slots in which text, buffer positions, or rectangles can be saved for later use. @xref{Registers}. A related -Emacs feature is `bookmarks' (q.v.@:). +Emacs feature is `bookmarks' (q.v.). @anchor{Glossary - Regular Expression} @item Regular Expression @@ -1134,13 +1134,13 @@ you have a supported method to gain access to those files. @item Restriction A buffer's restriction is the amount of text, at the beginning or the end of the buffer, that is temporarily inaccessible. Giving a buffer a -nonzero amount of restriction is called narrowing (q.v.@:); removing -a restriction is called widening (q.v.@:). @xref{Narrowing}. +nonzero amount of restriction is called narrowing (q.v.); removing +a restriction is called widening (q.v.). @xref{Narrowing}. @item @key{RET} @key{RET} is a character that in Emacs runs the command to insert a newline into the text. It is also used to terminate most arguments -read in the minibuffer (q.v.@:). @xref{User Input,Return}. +read in the minibuffer (q.v.). @xref{User Input,Return}. @item Reverting Reverting means returning to the original state. Emacs lets you @@ -1180,7 +1180,7 @@ files for certain purposes. For example, the variable @code{load-path} holds a search path for finding Lisp library files. @xref{Lisp Libraries}. @item Secondary Selection -The secondary selection is one particular X selection (q.v.@:); some X +The secondary selection is one particular X selection (q.v.); some X applications can use it for transferring text to and from other applications. Emacs has special mouse commands for transferring text using the secondary selection. @xref{Secondary Selection}. @@ -1203,7 +1203,7 @@ selections whose values are text. A program can also read the selections that other programs have set up. This is the principal way of transferring text between window applications. Emacs has commands to work with the primary (q.v.@:) selection and the secondary (q.v.@:) -selection, and also with the clipboard (q.v.@:). +selection, and also with the clipboard (q.v.). @item Self-Documentation Self-documentation is the feature of Emacs that can tell you what any @@ -1297,7 +1297,7 @@ have. To make a character Super, type it while holding down the @item Suspending Suspending Emacs means stopping it temporarily and returning control to its parent process, which is usually a shell. Unlike killing a job -(q.v.@:), you can later resume the suspended Emacs job without losing +(q.v.), you can later resume the suspended Emacs job without losing your buffers, unsaved edits, undo history, etc. @xref{Exiting}. @item @key{TAB} @@ -1344,12 +1344,12 @@ they also specify formatting information. @xref{Editing Format Info}. @item Theme A theme is a set of customizations (q.v.@:) that give Emacs a particular appearance or behavior. For example, you might use a theme -for your favorite set of faces (q.v.@:). +for your favorite set of faces (q.v.). @item Tool Bar The tool bar is a line (sometimes multiple lines) of icons at the top of an Emacs frame. Clicking on one of these icons executes a command. -You can think of this as a graphical relative of the menu bar (q.v.@:). +You can think of this as a graphical relative of the menu bar (q.v.). @xref{Tool Bars}. @anchor{Glossary - Tooltips} @@ -1362,8 +1362,8 @@ clicks, etc. @xref{Tooltips}. Top level is the normal state of Emacs, in which you are editing the text of the file you have visited. You are at top level whenever you are not in a recursive editing level (q.v.@:) or the minibuffer -(q.v.@:), and not in the middle of a command. You can get back to top -level by aborting (q.v.@:) and quitting (q.v.@:). @xref{Quitting}. +(q.v.), and not in the middle of a command. You can get back to top +level by aborting (q.v.@:) and quitting (q.v.). @xref{Quitting}. @c FIXME? Transient Mark Mode @@ -1395,7 +1395,7 @@ back the text that existed earlier in the editing session. Unix is a class of multi-user computer operating systems with a long history. There are several implementations today. The GNU project (q.v.@:) aims to develop a complete Unix-like operating system that -is free software (q.v.@:). +is free software (q.v.). @item User Option A user option is a face (q.v.@:) or a variable (q.v.@:) that exists so @@ -1413,7 +1413,7 @@ information on variables. @item Version Control Version control systems keep track of multiple versions of a source file. -They provide a more powerful alternative to keeping backup files (q.v.@:). +They provide a more powerful alternative to keeping backup files (q.v.). @xref{Version Control}. @item Visiting @@ -1426,7 +1426,7 @@ tab, newline, and backspace). @item Widening Widening is removing any restriction (q.v.@:) on the current buffer; -it is the opposite of narrowing (q.v.@:). @xref{Narrowing}. +it is the opposite of narrowing (q.v.). @xref{Narrowing}. @item Window Emacs divides a frame (q.v.@:) into one or more windows, each of which @@ -1438,7 +1438,7 @@ other editors use the term ``window'' for what we call a `frame' @item Window System A window system is software that operates on a graphical display -(q.v.@:), to subdivide the screen so that multiple applications can +(q.v.), to subdivide the screen so that multiple applications can have their] own windows at the same time. All modern operating systems include a window system. @@ -1451,7 +1451,7 @@ punctuation between them as insignificant. @xref{Word Search}. @anchor{Glossary - Yanking} @item Yanking -Yanking means reinserting text previously killed (q.v.@:). It can be +Yanking means reinserting text previously killed (q.v.). It can be used to undo a mistaken kill, or for copying or moving text. Some other systems call this ``pasting''. @xref{Yanking}. @end table diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi index 0f21dd635db..805b10c8193 100644 --- a/doc/emacs/gnu.texi +++ b/doc/emacs/gnu.texi @@ -34,7 +34,7 @@ our web site, @uref{http://www.gnu.org}. For software tasks and other ways to contribute, see @uref{http://www.gnu.org/help}. @end quotation -@unnumberedsec What's GNU? Gnu's Not Unix! +@unnumberedsec What's GNU@? Gnu's Not Unix! GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-compatible software system which I am writing so that I can give it @@ -151,7 +151,7 @@ systems, approved for use in a residential area, and not in need of sophisticated cooling or power. I have found very many programmers eager to contribute part-time work for -GNU. For most projects, such part-time distributed work would be very hard +GNU@. For most projects, such part-time distributed work would be very hard to coordinate; the independently-written parts would not work together. But for the particular task of replacing Unix, this problem is absent. A complete Unix system contains hundreds of utility programs, each of which @@ -262,7 +262,7 @@ and you must charge for the program to support that.'' @end quotation There are various forms of free or very cheap publicity that can be used to -inform numbers of computer users about something like GNU. But it may be +inform numbers of computer users about something like GNU@. But it may be true that one can reach more microcomputer users with advertising. If this is really so, a business which advertises the service of copying and mailing GNU for a fee ought to be successful enough to pay for its @@ -271,7 +271,7 @@ advertising pay for it. On the other hand, if many people get GNU from their friends, and such companies don't succeed, this will show that advertising was not really -necessary to spread GNU. Why is it that free market advocates don't +necessary to spread GNU@. Why is it that free market advocates don't want to let the free market decide this?@footnote{The Free Software Foundation raises most of its funds from a distribution service, although it is a charity rather than a company. If @emph{no one} diff --git a/doc/emacs/gpl.texi b/doc/emacs/gpl.texi index 1908d1f8f98..0e2e212acb1 100644 --- a/doc/emacs/gpl.texi +++ b/doc/emacs/gpl.texi @@ -2,7 +2,7 @@ @center Version 3, 29 June 2007 @c This file is intended to be included within another document, -@c hence no sectioning command or @node. +@c hence no sectioning command or @node. @display Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/} @@ -222,7 +222,7 @@ terms of section 4, provided that you also meet all of these conditions: @enumerate a -@item +@item The work must carry prominent notices stating that you modified it, and giving a relevant date. @@ -623,12 +623,12 @@ later version. @item Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +APPLICABLE LAW@. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +A PARTICULAR PURPOSE@. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU@. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. @@ -670,7 +670,7 @@ state the exclusion of warranty; and each file should have at least the ``copyright'' line and a pointer to where the full notice is found. @smallexample -@var{one line to give the program's name and a brief idea of what it does.} +@var{one line to give the program's name and a brief idea of what it does.} Copyright (C) @var{year} @var{name of author} This program is free software: you can redistribute it and/or modify @@ -680,7 +680,7 @@ your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License @@ -693,7 +693,7 @@ If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: @smallexample -@var{program} Copyright (C) @var{year} @var{name of author} +@var{program} Copyright (C) @var{year} @var{name of author} This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}. This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} for details. diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index d09885c5edd..050ecd150ab 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -243,7 +243,7 @@ by the innermost Lisp expression in the buffer around point, (That name appears as the default while you enter the argument.) For example, if point is located following the text @samp{(make-vector (car x)}, the innermost list containing point is the one that starts -with @samp{(make-vector}, so @kbd{C-h f @key{RET}} will describe the +with @samp{(make-vector}, so @kbd{C-h f @key{RET}} describes the function @code{make-vector}. @kbd{C-h f} is also useful just to verify that you spelled a diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 08914d20340..1cd77182045 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi @@ -134,7 +134,7 @@ leftward). This command can be used to remove all indentation from the lines in the region, by invoking it with a large negative argument, -e.g. @kbd{C-u -1000 C-x @key{TAB}}. +e.g., @kbd{C-u -1000 C-x @key{TAB}}. @end table @node Tab Stops diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index a034c6168aa..fcd881a6bdc 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -34,7 +34,7 @@ killing many different types of syntactic units. @cindex deletion Most commands which erase text from the buffer save it in the kill ring. These are known as @dfn{kill} commands, and their names -normally contain the word @samp{kill} (e.g. @code{kill-line}). The +normally contain the word @samp{kill} (e.g., @code{kill-line}). The kill ring stores several recent kills, not just the last one, so killing is a very safe operation: you don't have to worry much about losing text that you previously killed. The kill ring is shared by @@ -123,7 +123,7 @@ point, regardless of the number of spaces that existed previously (even if there were none before). With a numeric argument @var{n}, it leaves @var{n} spaces before point if @var{n} is positive; if @var{n} is negative, it deletes newlines in addition to spaces and tabs, -leaving a single space before point. +leaving @var{-n} spaces before point. @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines after the current line. If the current line is blank, it deletes all @@ -284,12 +284,12 @@ position, if you wish, with @kbd{C-u C-@key{SPC}} (@pxref{Mark Ring}). With a plain prefix argument (@kbd{C-u C-y}), the command instead leaves the cursor in front of the inserted text, and sets the mark at the end. Using any other prefix argument specifies an earlier kill; -e.g. @kbd{C-u 4 C-y} reinserts the fourth most recent kill. +e.g., @kbd{C-u 4 C-y} reinserts the fourth most recent kill. @xref{Earlier Kills}. On graphical displays, @kbd{C-y} first checks if another application has placed any text in the system clipboard more recently than the -last Emacs kill. If so, it inserts the text in the clipboard instead. +last Emacs kill. If so, it inserts the clipboard's text instead. Thus, Emacs effectively treats ``cut'' or ``copy'' clipboard operations performed in other applications like Emacs kills, except that they are not recorded in the kill ring. @xref{Cut and Paste}, @@ -535,13 +535,13 @@ or ``copy'' commands. Under X, whenever the region is active (@pxref{Mark}), the text in the region is saved in the primary selection. This applies regardless of whether the region was made by dragging or clicking the mouse -(@pxref{Mouse Commands}), or by keyboard commands (e.g. by typing +(@pxref{Mouse Commands}), or by keyboard commands (e.g., by typing @kbd{C-@key{SPC}} and moving point; @pxref{Setting Mark}). @vindex select-active-regions If you change the variable @code{select-active-regions} to @code{only}, Emacs saves only temporarily active regions to the -primary selection, i.e. those made with the mouse or with shift +primary selection, i.e., those made with the mouse or with shift selection (@pxref{Shift Selection}). If you change @code{select-active-regions} to @code{nil}, Emacs avoids saving active regions to the primary selection entirely. @@ -709,6 +709,9 @@ rectangle, depending on the command that uses them. @item C-x r k Kill the text of the region-rectangle, saving its contents as the ``last killed rectangle'' (@code{kill-rectangle}). +@item C-x r M-w +Save the text of the region-rectangle as the ``last killed rectangle'' +(@code{copy-rectangle-as-kill}). @item C-x r d Delete the text of the region-rectangle (@code{delete-rectangle}). @item C-x r y @@ -757,6 +760,12 @@ yanking a rectangle is so different from yanking linear text that different yank commands have to be used. Yank-popping is not defined for rectangles. +@kindex C-x r M-w +@findex copy-rectangle-as-kill + @kbd{C-x r M-w} (@code{copy-rectangle-as-kill}) is the equivalent of +@kbd{M-w} for rectangles: it records the rectangle as the ``last +killed rectangle'', without deleting the text from the buffer. + @kindex C-x r y @findex yank-rectangle To yank the last killed rectangle, type @kbd{C-x r y} @@ -832,8 +841,8 @@ has no effect for @kbd{C-x} and @kbd{C-c} (@pxref{Using Region}). To enter an Emacs command like @kbd{C-x C-f} while the mark is active, use one of the following methods: either hold @kbd{Shift} -together with the prefix key, e.g. @kbd{S-C-x C-f}, or quickly type -the prefix key twice, e.g. @kbd{C-x C-x C-f}. +together with the prefix key, e.g., @kbd{S-C-x C-f}, or quickly type +the prefix key twice, e.g., @kbd{C-x C-x C-f}. To disable the overriding of standard Emacs binding by CUA mode, while retaining the other features of CUA mode described below, set @@ -853,7 +862,7 @@ of each line in the rectangle (on the same side as the cursor). With CUA you can easily copy text and rectangles into and out of registers by providing a one-digit numeric prefix to the kill, copy, -and yank commands, e.g. @kbd{C-1 C-c} copies the region into register +and yank commands, e.g., @kbd{C-1 C-c} copies the region into register @code{1}, and @kbd{C-2 C-v} yanks the contents of register @code{2}. @cindex global mark @@ -866,7 +875,7 @@ position. For example, to copy words from various buffers into a word list in a given buffer, set the global mark in the target buffer, then -navigate to each of the words you want in the list, mark it (e.g. with +navigate to each of the words you want in the list, mark it (e.g., with @kbd{S-M-f}), copy it to the list with @kbd{C-c} or @kbd{M-w}, and insert a newline after the word in the target list by pressing @key{RET}. diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index 7a3f3151e5c..3b83d24e405 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi @@ -482,10 +482,11 @@ Edit the last 300 keystrokes as a keyboard macro @kindex C-x C-k C-e @kindex C-x C-k RET You can edit the last keyboard macro by typing @kbd{C-x C-k C-e} or -@kbd{C-x C-k RET} (@code{kmacro-edit-macro}). This formats the macro -definition in a buffer and enters a specialized major mode for editing -it. Type @kbd{C-h m} once in that buffer to display details of how to -edit the macro. When you are finished editing, type @kbd{C-c C-c}. +@kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}). This formats the +macro definition in a buffer and enters a specialized major mode for +editing it. Type @kbd{C-h m} once in that buffer to display details +of how to edit the macro. When you are finished editing, type +@kbd{C-c C-c}. @findex edit-kbd-macro @kindex C-x C-k e diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index c719c483ec8..66fa643091f 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -31,7 +31,7 @@ versions of a source file, storing information such as the creation time of each version, who made it, and a description of what was changed. - The Emacs version control interface is called @dfn{VC}. VC commands + The Emacs version control interface is called @dfn{VC}@. VC commands work with several different version control systems; currently, it supports GNU Arch, Bazaar, CVS, Git, Mercurial, Monotone, RCS, SCCS/CSSC, and Subversion. Of these, the GNU project distributes CVS, @@ -73,8 +73,8 @@ provides a uniform interface for common operations in many version control operations. Some uncommon or intricate version control operations, such as -altering repository settings, are not supported in VC. You should -perform such tasks outside Emacs, e.g.@: via the command line. +altering repository settings, are not supported in VC@. You should +perform such tasks outside Emacs, e.g., via the command line. This section provides a general overview of version control, and describes the version control systems that VC supports. You can skip @@ -128,13 +128,13 @@ which it refers to as @dfn{back ends}: @item SCCS was the first version control system ever built, and was long ago superseded by more advanced ones. VC compensates for certain features -missing in SCCS (e.g.@: tag names for releases) by implementing them +missing in SCCS (e.g., tag names for releases) by implementing them itself. Other VC features, such as multiple branches, are simply unavailable. Since SCCS is non-free, we recommend avoiding it. @cindex CSSC @item -CSSC is a free replacement for SCCS. You should use CSSC only if, for +CSSC is a free replacement for SCCS@. You should use CSSC only if, for some reason, you cannot use a more recent and better-designed version control system. @@ -455,7 +455,7 @@ and don't persist across sessions. @node VC With A Merging VCS @subsubsection Basic Version Control with Merging - On a merging-based version control system (i.e.@: most modern ones; + On a merging-based version control system (i.e., most modern ones; @pxref{VCS Merging}), @kbd{C-x v v} does the following: @itemize @bullet @@ -467,7 +467,7 @@ files and ``modified'' files; @pxref{Registering}.) @item If none of the files in the VC fileset are registered with a version -control system, register the VC fileset, i.e.@: place it under version +control system, register the VC fileset, i.e., place it under version control. @xref{Registering}. If Emacs cannot find a system to register under, it prompts for a repository type, creates a new repository, and registers the VC fileset with it. @@ -568,13 +568,13 @@ and Emacs fails to detect the correct one. Otherwise, if using CVS or RCS, you can specify a revision ID. If the fileset is modified (or locked), this makes Emacs commit with -that revision ID. You can create a new branch by supplying an +that revision ID@. You can create a new branch by supplying an appropriate revision ID (@pxref{Branches}). If the fileset is unmodified (and unlocked), this checks the specified revision into the working tree. You can also specify a revision on another branch by giving its revision or branch ID (@pxref{Switching -Branches}). An empty argument (i.e.@: @kbd{C-u C-x v v @key{RET}}) +Branches}). An empty argument (i.e., @kbd{C-u C-x v v @key{RET}}) checks out the latest (``head'') revision on the current branch. This signals an error on a decentralized version control system. @@ -759,7 +759,7 @@ comparison again, generating a new diff. prompts for two revision IDs (@pxref{VCS Concepts}), and displays a diff between those versions of the fileset. This will not work reliably for multi-file VC filesets, if the version control system is -file-based rather than changeset-based (e.g.@: CVS), since then +file-based rather than changeset-based (e.g., CVS), since then revision IDs for different files would not be related in any meaningful way. @@ -783,7 +783,7 @@ Ediff session. @xref{Top,, Ediff, ediff, The Ediff Manual}. @findex vc-root-diff @kindex C-x v D @kbd{C-x v D} (@code{vc-root-diff}) is similar to @kbd{C-x v =}, but -it displays the changes in the entire current working tree (i.e.@: the +it displays the changes in the entire current working tree (i.e., the working tree containing the current VC fileset). If you invoke this command from a Dired buffer, it applies to the working tree containing the directory. @@ -795,7 +795,7 @@ from the first non-@code{nil} value amongst the variables @code{vc-@var{backend}-diff-switches}, @code{vc-diff-switches}, and @code{diff-switches} (@pxref{Comparing Files}), in that order. Here, @var{backend} stands for the relevant version control system, -e.g.@: @code{bzr} for Bazaar. Since @code{nil} means to check the +e.g., @code{bzr} for Bazaar. Since @code{nil} means to check the next variable in the sequence, either of the first two may use the value @code{t} to mean no switches at all. Most of the @code{vc-@var{backend}-diff-switches} variables default to @code{nil}, @@ -835,12 +835,12 @@ view diffs, or view log entries: @table @kbd @item p -Annotate the previous revision, i.e.@: the revision before the one +Annotate the previous revision, i.e., the revision before the one currently annotated. A numeric prefix argument is a repeat count, so @kbd{C-u 10 p} would take you back 10 revisions. @item n -Annotate the next revision, i.e.@: the revision after the one +Annotate the next revision, i.e., the revision after the one currently annotated. A numeric prefix argument is a repeat count. @item j @@ -986,7 +986,7 @@ earlier revision. This shows the changes to all files made in that revision. @item @key{RET} -In a compact-style log buffer (e.g.@: the one created by @kbd{C-x v +In a compact-style log buffer (e.g., the one created by @kbd{C-x v L}), toggle between showing and hiding the full log entry for the revision at point. @end table @@ -1064,7 +1064,7 @@ the version control system which the VC Directory buffer should use. @pindex cvs @cindex CVS directory mode In addition to the VC Directory buffer, Emacs has a similar facility -called PCL-CVS which is specialized for CVS. @xref{Top, , About +called PCL-CVS which is specialized for CVS@. @xref{Top, , About PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}. @end ifnottex @@ -1080,7 +1080,7 @@ PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}. and their version control statuses. It lists files in the current directory (the one specified when you called @kbd{C-x v d}) and its subdirectories, but only those with a ``noteworthy'' status. Files -that are up-to-date (i.e.@: the same as in the repository) are +that are up-to-date (i.e., the same as in the repository) are omitted. If all the files in a subdirectory are up-to-date, the subdirectory is not listed either. As an exception, if a file has become up-to-date as a direct result of a VC command, it is listed. @@ -1131,7 +1131,7 @@ updates. If you change the variable @code{vc-stay-local} or @code{vc-cvs-stay-local} (for CVS) to @code{nil} (@pxref{CVS Options}), then Emacs avoids contacting a remote repository when generating the VC Directory buffer (it will still contact it when -necessary, e.g.@: when doing a commit). This may be desirable if you +necessary, e.g., when doing a commit). This may be desirable if you are working offline or the network is slow. @end ifnottex @@ -1186,11 +1186,8 @@ point is on a directory entry, mark all files in that directory tree (@code{vc-dir-mark-all-files}). With a prefix argument, mark all listed files and directories. -@kindex q @r{(VC Directory)} -@findex quit-window @item q -Bury the VC Directory buffer, and delete its window if the window was -created just for that buffer. +Quit the VC Directory buffer, and bury it (@code{quit-window}). @item u Unmark the file or directory on the current line. If the region is @@ -1205,9 +1202,6 @@ files and directories. @item x Hide files with @samp{up-to-date} status (@code{vc-dir-hide-up-to-date}). - -@item q -Quit the VC Directory buffer, and bury it (@code{quit-window}). @end table @findex vc-dir-mark @@ -1313,7 +1307,7 @@ revision 1.2 has revision IDs 1.2.1.1, 1.2.1.2, @dots{}, the second branch created from revision 1.2 has revision IDs 1.2.2.1, 1.2.2.2, @dots{}, and so forth. You can also specify the @dfn{branch ID}, which is a branch revision ID omitting its final component -(e.g.@: 1.2.1), to switch to the latest revision on that branch. +(e.g., 1.2.1), to switch to the latest revision on that branch. On a locking-based system, switching to a different branch also unlocks (write-protects) the working tree. @@ -1595,7 +1589,7 @@ source files. To produce a tags table, you run the @command{etags} shell command on a document or the source code file. The @samp{etags} program writes the tags to a @dfn{tags table file}, or @dfn{tags file} in -short. The conventional name for a tags file is @file{TAGS}. +short. The conventional name for a tags file is @file{TAGS}@. @xref{Create Tags Table}. Emacs provides many commands for searching and replacing using the @@ -1682,9 +1676,11 @@ specifies (using Bourne shell syntax) that the commands @item In Lisp code, any function defined with @code{defun}, any variable -defined with @code{defvar} or @code{defconst}, and in general the first -argument of any expression that starts with @samp{(def} in column zero is -a tag. +defined with @code{defvar} or @code{defconst}, and in general the +first argument of any expression that starts with @samp{(def} in +column zero is a tag. As an exception, expressions of the form +@code{(defvar @var{foo})} are treated as declarations, and are only +tagged if the @samp{--declarations} option is given. @item In Scheme code, tags include anything defined with @code{def} or with a @@ -1702,9 +1698,9 @@ tags. Use the @samp{--packages-only} option to create tags for packages only. In Ada, the same name can be used for different kinds of entity -(e.g.@:, for a procedure and for a function). Also, for things like -packages, procedures and functions, there is the spec (i.e.@: the -interface) and the body (i.e.@: the implementation). To make it +(e.g., for a procedure and for a function). Also, for things like +packages, procedures and functions, there is the spec (i.e., the +interface) and the body (i.e., the implementation). To make it easier to pick the definition you want, Ada tag name have suffixes indicating the type of entity: @@ -1772,11 +1768,11 @@ the file. @item In Perl code, the tags are the packages, subroutines and variables -defined by the @code{package}, @code{sub}, @code{my} and @code{local} -keywords. Use @samp{--globals} if you want to tag global variables. -Tags for subroutines are named @samp{@var{package}::@var{sub}}. The -name for subroutines defined in the default package is -@samp{main::@var{sub}}. +defined by the @code{package}, @code{sub}, @code{use constant}, +@code{my}, and @code{local} keywords. Use @samp{--globals} if you +want to tag global variables. Tags for subroutines are named +@samp{@var{package}::@var{sub}}. The name for subroutines defined in +the default package is @samp{main::@var{sub}}. @item In PHP code, tags are functions, classes and defines. Vars are tags @@ -2227,7 +2223,7 @@ the current buffer, followed by the remaining files of the tags table. reads a regexp to search for and a string to replace with, just like ordinary @kbd{M-x query-replace-regexp}. It searches much like @kbd{M-x tags-search}, but repeatedly, processing matches according to your -input. @xref{Replace}, for more information on query replace. +input. @xref{Query Replace}, for more information on query replace. @vindex tags-case-fold-search @cindex case-sensitivity and tags search diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 83d519a4cd2..db191eb175c 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -430,10 +430,6 @@ mark is by using @kbd{C-x C-x}, which exchanges the positions of the point and the mark (@pxref{Setting Mark}). @item -Many commands that move point long distances, like @kbd{M-<} and -@kbd{C-s}, first set the mark where point was. - -@item Some commands, which ordinarily act on the region when the mark is active, no longer do so. For example, normally @kbd{M-%} (@code{query-replace}) performs replacements within the region, if the @@ -455,9 +451,10 @@ command twice.) @item C-u C-x C-x @kindex C-u C-x C-x -Activate the mark and enable Transient Mark mode temporarily, until -the mark is next deactivated. (This is the @kbd{C-x C-x} command, -@code{exchange-point-and-mark}, with a prefix argument.) +Exchange point and mark, activate the mark and enable Transient Mark +mode temporarily, until the mark is next deactivated. (This is the +@kbd{C-x C-x} command, @code{exchange-point-and-mark}, with a prefix +argument.) @end table These commands set or activate the mark, and enable Transient Mark diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 2856db7a4fa..ebccedacc05 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -13,24 +13,54 @@ special-purpose buffer with a small amount of screen space. You can use the usual Emacs editing commands in the minibuffer to edit the argument text. +@menu +* Basic Minibuffer:: Basic usage of the minibuffer. +* Minibuffer File:: Entering file names with the minibuffer. +* Minibuffer Edit:: How to edit in the minibuffer. +* Completion:: An abbreviation facility for minibuffer input. +* Minibuffer History:: Reusing recent minibuffer arguments. +* Repetition:: Re-executing commands that used the minibuffer. +* Passwords:: Entering passwords in the echo area. +* Yes or No Prompts:: Replying yes or no in the echo area. +@end menu + +@node Basic Minibuffer +@section Using the Minibuffer + @cindex prompt When the minibuffer is in use, it appears in the echo area, with a -cursor. The minibuffer starts with a @dfn{prompt} in a distinct -color, usually ending with a colon. The prompt states what kind of -input is expected, and how it will be used. +cursor. The minibuffer starts with a @dfn{prompt}, usually ending +with a colon. The prompt states what kind of input is expected, and +how it will be used. The prompt is highlighted using the +@code{minibuffer-prompt} face (@pxref{Faces}). The simplest way to enter a minibuffer argument is to type the text, -then @key{RET} to submit the argument and exit the minibuffer. You -can cancel the minibuffer, and the command that wants the argument, by -typing @kbd{C-g}. +then @key{RET} to submit the argument and exit the minibuffer. +Alternatively, you can type @kbd{C-g} to exit the minibuffer by +cancelling the command asking for the argument (@pxref{Quitting}). @cindex default argument - Sometimes, a @dfn{default argument} appears in the prompt, inside + Sometimes, the prompt shows a @dfn{default argument}, inside parentheses before the colon. This default will be used as the argument if you just type @key{RET}. For example, commands that read buffer names usually show a buffer name as the default; you can type @key{RET} to operate on that default buffer. +@cindex Minibuffer Electric Default mode +@cindex mode, Minibuffer Electric Default +@findex minibuffer-electric-default-mode +@vindex minibuffer-eldef-shorten-default + If you enable Minibuffer Electric Default mode, a global minor mode, +Emacs hides the default argument as soon as you modify the contents of +the minibuffer (since typing @key{RET} would no longer submit that +default). If you ever bring back the original minibuffer text, the +prompt again shows the default. Furthermore, if you change the +variable @code{minibuffer-eldef-shorten-default} to a non-@code{nil} +value, the default argument is displayed as @samp{[@var{default}]} +instead of @samp{(default @var{default})}, saving some screen space. +To enable this minor mode, type @kbd{M-x +minibuffer-electric-default-mode}. + Since the minibuffer appears in the echo area, it can conflict with other uses of the echo area. If an error message or an informative message is emitted while the minibuffer is active, the message hides @@ -38,15 +68,6 @@ the minibuffer for a few seconds, or until you type something; then the minibuffer comes back. While the minibuffer is in use, keystrokes do not echo. -@menu -* Minibuffer File:: Entering file names with the minibuffer. -* Minibuffer Edit:: How to edit in the minibuffer. -* Completion:: An abbreviation facility for minibuffer input. -* Minibuffer History:: Reusing recent minibuffer arguments. -* Repetition:: Re-executing commands that used the minibuffer. -* Passwords:: Entering passwords in the echo area. -@end menu - @node Minibuffer File @section Minibuffers for File Names @@ -549,7 +570,7 @@ those completion alternatives; each subsequent invocation of the completion command replaces that with the next completion alternative, in a cyclic manner. If you give @code{completion-cycle-threshold} a numeric value @var{n}, completion commands switch to this cycling -behavior only when there are fewer than @var{n} alternatives. +behavior only when there are @var{n} or fewer alternatives. @cindex Icomplete mode @findex icomplete-mode @@ -682,13 +703,13 @@ the text for that expression. Even if you don't know Lisp, it will probably be obvious which command is displayed for repetition. If you type just @key{RET}, that repeats the command unchanged. You can also change the command by editing the Lisp expression before you execute -it. The repeated command is added to the front of the command history +it. The executed command is added to the front of the command history unless it is identical to the most recent item. Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you can use the usual minibuffer history commands (@pxref{Minibuffer History}) to move through the history list. After finding the desired -previous command, you can edit its expression as usual and then repeat +previous command, you can edit its expression as usual and then execute it by typing @key{RET}. @vindex isearch-resume-in-command-history @@ -726,10 +747,60 @@ completion, and you cannot change windows or perform any other action with Emacs until you have submitted the password. While you are typing the password, you may press @key{DEL} to delete -backwards, removing the last character entered. @key{C-u} deletes +backwards, removing the last character entered. @kbd{C-u} deletes everything you have typed so far. @kbd{C-g} quits the password prompt (@pxref{Quitting}). @kbd{C-y} inserts the current kill into the password (@pxref{Killing}). You may type either @key{RET} or @key{ESC} to submit the password. Any other self-inserting character key inserts the associated character into the password, and all other input is ignored. + +@node Yes or No Prompts +@section Yes or No Prompts + + An Emacs command may require you to answer a ``yes or no'' question +during the course of its execution. Such queries come in two main +varieties. + +@cindex y or n prompt + For the first type of ``yes or no'' query, the prompt ends with +@samp{(y or n)}. Such a query does not actually use the minibuffer; +the prompt appears in the echo area, and you answer by typing either +@samp{y} or @samp{n}, which immediately delivers the response. For +example, if you type @kbd{C-x C-w} (@kbd{write-file}) to save a +buffer, and enter the name of an existing file, Emacs issues a prompt +like this: + +@smallexample +File `foo.el' exists; overwrite? (y or n) +@end smallexample + +@noindent +Because this query does not actually use the minibuffer, the usual +minibuffer editing commands cannot be used. However, you can perform +some window scrolling operations while the query is active: @kbd{C-l} +recenters the selected window; @kbd{M-v} (or @key{PageDown} or +@key{next}) scrolls forward; @kbd{C-v} (or @key{PageUp}, or +@key{prior}) scrolls backward; @kbd{C-M-v} scrolls forward in the next +window; and @kbd{C-M-S-v} scrolls backward in the next window. Typing +@kbd{C-g} dismisses the query, and quits the command that issued it +(@pxref{Quitting}). + +@cindex yes or no prompt + The second type of ``yes or no'' query is typically employed if +giving the wrong answer would have serious consequences; it uses the +minibuffer, and features a prompt ending with @samp{(yes or no)}. For +example, if you invoke @kbd{C-x k} (@code{kill-buffer}) on a +file-visiting buffer with unsaved changes, Emacs activates the +minibuffer with a prompt like this: + +@smallexample +Buffer foo.el modified; kill anyway? (yes or no) +@end smallexample + +@noindent +To answer, you must type @samp{yes} or @samp{no} into the minibuffer, +followed by @key{RET}. The minibuffer behaves as described in the +previous sections; you can switch to another window with @kbd{C-x o}, +use the history commands @kbd{M-p} and @kbd{M-f}, etc. Type @kbd{C-g} +to quit the minibuffer and the querying command. diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 90072d19a69..e970d7f75d2 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -53,7 +53,7 @@ commands. The three most commonly-used Gnus buffers are the @dfn{group buffer}, the @dfn{summary buffer} and the @dfn{article buffer}. - The @dfn{group buffer} contains a list of article sources (e.g.@: + The @dfn{group buffer} contains a list of article sources (e.g., newsgroups and email inboxes), which are collectively referred to as @dfn{groups}. This is the first buffer Gnus displays when it starts up. It normally displays only the groups to which you subscribe and @@ -166,7 +166,7 @@ List zombie groups. @cindex unsubscribe groups @item u Toggle the subscription status of the group on the current line -(i.e.@: turn a subscribed group into an unsubscribed group, or vice +(i.e., turn a subscribed group into an unsubscribed group, or vice versa). Invoking this on a killed or zombie group turns it into an unsubscribed group. @@ -411,6 +411,10 @@ m} (@code{doc-view-set-slice-using-mouse}), where you use the mouse to select the slice. @c ??? How does this work? + The most convenient way is to set the optimal slice by using +BoundingBox information automatically determined from the document by +typing @kbd{s b} (@code{doc-view-set-slice-using-mouse}). + @findex doc-view-reset-slice To cancel the selected slice, type @kbd{s r} (@code{doc-view-reset-slice}). Then DocView shows the entire page @@ -514,7 +518,7 @@ output is long). type @kbd{M-! gunzip foo.gz @key{RET}}. That shell command normally creates the file @file{foo} and produces no terminal output. - A numeric argument to @code{shell-command}, e.g.@: @kbd{M-1 M-!}, + A numeric argument to @code{shell-command}, e.g., @kbd{M-1 M-!}, causes it to insert terminal output into the current buffer instead of a separate buffer. It puts point before the output, and sets the mark after the output. For instance, @kbd{M-1 M-! gunzip < foo.gz @@ -538,11 +542,19 @@ which is impossible to ignore. You can also type @kbd{M-&} (@code{async-shell-command}) to execute a shell command asynchronously; this is exactly like calling @kbd{M-!} with a trailing @samp{&}, except that you do not need the @samp{&}. -The output buffer for asynchronous shell commands is named +The default output buffer for asynchronous shell commands is named @samp{*Async Shell Command*}. Emacs inserts the output into this buffer as it comes in, whether or not the buffer is visible in a window. +@vindex async-shell-command-buffer + If you want to run more than one asynchronous shell command at the +same time, they could end up competing for the output buffer. The +option @code{async-shell-command-buffer} specifies what to do about +this; e.g., whether to rename the pre-existing output buffer, or to +use a different buffer for the new command. Consult the variable's +documentation for more possibilities. + @kindex M-| @findex shell-command-on-region @kbd{M-|} (@code{shell-command-on-region}) is like @kbd{M-!}, but @@ -587,7 +599,7 @@ the buffer and type the input, terminated by @key{RET}. While the subshell is waiting or running a command, you can switch windows or buffers and perform other editing in Emacs. Emacs inserts the output from the subshell into the Shell buffer whenever it has -time to process it (e.g.@: while waiting for keyboard input). +time to process it (e.g., while waiting for keyboard input). @cindex @code{comint-highlight-input} face @cindex @code{comint-highlight-prompt} face @@ -598,7 +610,7 @@ easier to distinguish input lines from the shell output. @xref{Faces}. To make multiple subshells, invoke @kbd{M-x shell} with a prefix -argument (e.g. @kbd{C-u M-x shell}). Then the command will read a +argument (e.g., @kbd{C-u M-x shell}). Then the command will read a buffer name, and create (or reuse) a subshell in that buffer. You can also rename the @file{*shell*} buffer using @kbd{M-x rename-uniquely}, then create a new @file{*shell*} buffer using plain @kbd{M-x shell}. @@ -633,7 +645,7 @@ Coding}. @cindex @env{EMACS} environment variable Emacs sets the environment variable @env{INSIDE_EMACS} in the subshell to @samp{@var{version},comint}, where @var{version} is the -Emacs version (e.g.@: @samp{24.1}). Programs can check this variable +Emacs version (e.g., @samp{24.1}). Programs can check this variable to determine whether they are running inside an Emacs subshell. (It also sets the @env{EMACS} environment variable to @code{t}, if that environment variable is not already defined. However, this @@ -1182,30 +1194,39 @@ underlying shell, of course. @subsection Emacs Terminal Emulator @findex term - To run a subshell in a terminal emulator, use @kbd{M-x term}. This -creates (or reuses) a buffer named @file{*terminal*}, and runs a + To run a subshell in a text terminal emulator, use @kbd{M-x term}. +This creates (or reuses) a buffer named @file{*terminal*}, and runs a subshell with input coming from your keyboard, and output going to that buffer. +@cindex line mode @r{(terminal emulator)} +@cindex char mode @r{(terminal emulator)} The terminal emulator uses Term mode, which has two input modes. In -line mode, Term basically acts like Shell mode (@pxref{Shell Mode}). - - In char mode, each character is sent directly to the subshell, as -``terminal input''. Any ``echoing'' of your input is the -responsibility of the subshell. The sole exception is the terminal -escape character, which by default is @kbd{C-c} (@pxref{Term Mode}). -Any ``terminal output'' from the subshell goes into the buffer, -advancing point. +@dfn{line mode}, Term basically acts like Shell mode (@pxref{Shell +Mode}). In @dfn{char mode}, each character is sent directly to the +subshell, as terminal input; the sole exception is the terminal escape +character, which by default is @kbd{C-c} (@pxref{Term Mode}). Any +echoing of your input is the responsibility of the subshell; any +terminal output from the subshell goes into the buffer, advancing +point. Some programs (such as Emacs itself) need to control the appearance -on the terminal screen in detail. They do this by sending special -control codes. The exact control codes needed vary from terminal to -terminal, but nowadays most terminals and terminal emulators -(including @code{xterm}) understand the ANSI-standard (VT100-style) -escape sequences. Term mode recognizes these escape sequences, and -handles each one appropriately, changing the buffer so that the -appearance of the window matches what it would be on a real terminal. -You can actually run Emacs inside an Emacs Term window. +of the terminal screen in detail. They do this by emitting special +control codes. Term mode recognizes and handles ANSI-standard +VT100-style escape sequences, which are accepted by most modern +terminals, including @command{xterm}. (Hence, you can actually run +Emacs inside an Emacs Term window.) + + The @code{term} face specifies the default appearance of text +in the terminal emulator (the default is the same appearance as the +@code{default} face). When terminal control codes are used to change +the appearance of text, these are represented in the terminal emulator +by the faces @code{term-color-black}, @code{term-color-red}, +@code{term-color-green}, @code{term-color-yellow} +@code{term-color-blue}, @code{term-color-magenta}, +@code{term-color-cyan}, @code{term-color-white}, +@code{term-color-underline}, and @code{term-color-bold}. +@xref{Faces}. You can also Term mode to communicate with a device connected to a serial port. @xref{Serial Terminal}. @@ -1220,6 +1241,9 @@ examining your input. But some shells can tell Term what the current directory is. This is done automatically by @code{bash} version 1.15 and later. + + + @node Term Mode @subsection Term Mode @cindex Term mode @@ -1283,7 +1307,7 @@ mode-line. Type @key{SPC} to display the next screenful of output, or @cindex Rlogin You can login to a remote computer, using whatever commands you -would from a regular terminal (e.g.@: using the @code{telnet} or +would from a regular terminal (e.g., using the @code{telnet} or @code{rlogin} commands), from a Term window. A program that asks you for a password will normally suppress @@ -1505,15 +1529,11 @@ precedence. @cindex client frame @item -c Create a new graphical @dfn{client frame}, instead of using an -existing Emacs frame. If you omit a filename argument while supplying -the @samp{-c} option, the new frame displays the @file{*scratch*} -buffer (@pxref{Buffers}). See below for the special behavior of -@kbd{C-x C-c} in a client frame. - -If Emacs is unable to create a new graphical frame (e.g.@: if it is -unable to connect to the X server), it tries to create a text terminal -client frame, as though you had supplied the @samp{-t} option instead -(see below). +existing Emacs frame. See below for the special behavior of @kbd{C-x +C-c} in a client frame. If Emacs cannot create a new graphical frame +(e.g., if it cannot connect to the X server), it tries to create a +text terminal client frame, as though you had supplied the @samp{-t} +option instead. On MS-Windows, a single Emacs session cannot display frames on both graphical and text terminals, nor on multiple text terminals. Thus, @@ -1521,6 +1541,11 @@ if the Emacs server is running on a text terminal, the @samp{-c} option, like the @samp{-t} option, creates a new frame in the server's current text terminal. @xref{Windows Startup}. +If you omit a filename argument while supplying the @samp{-c} option, +the new frame displays the @file{*scratch*} buffer by default. If +@code{initial-buffer-choice} is a string (@pxref{Entering Emacs}), the +new frame displays that file or directory instead. + @item -F @var{alist} @itemx --frame-parameters=@var{alist} Set the parameters for a newly-created graphical frame @@ -1541,38 +1566,24 @@ evaluate, @emph{not} as a list of files to visit. @item -f @var{server-file} @itemx --server-file=@var{server-file} @cindex @env{EMACS_SERVER_FILE} environment variable -@cindex server file -@vindex server-use-tcp -@vindex server-host Specify a @dfn{server file} for connecting to an Emacs server via TCP. An Emacs server usually uses an operating system feature called a ``local socket'' to listen for connections. Some operating systems, such as Microsoft Windows, do not support local sockets; in that case, -Emacs uses TCP instead. When you start the Emacs server, Emacs -creates a server file containing some TCP information that -@command{emacsclient} needs for making the connection. By default, -the server file is in @file{~/.emacs.d/server/}. On Microsoft -Windows, if @command{emacsclient} does not find the server file there, -it looks in the @file{.emacs.d/server/} subdirectory of the directory -pointed to by the @env{APPDATA} environment variable. You can tell -@command{emacsclient} to use a specific server file with the @samp{-f} -or @samp{--server-file} option, or by setting the -@env{EMACS_SERVER_FILE} environment variable. - -Even if local sockets are available, you can tell Emacs to use TCP by -setting the variable @code{server-use-tcp} to @code{t}. One advantage -of TCP is that the server can accept connections from remote machines. -For this to work, you must (i) set the variable @code{server-host} to -the hostname or IP address of the machine on which the Emacs server -runs, and (ii) provide @command{emacsclient} with the server file. -(One convenient way to do the latter is to put the server file on a -networked file system such as NFS.) +the server communicates with @command{emacsclient} via TCP. +@vindex server-auth-dir +@cindex server file @vindex server-port - When the Emacs server is using TCP, the variable @code{server-port} -determines the port number to listen on; the default value, -@code{nil}, means to choose a random port when the server starts. +When you start a TCP Emacs server, Emacs creates a @dfn{server file} +containing the TCP information to be used by @command{emacsclient} to +connect to the server. The variable @code{server-auth-dir} specifies +the directory containing the server file; by default, this is +@file{~/.emacs.d/server/}. To tell @command{emacsclient} to connect +to the server over TCP with a specific server file, use the @samp{-f} +or @samp{--server-file} option, or set the @env{EMACS_SERVER_FILE} +environment variable. @item -n @itemx --no-wait @@ -1602,19 +1613,14 @@ server it finds. (This option is not supported on MS-Windows.) @itemx --tty @itemx -nw Create a new client frame on the current text terminal, instead of -using an existing Emacs frame. This is similar to the @samp{-c} -option, above, except that it creates a text terminal frame -(@pxref{Non-Window Terminals}). If you omit a filename argument while -supplying this option, the new frame displays the @file{*scratch*} -buffer (@pxref{Buffers}). See below for the special behavior of -@kbd{C-x C-c} in a client frame. - -On MS-Windows, a single Emacs session cannot display frames on both -graphical and text terminals, nor on multiple text terminals. Thus, -if the Emacs server is using the graphical display, @samp{-t} behaves -like @samp{-c} (see above); whereas if the Emacs server is running on -a text terminal, it creates a new frame in its current text terminal. -@xref{Windows Startup}. +using an existing Emacs frame. This behaves just like the @samp{-c} +option, described above, except that it creates a text terminal frame +(@pxref{Non-Window Terminals}). + +On MS-Windows, @samp{-t} behaves just like @samp{-c} if the Emacs +server is using the graphical display, but if the Emacs server is +running on a text terminal, it creates a new frame in the current text +terminal. @end table The new graphical or text terminal frames created by the @samp{-c} @@ -1624,7 +1630,7 @@ frame. If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in a client frame, that command does not kill the Emacs session as it normally does (@pxref{Exiting}). Instead, Emacs deletes the client frame; furthermore, if the client frame has an @command{emacsclient} -waiting to regain control (i.e.@: if you did not supply the @samp{-n} +waiting to regain control (i.e., if you did not supply the @samp{-n} option), Emacs deletes all other frames of the same client, and marks the client's server buffers as finished, as though you had typed @kbd{C-x #} in all of them. If it so happens that there are no @@ -1683,7 +1689,7 @@ for printing by calling the @command{lpr} program. To change the printer program, customize the variable @code{lpr-command}. To specify extra switches to give the printer program, customize the list variable @code{lpr-switches}. Its value should be a list of option -strings, each of which should start with @samp{-} (e.g.@: the option +strings, each of which should start with @samp{-} (e.g., the option string @code{"-w80"} specifies a line width of 80 columns). The default is the empty list, @code{nil}. @@ -2174,7 +2180,7 @@ commands to perform arbitrary editing while in the middle of another Emacs command. For example, when you type @kbd{C-r} inside of a @code{query-replace}, you enter a recursive edit in which you can change the current buffer. On exiting from the recursive edit, you go back to -the @code{query-replace}. +the @code{query-replace}. @xref{Query Replace}. @kindex C-M-c @findex exit-recursive-edit @@ -2398,7 +2404,7 @@ done by calling @code{browse-url} as a subroutine It can be useful to add @code{goto-address-mode} to mode hooks and hooks for displaying an incoming message -(e.g.@: @code{rmail-show-message-hook} for Rmail, and +(e.g., @code{rmail-show-message-hook} for Rmail, and @code{mh-show-mode-hook} for MH-E). This is not needed for Gnus, which has a similar feature of its own. @@ -2481,7 +2487,7 @@ find the one you select (@code{ffap-menu}). @findex animate-birthday-present @cindex animate - The @code{animate} package makes text dance (e.g. @kbd{M-x + The @code{animate} package makes text dance (e.g., @kbd{M-x animate-birthday-present}). @findex blackbox diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index c619b1eb47e..52721026590 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi @@ -69,7 +69,7 @@ command to select that mode (e.g., @kbd{M-x lisp-mode} enters Lisp mode). @vindex major-mode The value of the buffer-local variable @code{major-mode} is a symbol -with the same name as the major mode command (e.g. @code{lisp-mode}). +with the same name as the major mode command (e.g., @code{lisp-mode}). This variable is set automatically; you should not change it yourself. The default value of @code{major-mode} determines the major mode to @@ -110,7 +110,7 @@ list of its key bindings, type @code{C-h m} (@code{describe-mode}). Every major mode, apart from Fundamental mode, defines a @dfn{mode hook}, a customizable list of Lisp functions to run each time the mode is enabled in a buffer. @xref{Hooks}, for more information about -hooks. Each mode hook is named after its major mode, e.g. Fortran +hooks. Each mode hook is named after its major mode, e.g., Fortran mode has @code{fortran-mode-hook}. Furthermore, all text-based major modes run @code{text-mode-hook}, and all programming language modes run @code{prog-mode-hook}, prior to running their own mode hooks. diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi index 0d05c8ac9c6..e634a5836d8 100644 --- a/doc/emacs/msdog-xtra.texi +++ b/doc/emacs/msdog-xtra.texi @@ -52,7 +52,7 @@ about Emacs's special handling of text files under MS-DOS (and Windows). @kindex BS @r{(MS-DOS)} The key that is called @key{DEL} in Emacs (because that's how it is designated on most workstations) is known as @key{BS} (backspace) on a -PC. That is why the PC-specific terminal initialization remaps the +PC@. That is why the PC-specific terminal initialization remaps the @key{BS} key to act as @key{DEL}; the @key{DELETE} key is remapped to act as @kbd{C-d} for the same reasons. @@ -233,7 +233,7 @@ The MS-DOS terminal doesn't support a vertical-bar cursor, so the bar cursor is horizontal, and the @code{@var{width}} parameter, if specified by the frame parameters, actually determines its height. For this reason, the @code{bar} and @code{hbar} cursor types produce -the same effect on MS-DOS. As an extension, the bar cursor +the same effect on MS-DOS@. As an extension, the bar cursor specification can include the starting scan line of the cursor as well as its width, like this: @@ -320,7 +320,7 @@ converts them to underscores @samp{_}; thus your default init file @ifnottex (@pxref{Init File}) @end ifnottex -is called @file{_emacs} on MS-DOS. Excess characters before or after +is called @file{_emacs} on MS-DOS@. Excess characters before or after the period are generally ignored by MS-DOS itself; thus, if you visit the file @file{LongFileName.EvenLongerExtension}, you will silently get @file{longfile.eve}, but Emacs will still display the long file @@ -552,7 +552,7 @@ when invoked with the @samp{-nw} option. asynchronous subprocesses are not available. In particular, Shell mode and its variants do not work. Most Emacs features that use asynchronous subprocesses also don't work on MS-DOS, including -Shell mode and GUD. When in doubt, try and see; commands that +Shell mode and GUD@. When in doubt, try and see; commands that don't work output an error message saying that asynchronous processes aren't supported. @@ -600,7 +600,7 @@ it, because MS-DOS provides no general way to terminate a process. Pressing @kbd{C-c} or @kbd{C-@key{BREAK}} might sometimes help in these cases. - Accessing files on other machines is not supported on MS-DOS. Other + Accessing files on other machines is not supported on MS-DOS@. Other network-oriented commands such as sending mail, Web browsing, remote login, etc., don't work either, unless network access is built into MS-DOS with some network redirector. diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index d8f9bb6961d..644d812d7ed 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -334,7 +334,7 @@ names that are associated with (a.k.a.@: @dfn{links to}) the file's data; this is only useful on NTFS volumes. @code{uid} means display the numerical identifier of the user who owns the file. @code{gid} means display the numerical identifier of the file owner's group. The -default value is @code{(links uid gid)} i.e.@: all the 3 optional +default value is @code{(links uid gid)} i.e., all the 3 optional attributes are displayed. @vindex ls-lisp-emulation @@ -354,12 +354,12 @@ Emulate @sc{gnu} systems; this is the default. This sets Emulate Unix systems. Like @code{GNU}, but sets @code{ls-lisp-verbosity} to @code{(links uid)}. @item MacOS -Emulate MacOS. Sets @code{ls-lisp-ignore-case} to @code{t}, and +Emulate MacOS@. Sets @code{ls-lisp-ignore-case} to @code{t}, and @code{ls-lisp-dirs-first} and @code{ls-lisp-verbosity} to @code{nil}. @item MS-Windows Emulate MS-Windows. Sets @code{ls-lisp-ignore-case} and @code{ls-lisp-dirs-first} to @code{t}, and @code{ls-lisp-verbosity} to -@code{(links)} on Windows NT/2K/XP/2K3 and to @code{nil} on Windows 9X. +@code{(links)} on Windows NT/2K/XP/2K3 and to @code{nil} on Windows 9X@. Note that the default emulation is @emph{not} @code{MS-Windows}, even on Windows, since many users of Emacs on those platforms prefer the @sc{gnu} defaults. @@ -422,7 +422,7 @@ Settings\@var{username}\Application Data} on Windows 2000/XP/2K3, @file{C:\Users\@var{username}\AppData\Roaming} on Windows Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or @file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows -9X/ME. If this directory does not exist or cannot be accessed, Emacs +9X/ME@. If this directory does not exist or cannot be accessed, Emacs falls back to @file{C:\} as the default value of @code{HOME}. You can override this default value of @code{HOME} by explicitly @@ -690,7 +690,7 @@ If you can go to the first subprocess, and tell it to exit, the second subprocess should continue normally. However, if the second subprocess is synchronous, Emacs itself will be hung until the first subprocess finishes. If it will not finish without user input, then you have no -choice but to reboot if you are running on Windows 9X. If you are +choice but to reboot if you are running on Windows 9X@. If you are running on Windows NT/2K/XP, you can use a process viewer application to kill the appropriate instance of NTVDM instead (this will terminate both DOS subprocesses). @@ -714,7 +714,7 @@ character based on the type of the program. customized commands that run MS-Windows applications registered to handle a certain standard Windows operation for a specific type of document or file. This function is a wrapper around the Windows -@code{ShellExecute} API. See the MS-Windows API documentation for +@code{ShellExecute} API@. See the MS-Windows API documentation for more details. @end ifnottex diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 1dfae79c788..edf2bb19a45 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -920,7 +920,6 @@ Unlike the previous two, this variable does not override any @samp{-*-coding:-*-} tag. @c FIXME? This seems somewhat out of place. Move to the Rmail section? -@vindex rmail-decode-mime-charset @vindex rmail-file-coding-system When you get new mail in Rmail, each message is translated automatically from the coding system it is written in, as if it were a @@ -995,7 +994,7 @@ decoding. (You can still use an unsuitable coding system if you enter its name at the prompt.) @c It seems that select-message-coding-system does this. -@c Both sendmail.el and smptmail.el call it; i.e. smtpmail.el still +@c Both sendmail.el and smptmail.el call it; i.e., smtpmail.el still @c obeys sendmail-coding-system. @vindex sendmail-coding-system When you send a mail message (@pxref{Sending Mail}), @@ -1040,12 +1039,16 @@ decoding it using coding system @var{right} instead. @findex set-buffer-file-coding-system The command @kbd{C-x @key{RET} f} (@code{set-buffer-file-coding-system}) sets the file coding system for -the current buffer---in other words, it says which coding system to -use when saving or reverting the visited file. You specify which -coding system using the minibuffer. If you specify a coding system -that cannot handle all of the characters in the buffer, Emacs warns -you about the troublesome characters when you actually save the -buffer. +the current buffer (i.e., the coding system to use when saving or +reverting the file). You specify which coding system using the +minibuffer. You can also invoke this command by clicking with +@kbd{Mouse-3} on the coding system indicator in the mode line +(@pxref{Mode Line}). + + If you specify a coding system that cannot handle all the characters +in the buffer, Emacs will warn you about the troublesome characters, +and ask you to choose another coding system, when you try to save the +buffer (@pxref{Output Coding}). @cindex specify end-of-line conversion You can also use this command to specify the end-of-line conversion @@ -1320,7 +1323,7 @@ scripts.@footnote{If you run Emacs on X, you may need to inform the X server about the location of the newly installed fonts with commands such as: @c FIXME? I feel like this may be out of date. -@c Eg the intlfonts tarfile is ~ 10 years old. +@c E.g., the intlfonts tarfile is ~ 10 years old. @example xset fp+ /usr/local/share/emacs/fonts @@ -1566,7 +1569,7 @@ no font appear as a hollow box. If you use Latin-1 characters but your terminal can't display Latin-1, you can arrange to display mnemonic @acronym{ASCII} sequences -instead, e.g.@: @samp{"o} for o-umlaut. Load the library +instead, e.g., @samp{"o} for o-umlaut. Load the library @file{iso-ascii} to do this. @vindex latin1-display @@ -1588,7 +1591,7 @@ the range 0240 to 0377 octal (160 to 255 decimal) to handle the accented letters and punctuation needed by various European languages (and some non-European ones). Note that Emacs considers bytes with codes in this range as raw bytes, not as characters, even in a unibyte -buffer, i.e.@: if you disable multibyte characters. However, Emacs +buffer, i.e., if you disable multibyte characters. However, Emacs can still handle these character codes as if they belonged to @emph{one} of the single-byte character sets at a time. To specify @emph{which} of these codes to use, invoke @kbd{M-x @@ -1764,7 +1767,7 @@ directionality when they are displayed. The default value is Each paragraph of bidirectional text can have its own @dfn{base direction}, either right-to-left or left-to-right. (Paragraph @c paragraph-separate etc have no influence on this? -boundaries are empty lines, i.e.@: lines consisting entirely of +boundaries are empty lines, i.e., lines consisting entirely of whitespace characters.) Text in left-to-right paragraphs begins on the screen at the left margin of the window and is truncated or continued when it reaches the right margin. By contrast, text in diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi index 4435590536f..9a4daebd7e4 100644 --- a/doc/emacs/package.texi +++ b/doc/emacs/package.texi @@ -52,18 +52,22 @@ on each line, with the following information: @itemize @bullet @item -The package name (e.g. @samp{auctex}). +The package name (e.g., @samp{auctex}). @item -The package's version number (e.g. @samp{11.86}). +The package's version number (e.g., @samp{11.86}). @item The package's status---normally one of @samp{available} (can be downloaded from the package archive), @samp{installed}, or @samp{built-in} (included in Emacs by default). -In some instances, the status can be @samp{held}, @samp{disabled}, or -@samp{obsolete}. @xref{Package Installation}. +The status can also be @samp{new}. This is equivalent to +@samp{available}, except that it means the package became newly +available on the package archive after your last invocation of +@kbd{M-x list-packages}. In other instances, a package may have the +status @samp{held}, @samp{disabled}, or @samp{obsolete}. +@xref{Package Installation}. @item A short description of the package. diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index e5340655770..a7d8188af58 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -85,7 +85,7 @@ Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++, Delphi, Fortran, Icon, IDL (CORBA), IDLWAVE, Java, Javascript, Metafont (@TeX{}'s companion for font creation), Modula2, Objective-C, Octave, Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl, and -VHDL. An alternative mode for Perl is called CPerl mode. Modes are +VHDL@. An alternative mode for Perl is called CPerl mode. Modes are also available for the scripting languages of the common GNU and Unix shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files, and for makefiles, DNS master files, and various sorts of configuration files. @@ -127,7 +127,7 @@ IDL/Pike/AWK (@pxref{Top, , CC Mode, ccmode, CC Mode}), and IDLWAVE @end ifinfo @ifnotinfo The Emacs distribution contains Info manuals for the major modes for -Ada, C/C++/Objective C/Java/Corba IDL/Pike/AWK, and IDLWAVE. For +Ada, C/C++/Objective C/Java/Corba IDL/Pike/AWK, and IDLWAVE@. For Fortran mode, @pxref{Fortran,,, emacs-xtra, Specialized Emacs Features}. @end ifnotinfo @@ -326,12 +326,13 @@ as you move around in a buffer. @findex which-function-mode @vindex which-func-modes To either enable or disable Which Function mode, use the command -@kbd{M-x which-function-mode}. Although Which Function mode is a -global minor mode, it takes effect only in certain major modes: those -listed in the variable @code{which-func-modes}. If the value of -@code{which-func-modes} is @code{t} rather than a list of modes, then -Which Function mode applies to all major modes that know how to -support it---in other words, all the major modes that support Imenu. +@kbd{M-x which-function-mode}. Which Function mode is a global minor +mode. By default, it takes effect in all major modes major modes that +know how to support it (i.e., all the major modes that support +Imenu). You can restrict it to a specific list of major modes by +changing the value of the variable @code{which-func-modes} from +@code{t} (which means to support all available major modes) to a list +of major mode names. @node Program Indent @section Indentation for Programs @@ -390,7 +391,7 @@ indentation. When indenting a line that starts within a parenthetical grouping, Emacs usually places the start of the line under the preceding line within the group, or under the text after the parenthesis. If you -manually give one of these lines a nonstandard indentation (e.g.@: for +manually give one of these lines a nonstandard indentation (e.g., for aesthetic purposes), the lines below will follow it. The indentation commands for most programming language modes assume @@ -430,7 +431,7 @@ lines that start inside comments and strings. To reindent the contents of a single parenthetical grouping, position point before the beginning of the grouping and type @kbd{C-M-q}. This changes the relative indentation within the -grouping, without affecting its overall indentation (i.e.@: the +grouping, without affecting its overall indentation (i.e., the indentation of the line where the grouping starts). The function that @kbd{C-M-q} runs depends on the major mode; it is @code{indent-pp-sexp} in Lisp mode, @code{c-indent-exp} in C mode, @@ -671,7 +672,7 @@ Put mark after following expression (@code{mark-sexp}). @findex backward-sexp To move forward over a balanced expression, use @kbd{C-M-f} (@code{forward-sexp}). If the first significant character after point -is an opening delimiter (e.g.@: @samp{(}, @samp{[} or @samp{@{} in C), +is an opening delimiter (e.g., @samp{(}, @samp{[} or @samp{@{} in C), this command moves past the matching closing delimiter. If the character begins a symbol, string, or number, the command moves over that. @@ -923,7 +924,7 @@ negative argument @var{-n} removes @var{n} delimiters. If the region is not active, and there is no existing comment on the current line, @kbd{M-;} adds a new comment to the current line. If -the line is blank (i.e.@: empty or containing only whitespace +the line is blank (i.e., empty or containing only whitespace characters), the comment is indented to the same position where @key{TAB} would indent to (@pxref{Basic Indent}). If the line is non-blank, the comment is placed after the last non-whitespace @@ -986,7 +987,7 @@ type @kbd{M-j} or @kbd{C-M-j} (@code{comment-indent-new-line}). This breaks the current line, and inserts the necessary comment delimiters and indentation to continue the comment. - For languages with closing comment delimiters (e.g.@: @samp{*/} in + For languages with closing comment delimiters (e.g., @samp{*/} in C), the exact behavior of @kbd{M-j} depends on the value of the variable @code{comment-multi-line}. If the value is @code{nil}, the command closes the comment on the old line and starts a new comment on @@ -1630,7 +1631,7 @@ Enable (or disable) @dfn{subword mode}. In subword mode, Emacs's word commands recognize upper case letters in @samp{StudlyCapsIdentifiers} as word boundaries. This is indicated by the flag @samp{/w} on the mode line after the mode name -(e.g. @samp{C/law}). You can even use @kbd{M-x subword-mode} in +(e.g., @samp{C/law}). You can even use @kbd{M-x subword-mode} in non-CC Mode buffers. In the GNU project, we recommend using underscores to separate words diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 72fd6458dde..0a83c0bdddd 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -92,6 +92,13 @@ Copy region into register @var{r} (@code{copy-to-register}). Insert text from register @var{r} (@code{insert-register}). @item M-x append-to-register @key{RET} @var{r} Append region to text in register @var{r}. + +@kindex C-x r + +When register @var{r} contains text, you can use @kbd{C-x r +} +(@code{increment-register}) to append to that register. Note that +command @kbd{C-x r +} behaves differently if @var{r} contains a +number. @xref{Number Registers}. + @item M-x prepend-to-register @key{RET} @var{r} Prepend region to text in register @var{r}. @end table @@ -116,6 +123,19 @@ region after appending it to the register. The command the region text to the text in the register instead of @emph{appending} it. +@vindex register-separator + When you are collecting text using @code{append-to-register} and +@code{prepend-to-register}, you may want to separate individual +collected pieces using a separator. In that case, configure a +@code{register-separator} and store the separator text in to that +register. For example, to get double newlines as text separator +during the collection process, you can use the following setting. + +@example +(setq register-separator ?+) +(set-register register-separator "\n\n") +@end example + @kindex C-x r i @findex insert-register @kbd{C-x r i @var{r}} inserts in the buffer the text from register @@ -191,8 +211,10 @@ Store @var{number} into register @var{r} (@code{number-to-register}). @item C-u @var{number} C-x r + @var{r} @kindex C-x r + @findex increment-register -Increment the number in register @var{r} by @var{number} -(@code{increment-register}). +If @var{r} contains a number, increment the number in that register by +@var{number}. Note that command @kbd{C-x r +} +(@code{increment-register}) behaves differently if @var{r} contains +text. @xref{Text Registers}. @item C-x r i @var{r} Insert the number from register @var{r} into the buffer. @end table diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 3938712a5e9..23255e65c78 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -284,7 +284,7 @@ deleted remains current. @kbd{d} with a prefix argument is equivalent to @kbd{C-d}. Note that the Rmail summary versions of these commands behave slightly differently (@pxref{Rmail Summary Edit}). -@c mention other hooks, eg show message hook? +@c mention other hooks, e.g., show message hook? @vindex rmail-delete-message-hook Whenever Rmail deletes a message, it runs the hook @code{rmail-delete-message-hook}. When the hook functions are invoked, @@ -1490,7 +1490,7 @@ the machine on which to look for the POP server. @c FIXME mention --with-hesiod "support Hesiod to get the POP server host"? @cindex IMAP mailboxes - Another method for accessing remote mailboxes is IMAP. This method is + Another method for accessing remote mailboxes is IMAP@. This method is supported only by the Mailutils @code{movemail}. To specify an IMAP mailbox in the inbox list, use the following mailbox @acronym{URL}: @samp{imap://@var{username}[:@var{password}]@@@var{hostname}}. The diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index 989cf998bfd..2b8edaf9375 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -314,5 +314,5 @@ the echo area. You can use the up and down arrow keys to move through the menu to different items, and then you can type @key{RET} to select the item. Each menu item is also designated by a letter or digit (usually the initial of some word in the item's name). This letter or -digit is separated from the item name by @samp{=>}. You can type the +digit is separated from the item name by @samp{==>}. You can type the item's letter or digit to select the item. diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index d5c9783b772..a3abdd19c27 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -17,11 +17,11 @@ thing, but search for patterns instead of fixed strings. (@pxref{Operating on Files}), or ask the @code{grep} program to do it (@pxref{Grep Searching}). - @menu * Incremental Search:: Search happens as you type the string. * Nonincremental Search:: Specify entire string and then search. * Word Search:: Search for sequence of words. +* Symbol Search:: Search for a source code symbol. * Regexp Search:: Search for match for a regexp. * Regexps:: Syntax of regular expressions. * Regexp Backslash:: Regular expression constructs starting with `\'. @@ -218,6 +218,24 @@ search. Some of the characters you type during incremental search have special effects. +@cindex lax space matching +@kindex M-s SPC @r{(Incremental search)} +@kindex SPC @r{(Incremental search)} +@findex isearch-toggle-lax-whitespace +@vindex search-whitespace-regexp + By default, incremental search performs @dfn{lax space matching}: +each space, or sequence of spaces, matches any sequence of one or more +spaces in the text. Hence, @samp{foo bar} matches @samp{foo bar}, +@samp{foo bar}, @samp{foo bar}, and so on (but not @samp{foobar}). +More precisely, Emacs matches each sequence of space characters in the +search string to a regular expression specified by the variable +@code{search-whitespace-regexp}. For example, set it to +@samp{"[[:space:]\n]+"} to make spaces match sequences of newlines as +well as spaces. To toggle lax space matching, type @kbd{M-s SPC} +(@code{isearch-toggle-lax-whitespace}). To disable this feature +entirely, change @code{search-whitespace-regexp} to @code{nil}; then +each space in the search string matches exactly one space + If the search string you entered contains only lower-case letters, the search is case-insensitive; as long as an upper-case letter exists in the search string, the search becomes case-sensitive. If you @@ -369,7 +387,7 @@ wrap around, going from the last page to the first page or vice versa. When the current match is on a history element, that history element is pulled into the minibuffer. If you exit the incremental search -normally (e.g. by typing @key{RET}), it remains in the minibuffer +normally (e.g., by typing @key{RET}), it remains in the minibuffer afterwards. Canceling the search, with @kbd{C-g}, restores the contents of the minibuffer when you began the search. @@ -450,6 +468,47 @@ the search string can match part of a word, so that the matching proceeds incrementally as you type. This additional laxity does not apply to the lazy highlight, which always matches whole words. +@node Symbol Search +@section Symbol Search +@cindex symbol search + + A @dfn{symbol search} is much like an ordinary search, except that +the boundaries of the search must match the boundaries of a symbol. +The meaning of @dfn{symbol} in this context depends on the major mode, +and usually refers to a source code token, such as a Lisp symbol in +Emacs Lisp mode. For instance, if you perform an incremental symbol +search for the Lisp symbol @code{forward-word}, it would not match +@code{isearch-forward-word}. This feature is thus mainly useful for +searching source code. + +@table @kbd +@item M-s _ +If incremental search is active, toggle symbol search mode +(@code{isearch-toggle-symbol}); otherwise, begin an incremental +forward symbol search (@code{isearch-forward-symbol}). +@item M-s _ @key{RET} @var{symbol} @key{RET} +Search forward for @var{symbol}, nonincrementally. +@item M-s _ C-r @key{RET} @var{symbol} @key{RET} +Search backward for @var{symbol}, nonincrementally. +@end table + +@kindex M-s _ +@findex isearch-forward-symbol + To begin a forward incremental symbol search, type @kbd{M-s _}. If +incremental search is not already active, this runs the command +@code{isearch-forward-symbol}. If incremental search is already +active, @kbd{M-s _} switches to a symbol search, preserving the +direction of the search and the current search string; you can disable +symbol search by typing @kbd{M-s _} again. In incremental symbol +search, only the beginning of the search string is required to match +the beginning of a symbol. + + To begin a nonincremental symbol search, type @kbd{M-s _ @key{RET}} +for a forward search, or @kbd{M-s _ C-r @key{RET}} or a backward +search. In nonincremental symbol searches, the beginning and end of +the search string are required to match the beginning and end of a +symbol, respectively. + @node Regexp Search @section Regular Expression Search @cindex regexp search @@ -492,12 +551,12 @@ Incremental regexp and non-regexp searches have independent defaults. They also have separate search rings, which you can access with @kbd{M-p} and @kbd{M-n}. -@vindex search-whitespace-regexp - If you type @key{SPC} in incremental regexp search, it matches any -sequence of whitespace characters, including newlines. If you want to -match just a space, type @kbd{C-q @key{SPC}}. You can control what a -bare space matches by setting the variable -@code{search-whitespace-regexp} to the desired regexp. + Just as in ordinary incremental search, any @key{SPC} typed in +incremental regexp search matches any sequence of one or more +whitespace characters. The variable @code{search-whitespace-regexp} +specifies the regexp for the lax space matching, and @kbd{M-s SPC} +(@code{isearch-toggle-lax-whitespace}) toggles the feature. +@xref{Special Isearch}. In some cases, adding characters to the regexp in an incremental regexp search can make the cursor move back and start again. For @@ -974,6 +1033,13 @@ instead (@pxref{Mark}). The basic replace commands replace one is possible to perform several replacements in parallel, using the command @code{expand-region-abbrevs} (@pxref{Expanding Abbrevs}). +@vindex replace-lax-whitespace + Unlike incremental search, the replacement commands do not use lax +space matching (@pxref{Special Isearch}) by default. To enable lax +space matching for replacement, change the variable +@code{replace-lax-whitespace} to @code{t}. (This only affects how +Emacs finds the text to replace, not the replacement text.) + @menu * Unconditional Replace:: Replacing all matches for a string. * Regexp Replace:: Replacing all matches for a regexp. @@ -1215,6 +1281,19 @@ occurrences. @item ! to replace all remaining occurrences without asking again. +@item Y @r{(Upper-case)} +to replace all remaining occurrences in all remaining buffers in +multi-buffer replacements (like the Dired `Q' command which performs +query replace on selected files). It answers this question and all +subsequent questions in the series with "yes", without further +user interaction. + +@item N @r{(Upper-case)} +to skip to the next buffer in multi-buffer replacements without +replacing remaining occurrences in the current buffer. It answers +this question "no", gives up on the questions for the current buffer, +and continues to the next buffer in the sequence. + @item ^ to go back to the position of the previous occurrence (or what used to be an occurrence), in case you changed it by mistake or want to diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 8802e5392d7..732078a6a65 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -113,7 +113,7 @@ people use only standard field names with accepted meanings. @vindex user-full-name @vindex user-mail-address The @samp{From} header field identifies the person sending the email -(i.e.@: you). This should be a valid mailing address, as replies are +(i.e., you). This should be a valid mailing address, as replies are normally sent there. The default contents of this header field are computed from the variables @code{user-full-name} (which specifies your full name) and @code{user-mail-address} (your email address). On diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index f10e78e17ad..c12b96724b1 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -818,10 +818,10 @@ indenting the current line. @xref{Indentation}, for details. Text mode turns off the features concerned with comments except when you explicitly invoke them. It changes the syntax table so that -single-quotes are considered part of words (e.g.@: @samp{don't} is +single-quotes are considered part of words (e.g., @samp{don't} is considered one word). However, if a word starts with a single-quote, it is treated as a prefix for the purposes of capitalization -(e.g.@: @kbd{M-c} converts @samp{'hello'} into @samp{'Hello'}, as +(e.g., @kbd{M-c} converts @samp{'hello'} into @samp{'Hello'}, as expected). @cindex Paragraph-Indent Text mode @@ -1096,9 +1096,9 @@ direct and indirect, and all of their bodies. current heading line as well as all the bodies in its subtree; the subheadings themselves are left visible. The command @kbd{C-c C-k} (@code{show-branches}) reveals the subheadings, if they had previously -been hidden (e.g.@: by @kbd{C-c C-d}). The command @kbd{C-c C-i} +been hidden (e.g., by @kbd{C-c C-d}). The command @kbd{C-c C-i} (@code{show-children}) is a weaker version of this; it reveals just -the direct subheadings, i.e.@: those one level down. +the direct subheadings, i.e., those one level down. @findex hide-other @kindex C-c C-o @r{(Outline mode)} @@ -1177,7 +1177,7 @@ in the mode line shows how deep you've gone. When zooming in on a heading, to see only the child subheadings specify a numeric argument: @kbd{C-u C-c C-z}. The number of levels of children -can be specified too (compare @kbd{M-x show-children}), e.g.@: @kbd{M-2 +can be specified too (compare @kbd{M-x show-children}), e.g., @kbd{M-2 C-c C-z} exposes two levels of child subheadings. Alternatively, the body can be specified with a negative argument: @kbd{M-- C-c C-z}. The whole subtree can be expanded, similarly to @kbd{C-c C-s} (@kbd{M-x @@ -1349,7 +1349,7 @@ date, beneath the heading line. The command @kbd{C-c C-d} Once you have some TODO items planned in an Org file, you can add that file to the list of @dfn{agenda files} by typing @kbd{C-c [} (@code{org-agenda-file-to-front}). Org mode is designed to let you -easily maintain multiple agenda files, e.g.@: for organizing different +easily maintain multiple agenda files, e.g., for organizing different aspects of your life. The list of agenda files is stored in the variable @code{org-agenda-files}. @@ -1372,7 +1372,7 @@ etc. export and publication. To export the current buffer, type @kbd{C-c C-e} (@code{org-export}) anywhere in an Org buffer. This command prompts for an export format; currently supported formats include -HTML, @LaTeX{}, OpenDocument (@file{.odt}), and PDF. Some formats, +HTML, @LaTeX{}, OpenDocument (@file{.odt}), and PDF@. Some formats, such as PDF, require certain system tools to be installed. @vindex org-publish-project-alist @@ -1399,7 +1399,7 @@ This is an example. #+end_example @end example - For further details, see @ref{Exporting,,,org, The Org Manual} and + For further details, @ref{Exporting,,,org, The Org Manual}, and @ref{Publishing,,,org, The Org Manual}. @node TeX Mode @@ -1606,7 +1606,7 @@ when you type the corresponding one. @subsection @TeX{} Printing Commands You can invoke @TeX{} as an subprocess of Emacs, supplying either -the entire contents of the buffer or just part of it (e.g.@: one +the entire contents of the buffer or just part of it (e.g., one chapter of a larger document). @table @kbd @@ -1681,7 +1681,7 @@ determined by the variable @code{tex-dvi-print-command}. shell command strings described in the preceding paragraph. For example, if @code{tex-dvi-view-command} is @code{"xdvi"}, @kbd{C-c C-v} runs @command{xdvi @var{output-file-name}}. In some cases, -however, the file name needs to be embedded in the command, e.g.@: if +however, the file name needs to be embedded in the command, e.g., if you need to provide the file name as an argument to one command whose output is piped to another. You can specify where to put the file name with @samp{*} in the command string. For example, @@ -1936,7 +1936,7 @@ Emacs. @vindex sgml-xml-mode You may choose to use the less powerful SGML mode for editing XML, -since XML is a strict subset of SGML. To enable SGML mode in an +since XML is a strict subset of SGML@. To enable SGML mode in an existing buffer, type @kbd{M-x sgml-mode}. On enabling SGML mode, Emacs examines the buffer to determine whether it is XML; if so, it sets the variable @code{sgml-xml-mode} to a non-@code{nil} value. @@ -1950,7 +1950,7 @@ always insert explicit closing tags as well. @findex nroff-mode @vindex nroff-mode-hook Nroff mode, a major mode derived from Text mode, is -specialized for editing nroff files (e.g.@: Unix man pages). Type +specialized for editing nroff files (e.g., Unix man pages). Type @kbd{M-x nroff-mode} to enter this mode. Entering Nroff mode runs the hook @code{text-mode-hook}, then @code{nroff-mode-hook} (@pxref{Hooks}). @@ -2706,7 +2706,7 @@ and 3 rows, and a total of 5 cells. @findex table-insert-sequence @kbd{M-x table-insert-sequence} inserts a string into each cell. -Each string is a part of a sequence i.e.@: a series of increasing +Each string is a part of a sequence i.e., a series of increasing integer numbers. @cindex table for HTML and LaTeX diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 025185c583f..fc4cef19760 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -149,6 +149,7 @@ Emacs. * Screen Garbled:: Garbage on the screen. * Text Garbled:: Garbage in the text. * Memory Full:: How to cope when you run out of memory. +* Crashing:: What Emacs does when it crashes. * After a Crash:: Recovering editing in an Emacs session that crashed. * Emergency Escape:: What to do if Emacs stops responding. @end menu @@ -274,9 +275,75 @@ will disappear from the mode line. That means you can safely go on editing in the same Emacs session. Do not use @kbd{M-x buffer-menu} to save or kill buffers when you run -out of memory, because the buffer menu needs a fair amount of memory +out of memory, because the Buffer Menu needs a fair amount of memory itself, and the reserve supply may not be enough. +@node Crashing +@subsection When Emacs Crashes + +@cindex crash report +@cindex backtrace +@cindex @file{emacs_backtrace.txt} file, MS-Windows + Emacs is not supposed to crash, but if it does, it produces a +@dfn{crash report} prior to exiting. The crash report is printed to +the standard error stream. If Emacs was started from a graphical +desktop on a GNU or Unix system, the standard error stream is commonly +redirected to a file such as @file{~/.xsession-errors}, so you can +look for the crash report there. On MS-Windows, the crash report is +written to a file named @file{emacs_backtrace.txt} in the current +directory of the Emacs process, in addition to the standard error +stream. + + The format of the crash report depends on the platform. On some +platforms, such as those using the GNU C Library, the crash report +includes a @dfn{backtrace} describing the execution state prior to +crashing, which can be used to help debug the crash. Here is an +example for a GNU system: + +@example +Fatal error 11: Segmentation fault +Backtrace: +emacs[0x5094e4] +emacs[0x4ed3e6] +emacs[0x4ed504] +/lib64/libpthread.so.0[0x375220efe0] +/lib64/libpthread.so.0(read+0xe)[0x375220e08e] +emacs[0x509af6] +emacs[0x5acc26] +@dots{} +@end example + +@noindent +The number @samp{11} is the system signal number corresponding to the +crash---in this case a segmentation fault. The hexadecimal numbers +are program addresses, which can be associated with source code lines +using a debugging tool. For example, the GDB command +@samp{list *0x509af6} prints the source-code lines corresponding to +the @samp{emacs[0x509af6]} entry. If your system has the +@command{addr2line} utility, the following shell command outputs a +backtrace with source-code line numbers: + +@example +sed -n 's/.*\[\(.*\)]$/\1/p' @var{backtrace} | + addr2line -Cfip -e @var{bindir}/@var{emacs-binary} +@end example + +@noindent +Here, @var{backtrace} is the name of a text file containing a copy of +the backtrace, @var{bindir} is the name of the directory that +contains the Emacs executable, and @var{emacs-binary} is the name of +the Emacs executable file, normally @file{emacs} on GNU and Unix +systems and @file{emacs.exe} on MS-Windows and MS-DOS. + +@cindex core dump + Optionally, Emacs can generate a @dfn{core dump} when it crashes, on +systems that support core files. A core dump is a file containing +voluminous data about the state of the program prior to the crash, +usually examined by loading it into a debugger such as GDB@. On many +platforms, core dumps are disabled by default, and you must explicitly +enable them by running the shell command @samp{ulimit -c unlimited} +(e.g., in your shell startup script). + @node After a Crash @subsection Recovery After a Crash @@ -313,7 +380,7 @@ symbols. @file{core.emacs}, so that another crash won't overwrite it. To use this script, run @code{gdb} with the file name of your Emacs -executable and the file name of the core dump, e.g. @samp{gdb +executable and the file name of the core dump, e.g., @samp{gdb /usr/bin/emacs core.emacs}. At the @code{(gdb)} prompt, load the recovery script: @samp{source /usr/src/emacs/etc/emacs-buffer.gdb}. Then type the command @code{ybuffer-list} to see which buffers are @@ -424,7 +491,8 @@ Instead of browsing the bug tracker as a webpage, you can browse it from Emacs using the @code{debbugs} package, which can be downloaded via the Package Menu (@pxref{Packages}). This package provides the command @kbd{M-x debbugs-gnu} to list bugs, and @kbd{M-x -debbugs-gnu-search} to search for a specific bug. +debbugs-gnu-search} to search for a specific bug. User tags, applied +by the Emacs maintainers, are shown by @kbd{M-x debbugs-gnu-usertags}. @item The @samp{bug-gnu-emacs} mailing list (also available as the newsgroup diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index cd5ed206dd6..291ad13b883 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -30,7 +30,7 @@ you can generate change log entries from the version control log entries of previous commits. - Note that this only works with RCS or CVS. This procedure would be + Note that this only works with RCS or CVS@. This procedure would be particularly incorrect on a modern changeset-based version control system, where changes to the @file{ChangeLog} file would normally be committed as part of a changeset. In that case, you should write the @@ -195,7 +195,7 @@ Thus, you can use it to compare a tagged version against the current files, or two tagged versions against each other. On SCCS, VC implements tags itself; these tags are visible only -through VC. Most later systems (including CVS, Subversion, bzr, git, +through VC@. Most later systems (including CVS, Subversion, bzr, git, and hg) have a native tag facility, and VC uses it where available; those tags will be visible even when you bypass VC. @@ -236,7 +236,7 @@ way, change the variable @code{vc-consult-headers} to @code{nil}. @vindex vc-@var{backend}-header To insert a suitable header string into the current buffer, type @kbd{C-x v h} (@code{vc-insert-headers}). This command works only on -Subversion, CVS, RCS, and SCCS. The variable +Subversion, CVS, RCS, and SCCS@. The variable @code{vc-@var{backend}-header} contains the list of keywords to insert into the version header; for instance, CVS uses @code{vc-cvs-header}, whose default value is @code{'("\$Id\$")}. (The extra backslashes @@ -313,13 +313,6 @@ appropriate version control system. If @code{vc-command-messages} is non-@code{nil}, VC displays messages to indicate which shell commands it runs, and additional messages when the commands finish. -@vindex vc-path - You can specify additional directories to search for version control -programs by setting the variable @code{vc-path}. These directories -are searched before the usual search path. It is rarely necessary to -set this variable, because VC normally finds the proper files -automatically. - @node RCS and SCCS @subsubsection Options for RCS and SCCS @@ -360,7 +353,7 @@ changed erroneously, set @code{vc-mistrust-permissions} to @code{t}. Then VC always checks the master file to determine the file's status. VC determines the version control state of files under SCCS much as -with RCS. It does not consider SCCS version headers, though. Thus, +with RCS@. It does not consider SCCS version headers, though. Thus, the variable @code{vc-mistrust-permissions} affects SCCS use, but @code{vc-consult-headers} does not. @@ -380,7 +373,7 @@ the name of the operation to invoke. network interactions to a minimum. This is controlled by the variable @code{vc-cvs-stay-local}. There is another variable, @code{vc-stay-local}, which enables the feature also for other back -ends that support it, including CVS. In the following, we will talk +ends that support it, including CVS@. In the following, we will talk only about @code{vc-cvs-stay-local}, but everything applies to @code{vc-stay-local} as well. diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 2496a505063..9373d9b2f1b 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -282,7 +282,7 @@ window one line taller, taking space from a vertically adjacent window without changing the height of the frame. With a positive numeric argument, this command increases the window height by that many lines; with a negative argument, it reduces the height by that many lines. -If there are no vertically adjacent windows (i.e. the window is at the +If there are no vertically adjacent windows (i.e., the window is at the full frame height), that signals an error. The command also signals an error if you attempt to reduce the height of any window below a certain minimum number of lines, specified by the variable @@ -328,7 +328,7 @@ usually work by calling @code{switch-to-buffer} internally @findex display-buffer Some commands try to display ``intelligently'', trying not to take -over the selected window, e.g. by splitting off a new window and +over the selected window, e.g., by splitting off a new window and displaying the desired buffer there. Such commands, which include the various help commands (@pxref{Help}), work by calling @code{display-buffer} internally. @xref{Window Choice}, for details. @@ -378,20 +378,12 @@ adding the desired buffer's name to the list expression to the list @code{same-window-regexps}. By default, these variables are @code{nil}, so this step is skipped. -@vindex display-buffer-reuse-frames @item Otherwise, if the buffer is already displayed in an existing window, ``reuse'' that window. Normally, only windows on the selected frame are considered, but windows on other frames are also reusable if you -change @code{display-buffer-reuse-frames} to @code{t}, or if you change @code{pop-up-frames} (see below) to @code{t}. -@item -Otherwise, if you specified that the buffer should be displayed in a -special frame by customizing @code{special-display-buffer-names} or -@code{special-display-regexps}, do so. @xref{Choosing Window -Options,,, elisp, The Emacs Lisp Reference Manual}. - @vindex pop-up-frames @item Otherwise, optionally create a new frame and display the buffer there. @@ -433,7 +425,7 @@ and display the buffer there. @cindex undoing window configuration changes @cindex window configuration changes, undoing Winner mode is a global minor mode that records the changes in the -window configuration (i.e. how the frames are partitioned into +window configuration (i.e., how the frames are partitioned into windows), so that you can ``undo'' them. You can toggle Winner mode with @kbd{M-x winner-mode}, or by customizing the variable @code{winner-mode}. When the mode is enabled, @kbd{C-c left} diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 5bdf734804b..b3ed78d7f1c 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -489,7 +489,7 @@ The color for the border shadow, on the top and the left. @cindex @file{~/.emacs.d/gtkrc} file If Emacs is compiled with GTK+ toolkit support, the simplest way to -customize its GTK+ widgets (e.g.@: menus, dialogs, tool bars and +customize its GTK+ widgets (e.g., menus, dialogs, tool bars and scroll bars) is to choose an appropriate GTK+ theme, for example with the GNOME theme selector. @@ -499,7 +499,7 @@ resources are specified in either the file @file{~/.emacs.d/gtkrc} (for Emacs-specific GTK+ resources), or @file{~/.gtkrc-2.0} (for general GTK+ resources). We recommend using @file{~/.emacs.d/gtkrc}, since GTK+ seems to ignore @file{~/.gtkrc-2.0} when running GConf with -GNOME. Note, however, that some GTK themes may override +GNOME@. Note, however, that some GTK themes may override customizations in @file{~/.emacs.d/gtkrc}; there is nothing we can do about this. GTK+ resources do not affect aspects of Emacs unrelated to GTK+ widgets, such as fonts and colors in the main Emacs window; @@ -541,7 +541,7 @@ gtk-font-name = "courier 12" @noindent Note that in this case the font name must be supplied as a GTK font pattern (also called a @dfn{Pango font name}), not as a -Fontconfig-style font name or XLFD. @xref{Fonts}. +Fontconfig-style font name or XLFD@. @xref{Fonts}. To customize widgets you first define a @dfn{style}, and then apply the style to the widgets. Here is an example that sets the font for @@ -590,8 +590,8 @@ widget "*verticalScrollBar*" style "scroll" A GTK+ widget is specified by a @dfn{widget name} and a @dfn{widget class}. The widget name refers to a specific widget -(e.g.@: @samp{emacs-menuitem}), while the widget class refers to a -collection of similar widgets (e.g.@: @samp{GtkMenuItem}). A widget +(e.g., @samp{emacs-menuitem}), while the widget class refers to a +collection of similar widgets (e.g., @samp{GtkMenuItem}). A widget always has a class, but need not have a name. @dfn{Absolute names} are sequences of widget names or widget @@ -746,7 +746,7 @@ possible states are: This is the default state for widgets. @item ACTIVE This is the state for a widget that is ready to do something. It is -also for the trough of a scroll bar, i.e.@: @code{bg[ACTIVE] = "red"} +also for the trough of a scroll bar, i.e., @code{bg[ACTIVE] = "red"} sets the scroll bar trough to red. Buttons that have been pressed but not released yet (``armed'') are in this state. @item PRELIGHT @@ -780,7 +780,7 @@ dialog. @item bg_pixmap[@var{state}] = "@var{pixmap}" This specifies an image background (instead of a background color). @var{pixmap} should be the image file name. GTK can use a number of -image file formats, including XPM, XBM, GIF, JPEG and PNG. If you +image file formats, including XPM, XBM, GIF, JPEG and PNG@. If you want a widget to use the same image as its parent, use @samp{<parent>}. If you don't want any image, use @samp{<none>}. @samp{<none>} is the way to cancel a background image inherited from a @@ -790,7 +790,7 @@ You can't specify the file by its absolute file name. GTK looks for the pixmap file in directories specified in @code{pixmap_path}. @code{pixmap_path} is a colon-separated list of directories within double quotes, specified at the top level in a @file{gtkrc} file -(i.e.@: not inside a style definition; see example above): +(i.e., not inside a style definition; see example above): @smallexample pixmap_path "/usr/share/pixmaps:/usr/include/X11/pixmaps" @@ -814,8 +814,8 @@ GTK-style (or Pango) font name, like @samp{Sans Italic 10}. There are three ways to specify a color: a color name, an RGB triplet, or a GTK-style RGB triplet. @xref{Colors}, for a description of color names and RGB triplets. Color names should be enclosed with -double quotes, e.g.@: @samp{"red"}. RGB triplets should be written -without double quotes, e.g.@: @samp{#ff0000}. GTK-style RGB triplets +double quotes, e.g., @samp{"red"}. RGB triplets should be written +without double quotes, e.g., @samp{#ff0000}. GTK-style RGB triplets have the form @w{@code{@{ @var{r}, @var{g}, @var{b} @}}}, where @var{r}, @var{g} and @var{b} are either integers in the range 0-65535 or floats in the range 0.0-1.0. |