diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 29 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 3 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 11 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 1 | ||||
| -rw-r--r-- | doc/emacs/msdog.texi | 73 | ||||
| -rw-r--r-- | doc/emacs/search.texi | 12 | ||||
| -rw-r--r-- | doc/emacs/text.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/trouble.texi | 5 |
8 files changed, 116 insertions, 24 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index e390c6cbc16..d300ed84062 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,32 @@ +2010-12-13 Eli Zaretskii <eliz@gnu.org> + + * custom.texi (Init Syntax): Add index entries for "character syntax". + (Bug#7576) + +2010-12-13 Karel Klíč <kklic@redhat.com> + + * text.texi (HTML Mode): Small fixes. (Bug#7607) + +2010-12-13 Glenn Morris <rgm@gnu.org> + + * trouble.texi (Checklist): Fix typo in newsgroup name. + +2010-12-13 Chong Yidong <cyd@stupidchicken.com> + + * search.texi (Word Search): Note that the lazy highlight always + matches to whole words (Bug#7470). + +2010-12-13 Eli Zaretskii <eliz@gnu.org> + + * display.texi (Optional Mode Line): Make the description of + load-average more accurate. + + * msdog.texi (Windows HOME): Mention that HOME can also be set in the + registry, with a cross-reference. + (Windows Startup): New node. Move the stuff about the current + directory from "Windows HOME". + +2010-12-13 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> 2010-11-27 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> * maintaining.texi (VC With A Locking VCS, VC Directory Commands): diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 18fdb581210..0d78e21ca06 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -2234,6 +2234,8 @@ a Meta character, as in @samp{\M-a} for @kbd{Meta-A} or @samp{\M-\C-a} for non-@acronym{ASCII} in your init file. @item Characters: +@cindex Lisp character syntax +@cindex character syntax Lisp character constant syntax consists of a @samp{?} followed by either a character or an escape sequence starting with @samp{\}. Examples: @code{?x}, @code{?\n}, @code{?\"}, @code{?\)}. Note that @@ -2250,6 +2252,7 @@ keys which send non-@acronym{ASCII} characters. @code{nil} stands for `false'. @item Other Lisp objects: +@cindex Lisp object syntax Write a single-quote (@code{'}) followed by the Lisp object you want. @end table diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index cd08a524f50..49a50af19d8 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1010,11 +1010,12 @@ their parentheses. It looks like this: @noindent @vindex display-time-24hr-format 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 of running -processes in the whole system recently. (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}. +@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 +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}. @cindex mail (on mode line) @vindex display-time-use-mail-icon diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 65a565dbe8e..a47bb8beb49 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -1192,6 +1192,7 @@ Emacs and Mac OS / GNUstep Emacs and Microsoft Windows/MS-DOS +* Windows Startup:: How to start Emacs on Windows. * Text and Binary:: Text files use CRLF to terminate lines. * Windows Files:: File-name conventions on Windows. * ls in Lisp:: Emulation of @code{ls} for Dired. diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 4be67aa31de..d4ee8463e5c 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -28,6 +28,7 @@ However, a few special considerations apply, and they are described here. @menu +* Windows Startup:: How to start Emacs on Windows. * Text and Binary:: Text files use CRLF to terminate lines. * Windows Files:: File-name conventions on Windows. * ls in Lisp:: Emulation of @code{ls} for Dired. @@ -44,6 +45,68 @@ here. @end ifnottex @end menu +@node Windows Startup +@section How to Start Emacs on MS-Windows +@cindex starting Emacs on MS-Windows + + There are several ways of starting Emacs on MS-Windows: + +@enumerate +@item +@pindex runemacs.exe +@cindex desktop shortcut, MS-Windows +@cindex start directory, MS-Windows +@cindex directory where Emacs starts on MS-Windows +From the desktop shortcut icon: either double-click the left mouse +button on the icon, or click once, then press @key{RET}. The desktop +shortcut should specify as its ``Target'' (in the ``Properties'' of +the shortcut) the full absolute file name of @file{runemacs.exe}, +@emph{not} of @file{emacs.exe}. This is because @file{runemacs.exe} +hides the console window that would have been created if the target of +the shortcut were @file{emacs.exe} (which is a console program, as far +as Windows is concerned). If you use this method, Emacs starts in the +directory specified by the shortcut. To control where that is, +right-click on the shortcut, select ``Properties'', and in the +``Shortcut'' tab modify the ``Start in'' field to your liking. + +@item +From the Command Prompt window, by typing @kbd{emacs @key{RET}} at the +prompt. The Command Prompt window where you did that will not be +available for invoking other commands until Emacs exits. In this +case, Emacs will start in the current directory of the Windows shell. + +@item +From the Command Prompt window, by typing @kbd{runemacs @key{RET}} at +the prompt. The Command Prompt window where you did that will be +immediately available for invoking other commands. In this case, +Emacs will start in the current directory of the Windows shell. + +@item +@cindex invoking Emacs from Windows Explorer +@pindex emacsclient.exe +@pindex emacsclientw.exe +Via the Emacs client program, @file{emacsclient.exe} or +@file{emacsclientw.exe}. This allows to invoke Emacs from other +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 +@command{emacsclient}. +@end enumerate + @node Text and Binary @section Text Files and Binary Files @cindex text and binary files on MS-DOS/MS-Windows @@ -342,6 +405,9 @@ Windows 2K/XP and later, and either @file{C:\WINDOWS\Application Data} or @file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the older Windows 9X/ME systems. + @code{HOME} can also be set in the system registry, for details see +@ref{MS-Windows Registry}. + @cindex init file @file{.emacs} on MS-Windows The home directory is where your init file @file{.emacs} is stored. When Emacs starts, it first checks whether the environment variable @@ -373,13 +439,6 @@ names, the Windows port of Emacs supports an alternative name @file{_emacs} as a fallback, if such a file exists in the home directory, whereas @file{.emacs} does not. -@cindex start directory, MS-Windows -@cindex directory where Emacs starts on MS-Windows - If you use a Windows desktop shortcut to start Emacs, it starts in -the directory specified by the shortcut. To control where that is, -right-click on the shortcut, select ``Properties'', and in the -``Shortcut'' tab modify the ``Start in'' field to your liking. - @node Windows Keyboard @section Keyboard Usage on MS-Windows @cindex keyboard, MS-Windows diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 69532e6083d..6e62dba3bef 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -459,11 +459,13 @@ for a forward search, or @kbd{M-s w C-r @key{RET}} for a backward search. These run the commands @code{word-search-forward} and @code{word-search-backward} respectively. - A nonincremental word search differs slightly from the incremental -version in the way it finds a match: the last word in the search -string must be an exact match for a whole word. In an incremental -word search, the last word in the search string can match part of a -word; this allows the matching to proceed incrementally as you type. + Incremental and nonincremental word searches differ slightly in the +way they find a match. In a nonincremental word search, the last word +in the search string must exactly match a whole word. In an +incremental word search, the matching is more lax: the last word in +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 Regexp Search @section Regular Expression Search diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index a9faa420967..bef7319eae5 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1765,7 +1765,7 @@ variant of SGML mode. @kindex C-c C-n @r{(SGML mode)} @findex sgml-name-char Interactively specify a special character and insert the SGML -@samp{&}-command for that character. +@samp{&}-command for that character (@code{sgml-name-char}). @item C-c C-t @kindex C-c C-t @r{(SGML mode)} @@ -1799,7 +1799,7 @@ A numeric argument acts as a repeat count. @findex sgml-skip-tag-backward Skip backward across a balanced tag group (which extends from an opening tag through its corresponding closing tag) -(@code{sgml-skip-tag-forward}). A numeric argument acts as a repeat +(@code{sgml-skip-tag-backward}). A numeric argument acts as a repeat count. @item C-c C-d @@ -1841,7 +1841,7 @@ buffer as SGML (@code{sgml-validate}). @kindex C-c TAB @r{(SGML mode)} @findex sgml-tags-invisible Toggle the visibility of existing tags in the buffer. This can be -used as a cheap preview. +used as a cheap preview (@code{sgml-tags-invisible}). @end table @cindex nXML mode diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 2f90b30bf83..e2b27083243 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -629,7 +629,7 @@ read the tracker's online documentation to see the various features you can use. All mail sent to the @samp{bug-gnu-emacs} mailing list is also -gatewayed to the @samp{bug.gnu.emacs} newsgroup. The reverse is also +gatewayed to the @samp{gnu.emacs.bug} newsgroup. The reverse is also true, but we ask you not to post bug reports via the newsgroup. It can make it much harder to contact you if we need to ask for more information, and it does not integrate well with the bug tracker. @@ -1127,6 +1127,3 @@ Emacs distribution. @lowersections @end ifnottex -@ignore - arch-tag: c9cba76d-b2cb-4e0c-ae3f-19d5ef35817c -@end ignore |