From c1f04bcf73cecd5c0ca31f0c60f071db1e92054e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 7 Jan 2011 17:32:12 +0200 Subject: Fix description of emacsclientw.exe. msdog.texi (Windows Startup): Correct inaccurate description of differences between emacsclient.exe and emacsclientw.exe. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/msdog.texi | 32 ++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) (limited to 'doc/emacs') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a374272135f..829f61efb38 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-01-07 Eli Zaretskii + + * msdog.texi (Windows Startup): Correct inaccurate description of + differences between emacsclient.exe and emacsclientw.exe. + 2010-12-30 Chong Yidong * rmail.texi (Rmail Display): Edit for grammar and conciseness. diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 514ef956dc3..caa1bbccd19 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -90,20 +90,24 @@ Via the Emacs client program, @file{emacsclient.exe} or programs, and to reuse a running Emacs process for serving editing jobs required by other programs. @xref{Emacs Server}. The difference between @file{emacsclient.exe} and @file{emacsclientw.exe} is that the -former waits for Emacs to signal that the editing job is finished, -while the latter does not wait. Which one of them to use in each case -depends on the expectations of the program that needs editing -services. If the program will use the edited files, it needs to wait -for Emacs, so you should use @file{emacsclient.exe}. By contrast, if -the results of editing are not needed by the invoking program, you -will be better off using @file{emacsclientw.exe}. A notable situation -where you would want @file{emacsclientw.exe} is when you right-click -on a file in the Windows Explorer and select ``Open With'' from the -pop-up menu. Use the @samp{--alternate-editor=} or @samp{-a} options -if Emacs might not be running (or not running as a server) when -@command{emacsclient} is invoked---that will always give you an -editor. When invoked via @command{emacsclient}, Emacs will start in -the current directory of the program that invoked +former is a console program, while the latter is a Windows GUI +program. Both programs wait for Emacs to signal that the editing job +is finished, before they exit and return control to the program that +invoked them. Which one of them to use in each case depends on the +expectations of the program that needs editing services. If that +program is itself a console (text-mode) program, you should use +@file{emacsclient.exe}, so that any of its messages and prompts appear +in the same command window as those of the invoking program. By +contrast, if the invoking program is a GUI program, you will be better +off using @file{emacsclientw.exe}, because @file{emacsclient.exe} will +pop up a command window if it is invoked from a GUI program. A +notable situation where you would want @file{emacsclientw.exe} is when +you right-click on a file in the Windows Explorer and select ``Open +With'' from the pop-up menu. Use the @samp{--alternate-editor=} or +@samp{-a} options if Emacs might not be running (or not running as a +server) when @command{emacsclient} is invoked---that will always give +you an editor. When invoked via @command{emacsclient}, Emacs will +start in the current directory of the program that invoked @command{emacsclient}. @end enumerate -- cgit v1.2.1 From c40b51e0ff77adfbe27150de0e154bd0015a4ec5 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 8 Jan 2011 17:01:13 -0500 Subject: Move directory-abbrev-alist doc from Lispref to Emacs manual. * doc/emacs/files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp manual. Explain why directory-abbrev-alist elements should be anchored (Bug#7777). * doc/lispref/files.texi (Directory Names): Move directory-abbrev-alist doc to Emacs manual. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/files.texi | 26 +++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) (limited to 'doc/emacs') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 829f61efb38..4825f08979f 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2011-01-08 Chong Yidong + + * files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp + manual. Explain why directory-abbrev-alist elements should be anchored + (Bug#7777). + 2011-01-07 Eli Zaretskii * msdog.texi (Windows Startup): Correct inaccurate description of diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 4df81caa8f2..530c2bb94f7 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1158,7 +1158,6 @@ links point to directories. @vindex find-file-existing-other-name @vindex find-file-suppress-same-file-warnings - Normally, if you visit a file which Emacs is already visiting under a different name, Emacs displays a message in the echo area and uses the existing buffer visiting that file. This can happen on systems @@ -1180,6 +1179,31 @@ then the file name recorded for a buffer is the file's @dfn{truename} than the name you specify. Setting @code{find-file-visit-truename} also implies the effect of @code{find-file-existing-other-name}. +@cindex directory name abbreviation +@vindex directory-abbrev-alist + Sometimes, a directory is ordinarily accessed through a symbolic +link, and you may want Emacs to preferentially display its ``linked'' +name instead of its truename. To do this, customize the variable +@code{directory-abbrev-alist}. Each element in this list should have +the form @code{(@var{from} . @var{to})}, which says to replace +@var{from} with @var{to} when it appears in a directory name. For +this feature to work properly, @var{from} and @var{to} should point to +the same file. The @var{from} string is actually a regular expression +(@pxref{Regexps}); it should always start with @samp{\`}, to avoid +matching to an incorrect part of the original directory name. The +@var{to} string should be an ordinary absolute directory name. Do not +use @samp{~} to stand for a home directory in the @var{to} string; +Emacs performs these substitutions separately. + + Here's an example, from a system on which file system +@file{/home/fsf} and so on are normally accessed through symbolic +links named @file{/fsf} and so on. + +@example +(("\\`/home/fsf" . "/fsf") + ("\\`/home/gd" . "/gd")) +@end example + @node Directories @section File Directories -- cgit v1.2.1 From b024d9f02d2758815069b2a0df3af72fcf0ee220 Mon Sep 17 00:00:00 2001 From: Mark Diekhans Date: Fri, 14 Jan 2011 21:32:19 -0500 Subject: Make last-resort backup file in .emacs.d (Bug#6953). * lisp/files.el (backup-buffer): Make last-resort backup file in .emacs.d. * lisp/subr.el (locate-user-emacs-file): If .emacs.d does not exist, make it with permission 700. * doc/emacs/files.texi (Backup Names): Document the new location of the last-resort backup file. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/files.texi | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'doc/emacs') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 4825f08979f..d1e5beb7384 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-01-15 Chong Yidong + + * files.texi (Backup Names): Document the new location of the + last-resort backup file. + 2011-01-08 Chong Yidong * files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 530c2bb94f7..b16549450e4 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -566,10 +566,10 @@ another from the newly saved contents if you save again. appending @samp{~} to the file name being edited; thus, the backup file for @file{eval.c} would be @file{eval.c~}. - If access control stops Emacs from writing backup files under the usual -names, it writes the backup file as @file{%backup%~} in your home -directory. Only one such file can exist, so only the most recently -made such backup is available. + If access control stops Emacs from writing backup files under the +usual names, it writes the backup file as @file{~/.emacs.d/%backup%~}. +Only one such file can exist, so only the most recently made such +backup is available. Emacs can also make @dfn{numbered backup files}. Numbered backup file names contain @samp{.~}, the number, and another @samp{~} after -- cgit v1.2.1 From bb033b5f612524de2410c8491170b008a04e8994 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 14 Jan 2011 22:10:38 -0500 Subject: * building.texi (Compilation): Improve instructions for running two compilations (Bug#7573). --- doc/emacs/ChangeLog | 3 +++ doc/emacs/building.texi | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'doc/emacs') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d1e5beb7384..70cc9399a3f 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,8 @@ 2011-01-15 Chong Yidong + * building.texi (Compilation): Improve instructions for running two + compilations (Bug#7573). + * files.texi (Backup Names): Document the new location of the last-resort backup file. diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index dcfa60ecc81..296dbb2bce7 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -122,10 +122,10 @@ confirmation before actually killing a compilation that is running. You can also kill the compilation process with @kbd{M-x kill-compilation}. - If you want to run two compilations at once, you should start the -first one, then rename the @samp{*compilation*} buffer (perhaps using -@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other -compilation. That will create a new @samp{*compilation*} buffer. + To run two compilations at once, start the first one, then rename +the @samp{*compilation*} buffer (perhaps using @code{rename-uniquely}; +@pxref{Misc Buffer}), then switch buffers and start the other +compilation. This will create a new @samp{*compilation*} buffer. Emacs does not expect a compiler process to launch asynchronous subprocesses; if it does, and they keep running after the main -- cgit v1.2.1 From 9f19b8ddfe3a46d8a5ae86b6c8d2394562d02843 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 14 Jan 2011 22:50:47 -0500 Subject: Bump version to 23.2.92. Regenerate AUTHORS, configure, and ldefs-boot.el. --- doc/emacs/emacs.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/emacs') diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 069c777a51b..84a1a72ecb2 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 23.2.91 +@set EMACSVER 23.2.92 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* -- cgit v1.2.1