From 5cf98ab4b3a736ab2df3140f9bde2f66e8f241fb Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Sat, 4 Jun 2005 10:18:46 +0000 Subject: (After a Crash): Polish previous change. --- man/trouble.texi | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'man') diff --git a/man/trouble.texi b/man/trouble.texi index ff846821ff2..da14f25568f 100644 --- a/man/trouble.texi +++ b/man/trouble.texi @@ -351,7 +351,6 @@ visits the file but gets the text from the auto-save file. recover are present in Emacs buffers. You should then save them. Only this---saving them---updates the files themselves. - As a last resort, if you had buffers with content which were not associated with any files, or if the autosave was not recent enough to have recorded important changes, you can use the @@ -360,16 +359,16 @@ retrieve them from a core dump--provided that a core dump was saved, and that the Emacs executable was not stripped of its debugging symbols. - 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 + 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 /usr/bin/emacs core.emacs}. At the @code{(gdb)} prompt, load the recovery script: @samp{source /usr/src/emacs/etc/emacs-buffer.gdb}. -You can now use the commands @code{ybuffer-list} and -@code{ysave-buffer} to list and save buffers. The @code{ysave-buffer} -command takes a buffer number (as listed by @code{ybuffer-list}) and a -file name to which to write the buffer contents. You should use a -file name which does not already exist; no backups of the previous -contents of the file will be saved, if any. +Then type the command @code{ybuffer-list} to see which buffers are +available. For each buffer, it lists a buffer number. To save a +buffer, use @code{ysave-buffer}; you specify the buffer number, and +the file name to write that buffer into. You should use a file name +which does not already exist; if the file does exist, the script does +not make make a backup of its old contents. @node Emergency Escape @subsection Emergency Escape -- cgit v1.2.1 From a4e51a7a678a101cf7a6766e50ef6e5d3fe8d369 Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Sat, 4 Jun 2005 10:24:11 +0000 Subject: *** empty log message *** --- man/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index 30aaac5833e..9fe0433aaff 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2005-06-04 Richard M. Stallman + + * trouble.texi (After a Crash): Polish previous change. + 2005-05-31 Jay Belanger * calc.texi (Notations Used in This Manual): Use @kbd for key -- cgit v1.2.1 From c1d847015ea047e825b9283472da33e11762553e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:55:02 +0000 Subject: Rename Hardcopy to Printing. Make PostScript and PostScript Variables subnodes of it. --- man/emacs.texi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'man') diff --git a/man/emacs.texi b/man/emacs.texi index 345d54ce0c5..69081b2c02b 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -191,9 +191,7 @@ Advanced Features * Gnus:: How to read netnews with Emacs. * Shell:: Executing shell commands from Emacs. * Emacs Server:: Using Emacs as an editing server for @code{mail}, etc. -* Hardcopy:: Printing buffers or regions. -* PostScript:: Printing buffers or regions as PostScript. -* PostScript Variables::Customizing the PostScript printing commands. +* Printing:: Printing hardcopies of buffers or regions. * Sorting:: Sorting lines, paragraphs or pages within Emacs. * Narrowing:: Restricting display and editing to a portion of the buffer. -- cgit v1.2.1 From 66bb4d9a02bbf4c6c32b437f2aae0e138ee4f99b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:55:50 +0000 Subject: (Printing): Rename node from Hardcopy. Mention menu bar options. Move PostScript and PostScript Variables to a submenu. (Printing package): New node. --- man/misc.texi | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 10 deletions(-) (limited to 'man') diff --git a/man/misc.texi b/man/misc.texi index 68dd7356479..cf2fa5ff28d 100644 --- a/man/misc.texi +++ b/man/misc.texi @@ -1214,7 +1214,7 @@ off directory tracking. @end ignore -@node Emacs Server, Hardcopy, Shell, Top +@node Emacs Server, Printing, Shell, Top @section Using Emacs as a Server @pindex emacsclient @cindex Emacs as a server @@ -1374,14 +1374,17 @@ code, using the option @samp{--eval}. When this option is given, the rest of the arguments is not taken as a list of files to visit but as a list of expressions to evaluate. -@node Hardcopy, PostScript, Emacs Server, Top -@section Hardcopy Output +@node Printing, Sorting, Emacs Server, Top +@section Printing Hard Copies @cindex hardcopy +@cindex printing - The Emacs commands for making hardcopy let you print either an entire -buffer or just part of one, either with or without page headers. -See also the hardcopy commands of Dired (@pxref{Misc File Ops}) -and the diary (@pxref{Displaying the Diary}). + Emacs provides commands for printing hard copies of either an entire +buffer or just part of one, with or without page headers. You can +invoke the printing commands directly, as detailed in the following +section, or using the @samp{File} menu on the menu bar. See also the +hardcopy commands of Dired (@pxref{Misc File Ops}) and the diary +(@pxref{Displaying the Diary}). @table @kbd @item M-x print-buffer @@ -1428,7 +1431,13 @@ whether to supply @samp{-T} and @samp{-J} options (suitable for @code{lpr-add-switches} should be @code{nil} if your printer program is not compatible with @code{lpr}. -@node PostScript, PostScript Variables, Hardcopy, Top +@menu +* PostScript:: Printing buffers or regions as PostScript. +* PostScript Variables:: Customizing the PostScript printing commands. +* Printing Package:: An optional advanced printing interface. +@end menu + +@node PostScript, PostScript Variables,, Printing @section PostScript Hardcopy These commands convert buffer contents to PostScript, @@ -1492,7 +1501,7 @@ supports ISO 8859-1 characters. The following section describes variables for customizing these commands. @end ifinfo -@node PostScript Variables, Sorting, PostScript, Top +@node PostScript Variables, Printing Package, PostScript, Printing @section Variables for PostScript Hardcopy @vindex ps-lpr-command @@ -1584,7 +1593,33 @@ includes a single directory @file{/usr/local/share/emacs/fonts/bdf}. Many other customization variables for these commands are defined and described in the Lisp files @file{ps-print.el} and @file{ps-mule.el}. -@node Sorting, Narrowing, PostScript Variables, Top +@node Printing Package,, PostScript Variables, Printing +@section Printing Package +@cindex Printing package + + The basic Emacs facilities for printing hardcopy can be extended +using the Printing package. This provides an easy-to-use interface +for choosing what to print, previewing PostScript files before +printing, and setting various printing options such as print headers, +landscape or portrait modes, duplex modes, and so forth. On GNU/Linux +or Unix systems, the Printing package relies on the @file{gs} and +@file{gv} utilities, which are distributed as part of the GhostScript +program. On MS-Windows, the @file{gstools} port of Ghostscript can be +used. + +@findex pr-interface + To use the Printing package, add @code{(require 'printing)} to your +init file (@pxref{Init File}). The usual printing options in the menu +bar will be replaced with a @samp{Printing} submenu, containing +various printing options. You can also type @kbd{M-x pr-interface +RET}; this creates a @samp{*Printing Interface*} buffer, similar to a +customization buffer , where you can set the printing options. After +selecting what and how to print, start the print job using the +@samp{Print} button (click @kbd{mouse-2} on it, or move point over it +and type @kbd{RET}). For further information on the various options, +use the @samp{Interface Help} button. + +@node Sorting, Narrowing, Printing, Top @section Sorting Text @cindex sorting -- cgit v1.2.1 From cb4a6fe1d86cc6767327e7bb3ed6d2e8cd42ff3c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:56:22 +0000 Subject: (Using Region): Change Hardcopy xref to Printing. --- man/mark.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/mark.texi b/man/mark.texi index f609472bca7..5f4c44de9e1 100644 --- a/man/mark.texi +++ b/man/mark.texi @@ -293,7 +293,7 @@ Indent it with @kbd{C-x @key{TAB}} or @kbd{C-M-\} (@pxref{Indentation}). @item Fill it as text with @kbd{M-x fill-region} (@pxref{Filling}). @item -Print hardcopy with @kbd{M-x print-region} (@pxref{Hardcopy}). +Print hardcopy with @kbd{M-x print-region} (@pxref{Printing}). @item Evaluate it as Lisp code with @kbd{M-x eval-region} (@pxref{Lisp Eval}). @end itemize -- cgit v1.2.1 From e159097a9cb8ce586665ab521629a41ee2500047 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:57:01 +0000 Subject: (Operating on Files): Change Hardcopy xref to Printing. --- man/dired.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/dired.texi b/man/dired.texi index f2699cfde07..8cb4646075e 100644 --- a/man/dired.texi +++ b/man/dired.texi @@ -616,7 +616,7 @@ Print the specified files (@code{dired-do-print}). You must specify the command to print them with, but the minibuffer starts out with a suitable guess made using the variables @code{lpr-command} and @code{lpr-switches} (the same variables that @code{lpr-buffer} uses; -@pxref{Hardcopy}). +@pxref{Printing}). @findex dired-do-compress @kindex Z @r{(Dired)} -- cgit v1.2.1 From d00819eaf43f0ae22ed5e5ecdd5a4eed6fd91619 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:57:44 +0000 Subject: (Displaying the Diary): Change Hardcopy xref to Printing. --- man/calendar.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/calendar.texi b/man/calendar.texi index cf02377f1d9..1ef4aef09d4 100644 --- a/man/calendar.texi +++ b/man/calendar.texi @@ -1046,7 +1046,7 @@ an illusion, so simply printing the buffer does not print what you see on your screen. There is a special command to print hard copy of the diary buffer @emph{as it appears}; this command is @kbd{M-x print-diary-entries}. It sends the data directly to the printer. You -can customize it like @code{lpr-region} (@pxref{Hardcopy}). +can customize it like @code{lpr-region} (@pxref{Printing}). @findex diary The command @kbd{M-x diary} displays the diary entries for the current -- cgit v1.2.1 From 2873a2d1ab441ac12c914c8c1a289c2a19740097 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:58:43 +0000 Subject: (MS-DOS Printing, MS-DOS Processes): Change Hardcopy xref to Printing. --- man/msdog.texi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'man') diff --git a/man/msdog.texi b/man/msdog.texi index a1d7647a95d..a5aea27f161 100644 --- a/man/msdog.texi +++ b/man/msdog.texi @@ -419,13 +419,12 @@ EOL conversion is determined by @code{file-name-buffer-file-type-alist}. @node MS-DOS Printing @section Printing and MS-DOS - Printing commands, such as @code{lpr-buffer} (@pxref{Hardcopy}) and + Printing commands, such as @code{lpr-buffer} (@pxref{Printing}) and @code{ps-print-buffer} (@pxref{PostScript}) can work in MS-DOS and MS-Windows by sending the output to one of the printer ports, if a Posix-style @code{lpr} program is unavailable. The same Emacs -variables control printing on all systems (@pxref{Hardcopy}), but in -some cases they have different default values on MS-DOS and -MS-Windows. +variables control printing on all systems, but in some cases they have +different default values on MS-DOS and MS-Windows. @vindex printer-name @r{(MS-DOS)} If you want to use your local printer, printing on it in the usual DOS @@ -758,7 +757,7 @@ implements a Posix-like shell entirely in Emacs Lisp. Processes}. @cindex printing under MS-DOS - Printing commands, such as @code{lpr-buffer} (@pxref{Hardcopy}) and + Printing commands, such as @code{lpr-buffer} (@pxref{Printing}) and @code{ps-print-buffer} (@pxref{PostScript}), work in MS-DOS by sending the output to one of the printer ports. @xref{MS-DOS Printing}. -- cgit v1.2.1 From 7350d665892ede4f59c6a51dccaa400b61cb4444 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:59:18 +0000 Subject: (Glossary): Change Hardcopy xref to Printing. --- man/glossary.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/glossary.texi b/man/glossary.texi index f75ba725a18..78abbfb30b7 100644 --- a/man/glossary.texi +++ b/man/glossary.texi @@ -573,7 +573,7 @@ Search}). See also `font lock'. @item Hardcopy Hardcopy means printed output. Emacs has commands for making printed -listings of text in Emacs buffers. @xref{Hardcopy}. +listings of text in Emacs buffers. @xref{Printing}. @item @key{HELP} @key{HELP} is the Emacs name for @kbd{C-h} or @key{F1}. You can type -- cgit v1.2.1 From 0703917482a0d4c475cc64bd755bd53e84ee4bb7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 18:59:54 +0000 Subject: (Mode Line Mouse): Mention mode-line-highlight effect. --- man/frames.texi | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'man') diff --git a/man/frames.texi b/man/frames.texi index 2b2c61af133..e5bada851ad 100644 --- a/man/frames.texi +++ b/man/frames.texi @@ -393,6 +393,14 @@ This menu is for specifying the frame's principal font. You can use mouse clicks on window mode lines to select and manipulate windows. + Some areas of the mode line, such as the buffer name and the major +mode name, have their own special mouse bindings. These areas are +highlighted when you hold the mouse over them, and information about +the special bindings will be displayed (@pxref{Tooltips}). + + You can also click on areas of the mode line that do not have +special mouse bindings of their own. This has the following effects: + @table @kbd @item Mouse-1 @kindex Mouse-1 @r{(mode line)} @@ -420,12 +428,6 @@ horizontally, above the place in the mode line where you click. @kbd{C-Mouse-2} on a scroll bar splits the corresponding window vertically. @xref{Split Window}. - The commands above apply to areas of the mode line which do not have -special mouse bindings of their own. Some areas, such as the buffer -name and the major mode name, have their own special mouse bindings. -Emacs displays information about these bindings when you hold the -mouse over such a place (@pxref{Tooltips}). - @node Creating Frames @section Creating Frames @cindex creating frames -- cgit v1.2.1 From d01a9710746df2584e6f24b1398cbe2d0e87728d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 20:00:54 +0000 Subject: *** empty log message *** --- man/ChangeLog | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index 9fe0433aaff..74b6e19d0ed 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,26 @@ +2005-06-05 Chong Yidong + + * emacs.texi: Rename Hardcopy to Printing. + Make PostScript and PostScript Variables subnodes of it. + + * misc.texi (Printing): Rename node from Hardcopy. + Mention menu bar options. + Move PostScript and PostScript Variables to submenu. + (Printing package): New node. + + * mark.texi (Using Region): Change Hardcopy xref to Printing. + + * dired.texi (Operating on Files): Likewise. + + * calendar.texi (Displaying the Diary): Likewise. + + * msdog.texi (MS-DOS Printing, MS-DOS Processes): Likewise. + + * glossary.texi (Glossary): Likewise. + + * frames.texi (Mode Line Mouse): Mention mode-line-highlight + effect. + 2005-06-04 Richard M. Stallman * trouble.texi (After a Crash): Polish previous change. -- cgit v1.2.1 From 227c36fba6555223daf647c7c83d989ca3885965 Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Mon, 6 Jun 2005 12:52:53 +0000 Subject: (Action Arguments): Clarify directory default for -l. --- man/cmdargs.texi | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'man') diff --git a/man/cmdargs.texi b/man/cmdargs.texi index e47a66bcf91..5094a924cc7 100644 --- a/man/cmdargs.texi +++ b/man/cmdargs.texi @@ -119,6 +119,10 @@ the library can be found either in the current directory, or in the Emacs library search path as specified with @env{EMACSLOADPATH} (@pxref{General Variables}). +@strong{Warning:} If previous command-line arguments have visited +files, the current directory is the directory of the last file +visited. + @item -L @var{dir} @opindex -L @itemx --directory=@var{dir} -- cgit v1.2.1 From aada47fc710c0fadbd1a315a9a261dafd9cd7a71 Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Mon, 6 Jun 2005 12:53:42 +0000 Subject: (Printing Package): Explain how to initialize printing package. --- man/misc.texi | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'man') diff --git a/man/misc.texi b/man/misc.texi index cf2fa5ff28d..b52264e1f57 100644 --- a/man/misc.texi +++ b/man/misc.texi @@ -1609,15 +1609,16 @@ used. @findex pr-interface To use the Printing package, add @code{(require 'printing)} to your -init file (@pxref{Init File}). The usual printing options in the menu -bar will be replaced with a @samp{Printing} submenu, containing -various printing options. You can also type @kbd{M-x pr-interface -RET}; this creates a @samp{*Printing Interface*} buffer, similar to a -customization buffer , where you can set the printing options. After -selecting what and how to print, start the print job using the -@samp{Print} button (click @kbd{mouse-2} on it, or move point over it -and type @kbd{RET}). For further information on the various options, -use the @samp{Interface Help} button. +init file (@pxref{Init File}), followed by @code{(pr-update-menus)}. +This function replaces the usual printing commands in the menu bar +with a @samp{Printing} submenu that contains various printing options. +You can also type @kbd{M-x pr-interface RET}; this creates a +@samp{*Printing Interface*} buffer, similar to a customization buffer, +where you can set the printing options. After selecting what and how +to print, you start the print job using the @samp{Print} button (click +@kbd{mouse-2} on it, or move point over it and type @kbd{RET}). For +further information on the various options, use the @samp{Interface +Help} button. @node Sorting, Narrowing, Printing, Top @section Sorting Text -- cgit v1.2.1 From ce6e10af528e2caeee454097bde62bc65f2ea220 Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Mon, 6 Jun 2005 12:58:13 +0000 Subject: *** empty log message *** --- man/ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index 74b6e19d0ed..d50afecf0cc 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,10 @@ +2005-06-06 Richard M. Stallman + + * misc.texi (Printing Package): Explain how to initialize + printing package. + + * cmdargs.texi (Action Arguments): Clarify directory default for -l. + 2005-06-05 Chong Yidong * emacs.texi: Rename Hardcopy to Printing. -- cgit v1.2.1 From 24cca6f2c022b54f144b0a514996a90541611614 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Tue, 7 Jun 2005 03:30:21 +0000 Subject: * display.texi (Faces): Write about mode-line-highlight. --- man/ChangeLog | 4 ++++ man/display.texi | 2 ++ 2 files changed, 6 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index d50afecf0cc..1d6d0090b37 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2005-06-07 Masatake YAMATO + + * display.texi (Faces): Write about mode-line-highlight. + 2005-06-06 Richard M. Stallman * misc.texi (Printing Package): Explain how to initialize diff --git a/man/display.texi b/man/display.texi index 11e45e353cf..e6c8b19ddd9 100644 --- a/man/display.texi +++ b/man/display.texi @@ -118,6 +118,8 @@ This face is used for the prompt strings displayed in the minibuffer. @item highlight This face is used for highlighting portions of text, in various modes. For example, mouse-sensitive text is highlighted using this face. +@item mode-line-highlight +Like @code{highlight}, but used for portions of text on mode lines. @item isearch This face is used for highlighting Isearch matches. @item lazy-highlight -- cgit v1.2.1 From 5309066b1cd965f8163c91ab738928dec474c151 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 8 Jun 2005 03:20:56 +0000 Subject: (Faces): Add `shadow' face. --- man/display.texi | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'man') diff --git a/man/display.texi b/man/display.texi index e6c8b19ddd9..4276209326d 100644 --- a/man/display.texi +++ b/man/display.texi @@ -169,6 +169,10 @@ The face for highlighting trailing whitespace when Whitespace}. @item variable-pitch The basic variable-pitch face. +@item shadow +The basic face for making the text less noticeable than the surrounding +ordinary text. Usually this is achieved by using shades of grey in +contrast with either black or white default foreground color. @end table @cindex @code{region} face -- cgit v1.2.1 From ecc8893aa3cd26a2d1a601b605ab59e74ffb0eac Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 8 Jun 2005 03:21:08 +0000 Subject: *** empty log message *** --- man/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index 1d6d0090b37..9cfa75796c2 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2005-06-08 Juri Linkov + + * display.texi (Faces): Add `shadow' face. + 2005-06-07 Masatake YAMATO * display.texi (Faces): Write about mode-line-highlight. -- cgit v1.2.1 From e2e8c87d3bb1c4e4255b82eea7457da78a42a5d6 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Wed, 8 Jun 2005 22:34:19 +0000 Subject: *** empty log message *** --- man/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index 9cfa75796c2..ef16f71987a 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2005-06-08 Luc Teirlinck + + * files.texi (Log Buffer): Document when there can be more than + one file to be committed. + 2005-06-08 Juri Linkov * display.texi (Faces): Add `shadow' face. -- cgit v1.2.1 From 7df73b0d1e96ec0273f94b0ab71756d404aee042 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Wed, 8 Jun 2005 22:36:28 +0000 Subject: (Log Buffer): Document when there can be more than one file to be committed. --- man/files.texi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'man') diff --git a/man/files.texi b/man/files.texi index c83572a8550..26f6af37603 100644 --- a/man/files.texi +++ b/man/files.texi @@ -1545,7 +1545,9 @@ working---generating ChangeLog entries from the revision control log. In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x log-edit-show-files}) shows the list of files to be committed in case you need to check -that. +that. (This can be a list of more than one file if you use VC Dired +mode or PCL-CVS. @xref{VC Dired Mode}, and @ref{Top, , About PCL-CVS, +pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.) When you have finished editing the log message, type @kbd{C-c C-c} to exit the buffer and commit the change. -- cgit v1.2.1 From 08d01386a624a339c879fa09c50131083e511218 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Fri, 10 Jun 2005 10:16:32 +0000 Subject: (Top): Correct version number. --- man/emacs.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/emacs.texi b/man/emacs.texi index 69081b2c02b..ef9200d595e 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -121,7 +121,7 @@ and Sending Mail and Registers and Minibuffer. * GNU Free Documentation License:: The license for this documentation. * Intro:: An introduction to Emacs concepts. * Glossary:: The glossary. -* Antinews:: Information about Emacs version 20. +* Antinews:: Information about Emacs version 21. * Mac OS:: Using Emacs in the Mac. * MS-DOS:: Using Emacs on MS-DOS (otherwise known as "MS-DOG"). * Manifesto:: What's GNU? Gnu's Not Unix! -- cgit v1.2.1 From cb08cc40d6b9deb62596b8490419d47726549a2a Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Fri, 10 Jun 2005 10:17:20 +0000 Subject: (Antinews): Correct version number. Use EMACSVER to refer to the current version of Emacs. --- man/anti.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'man') diff --git a/man/anti.texi b/man/anti.texi index f20cada4f48..40e7c861fe2 100644 --- a/man/anti.texi +++ b/man/anti.texi @@ -3,11 +3,12 @@ @c See file emacs.texi for copying conditions. @node Antinews, Mac OS, X Resources, Top -@appendix Emacs 22.1 Antinews +@appendix Emacs 21 Antinews For those users who live backwards in time, here is information about downgrading to Emacs version 21.4. We hope you will enjoy the greater -simplicity that results from the absence of many Emacs 22 features. +simplicity that results from the absence of many Emacs @value{EMACSVER} +features. @itemize @bullet -- cgit v1.2.1 From 257914aaabe89bb14c22b9430a21fbc8b5b05657 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Fri, 10 Jun 2005 11:00:43 +0000 Subject: *** empty log message *** --- man/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index ef16f71987a..b57a2370eaa 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,9 @@ +2005-06-10 Lute Kamstra + + * emacs.texi (Top): Correct version number. + * anti.texi (Antinews): Correct version number. Use EMACSVER to + refer to the current version of Emacs. + 2005-06-08 Luc Teirlinck * files.texi (Log Buffer): Document when there can be more than -- cgit v1.2.1 From 837c084dda177131daf2e7b034be58dd778b02d8 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Mon, 13 Jun 2005 03:37:47 +0000 Subject: (Getting Started): Remove extra menu item. --- man/calc.texi | 1 - 1 file changed, 1 deletion(-) (limited to 'man') diff --git a/man/calc.texi b/man/calc.texi index 6e947050107..948b6049198 100644 --- a/man/calc.texi +++ b/man/calc.texi @@ -585,7 +585,6 @@ and what are the various ways that it can be used. * Notations Used in This Manual:: * Demonstration of Calc:: * Using Calc:: -* Demonstration of Calc:: * History and Acknowledgements:: @end menu -- cgit v1.2.1 From 93a6b94aea8b64d2e450c1bc6f0b990c12f6ce50 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Mon, 13 Jun 2005 03:56:34 +0000 Subject: *** empty log message *** --- man/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index b57a2370eaa..70e55a4b8df 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2005-06-12 Jay Belanger + + * calc.texi (Getting Started): Remove extra menu item. + 2005-06-10 Lute Kamstra * emacs.texi (Top): Correct version number. -- cgit v1.2.1 From 30313b908d672bd3949df266e8d8a4fd527fa80c Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 13 Jun 2005 06:42:53 +0000 Subject: (org-CUA-compatible): New option. (org-disputed-keys): New variable. (org-key): New function. (orgtbl-make-binding): Add docstring to the created function. (org-mode): Set paragraph start/separate regexps. (orgtbl-mode): Don't start `orgtbl-mode' in `org-mode' buffers. (org-archive-location, org-archive-mark-done) (org-archive-stamp-time): New options. (org-archive-subtree): New command. (org-fill-paragraph): New function. (org-mode): Set `fill-paragraph-function' to `org-fill-paragraph'. (org-fake-empty-table-line): Function removed. (org-format-org-table-html): Do not create empty table lines at separator lines. Improved table header treatment. (org-link-format): New option. (org-make-link): New function. (org-insert-link, org-store-link): Use org-make-link. (org-open-file): Quote file name for shell command, to allow spaces in file names. (org-link-regexp): Fixed bug with mailto link. (org-link-maybe-angles-regexp, org-protected-link-regexp): New constant. (org-export-as-html): Deal with the optional angles around a link. Better treatment of file: links. (org-open-at-point): Replace @{ and @} with < and >. (org-run-mode-hooks): Function removed. (org-agenda-mode): No longer use `org-run-mode-hooks'. --- man/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'man') diff --git a/man/ChangeLog b/man/ChangeLog index 70e55a4b8df..cfbbf8aab89 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2005-06-13 Carsten Dominik + + * org.texi: Version 3.11 + 2005-06-12 Jay Belanger * calc.texi (Getting Started): Remove extra menu item. -- cgit v1.2.1 From 225ff03789844f6ee9a5c63900490db4e85a54da Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 13 Jun 2005 06:43:12 +0000 Subject: Version 3.11 --- man/org.texi | 231 +++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 152 insertions(+), 79 deletions(-) (limited to 'man') diff --git a/man/org.texi b/man/org.texi index 4f3576d57c4..69c323c5eba 100644 --- a/man/org.texi +++ b/man/org.texi @@ -4,8 +4,8 @@ @setfilename ../info/org @settitle Org Mode Manual -@set VERSION 3.10 -@set DATE May 2005 +@set VERSION 3.11 +@set DATE June 2005 @dircategory Emacs @direntry @@ -103,6 +103,7 @@ Document Structure * Visibility cycling:: Show ad hide, much simplified * Motion:: Jumping to other headlines * Structure editing:: Changing sequence and level of headlines +* Archiving:: Move done task trees to a different place * Sparse trees:: Matches embedded in context Tables @@ -158,8 +159,8 @@ Miscellaneous * Customization:: Adapting Org-mode to your taste * FAQ:: Frequently asked questions * Interaction:: Other Emacs packages -* Acknowledgments:: These people provided feedback and more * Bugs:: Things which do not work perfectly +* Acknowledgments:: These people provided feedback and more @end detailmenu @end menu @@ -303,6 +304,7 @@ edit the structure of the document. * Visibility cycling:: Show ad hide, much simplified * Motion:: Jumping to other headlines * Structure editing:: Changing sequence and level of headlines +* Archiving:: Move done task trees to a different place * Sparse trees:: Matches embedded in context @end menu @@ -426,7 +428,7 @@ the original buffer, and the headings hierarchy above it is made visible. @end table -@node Structure editing, Sparse trees, Motion, Document Structure +@node Structure editing, Archiving, Motion, Document Structure @section Structure editing @cindex structure editing @cindex headline, promotion and demotion @@ -487,7 +489,30 @@ just after the last headline to change. Note that when the cursor is inside a table (@pxref{Tables}), the Meta-Cursor keys have different functionality. -@node Sparse trees, , Structure editing, Document Structure +@node Archiving, Sparse trees, Structure editing, Document Structure +@section Archiving +@cindex archiving + +When an project represented by a (sub)tree is finished, you may want +to move the tree to an Archive place, either in the same file under a +special top-level heading, or even to a different file. +@table @kbd +@kindex @kbd{C-c $} +@item @kbd{C-c $} +Archive the subtree starting at the cursor position to the location +given by @code{org-archive-location}. +@end table + +@cindex archive locations +The default archive is a file in the same directory as the current +file, with the name derived by appending @file{_archive} to the +current file name. For information and examples on how to change +this, see the documentation string of the variable +@code{org-archive-location}. If you are also using the Org-mode +agenda, archiving to a different file is a good way to keep archived +trees from contributing agenda items. + +@node Sparse trees, , Archiving, Document Structure @section Sparse trees @cindex sparse trees @cindex trees, sparse @@ -702,7 +727,8 @@ When current field is empty, copy from first non-empty field above. When not empty, copy current field down to next row and move cursor along with it. Depending on the variable @code{org-table-copy-increment}, integer field values will be -incremented during copy. +incremented during copy. This key is also used by CUA-mode +(@pxref{Interaction}). @cindex formula, in tables @cindex calculations, in tables @@ -807,33 +833,35 @@ articles, emails and much more. @cindex SHELL links Org-mode supports links to files, websites, usenet and email messages; -and BBDB database entries. Links are just plain-text URL-like locators. -The following list shows examples for each link type. +and BBDB database entries. Links are just plain-text URL-like +locators, optionally enclosed by angular brackets. The following list +shows examples for each link type. @example -http://www.astro.uva.nl/~dominik @r{on the web} -file:/home/dominik/images/jupiter.jpg @r{file, absolute path} -file:papers/last.pdf @r{file, relative path} -file:~/code/main.c:255 @r{file, with line number} -news:comp.emacs @r{Usenet link} -mailto:adent@@galaxy.net @r{Mail link} -vm:folder @r{VM folder link} -vm:folder#id @r{VM message link} -vm://myself@@some.where.org/folder#id @r{VM on remote machine} -wl:folder @r{WANDERLUST folder link} -wl:folder#id @r{WANDERLUST message link} -rmail:folder @r{RMAIL folder link} -rmail:folder#id @r{RMAIL message link} -gnus:group @r{GNUS group link} -gnus:group#id @r{GNUS article link} -bbdb:Richard Stallman @r{BBDB link} -shell:ls *.org @r{A shell command} + @r{on the web} + @r{file, absolute path} + @r{file, relative path} + @r{file, with line number} + @r{Usenet link} + @r{Mail link} + @r{VM folder link} + @r{VM message link} + @r{VM on remote machine} + @r{WANDERLUST folder link} + @r{WANDERLUST message link} + @r{RMAIL folder link} + @r{RMAIL message link} + @r{GNUS group link} + @r{GNUS article link} + @r{BBDB link} +@footnote{Note that @samp{<} and @samp{>} cannot be part of a link, and therefore of a shell command. If you need redirection, use @@@{ and @@@} instead.} @r{A shell command} @end example -A link may contain space characters and is terminated by the end of -the line or, in tables, by the end of the table field. Therefore, -outside of tables there can be only one link per line (but see the -variable @code{org-allow-space-in-links}). +A link may contain space characters and is terminated by @samp{>} or by +the end of a line. In tables, the end of a table field also terminates +a link. Angle brackets around a link are not required, but are +recommended to avoid problems with punctuation and other text following +the link. See also the variable @code{org-allow-space-in-links}. @cindex storing links @table @kbd @@ -854,10 +882,11 @@ Insert a link. This prompts for a link to be inserted into the buffer. You can just type a link, using one of the link type prefixes mentioned in the examples above. Through completion, all links stored during the current session can be accessed. When called with prefix -arg, you can use file name completion to enter a file link. Note that -you don't have to use this command to insert a link. Links in -Org-mode are plain text, and you can type or paste them straight into -the buffer. +arg, you can use file name completion to enter a file link. The link +will be formatted as given in the variable @code{org-link-format} and +inserted into the buffer. Note that you don't have to use this +command to insert a link. Links in Org-mode are plain text, and you +can type or paste them straight into the buffer. @cindex inserting links @kindex C-c C-o @@ -930,9 +959,11 @@ cycling (@key{TAB}) to find a better place. Pressing @key{RET} or Or use prefix arg to specify level manually. @end multitable -So the fastest way to store the note is to press @kbd{C-c C-c @key{RET} -@key{RET}} to append it to the default file. But with little extra -effort, you can push it directly to the correct location. +So a fast way to store the note is to press @kbd{C-c C-c @key{RET} +@key{RET}} to append it to the default file. Even shorter would be +@kbd{C-u C-c C-c}, which does the same without even showing the tree. +But with little extra effort, you can push it directly to the correct +location. Before inserting the text into a tree, the function ensures that the text has a headline, i.e. a first line that starts with a @samp{*}. @@ -1140,6 +1171,8 @@ agenda buffer with the @kbd{,} command (@pxref{Agenda commands}). @itemx S-@key{down} Increase/decrease priority of current item. Note that these keys are also used to modify time stamps (@pxref{Creating timestamps}). +Furthermore, these keys is also used by CUA-mode +(@pxref{Interaction}). @end table @@ -1267,7 +1300,8 @@ Insert @samp{SCHEDULED} keyword along with a stamp. @kindex S-@key{right} @item S-@key{left} @itemx S-@key{right} -Change date at cursor by one day. +Change date at cursor by one day. These key bindings conflict with +CUA-mode (@pxref{Interaction}). @kindex S-@key{up} @kindex S-@key{down} @@ -1275,8 +1309,10 @@ Change date at cursor by one day. @itemx S-@key{down} Change the item under the cursor in a timestamp. The cursor can be on a year, month, day, hour or minute. Note that if the cursor is not at -a time stamp, these same keys modify the priority of an item -(@pxref{Priorities}). +a time stamp, these same keys modify the priority of an item. +(@pxref{Priorities}). These key bindings conflict with CUA-mode +(@pxref{Interaction}). + @kindex C-c C-y @cindex evaluate time range @@ -1872,7 +1908,8 @@ letters, and press @kbd{M-@key{TAB}} to see possible completions. @cindex tables, export to HTML @item -Tables are transformed into HTML tables. +Tables are transformed into HTML tables. Data fields before the first +horizontal separator line will be formatted as table header fields. @cindex fixed width @item @@ -1960,8 +1997,8 @@ Toggle the COMMENT keyword at the beginning of an entry. * Customization:: Adapting Org-mode to your taste * FAQ:: Frequently asked questions * Interaction:: Other Emacs packages -* Acknowledgments:: These people provided feedback and more * Bugs:: Things which do not work perfectly +* Acknowledgments:: These people provided feedback and more @end menu @node Completion, Customization, Miscellaneous, Miscellaneous @@ -2024,9 +2061,7 @@ file, but with different outline visibility. Is that possible?}@* In GNU Emacs, you may use @emph{indirect buffers} which do exactly this. See the documentation on the command @code{make-indirect-buffer}. In XEmacs, this is currently not -possible because of the different outline implementation., which visit -the same file, but have separate settings, also for outline -visibility. +possible because of the different outline implementation. @item @b{Is there an easy way to insert links to web locations?}@* @cindex URL, paste into buffer @@ -2060,12 +2095,17 @@ configure the @samp{H} switch. If you want to export a subtree, mark the subtree as region and then export. Marking can be done with @kbd{C-c @@ C-x C-x}, for example. +@item @b{Org-mode takes over the S-cursor keys. I also want to use +CUA-mode, is there a way to fix this conflict?}@* +Yes, see @ref{Interaction} + @item @b{Is there an easy way to insert an empty table template with a default number of rows and columns?}@* @cindex table, empty template To insert an empty table template, just type @samp{|-} and use @key{TAB}. The default size can be changed with the variable -@code{org-table-default-size}. +@code{org-table-default-size}. However, just starting to type the +first line is usually much easier. @item @b{When I am in the last column of a table and just above a horizontal line in the table, pressing TAB creates a new table line @@ -2082,7 +2122,7 @@ indentation of the first line and realign with @key{TAB}. @end enumerate -@node Interaction, Acknowledgments, FAQ, Miscellaneous +@node Interaction, Bugs, FAQ, Miscellaneous @section Interaction with other packages @cindex packages, interaction with other @cindex @file{planner.el} @@ -2106,11 +2146,64 @@ planner. @cindex @file{table.el} @item @file{table.el} by Takaaki Ota Org mode cooperates with table.el, see @ref{table.el}. +@cindex @file{CUA.el} +@item @file{CUA.el} by Kim. F. Storm +Keybindings in Org-mode conflict with the @kbd{S-} keys +used by CUA-mode (as well as pc-select-mode and s-region-mode) to +select and extend the region. If you want to use one of these +packages along with Org-mode, configure the variable +@code{org-CUA-compatible}. When set, Org-mode will move the folowing +keybindings in org-mode files, and in the agenda buffer (but not +during date selection). +@example +S-UP -> M-p S-DOWN -> M-n +S-LEFT -> M-- S-RIGHT -> M-+ +S-RET -> C-S-RET +@end example +Yes, these are unfortunately more difficult to remember. If you want +to have other replacement keys, look at the variable +@code{org-disputed-keys}. + @end table -@page @c FIXME +@node Bugs, Acknowledgments, Interaction, Miscellaneous +@section Bugs +@cindex bugs + +Here is a list of things which should work differently, but which I +have found too hard to fix. -@node Acknowledgments, Bugs, Interaction, Miscellaneous +@itemize @bullet +@item +If you call @code{fill-paragraph} (bound to @kbd{M-q}) in a table, the +filling is correctly disabled. However, if some text directly +(without an empty line in between) preceeds or follws a table, calling +@code{fill-paragraph} in that text will also fill the table like +normal text. Also, @code{fill-region} does bypass the +@code{fill-paragraph} code and will fill tables like normal text. +@item +When the application called by @kbd{C-c C-o} to open a file link fails +(for example because the application does not exits or refuses to open +the file), it does so silently. No error message is displayed. +@item +Under XEmacs, if Org-mode entries are included into the diary, it is +not possible to jump back from the diary to the org file. Apparently, +the text properties are lost when the fancy-diary-display is used. +However, from Org-mode's timeline and agenda buffers (created with +@kbd{C-c C-r} and @kbd{C-c a}), things do work correctly. +@item +Linux should also have a default viewer application, using mailcap. +Maybe we can use GNUS or VM mime code? Or dired's guessing commands? +Any hints (or even patches) are appreciated. +@item +When you write @samp{x = a /b/ c}, b will be exported in italics. +@item +The exporters work well, but could be made more efficient. +@end itemize + +@page + +@node Acknowledgments, , Bugs, Miscellaneous @section Acknowledgments @cindex acknowledgments @@ -2136,13 +2229,18 @@ his ideas have found their way into the agenda. Philip Rooke created the Org-mode reference card. He also helped with beta testing and contributed a number of very useful ideas. @item +Christian Schlauer proposed angular brackets around links, and some +other useful stuff. +@item +David Wainberg suggested to implement an archiving mechanism. +@item Linking to VM/BBDB/GNUS was inspired by Tom Shannon's @file{organizer-mode.el}. @item Scheduling TODO items was inspired by John Wiegley's @file{planner.el}. @item -Sacha Chua, the current maintainer of Planner suggested to take some -linking code from Planner, which I did (for RMAIL and Wanderlust). +Sacha Chua, the current maintainer of Planner, offered linking code +from Planner. I made use of the offer for links to RMAIL and Wanderlust. @item Oliver Oppitz sent several useful suggestions. @item @@ -2150,38 +2248,13 @@ Carsten Wimmer suggested some changes and helped fix a bug in linking to GNUS. @item Pavel Chalmoviansky reported bugs and suggested improvements related -to the agenda treatment of items with specifed time. +to the agenda treatment of items with specified time. @item Stefan Monnier provided a patch with lots of little fixes to keep the Emacs-Lisp compiler happy. -@end itemize - -@node Bugs, , Acknowledgments, Miscellaneous -@section Bugs -@cindex bugs - -Here is a list of things which should work differently, but which I -have found too hard to fix. - -@itemize @bullet -@item -When the application called by @kbd{C-c C-o} to open a file link fails -(for example because the application does not exits or refuses to open -the file), it does so silently. No error message is displayed. -@item -Under XEmacs, if Org-mode entries are included into the diary, it is -not possible to jump back from the diary to the org file. Apparently, -the text properties are lost when the fancy-diary-display is used. -However, from Org-mode's timeline and agenda buffers (created with -@kbd{C-c C-r} and @kbd{C-c a}), things do work correctly. -@item -Linux should also have a default viewer application, using mailcap. -Maybe we can use GNUS or VM mime code? Or dired's guessing commands? -Any hints (or even patches) are appreciated. -@item -When you write @samp{x = a /b/ c}, b will be exported in italics. -@item -The exporters work well, but could be made more efficient. +@item +Kai Grossjohann pointed out that a number of key bindings in Org-mode +conflict with other packages. @end itemize @node Index, Key Index, Miscellaneous, Top -- cgit v1.2.1