Commit 3f87f67e authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-371
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-372
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-373
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-374
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-375
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-376
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-377
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-378
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-379
   Merge from erc--emacs--21

 * emacs@sv.gnu.org/emacs--devo--0--patch-380
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-381
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-382
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-383
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-384
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-385
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-386
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-387
   Fix ERC bug introduced in last patch

 * emacs@sv.gnu.org/emacs--devo--0--patch-388
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-389
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-390
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-391
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-392
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-393
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-394
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-395
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-396
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-397
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-398
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-399
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-400
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-401
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-402
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-403
   Rcirc update from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-404
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-405
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-406
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-407
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-408
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-409
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-410
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-411
   Miscellaneous tq-related fixes.

 * emacs@sv.gnu.org/emacs--devo--0--patch-412
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-121
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-122
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-123
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-124
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-125
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-126
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-127
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-581
parents 350e4fb8 7a210b69
2006-08-16 Andreas Schwab <schwab@suse.de>
* configure.in (PKG_CHECK_MODULES): Use AS_MESSAGE_LOG_FD instead
of hardcoding it.
2006-08-16 Richard Stallman <rms@gnu.org>
* INSTALL.CVS: Clean up wording.
2006-07-14 Eli Zaretskii <eliz@gnu.org>
* configure.in (PKG_CHECK_MODULES): Redirect the output of
......
......@@ -12,8 +12,9 @@ The bootstrap process makes sure all necessary files are rebuilt
before it builds the final Emacs binary.
Normally, it is not necessary to use "make bootstrap" after every CVS
update. Unless there are problems, we suggest the following
procedure:
update. Unless there are problems, we suggest using the following
alternative procedure after you have done "make bootstrap" at least
once:
$ ./configure
$ make
......
2006-08-13 Chong Yidong <cyd@stupidchicken.com>
* FOR-RELEASE: Elisp manual checking completed.
2006-07-17 Reiner Steib <Reiner.Steib@gmx.de>
* FOR-RELEASE: Update refcard section.
......
......@@ -29,7 +29,9 @@ Reminders sent out on 2006-06-08.
** Send an email to the various distributions, including the GNOME
and KDE projects, to use the new Emacs icons in etc/images/icons.
* BUGS
* WINDOWS SUPPORT BUGS.
These don't need to be fixed to start pretest, but we call the
attention of Windows users to fixing them.
** Markus Gritsch's report about Emacs looping on Windoze with the following
.emacs file, and then reduce Emacs frame width to "something quite narrow":
......@@ -39,73 +41,23 @@ and KDE projects, to use the new Emacs icons in etc/images/icons.
'(hscroll-step 1)
)
** David Kastrup's report on strange scrolling of large images.
** Drew Adams 12 Aug bug rpt: overlay display artifact: trace left behind
Windows only bug.
* BUGS
** Milan Zamazal's Aug 23 bug report about crashes with certain fonts.
** Jorgen Schaefer <forcer@forcix.cx>'s June 18 bug report about
fields and invisible overlays needs attention from a field expert.
** C-g fails to interrupt accept-process-output in Gnus.
** Implement buffer-chars-modified-tick.
* DOCUMENTATION
** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem.
** Check the Emacs Lisp manual.
** Make key-binding use the maps specified by positions given in the events.
Each manual section should be checked for factual correctness
regarding recent changes by at least two people. After each file
name, on the same line or the following line, come the names of the
people who have checked it.
SECTION READERS
----------------------------------
lispref/abbrevs.texi "Luc Teirlinck" Chong Yidong
lispref/advice.texi Joakim Verona Chong Yidong
lispref/anti.texi Chong Yidong Kim F. Storm
lispref/backups.texi "Luc Teirlinck" Chong Yidong
lispref/buffers.texi "Luc Teirlinck" Chong Yidong
lispref/calendar.texi Joakim Verona Chong Yidong
lispref/commands.texi "Luc Teirlinck" Chong Yidong
lispref/compile.texi "Luc Teirlinck" Chong Yidong
lispref/control.texi "Luc Teirlinck" Chong Yidong
lispref/customize.texi Chong Yidong "Luc Teirlinck"
lispref/debugging.texi Joakim Verona Lute Kamstra
lispref/display.texi Chong Yidong Jason Rumney
lispref/edebug.texi Chong Yidong "Luc Teirlinck"
lispref/elisp.texi "Luc Teirlinck" Lute Kamstra
lispref/errors.texi "Luc Teirlinck" Chong Yidong
lispref/eval.texi "Luc Teirlinck" Chong Yidong
lispref/files.texi "Luc Teirlinck" Chong Yidong
lispref/frames.texi "Luc Teirlinck" Chong Yidong
lispref/functions.texi "Luc Teirlinck" Chong Yidong
lispref/hash.texi "Luc Teirlinck" Chong Yidong
lispref/help.texi "Luc Teirlinck" Chong Yidong
lispref/hooks.texi Lute Kamstra Chong Yidong
lispref/internals.texi "Luc Teirlinck" Chong Yidong
lispref/intro.texi "Luc Teirlinck" Josh Varner
lispref/keymaps.texi "Luc Teirlinck" Chong Yidong
lispref/lists.texi "Luc Teirlinck" Chong Yidong
lispref/loading.texi "Luc Teirlinck" Chong Yidong
lispref/locals.texi Chong Yidong Nick Roberts
lispref/macros.texi "Luc Teirlinck" Chong Yidong
lispref/maps.texi Chong Yidong Kim F. Storm
lispref/markers.texi "Luc Teirlinck" Chong Yidong
lispref/minibuf.texi "Luc Teirlinck" Chong Yidong
lispref/modes.texi Chong Yidong
lispref/nonascii.texi "Luc Teirlinck" Chong Yidong
lispref/numbers.texi "Luc Teirlinck" Chong Yidong
lispref/objects.texi "Luc Teirlinck" Chong Yidong
lispref/os.texi "Luc Teirlinck" Chong Yidong
lispref/positions.texi "Luc Teirlinck" Chong Yidong
lispref/processes.texi Chong Yidong ttn
lispref/searching.texi "Luc Teirlinck" Chong Yidong
lispref/sequences.texi "Luc Teirlinck" Chong Yidong
lispref/streams.texi "Luc Teirlinck" Chong Yidong
lispref/strings.texi "Luc Teirlinck" Chong Yidong
lispref/symbols.texi "Luc Teirlinck" Chong Yidong
lispref/syntax.texi "Luc Teirlinck" Chong Yidong
lispref/text.texi Chong Yidong
lispref/tips.texi "Luc Teirlinck" Chong Yidong
lispref/variables.texi "Luc Teirlinck" Chong Yidong
lispref/windows.texi "Luc Teirlinck" Chong Yidong
* DOCUMENTATION
** Check the Emacs Tutorial.
......
......@@ -1500,7 +1500,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" 2>&5; then
if $PKG_CONFIG --exists "$2" 2>&AS_MESSAGE_LOG_FD; then
AC_MSG_RESULT(yes)
succeeded=yes
......
2006-08-25 Richard Stallman <rms@gnu.org>
* TUTORIAL: Give priority to graphical terminals over text terminals
regarding C-z.
2006-08-21 Sun Yijiang <sunyijiang@gmail.com>
* TUTORIAL.cn: Sync with the latest TUTORIAL.
2006-08-20 Dave Love <fx@gnu.org>
* emacs.py: Update to Dave Love's latest version.
(__all__): Fix args -> eargs. Add new `modpath' fun.
(eargs): Add `imports' arg.
(all_names): New fun.
(complete): Rewrite without using rlcompleter.
Remove `namespace' arg, add `imports' arg.
(ehelp): Replace g and l args with `imports'.
(eimport): Use __main__ rather than `emacs' namespace.
(modpath): New fun.
2006-08-20 Slawomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se> (tiny change)
* emacs.py (eexecfile): Use the __main__ rather than `emacs' namespace.
2006-08-18 Primoz PETERLIN <primoz.peterlin@mf.uni-lj.si>
* TUTORIAL.sl: Synchronize with TUTORIAL.
2006-08-18 Mats Lidell <matsl@contactor.se>
* TUTORIAL.sv: Synchronize with TUTORIAL.
2006-08-18 Alfredo Finelli <alfredofnl@tiscali.it>
* TUTORIAL.it: Synchronize with TUTORIAL.
2006-08-15 Carsten Dominik <dominik@science.uva.nl>
* orgcard.tex: Version number change.
2006-08-12 Werner Lemberg <wl@gnu.org>
* TUTORIAL.de: Synchronize with TUTORIAL.
2006-08-10 Romain Francoise <romain@orebokech.com>
* NEWS: Mention that zone-mode.el is now obsolete.
2006-08-09 Richard Stallman <rms@gnu.org>
* TUTORIAL: Don't say which side scroll bar is on.
2006-08-06 Nick Roberts <nickrob@snap.net.nz>
* DEBUG (Note): Add note about following a longjmp call.
Add local variables list for outline mode.
2006-08-03 Michael Olson <mwolson@gnu.org>
* ERC-NEWS: Update for ERC 5.1.4.
2006-08-01 Kenichi Handa <handa@m17n.org>
* NEWS (find-operation-coding-system): Describe the more detail of
the change.
2006-07-28 Reiner Steib <Reiner.Steib@gmx.de>
* GNUS-NEWS: Regenerate from Oort Gnus node in texi/gnus.texi using
texi/gnus-news.el of the trunk.
2006-07-29 Reiner Steib <Reiner.Steib@gmx.de>
* NEWS: Fix typo.
2006-07-17 Reiner Steib <Reiner.Steib@gmx.de>
* ru-refcard.ps: Regenerate.
......@@ -168,7 +244,7 @@
2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* NEWS: Mention F10 for Gtk+/Leddtif/Lucid menus.
* NEWS: Mention F10 for Gtk+/Lesstif/Lucid menus.
2006-05-26 Eli Zaretskii <eliz@gnu.org>
......
......@@ -272,6 +272,13 @@ related data structures in a terse and user-friendly format:
The above commands also exist in a version with an `x' suffix which
takes an object of the relevant type as argument.
** Following longjmp call.
Recent versions of glibc (2.4+?) encrypt stored values for setjmp/longjmp which
prevents GDB from being able to follow a longjmp call using `next'. To
disable this protection you need to set the environment variable
LD_POINTER_GUARD to 0.
** Using GDB in Emacs
Debugging with GDB in Emacs offers some advantages over the command line (See
......@@ -739,4 +746,10 @@ look at the disassembly to determine which registers are being used,
and look at those registers directly, to see the actual current values
of these variables.
Local variables:
mode: outline
paragraph-separate: "[ ]*$"
end:
;;; arch-tag: fbf32980-e35d-481f-8e4c-a2eca2586e6b
ERC NEWS -*- outline -*-
* Changes in ERC 5.2 (unreleased)
* Changes in ERC 5.1.4
** Make find-function and find-variable work in Emacs 22 for
names that are constructed by `define-erc-module'.
** Fix bug introduced in ERC 5.1.3 that caused messages to go the
wrong buffer.
** Changes and additions to modules
*** Highlighting (erc-match.el)
**** Don't activate view-mode.
*** Logging (erc-log.el)
**** When this module is activated, make sure logging is enabled on
already-opened buffers. Ditto for disabling logging when the module
is deactivated.
**** Fix some errors that occur when exiting Emacs without first
quitting open IRC servers.
* Changes in ERC 5.1.3
......
This diff is collapsed.
......@@ -95,7 +95,6 @@ doesn't automatically select the right one.
Its name is `pt-br-refcard.tex'. The corresponding PostScript file is
also included.
---
** A French translation of the `Emacs Survival Guide' is available.
......@@ -202,6 +201,13 @@ an interactively callable function.
all frames you create. A position specified with --geometry only
affects the initial frame.
---
** Emacs built for MS-Windows now behaves like Emacs on X does,
wrt its frame position: if you don't specify a position (in your
.emacs init file, in the Registry, or with the --geometry command-line
option), Emacs leaves the frame position to the Windows' window
manager.
+++
** Emacs can now be invoked in full-screen mode on a windowed display.
When Emacs is invoked on a window system, the new command-line options
......@@ -241,8 +247,9 @@ according to the value of `save-abbrevs'.
+++
** If the environment variable EMAIL is defined, Emacs now uses its value
to compute the default value of `use-mail-address', in preference to
to compute the default value of `user-mail-address', in preference to
concatenation of `user-login-name' with the name of your host machine.
* Incompatible Editing Changes in Emacs 22.1
......@@ -832,6 +839,13 @@ The variable `automatic-hscrolling' was renamed to
the window now works sensibly, by automatically adjusting the window's
vscroll property.
*** New customize option `overline-margin' controls the space between
overline and text.
*** New variable `x-underline-at-descent-line' controls the relative
position of the underline. When set, it overrides the
`x-use-underline-position-properties' variables.
+++
*** The new face `mode-line-inactive' is used to display the mode line
of non-selected windows. The `mode-line' face is now used to display
......@@ -1764,9 +1778,8 @@ type "C-h i m org RET" to read that manual. A reference card is
available in `etc/orgcard.tex' and `etc/orgcard.ps'.
+++
** The new package dns-mode.el add syntax highlight of DNS master files.
The key binding C-c C-s (`dns-mode-soa-increment-serial') can be used
to increment the SOA serial.
** The new package dns-mode.el adds syntax highlighting of DNS master files.
It is a modern replacement for zone-mode.el, which is now obsolete.
---
** The new global minor mode `file-name-shadow-mode' modifies the way
......@@ -1987,6 +2000,7 @@ using hi-lock-mode in an initialization file will turn on Hi Lock in all
buffers and no warning will be issued (for compatibility with the
behavior in older versions of Emacs).
---
** Changes in Allout
*** Topic cryptography added, enabling easy gpg topic encryption and
......@@ -1995,11 +2009,19 @@ clear-text within a single file to your heart's content, using symmetric
and/or public key modes. Time-limited key caching, user-provided
symmetric key hinting and consistency verification, auto-encryption of
pending topics on save, and more, make it easy to use encryption in
powerful ways.
powerful ways. Encryption behavior customization is collected in the
allout-encryption customization group.
*** `allout-view-change-hook' marked as being deprecated - use
`allout-exposure-change-hook' instead. Both are currently being used, but
`allout-view-change-hook' will be ignored in a subsequent allout version.
`allout-exposure-change-hook' instead. Both are still invoked, but
`allout-view-change-hook' will eventually be ignored. The new
`allout-exposure-change-hook' is called with args that were passed to
`allout-flag-region', making it easier to use.
*** Other allout functions which change the outline structure also have
hooks, enabling cooperative allout enhancements. See
`allout-structure-added-hook', `allout-structure-deleted-hook', and
`allout-structure-shifted-hook'.
*** Default command prefix changed to "\C-c " (control-c space), to avoid
intruding on user's keybinding space. Customize the
......@@ -2010,23 +2032,43 @@ concealed text, instead of selective-display. This simplifies the code, in
particular avoiding the need for kludges for isearch dynamic-display,
discretionary handling of edits of concealed text, undo concerns, etc.
*** Some previously rough topic-header format edge cases are reconciled.
Level 1 topics use the mode's comment format, and lines starting with the
asterisk - for instance, the comment close of some languages (eg, c's "*/"
or mathematica's "*)") - at the beginning of line are no longer are
interpreted as level 1 topics in those modes. (Yay!)
*** Many substantial fixes and refinements, including:
- repaired inhibition of inadvertent edits to concealed text
- repaired retention of topic body hanging indent upon topic depth shifts
- repaired regexp-quoting of custom header prefixes, so any literals
will now work (for instance, mathematica's "(*" is now properly
accepted).
- repaired inhibition of inadvertent edits to concealed text.
- refuse to create "containment discontinuities", where a
topic is shifted deeper than the offspring-depth of its' container
- auto-fill-mode is now left inactive when allout-mode starts, if it
already was inactive. also, `allout-inhibit-auto-fill' custom
configuration variable makes it easy to disable auto fill in allout
outlines in general or on a per-buffer basis.
- new hook `allout-mode-deactivate-hook', for coordinating with
deactivation of allout-mode.
- mode hook changes: new hook `allout-mode-deactivate-hook', for
coordinating with deactivation of allout-mode. `allout-mode-hook' is
now run after the `allout-mode' variable is changed, as is the new
`allout-mode-deactivate-hook'.
- allout now tolerates fielded text in outlines without disruption.
- hot-spot navigation now is modularized with a new function,
`allout-hotspot-key-handler', enabling easier articulation and
enhancement of the functionality by allout addons.
- topic body navigation is easier, where repeated beginning of line and
end of line key commands cycle through the actually beginning/end of
line and then beginning/end of topic, etc. see new customization vars
`allout-beginning-of-line-cycles' and `allout-end-of-line-cycles'.
- repaired retention of topic body hanging indent upon topic depth shifts
- bulleting variation is simpler and more accommodating, both in the
default behavior and in ability to vary when creating new topics
- mode deactivation now does cleans up effectively, more properly
restoring affected variables and hooks to former state, removing
overlays, etc.
overlays, etc. see `allout-add-resumptions' and
`allout-do-resumptions', which replace the old `allout-resumptions'.
- included a few unit-tests for interior functionality. developers can
have them automatically run at the end of module load by customizing
the option `allout-run-unit-tests-on-load'.
......@@ -3505,6 +3547,9 @@ variable `calculator-radix-grouping-mode'.
---
** iso-acc.el is now obsolete. Use one of the latin input methods instead.
---
** zone-mode.el is now obsolete. Use dns-mode.el instead.
---
** cplus-md.el has been deleted.
......@@ -3654,8 +3699,10 @@ w32-use-full-screen-buffer to t.
* Incompatible Lisp Changes in Emacs 22.1
** The function find-operation-coding-system accepts a cons (FILENAME
. BUFFER) in an argument correponding to the target.
** The function find-operation-coding-system may be called with a cons
(FILENAME . BUFFER) in the second argument if the first argument
OPERATION is `insert-file-contents', and thus a function registered in
`file-coding-system-alist' is also called with such an argument.
---
** The variables post-command-idle-hook and post-command-idle-delay have
......@@ -4625,6 +4672,7 @@ keymap alist to this list.
*** The definition of a key-binding passed to define-key can use XEmacs-style
key-sequences, such as [(control a)].
** Abbrev changes:
+++
......@@ -5354,6 +5402,11 @@ text to being a piece of code, so you'd put a `jit-lock-defer-multiline'
property over the second half of the command to force (deferred)
refontification of `bar' whenever the `e' is added/removed.
*** `font-lock-extend-region-functions' makes it possible to alter the way
the fontification region is chosen. This can be used to prevent rounding
up to whole lines, or to extend the region to include all related lines
of multiline constructs so that such constructs get properly recognized.
** Major mode mechanism changes:
+++
......@@ -5448,6 +5501,9 @@ been renamed to `disabled-command-function'. The variable
*** `emacsserver' now runs `pre-command-hook' and `post-command-hook'
when it receives a request from emacsclient.
+++
*** `current-idle-time' reports how long Emacs has been idle.
** Lisp file loading changes:
+++
......
......@@ -21,7 +21,7 @@ a window doesn't select it.
but if you type M-n you should get the visited file name of the
current buffer.
** whitespace-cleanup should work only on the region if the region is active.
** describe-face should show an example of text in the face.
** Distribute a bar cursor of width > 1 evenly between the two glyphs
on each side of the bar (what to do at the edges?).
......@@ -125,6 +125,9 @@ current buffer.
** Internationalize Emacs's messages.
** Set up a facility to save backtraces when errors happen during
specified filters, specified timers, and specified hooks.
** Install mmc@maruska.dyndns.org's no-flicker change.
** Add a "current vertical pixel level" value that goes with point,
......
......@@ -217,7 +217,7 @@ This should have scrolled the screen up by 8 lines. If you would like
to scroll it down again, you can give an argument to M-v.
If you are using a windowed display, such as X11 or MS-Windows, there
should be a tall rectangular area called a scroll bar at the left hand
should be a tall rectangular area called a scroll bar at the
side of the Emacs window. You can scroll the text by clicking the
mouse in the scroll bar.
......@@ -644,18 +644,18 @@ session--this is the command C-x C-c. (Do not worry about losing
changes you have made; C-x C-c offers to save each changed file before
it kills the Emacs.)
C-z is the command to exit Emacs *temporarily*--so that you can go
back to the same Emacs session afterward.
On systems which allow it, C-z "suspends" Emacs; that is, it returns
to the shell but does not destroy the Emacs. In the most common
shells, you can resume Emacs with the `fg' command or with `%emacs'.
If you are using a graphical display that supports multiple
applications in parallel, you don't need any special command to move
from Emacs to another application. You can do this with the mouse or
with window manager commands. However, if you're using a text
terminal which can only show one application at a time, you need to
"suspend" Emacs to move to any other program.
On systems which do not implement suspending, C-z creates a subshell
running under Emacs to give you the chance to run other programs and
return to Emacs afterward; it does not truly "exit" from Emacs. In
this case, the shell command `exit' is the usual way to get back to
Emacs from the subshell.
C-z is the command to exit Emacs *temporarily*--so that you can go
back to the same Emacs session afterward. When Emacs is running on a
text terminal, C-z "suspends" Emacs; that is, it returns to the shell
but does not destroy the Emacs. In the most common shells, you can
resume Emacs with the `fg' command or with `%emacs'.
The time to use C-x C-c is when you are about to log out. It's also
the right thing to use to exit an Emacs invoked under mail handling
......
......@@ -165,7 +165,7 @@ M-comma
大部分的 Emacs 命令接受数字参数,并且对于多数命令而言,这些数字参数的作
用是指定命令的重复次数。为一个命令指定数字参数(也就是重复次数)的方法
是:先输入 C-u,然后输入数字作为参数,最后再输入命令。如果你有META (或
EDIT 或 ALT)键,那么还有另一种办法:按住 META 键不,然后输入数字。不
EDIT 或 ALT)键,那么还有另一种办法:按住 META 键不,然后输入数字。不
过我们还是建议你用 C-u,因为它在任何终端机上都能用。这种数字参数也称为
“前缀参数”,意思是说这个参数是先于使用它的命令而输入的。
......@@ -174,9 +174,9 @@ EDIT
>> 为 C-n 或者 C-p 指定一个数字参数,这样你可以只用一个命令就把光标移动
到本行的附近。
虽然大部分命令数字参数来作为其重复次数,但是也有些命令例外,它们将数
字参数另做它用。比如有些命令(目前还没学到)仅仅将前缀参数作为一个
志——只要有一个前缀参数出现,不管其值为何,命令的功能都会改变
虽然大部分命令数字参数解释为其重复次数,但是也有些命令例外,它们将数
字参数另做它用。比如有些命令(我们目前还没学到)仅仅将前缀参数作为一个
志——只要给出有一个前缀参数,不管其值为何,它都会改变命令的功能。
而 C-v 和 M-v 则属于另一种类型的例外。当给定一个参数时,它们将滚动你指
定的“行数”,而不是“屏数”。举例来说,C-u 8 C-v 将屏幕向下滚动 8 行,
......@@ -188,8 +188,8 @@ EDIT
以给定一个参数然后执行 M-v。
如果你正在使用一个窗口系统,比如 X11 或者微软的 Windows,那么在 Emacs
窗口的左边或者右边应该有一个长方形的区域叫“滚动条”,你可以用鼠标操纵
滚动条来滚动文字。
窗口的边应该有一个长方形的区域叫“滚动条”,你可以用鼠标操纵滚动条来
滚动文字。
>> 试着在“滚动条内的反白区域”上按一下鼠标中键。
文字应该会滚动到鼠标所指示的位置。
......@@ -202,10 +202,10 @@ EDIT
* 在 EMACS 失去响应的时候(WHEN EMACS IS HUNG)
-----------------------------------------------
如果 Emacs 对你的命令失去响应,你可以很安全地用 C-g 来终止这命令。
C-g 也可以被用来终止一执行过久的命令。
如果 Emacs 对你的命令失去响应,你可以用 C-g 来安全地终止这命令。C-g
也可以终止一执行过久的命令。
C-g 还可以被来取消数字参数和那些输入到一半的命令。
C-g 还可以取消数字参数和输入到一半的命令。
>> 输入 C-u 100 设定一个值为 100 的数字参数,然后按 C-g。
现在再按 C-f,光标应该只会移动一个字符,因为你已经用 C-g 取消了参数。
......@@ -219,16 +219,16 @@ C-g
-----------------------------------
有一些 Emacs 命令被“禁用”了,以避免初学者在不了解其确切功能的情况下误
这些命令,造成麻烦。
它们,造成麻烦。
如果你用到了一个被禁用的命令,Emacs 会显示一个提示消息,告诉你这个命令
到底是干什么的,询问你是否要继续,并在得到你的肯定之后再执行这命令。
你要是真的想执行被禁用的命令,那么在 Emacs 询问你的时候应该按空格。一般
来说,如果你不想执行,按“n”就行了
如果你真的想用这条命令,在 Emacs 询问你的时候应该按空格。一般来说,如果
你不想用,就按“n”。
>> 试试 C-x C-l (这是一个被禁用的命令)
然后用 n 来回答问
然后用 n 来回答问。
* 窗格(WINDOWS)
......@@ -245,7 +245,7 @@ Emacs
>> 把光标移到本行然后输入 C-u 0 C-l。
>> 输入 CONTROL-h k CONTROL-f。观察当一个新窗格出现时当前窗格(用来显示
CONTROL-f 命令的文档)是如何小的。
CONTROL-f 命令的文档)是如何小的。
>> 输入 C-x 1 关掉文档窗格。
......@@ -265,33 +265,33 @@ Emacs
用法应该一样。一般来说 <Delback> 就是位于 <Return> 键上方某处的一个大号
键,通常被标示为“Delete”、“Del”或者“Backspace”。
如果你找到了标着“Backspace”键,那么它应该就是 <Delback>;即便你又在
键盘其它地方找到了一个标示为“Del”键,那么它也应该不是 <Delback>。
如果你找到了“Backspace”键,那么它应该就是 <Delback>;哪怕你又在别的地
方找到了一个“Del”键,那么它也应该不是 <Delback>。
一种更通用的说法是,<Delback> 将位于光标前的一个字符删除
一种更通用的说法是,<Delback> 将删除位于光标前的一个字符。
>> 现在就试试——敲点字,然后按几下 <Delback> 删除它们。
不用担心你会修改文件,你干什么都没关系,这里就是专给你练习用的。
如果一行文字很长、超出了窗格的宽度,显示不下的部分会在紧邻的下一行继续
显示。这时会有一个反斜线(控制台下是反斜线,如果你用图形窗口系统,则
该是一个小小的转弯箭头)显示在右边沿,表明这是某一行的接续显示。
显示。这时会有一个反斜线(控制台下是反斜线,如果你用图形窗口系统,则
该是一个小小的转弯箭头)显示在右边沿,表明这是某一行的接续显示。
>> 输入文字,一直到屏幕的右边界,然后继续,你会看到一个接续行出现。
>> 用 <Delback> 删掉一些文字,直到此行长度小于窗格宽度,接续行就消失了。
你可以像删除其他字符一样删除换行符。删除两行中间的换行符会将两行合并成
一行。如果合并的结果使这一行太长,超出了窗格宽度,它就会以一个接续行
显示。
换行符跟其他字符一样可以被删除。两行中间的换行符被删除后,这两行将会合
并成一行。如果合并的这一行太长,超出了窗格宽度,它就会以一个接续行
显示。
>> 移动光标到行的开头并输入 <Delback>。
这时本行与其前一行被合并为一行。
>> 移动光标到行的开头并输入 <Delback>。
这时该行将与其前一行一起被合并为一行。
>> 输入 <Return> 重新插入你刚才删除的换行符。
前面过,大部分的 Emacs 命令都可以指定重复次数,这其中也包括输入字符的