Merged in changes from CVS head

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-5
   Add =cvs-sync-make-log script

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-6
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-7
   Use absolute tla-tools filenames in =cvs-sync-make-log

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-8
   Use proper arch-tag: syntax for lispintro/texinfo.tex

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-9
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-24

81 files changed, 2223 insertions, 1281 deletions

diff --git a/ChangeLog b/ChangeLog
index 0dbff7b166d..1a535606dc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-30  Eli Zaretskii  <eliz@elta.co.il>
+
+        * INSTALL.CVS: Renamed from INSTALL-CVS to avoid file-name
+        clashes with install-sh on 8+3 filesystems.
+
 2003-12-08  Miles Bader  <miles@gnu.org>
 
         * .cvsignore: Add .arch-inventory.
diff --git a/INSTALL-CVS b/INSTALL.CVS
index 3acb070de3b..3acb070de3b 100755..100644
--- a/INSTALL-CVS
+++ b/INSTALL.CVS
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2a98dc67294..bceac931cd5 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-29  Ognyan Kulev <ogi@fmi.uni-sofia.bg>
+
+        * TUTORIAL.bg: Use windows-1251 encoding.  Fix punctuation errors.
+
 2003-11-21  Lars Hansen  <larsh@math.ku.dk>
 
         * TODO: Add plans for change of file attributes UID and GID from
diff --git a/etc/NEWS b/etc/NEWS
index 13a8b93dc0f..fd4ffb215b4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1734,6 +1734,11 @@ configuration files.
 
 * Lisp Changes in Emacs 21.4
 
+** The function `insert-for-yank' now supports strings where the
+`yank-handler' property does not span the first character of the
+string.  The old behavior is available if you call
+`insert-for-yank-1' instead.
+
 ** New function `get-char-property-and-overlay' accepts the same
 arguments as `get-char-property' and returns a cons whose car is the
 return value of `get-char-property' called with those arguments and
@@ -7260,7 +7265,8 @@ Additional image properties supported are:
 `:index INDEX'
 
 INDEX must be an integer >= 0.  Load image number INDEX from a
-multi-image GIF file.  An error is signaled if INDEX is too large.
+multi-image GIF file.  If INDEX is too large, the image displays
+as a hollow box.
 
 This could be used to implement limited support for animated GIFs.
 For example, the following function displays a multi-image GIF file
diff --git a/etc/TUTORIAL.bg b/etc/TUTORIAL.bg
index 447ba5b5041..8bd4b2a19ad 100644
--- a/etc/TUTORIAL.bg
+++ b/etc/TUTORIAL.bg
@@ -1,1169 +1,1171 @@
-÷ÉÅ ÇÌÅÄÁÔÅ ×ß×ÅÄÅÎÉÅÔÏ ÎÁ åÍÁËÓ.  õÓÌÏ×ÉÑÔÁ ÚÁ ËÏÐÉÒÁÎÅ ÓÁ × ËÒÁÑ ÎÁ ÔÅËÓÔÁ.
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
-
-ëÏÍÁÎÄÉÔÅ ÎÁ åÍÁËÓ ÎÁÊ-ÞÅÓÔÏ ×ËÌÀÞ×ÁÔ ËÌÁ×ÉÛÉÔÅ CONTROL (ÐÏÎÑËÏÇÁ
-ÏÔÂÅÌÑÚ×ÁÎ Ó CTRL ÉÌÉ CTL) É META (ÐÏÎÑËÏÇÁ ÏÔÂÅÌÑÚ×ÁÎ Ó EDIT ÉÌÉ
-ALT).  ÷ÍÅÓÔÏ ÄÁ ÓÅ ÉÚÐÉÓ×ÁÔ Ó ÐßÌÎÏ ÉÍÅ ×ÓÅËÉ ÐßÔ, ÎÉÅ ÝÅ ÉÚÐÏÌÚ×ÁÍÅ
-ÓÌÅÄÎÉÔÅ ÓßËÒÁÝÅÎÉÑ:
-
- C-<ÚÎÁË>       ÏÚÎÁÞÁ×Á ÚÁÄßÒÖÁÎÅ ÎÁ ËÌÁ×ÉÛÁ CONTROL ÄÏËÁÔÏ ÓÅ
-                ÎÁÔÉÓËÁ ÚÎÁËÁ <ÚÎÁË>.  ôÁËÁ C-f ÝÅ ÏÚÎÁÞÁ×Á: ÄÏËÁÔÏ
-                ÓÅ ÚÁÄßÒÖÁ ÎÁÔÉÓÎÁÔ ËÌÁ×ÉÛÁ CONTROL ÓÅ ÎÁÔÉÓËÁ f.
- M-<ÚÎÁË>       ÏÚÎÁÞÁ×Á ÚÁÄßÒÖÁÎÅ ÎÁÔÉÓÎÁÔ ÎÁ ËÌÁ×ÉÛÁ META (ÉÌÉ EDIT
-                ÉÌÉ ALT) ÄÏËÁÔÏ ÓÅ ÎÁÔÉÓËÁ <ÚÎÁË>.  áËÏ ÎÑÍÁ ËÌÁ×ÉÛ
-                META, EDIT ÉÌÉ ALT, ×ÍÅÓÔÏ ÎÅÇÏ ÎÁÔÉÓÎÅÔÅ É ÏÔÐÕÓÎÅÔÅ
-                ËÌÁ×ÉÛÁ ESC É ÓÌÅÄ ÔÏ×Á ×ß×ÅÄÅÔÅ <ÚÎÁË>.  îÉÅ
-                ÚÁÐÉÓ×ÁÍÅ <ESC> ÚÁ ÄÁ ÏÔÂÅÌÅÖÉÍ ËÌÁ×ÉÛÁ ESC.
-
-÷ÁÖÎÁ ÂÅÌÅÖËÁ: × ËÒÁÑ ÎÁ åÍÁËÓ ÓÅÓÉÑÔÁ ×ß×ÅÄÅÔÅ Ä×ÁÔÁ ÚÎÁËÁ C-x C-c.
-úÎÁÃÉÔÅ ">>" ÏÔÌÑ×Ï ×É ÄÁ×ÁÔ ÕËÁÚÁÎÉÅ ÄÁ ÉÚÐßÌÎÉÔÅ ËÏÍÁÎÄÁ.  îÁÐÒÉÍÅÒ:
+Âèå ãëåäàòå âúâåäåíèåòî íà Åìàêñ.  Óñëîâèÿòà çà êîïèðàíå ñà â êðàÿ íà òåêñòà.
+Copyright (c) 1985, 1996, 1998, 2001, 2002, 2003 Free Software Foundation.
+
+Êîìàíäèòå íà Åìàêñ íàé-÷åñòî âêëþ÷âàò êëàâèøèòå CONTROL (ïîíÿêîãà
+îòáåëÿçâàí ñ CTRL èëè CTL) è META (ïîíÿêîãà îòáåëÿçâàí ñ EDIT èëè
+ALT).  Âìåñòî äà ñå èçïèñâàò ñ ïúëíî èìå âñåêè ïúò, íèå ùå èçïîëçâàìå
+ñëåäíèòå ñúêðàùåíèÿ:
+
+ C-<çíàê>       îçíà÷àâà çàäúðæàíå íà êëàâèøà CONTROL, äîêàòî ñå
+                íàòèñêà çíàêà <çíàê>.  Òàêà C-f ùå îçíà÷àâà: äîêàòî
+                ñå çàäúðæà íàòèñíàò êëàâèøà CONTROL, ñå íàòèñêà f.
+ M-<çíàê>       îçíà÷àâà çàäúðæàíå íàòèñíàò íà êëàâèøà META (èëè EDIT,
+                èëè ALT), äîêàòî ñå íàòèñêà <çíàê>.  Àêî íÿìà êëàâèø
+                META, EDIT èëè ALT, âìåñòî íåãî íàòèñíåòå è îòïóñíåòå
+                êëàâèøà ESC è ñëåä òîâà âúâåäåòå <çíàê>.  Íèå
+                çàïèñâàìå <ESC>, çà äà îòáåëåæèì êëàâèøà ESC.
+
+Âàæíà áåëåæêà: â êðàÿ íà Åìàêñ ñåñèÿòà âúâåäåòå äâàòà çíàêà C-x C-c.
+Çíàöèòå ">>" îòëÿâî âè äàâàò óêàçàíèå äà èçïúëíèòå êîìàíäà.  Íàïðèìåð:
 <<Blank lines inserted here by startup of help-with-tutorial>>
->> óÅÇÁ ×ß×ÅÄÅÔÅ C-v (ðÏËÁÖÉ ÓÌÅÄ×ÁÝÉÑ ÅËÒÁÎ) ÚÁ ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ ËßÍ
-ÓÌÅÄ×ÁÝÉÑ ÅËÒÁÎ.
-        (îÁÐÒÁ×ÅÔÅ ÇÏ ÓÅÇÁ, ÚÁÄÒßÖÔÅ CONTROL ÄÏËÁÔÏ ÎÁÔÉÓËÁÔÅ v).
-        ïÔÓÅÇÁ ÎÁÔÁÔßË ×ÉÅ ÝÅ ÐÒÁ×ÉÔÅ ÔÏ×Á ×ÉÎÁÇÉ ËÏÇÁÔÏ ÐÒÏÞÅÔÅÔÅ
-        ÅËÒÁÎÁ.
+>> Ñåãà âúâåäåòå C-v (Ïîêàæè ñëåäâàùèÿ åêðàí), çà äà ñå ïðèäâèæèòå êúì
+ñëåäâàùèÿ åêðàí.
+        (Íàïðàâåòå ãî ñåãà, çàäðúæòå CONTROL, äîêàòî íàòèñêàòå v).
+        Îòñåãà íàòàòúê âèå ùå ïðàâèòå òîâà âèíàãè, êîãàòî ïðî÷åòåòå
+        åêðàíà.
 
-úÁÂÅÌÅÖÅÔÅ, ÞÅ ÉÍÁ ÐÒÉÐÏËÒÉ×ÁÎÅ ÎÁ Ä×Á ÒÅÄÁ, ËÏÇÁÔÏ ÓÅ ÐÒÉÄ×ÉÖ×ÁÔÅ ÏÔ
-ÅËÒÁÎ × ÅËÒÁÎ; ÔÏ×Á ÏÓÉÇÕÒÑ×Á ÎÑËÁË×Á ÐÒÉÅÍÓÔ×ÅÎÏÓÔ, ÔÁËÁ ÞÅ ÄÁ ÍÏÖÅÔÅ
-ÐÏ-ÌÅÓÎÏ ÄÁ ÐÒÏÄßÌÖÉÔÅ Ó ÞÅÔÅÎÅÔÏ ÎÁ ÔÅËÓÔÁ.
+Çàáåëåæåòå, ÷å èìà ïðèïîêðèâàíå íà äâà ðåäà, êîãàòî ñå ïðèäâèæâàòå îò
+åêðàí â åêðàí; òîâà îñèãóðÿâà íÿêàêâà ïðèåìñòâåíîñò, òàêà ÷å äà ìîæåòå
+ïî-ëåñíî äà ïðîäúëæèòå ñ ÷åòåíåòî íà òåêñòà.
 
-ðßÒ×ÏÔÏ ÎÅÝÏ, ËÏÅÔÏ ÔÒÑÂ×Á ÄÁ ÚÎÁÅÔÅ, Å ËÁË ÄÁ ÓÅ ÐÒÉÄ×ÉÖ×ÁÔÅ ÏÔ ÅÄÎÏ
-ÍÑÓÔÏ ÎÁ ÔÅËÓÔÁ ËßÍ ÄÒÕÇÏ.  ÷ÉÅ ×ÅÞÅ ÚÎÁÅÔÅ ËÁË ÄÁ ÓÅ ÐÒÉÄ×ÉÖ×ÁÔÅ
-ÅËÒÁÎ ÎÁÐÒÅÄ, Ó C-v.  úÁ ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ ÅËÒÁÎ ÎÁÚÁÄ, ×ß×ÅÄÅÔÅ M-v
-(ÚÁÄÒßÖÔÅ ËÌÁ×ÉÛÁ META É ÎÁÔÉÓÎÅÔÅ v, ÉÌÉ ×ß×ÅÄÅÔÅ <ESC>v ÁËÏ ÎÑÍÁÔÅ
-ËÌÁ×ÉÛ META, EDIT ÉÌÉ ALT).
+Ïúðâîòî íåùî, êîåòî òðÿáâà äà çíàåòå, å êàê äà ñå ïðèäâèæâàòå îò åäíî
+ìÿñòî íà òåêñòà êúì äðóãî.  Âèå âå÷å çíàåòå êàê äà ñå ïðèäâèæâàòå
+åêðàí íàïðåä, ñ C-v.  Çà äà ñå ïðèäâèæèòå åêðàí íàçàä, âúâåäåòå M-v
+(çàäðúæòå êëàâèøà META è íàòèñíåòå v, èëè âúâåäåòå <ESC>v, àêî íÿìàòå
+êëàâèø META, EDIT èëè ALT).
 
->> ïÐÉÔÁÊÔÅ ÓÅ ÄÁ ×ß×ÅÄÅÔÅ M-v É ÓÌÅÄ ÔÏ×Á C-v ÎÑËÏÌËÏ ÐßÔÉ.
+>> Îïèòàéòå ñå äà âúâåäåòå M-v è ñëåä òîâà C-v íÿêîëêî ïúòè.
 
 
-* ïâïâýåîéå
+* ÎÁÎÁÙÅÍÈÅ
 -----------
 
-óÌÅÄ×ÁÝÉÔÅ ËÏÍÁÎÄÉ ÓÁ ÐÏÌÅÚÎÉ ÐÒÉ ÐßÌÎÏÅËÒÁÎÎÏ ÒÁÚÇÌÅÖÄÁÎÅ:
+Ñëåäâàùèòå êîìàíäè ñà ïîëåçíè ïðè ïúëíîåêðàííî ðàçãëåæäàíå:
 
-        C-v     ðÒÉÄ×ÉÖ×ÁÎÅ ÎÁÐÒÅÄ Ó ÅÄÉÎ ÅËÒÁÎ
-        M-v     ðÒÉÄ×ÉÖ×ÁÎÅ ÎÁÚÁÄ Ó ÅÄÉÎ ÅËÒÁÎ
-        C-l     éÚÞÉÓÔ×ÁÎÅ ÎÁ ÅËÒÁÎÁ É ÐÒÅÞÅÒÔÁ×ÁÎÅ ÎÁ ÃÅÌÉÑ ÔÅËÓÔ,
-                 ÐÒÅÍÅÓÔ×ÁÊËÉ ÔÅËÓÔÁ ÏËÏÌÏ ËÕÒÓÏÒÁ
-                 × ÓÒÅÄÁÔÁ ÎÁ ÅËÒÁÎÁ.
-                 (ôÏ×Á Å CONTROL-L, ÎÅ CONTROL-1.)
+        C-v     Ïðèäâèæâàíå íàïðåä ñ åäèí åêðàí
+        M-v     Ïðèäâèæâàíå íàçàä ñ åäèí åêðàí
+        C-l     Èç÷èñòâàíå íà åêðàíà è ïðå÷åðòàâàíå íà öåëèÿ òåêñò,
+                 ïðåìåñòâàéêè òåêñòà îêîëî êóðñîðà â ñðåäàòà íà åêðàíà.
+                 (Òîâà å CONTROL-L, íå CONTROL-1.)
 
->> îÁÍÅÒÅÔÅ ËÕÒÓÏÒÁ É ÓÉ ÚÁÐÏÍÎÅÔÅ ËÁËß× Å ÔÅËÓÔßÔ ÏËÏÌÏ ÎÅÇÏ.
-   óÌÅÄ ÔÏ×Á ×ß×ÅÄÅÔÅ C-l.
-   îÁÍÅÒÅÔÅ ÐÁË ËÕÒÓÏÒÁ É ×ÉÖÔÅ, ÞÅ ÓßÝÉÑÔ ÔÅËÓÔ Å ÐÁË ÏËÏÌÏ ËÕÒÓÏÒÁ.
+>> Íàìåðåòå êóðñîðà è ñè çàïîìíåòå êàêúâ å òåêñòúò îêîëî íåãî.
+   Ñëåä òîâà âúâåäåòå C-l.
+   Íàìåðåòå ïàê êóðñîðà è âèæòå, ÷å ñúùèÿò òåêñò å ïàê îêîëî êóðñîðà.
 
-íÏÖÅ ÓßÝÏ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ËÌÁ×ÉÛÉÔÅ PageUp É PageDn ÚÁ ÐÒÉÄ×ÉÖ×ÁÎÅ ÐÏ
-ÅËÒÁÎÉ ÁËÏ ×ÁÛÉÑÔ ÔÅÒÍÉÎÁÌ ÇÉ ÐÒÉÔÅÖÁ×Á, ÎÏ ×ÉÅ ÍÏÖÅÔÅ ÄÁ ÒÅÄÁËÔÉÒÁÔÅ
-ÐÏ-ÅÆÅËÔÉ×ÎÏ ÁËÏ ÉÚÐÏÌÚ×ÁÔÅ C-v É M-v.
+Ìîæå ñúùî äà èçïîëçâàòå êëàâèøèòå PageUp è PageDown çà ïðèäâèæâàíå ïî
+åêðàíè, àêî âàøèÿò òåðìèíàë ãè ïðèòåæàâà, íî âèå ìîæåòå äà ðåäàêòèðàòå
+ïî-åôåêòèâíî, àêî èçïîëçâàòå C-v è M-v.
 
 
-* ïóîï÷é îá õðòá÷ìåîéåôï îá ëõòóïòá
+* ÎÑÍÎÂÈ ÍÀ ÓÏÐÀÂËÅÍÈÅÒÎ ÍÀ ÊÓÐÑÎÐÀ
 -----------------------------------
 
-ðÒÉÄ×ÉÖ×ÁÎÅÔÏ ÏÔ ÅËÒÁÎ ÎÁ ÅËÒÁÎ Å ÐÏÌÅÚÎÏ, ÎÏ ËÁË ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ ÄÏ
-ÏÐÒÅÄÅÌÅÎÏ ÍÑÓÔÏ ×ßÔÒÅ × ÔÅËÓÔÁ ÎÁ ÅËÒÁÎÁ?
+Ïðèäâèæâàíåòî îò åêðàí íà åêðàí å ïîëåçíî, íî êàê äà ñå ïðèäâèæèòå äî
+îïðåäåëåíî ìÿñòî âúòðå â òåêñòà íà åêðàíà?
 
-éÍÁ ÎÑËÏÌËÏ ÎÁÞÉÎÁ ÄÁ ÇÏ ÎÁÐÒÁ×ÉÔÅ.  íÏÖÅ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ËÌÁ×ÉÛÉÔÅ
-ÓÔÒÅÌËÉ, ÎÏ Å ÐÏ-ÅÆÅËÔÉ×ÎÏ ÄÁ ÄßÒÖÉÔÅ ÒßÃÅÔÅ ÓÉ × ÓÔÁÎÄÁÒÔÎÏ ÐÏÌÏÖÅÎÉÅ
-É ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ËÏÍÁÎÄÉÔÅ C-p, C-b, C-f É C-n.  ôÅÚÉ ÚÎÁÃÉ ÓÁ
-ÅË×É×ÁÌÅÎÔÎÉ ÎÁ ÞÅÔÉÒÉÔÅ ËÌÁ×ÉÛÉ ÓÔÒÅÌËÉ, ÅÔÏ ÔÁËÁ:
+Èìà íÿêîëêî íà÷èíà äà ãî íàïðàâèòå.  Ìîæå äà èçïîëçâàòå êëàâèøèòå
+ñòðåëêè, íî å ïî-åôåêòèâíî äà äúðæèòå ðúöåòå ñè â ñòàíäàðòíî ïîëîæåíèå
+è äà èçïîëçâàòå êîìàíäèòå C-p, C-b, C-f è C-n.  Òåçè çíàöè ñà
+åêâèâàëåíòíè íà ÷åòèðèòå êëàâèøè ñòðåëêè, åòî òàêà:
 
-                    ðÒÅÄÉÛÅÎ ÒÅÄ (Previous), C-p
+                    Ïðåäèøåí ðåä (Previous), C-p
                                   :
                                   :
-      îÁÚÁÄ, C-b .... ôÅËÕÝÁ ÐÏÚÉÃÉÑ ÎÁ ËÕÒÓÏÒÁ .... îÁÐÒÅÄ, C-f
+      Íàçàä, C-b .... Òåêóùà ïîçèöèÿ íà êóðñîðà .... Íàïðåä, C-f
       (Backward)                  :                  (Forward)
                                   :
-                       óÌÅÄ×ÁÝ ÒÅÄ (Next), C-n
+                       Ñëåäâàù ðåä (Next), C-n
 
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÒÅÄÁ × ÓÒÅÄÁÔÁ ÎÁ ÔÁÚÉ ÄÉÁÇÒÁÍÁ ÉÚÐÏÌÚ×ÁÊËÉ
-   C-n É C-p.  óÌÅÄ ÔÏ×Á ÎÁÔÉÓÎÅÔÅ C-l ÚÁ ÄÁ ×ÉÄÉÔÅ ÃÑÌÁÔÁ ÄÉÁÇÒÁÍÁ
-   ÃÅÎÔÒÉÒÁÎÁ ÎÁ ÅËÒÁÎÁ.
+>> Ïðèäâèæåòå êóðñîðà äî ðåäà â ñðåäàòà íà òàçè äèàãðàìà, èçïîëçâàéêè
+   C-n è C-p.  Ñëåä òîâà íàòèñíåòå C-l, çà äà âèäèòå öÿëàòà äèàãðàìà,
+   öåíòðèðàíà íà åêðàíà.
 
-ýÅ ÎÁÍÅÒÉÔÅ, ÞÅ ÚÁÐÏÍÎÑÎÅÔÏ ÎÁ ÔÅÚÉ ÂÕË×É ÐÏ ÄÕÍÉÔÅ ÎÁ ÁÎÇÌÉÊÓËÉ ÎÁ
-ÄÅÊÓÔ×ÉÑÔÁ, ËÏÉÔÏ ÉÚ×ßÒÛ×ÁÔ, Å ÌÅÓÎÏ: P ÚÁ Previous (ÐÒÅÄÉÛÅÎ), N ÚÁ
-Next (ÓÌÅÄ×ÁÝ), B ÚÁ Backward (ÎÁÚÁÄ) É F ÚÁ Forward (ÎÁÐÒÅÄ).  ÷ÉÅ ÝÅ
-ÉÚÐÏÌÚ×ÁÔÅ ÔÅÚÉ ÏÓÎÏ×ÎÉ ËÏÍÁÎÄÉ ÚÁ ÐÒÉÄ×ÉÖ×ÁÎÅ ÎÁ ËÕÒÓÏÒÁ ÐÒÅÚ ÃÑÌÏÔÏ
-×ÒÅÍÅ.
+Ùå íàìåðèòå, ÷å çàïîìíÿíåòî íà òåçè áóêâè ïî äóìèòå íà àíãëèéñêè íà
+äåéñòâèÿòà, êîèòî èçâúðøâàò, å ëåñíî: P çà Previous (ïðåäèøåí), N çà
+Next (ñëåäâàù), B çà Backward (íàçàä) è F çà Forward (íàïðåä).  Âèå ùå
+èçïîëçâàòå òåçè îñíîâíè êîìàíäè çà ïðèäâèæâàíå íà êóðñîðà ïðåç öÿëîòî
+âðåìå.
 
->> îÁÐÒÁ×ÅÔÅ ÎÑËÏÌËÏ C-n ÚÁ ÄÁ ÄÏ×ÅÄÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÔÏÚÉ ÒÅÄ.
+>> Âúâåäåòå íÿêîëêî C-n, çà äà äîâåäåòå êóðñîðà äî òîçè ðåä.
 
->> ðÒÉÄ×ÉÖÅÔÅ ÓÅ × ÒÅÄÁ Ó ÎÑËÏÌËÏ C-f É ÓÌÅÄ ÔÏ×Á Ó ÎÑËÏÌËÏ C-p.
-   ÷ÉÖÔÅ ËÁË×Ï ÐÒÁ×É C-p, ËÏÇÁÔÏ ËÕÒÓÏÒßÔ Å × ÓÒÅÄÁÔÁ ÎÁ ÒÅÄÁ.
+>> Ïðèäâèæåòå ñå â ðåäà ñ íÿêîëêî C-f è ñëåä òîâà ñ íÿêîëêî C-p.
+   Âèæòå êàêâî ïðàâè C-p, êîãàòî êóðñîðúò å â ñðåäàòà íà ðåäà.
 
-÷ÓÅËÉ ÒÅÄ ÏÔ ÔÅËÓÔ ÚÁ×ßÒÛ×Á ÓßÓ ÚÎÁË ÚÁ ÎÏ× ÒÅÄ, ËÏÊÔÏ ÓÌÕÖÉ ÚÁ
-ÏÔÄÅÌÑÎÅÔÏ ÎÁ ÒÅÄÁ ÏÔ ÓÌÅÄ×ÁÝÉÑ ÒÅÄ.  ðÏÓÌÅÄÎÉÑÔ ÒÅÄ ×ß× ×ÁÛÉÑ ÆÁÊÌ
-ÔÒÑÂ×Á ÄÁ ÉÍÁ ÚÎÁË ÚÁ ÎÏ× ÒÅÄ × ËÒÁÑ (ÎÏ åÍÁËÓ ÎÅ ÉÚÉÓË×Á ÔÁËß×,
-ËÏÇÁÔÏ ÐÒÏÞÉÔÁ ÆÁÊÌÁ).
+Âñåêè ðåä îò òåêñò çàâúðøâà ñúñ çíàê çà íîâ ðåä, êîéòî ñëóæè çà
+îòäåëÿíåòî íà ðåäà îò ñëåäâàùèÿ ðåä.  Ïîñëåäíèÿò ðåä âúâ âàøèÿ ôàéë
+òðÿáâà äà èìà çíàê çà íîâ ðåä â êðàÿ (íî Åìàêñ íå èçèñêâà òàêúâ,
+êîãàòî ïðî÷èòà ôàéëà).
 
->> ïÐÉÔÁÊÔÅ C-b × ÎÁÞÁÌÏÔÏ ÎÁ ÒÅÄ.  ôÏ×Á ÔÒÑÂ×Á ÄÁ ×É ÐÒÉÄ×ÉÖÉ × ËÒÁÑ
-   ÎÁ ÐÒÅÄÉÛÎÉÑ ÒÅÄ.  ôÏ×Á Å ÔÁËÁ, ÚÁÝÏÔÏ ËÕÒÓÏÒßÔ ÓÅ ÐÒÉÄ×ÉÖ×Á ËßÍ
-   ÚÎÁËÁ ÚÁ ÎÏ× ÒÅÄ ÎÁ ÐÒÅÄÉÛÎÉÑ ÒÅÄ.
+>> Îïèòàéòå C-b â íà÷àëîòî íà ðåä.  Òîâà òðÿáâà äà âè ïðèäâèæè â êðàÿ
+   íà ïðåäèøíèÿ ðåä.  Òîâà å òàêà, çàùîòî êóðñîðúò ñå ïðèäâèæâà êúì
+   çíàêà çà íîâ ðåä íà ïðåäèøíèÿ ðåä.
 
-C-f ÍÏÖÅ ÄÁ ÐÒÉÄ×ÉÖ×Á ÐÒÅÚ ÚÎÁË ÚÁ ÎÏ× ÒÅÄ ÔÏÞÎÏ ËÁËÔÏ C-b.
+C-f ìîæå äà ïðèäâèæâà ïðåç çíàê çà íîâ ðåä òî÷íî êàêòî C-b.
 
->> îÁÐÒÁ×ÅÔÅ ÎÑËÏÌËÏ C-b ÐÒÉÄ×ÉÖ×ÁÎÉÑ, ÔÁËÁ ÞÅ ÄÁ ÄÏÂÉÅÔÅ ÕÓÅÝÁÎÅ ËßÄÅ
-   ÓÅ ÎÁÍÉÒÁ ËÕÒÓÏÒÁ.  óÌÅÄ ÔÏ×Á ÎÑËÏÌËÏ C-f ÚÁ ÄÁ ÓÅ ×ßÒÎÅÔÅ × ËÒÁÑ
-   ÎÁ ÒÅÄÁ.  óÌÅÄ ÔÏ×Á ÏÝÅ ÎÑËÏÌËÏ C-f ÚÁ ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ ÄÏ
-   ÓÌÅÄ×ÁÝÉÑ ÒÅÄ.
-
-ëÏÇÁÔÏ ÓÅ ÐÒÉÄ×ÉÖ×ÁÔÅ ÓÌÅÄ ÇÏÒÎÉÑ ÉÌÉ ÄÏÌÎÉÑ ËÒÁÊ ÎÁ ÅËÒÁÎÁ, ÔÅËÓÔßÔ
-ÏÔ×ßÄ ËÒÁÑ ÓÅ ÉÚÍÅÓÔ×Á ËßÍ ÅËÒÁÎÁ.  ôÏ×Á ÓÅ ÎÁÒÉÞÁ "ÓËÒÏÌÉÒÁÎÅ".  ôÏ
-ÐÏÚ×ÏÌÑ×Á ÎÁ åÍÁËÓ ÄÁ ÐÒÉÄ×ÉÖ×Á ËÕÒÓÏÒÁ ËßÍ ÚÁÄÁÄÅÎÏÔÏ ÍÑÓÔÏ × ÔÅËÓÔÁ
-ÂÅÚ ÄÁ ÇÏ ÉÚËÁÒ×Á ÉÚ×ßÎ ÅËÒÁÎÁ.
+>> Íàïðàâåòå íÿêîëêî C-b ïðèäâèæâàíèÿ, òàêà ÷å äà äîáèåòå óñåùàíå êúäå
+   ñå íàìèðà êóðñîðúò.  Ñëåä òîâà íÿêîëêî C-f, çà äà ñå âúðíåòå â êðàÿ
+   íà ðåäà.  Ñëåä òîâà îùå íÿêîëêî C-f, çà äà ñå ïðèäâèæèòå äî
+   ñëåäâàùèÿ ðåä.
+
+Êîãàòî ñå ïðèäâèæâàòå ñëåä ãîðíèÿ èëè äîëíèÿ êðàé íà åêðàíà, òåêñòúò
+îòâúä êðàÿ ñå èçìåñòâà êúì åêðàíà.  Òîâà ñå íàðè÷à "ñêðîëèðàíå".  Òî
+ïîçâîëÿâà íà Åìàêñ äà ïðèäâèæâà êóðñîðà êúì çàäàäåíîòî ìÿñòî â òåêñòà,
+áåç äà ãî èçêàðâà èçâúí åêðàíà.
 
->> ïÐÉÔÁÊÔÅ ÓÅ ÄÁ ÐÒÉÄ×ÉÖÉÔÅ ËÕÒÓÏÒÁ ÓÌÅÄ ÄÏÌÎÉÑ ËÒÁÊ ÎÁ ÅËÒÁÎÁ Ó C-n
-   É ×ÉÖÔÅ ËÁË×Ï ÓÅ ÓÌÕÞ×Á.
+>> Îïèòàéòå ñå äà ïðèäâèæèòå êóðñîðà ñëåä äîëíèÿ êðàé íà åêðàíà ñ C-n
+   è âèæòå êàêâî ñå ñëó÷âà.
 
-áËÏ ÐÒÉÄ×ÉÖ×ÁÎÅÔÏ ÐÏ ÚÎÁÃÉ Å Ô×ßÒÄÅ ÂÁ×ÎÏ, ÍÏÖÅ ÄÁ ÐÒÏÂ×ÁÔÅ
-ÐÒÉÄ×ÉÖ×ÁÎÅ ÐÏ ÄÕÍÉ.  M-f (META-f) ÐÒÉÄ×ÉÖ×Á ËÕÒÓÏÒÁ ÄÕÍÁ ÎÁÐÒÅÄ, Á
-M-b ÐÒÉÄ×ÉÖ×Á ÄÕÍÁ ÎÁÚÁÄ.
-
->> ÷ß×ÅÄÅÔÅ ÎÑËÏÌËÏ M-f É M-b.
+Àêî ïðèäâèæâàíåòî ïî çíàöè å òâúðäå áàâíî, ìîæå äà ïðîáâàòå
+ïðèäâèæâàíå ïî äóìè.  M-f (META-f) ïðèäâèæâà êóðñîðà äóìà íàïðåä, à
+M-b ïðèäâèæâà äóìà íàçàä.
+
+>> Âúâåäåòå íÿêîëêî M-f è M-b.
 
-ëÏÇÁÔÏ ÓÔÅ × ÓÒÅÄÁÔÁ ÎÁ ÄÕÍÁ, M-f ÐÒÉÄ×ÉÖ×Á × ËÒÁÑ ÎÁ ÄÕÍÁÔÁ.  ëÏÇÁÔÏ
-ÓÔÅ × ÐÒÁÚÎÏ ÍÑÓÔÏ ÍÅÖÄÕ ÄÕÍÉ, M-f ÐÒÉÄ×ÉÖ×Á × ËÒÁÑ ÎÁ ÓÌÅÄ×ÁÝÁÔÁ
-ÄÕÍÁ.  M-b ÒÁÂÏÔÉ ÐÏ ÐÏÄÏÂÅÎ ÎÁÞÉÎ × ÐÒÏÔÉ×ÏÐÏÌÏÖÎÁÔÁ ÐÏÓÏËÁ.
+Êîãàòî ñòå â ñðåäàòà íà äóìà, M-f ïðèäâèæâà â êðàÿ íà äóìàòà.  Êîãàòî
+ñòå â ïðàçíî ìÿñòî ìåæäó äóìè, M-f ïðèäâèæâà â êðàÿ íà ñëåäâàùàòà
+äóìà.  M-b ðàáîòè ïî ïîäîáåí íà÷èí â ïðîòèâîïîëîæíàòà ïîñîêà.
 
->> ÷ß×ÅÄÅÔÅ M-f É M-b ÎÑËÏÌËÏ ÐßÔÉ, ÒÁÚÍÅÓÅÎÉ Ó C-f É C-b, ÔÁËÁ ÞÅ ÄÁ
-   ÍÏÖÅÔÅ ÄÁ ÎÁÂÌÀÄÁ×ÁÔÅ ÄÅÊÓÔ×ÉÅÔÏ ÎÁ M-f É M-b × ÒÁÚÌÉÞÎÉ ÍÅÓÔÁ
-   ×ßÔÒÅ É ÍÅÖÄÕ ÄÕÍÉÔÅ.
+>> Âúâåäåòå M-f è M-b íÿêîëêî ïúòè, ðàçìåñåíè ñ C-f è C-b, òàêà ÷å äà
+   ìîæåòå äà íàáëþäàâàòå äåéñòâèåòî íà M-f è M-b â ðàçëè÷íè ìåñòà
+   âúòðå è ìåæäó äóìèòå.
 
-úÁÂÅÌÅÖÅÔÅ ÐÒÉÌÉËÁÔÁ ÍÅÖÄÕ C-f É C-b ÏÔ ÅÄÎÁ ÓÔÒÁÎÁ, É M-f É M-b ÏÔ
-ÄÒÕÇÁ.  íÎÏÇÏ ÞÅÓÔÏ Meta-ÚÎÁÃÉÔÅ ÓÁ ÉÚÐÏÌÚ×ÁÎÉ ÚÁ ÄÅÊÓÔ×ÉÑ ×ßÒÈÕ
-ÅÄÉÎÉÃÉ ÄÅÆÉÎÉÒÁÎÉ ÏÔ ÅÚÉËÁ (ÄÕÍÉ, ÉÚÒÅÞÅÎÉÑ, ÁÂÚÁÃÉ), ÄÏËÁÔÏ
-Control-ÚÎÁÃÉÔÅ ÄÅÊÓÔ×ÁÔ ×ßÒÈÕ ÏÓÎÏ×ÎÉ ÅÄÉÎÉÃÉ, ËÏÉÔÏ ÓÁ ÎÅÚÁ×ÉÓÉÍÉ ÏÔ
-ÔÏ×Á ËÁË×Ï ÒÅÄÁËÔÉÒÁÔÅ (ÚÎÁÃÉ, ÒÅÄÏ×Å É ÄÒÕÇÉ).
+Çàáåëåæåòå ïðèëèêàòà ìåæäó C-f è C-b, îò åäíà ñòðàíà, è M-f è M-b, îò
+äðóãà.  Ìíîãî ÷åñòî Meta-çíàöèòå ñà èçïîëçâàíè çà äåéñòâèÿ âúðõó
+åäèíèöè, äåôèíèðàíè îò åçèêà (äóìè, èçðå÷åíèÿ, àáçàöè), äîêàòî
+Control-çíàöèòå äåéñòâàò âúðõó îñíîâíè åäèíèöè, êîèòî ñà íåçàâèñèìè îò
+òîâà, êàêâî ðåäàêòèðàòå (çíàöè, ðåäîâå è äðóãè).
 
-ôÁÚÉ ÐÒÉÌÉËÁ ÓÅ ÐÒÉÌÁÇÁ ×ßÒÈÕ ÒÅÄÏ×Å É ÉÚÒÅÞÅÎÉÑ: C-a É C-e ÐÒÉÄ×ÉÖ×ÁÔ
-ÄÏ ÎÁÞÁÌÏÔÏ ÉÌÉ ËÒÁÑ ÎÁ ÒÅÄ, Á M-a É M-e ÐÒÉÄ×ÉÖ×ÁÔ ÄÏ ÎÁÞÁÌÏÔÏ É ËÒÁÑ
-ÎÁ ÉÚÒÅÞÅÎÉÅ.
+Òàçè ïðèëèêà ñå ïðèëàãà âúðõó ðåäîâå è èçðå÷åíèÿ: C-a è C-e ïðèäâèæâàò
+äî íà÷àëîòî èëè êðàÿ íà ðåä, à M-a è M-e ïðèäâèæâàò äî íà÷àëîòî è êðàÿ
+íà èçðå÷åíèå.
 
->> ïÐÉÔÁÊÔÅ ÎÑËÏÌËÏ C-a, Á ÓÌÅÄ ÔÏ×Á ÎÑËÏÌËÏ C-e.
-   ïÐÉÔÁÊÔÅ ÎÑËÏÌËÏ M-a, Á ÓÌÅÄ ÔÏ×Á ÎÑËÏÌËÏ M-e.
-
-÷ÉÖÔÅ ËÁË ÐÏ×ÔÁÒÑÎÅÔÏ ÎÁ C-a ÎÅ ÐÒÁ×É ÎÉÝÏ, ÄÏËÁÔÏ ÐÏ×ÔÁÒÑÎÅÔÏ ÎÁ M-a
-ÐÒÏÄßÌÖÁ×Á ÐÒÉÄ×ÉÖ×ÁÎÅÔÏ Ó ÏÝÅ ÅÄÎÏ ÉÚÒÅÞÅÎÉÅ.  ÷ßÐÒÅËÉ ÞÅ ÔÅÚÉ
-ËÌÁ×ÉÛÎÉ ËÏÍÂÉÎÁÃÉÉ ÎÅ ÓÁ ÔÏÞÎÏ ÁÎÁÌÏÇÉÞÎÉ, ×ÓÑËÁ ÅÄÎÁ ÏÔ ÔÑÈ ÉÚÇÌÅÖÄÁ
-ÅÓÔÅÓÔ×ÅÎÁ.
+>> Îïèòàéòå íÿêîëêî C-a, à ñëåä òîâà íÿêîëêî C-e.
+   Îïèòàéòå íÿêîëêî M-a, à ñëåä òîâà íÿêîëêî M-e.
+
+Âèæòå êàê ïîâòàðÿíåòî íà C-a íå ïðàâè íèùî, äîêàòî ïîâòàðÿíåòî íà M-a
+ïðîäúëæàâà ïðèäâèæâàíåòî ñ îùå åäíî èçðå÷åíèå.  Âúïðåêè ÷å òåçè
+êëàâèøíè êîìáèíàöèè íå ñà òî÷íî àíàëîãè÷íè, âñÿêà åäíà îò òÿõ èçãëåæäà
+åñòåñòâåíà.
 
-ðÏÌÏÖÅÎÉÅÔÏ ÎÁ ËÕÒÓÏÒÁ × ÔÅËÓÔÁ ÓÅ ÎÁÒÉÞÁ ÓßÝÏ "ÔÏÞËÁ".
-ðÅÒÅÆÒÁÚÉÒÁÎÏ, ËÕÒÓÏÒßÔ ÐÏËÁÚ×Á ÎÁ ÅËÒÁÎÁ ËßÄÅ Å ÒÁÚÐÏÌÏÖÅÎÁ ÔÏÞËÁÔÁ ×
-ÔÅËÓÔÁ.
+Ïîëîæåíèåòî íà êóðñîðà â òåêñòà ñå íàðè÷à ñúùî "òî÷êà".
+Ïåðåôðàçèðàíî, êóðñîðúò ïîêàçâà íà åêðàíà êúäå å ðàçïîëîæåíà òî÷êàòà â
+òåêñòà.
 
-åÔÏ ÏÂÏÂÝÅÎÉÅ ÎÁ ÐÒÏÓÔÉÔÅ ÄÅÊÓÔ×ÉÑ Ä×ÉÖÅÝÉ ËÕÒÓÏÒÁ, ×ËÌÀÞÉÔÅÌÎÏ
-ÐÒÉÄ×ÉÖ×ÁÝÉÔÅ ÐÏ ÄÕÍÁ É ÉÚÒÅÞÅÎÉÅ:
+Åòî îáîáùåíèå íà ïðîñòèòå äåéñòâèÿ, äâèæåùè êóðñîðà, âêëþ÷èòåëíî
+ïðèäâèæâàùèòå ïî äóìà è èçðå÷åíèå:
 
-        C-f     ðÒÉÄ×ÉÖ×Á ÎÁÐÒÅÄ Ó ÅÄÉÎ ÚÎÁË
-        C-b     ðÒÉÄ×ÉÖ×Á ÎÁÚÁÄ Ó ÅÄÉÎ ÚÎÁË
+        C-f     Ïðèäâèæâà íàïðåä ñ åäèí çíàê
+        C-b     Ïðèäâèæâà íàçàä ñ åäèí çíàê
 
-        M-f     ðÒÉÄ×ÉÖ×Á ÎÁÐÒÅÄ Ó ÅÄÎÁ ÄÕÍÁ
-        M-b     ÐÒÉÄ×ÉÖ×Á ÎÁÚÁÄ Ó ÅÄÎÁ ÄÕÍÁ
+        M-f     Ïðèäâèæâà íàïðåä ñ åäíà äóìà
+        M-b     ïðèäâèæâà íàçàä ñ åäíà äóìà
 
-        C-n     ðÒÉÄ×ÉÖ×Á ÄÏ ÓÌÅÄ×ÁÝÉÑ ÒÅÄ
-        C-p     ðÒÉÄ×ÉÖ×Á ÄÏ ÐÒÅÄÉÛÎÉÑ ÒÅÄ
+        C-n     Ïðèäâèæâà äî ñëåäâàùèÿ ðåä
+        C-p     Ïðèäâèæâà äî ïðåäèøíèÿ ðåä
 
-        C-a     ðÒÉÄ×ÉÖ×Á ÄÏ ÎÁÞÁÌÏÔÏ ÎÁ ÒÅÄ
-        C-e     ðÒÉÄ×ÉÖ×Á ÄÏ ËÒÁÑ ÎÁ ÒÅÄ
+        C-a     Ïðèäâèæâà äî íà÷àëîòî íà ðåä
+        C-e     Ïðèäâèæâà äî êðàÿ íà ðåä
 
-        M-a     ðÒÉÄ×ÉÖ×Á ÄÏ ÎÁÞÁÌÏÔÏ ÎÁ ÉÚÒÅÞÅÎÉÅ
-        M-e     ðÒÉÄ×ÉÖ×Á ÄÏ ËÒÁÑ ÎÁ ÉÚÒÅÞÅÎÉÅ
+        M-a     Ïðèäâèæâà äî íà÷àëîòî íà èçðå÷åíèå
+        M-e     Ïðèäâèæâà äî êðàÿ íà èçðå÷åíèå
 
->> óÅÇÁ ÏÐÉÔÁÊÔÅ ×ÓÉÞËÉ ÔÅÚÉ ËÏÍÁÎÄÉ ÎÑËÏÌËÏ ÐßÔÉ ÚÁ ÐÒÁËÔÉËÁ.  ôÅÚÉ
-   ÓÁ ÎÁÊ-ÞÅÓÔÏ ÉÚÐÏÌÚ×ÁÎÉÔÅ ËÏÍÁÎÄÉ.
+>> Ñåãà îïèòàéòå âñè÷êè òåçè êîìàíäè íÿêîëêî ïúòè çà ïðàêòèêà.  Òåçè
+   ñà íàé-÷åñòî èçïîëçâàíèòå êîìàíäè.
 
-ä×Å ÄÒÕÇÉ ×ÁÖÎÉ ËÏÍÁÎÄÉ ÚÁ Ä×ÉÖÅÎÉÅ ÎÁ ËÕÒÓÏÒÁ ÓÁ M-< (Meta ÐÏ-ÍÁÌËÏ),
-ËÏÑÔÏ ÐÒÉÄ×ÉÖ×Á ÄÏ ÎÁÞÁÌÏÔÏ ÎÁ ÃÅÌÉÑ ÔÅËÓÔ, É M-> (Meta ÐÏ-ÇÏÌÑÍÏ),
-ËÏÑÔÏ ÐÒÅÍÅÓÔ×Á ÄÏ ËÒÁÑ ÎÁ ÃÅÌÉÑ ÔÅËÓÔ.
+Äâå äðóãè âàæíè êîìàíäè çà äâèæåíèå íà êóðñîðà ñà M-< (Meta ïî-ìàëêî),
+êîÿòî ïðèäâèæâà äî íà÷àëîòî íà öåëèÿ òåêñò, è M-> (Meta ïî-ãîëÿìî),
+êîÿòî ïðåìåñòâà äî êðàÿ íà öåëèÿ òåêñò.
 
-ðÒÉ ÐÏ×ÅÞÅÔÏ ÔÅÒÍÉÎÁÌÉ, ÚÎÁËßÔ "<" Å ÏÔÂÅÌÑÚÁÎ ÎÁÄ ÚÁÐÅÔÁÑÔÁ, ÔÁËÁ ÞÅ
-ÔÒÑÂ×Á ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ËÌÁ×ÉÛÁ Shift ÚÁ ÄÁ ÇÏ ÎÁÐÉÛÅÔÅ.  îÁ ÔÅÚÉ
-ÔÅÒÍÉÎÁÌÉ ÔÒÑÂ×Á ÄÁ ÉÚÐÏÌÚ×ÁÔÅ Shift ÚÁ ÄÁ ×ß×ÅÄÅÔÅ É M-<; ÂÅÚ ËÌÁ×ÉÛÁ
-Shift ÂÉÈÔÅ ×ß×ÅÌÉ M-ÚÁÐÅÔÁÑ.
+Ïðè ïîâå÷åòî òåðìèíàëè çíàêúò "<" å îòáåëÿçàí íàä çàïåòàÿòà, òàêà ÷å
+òðÿáâà äà èçïîëçâàòå êëàâèøà Shift, çà äà ãî íàïèøåòå.  Íà òåçè
+òåðìèíàëè òðÿáâà äà èçïîëçâàòå Shift, çà äà âúâåäåòå è M-<; áåç êëàâèøà
+Shift áèõòå âúâåëè M-çàïåòàÿ.
 
->> ïÐÉÔÁÊÔÅ M-< ÓÅÇÁ, ÚÁ ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ ÄÏ ÎÁÞÁÌÏÔÏ ÎÁ ×ß×ÅÄÅÎÉÅÔÏ.
-   óÌÅÄ ÔÏ×Á ÉÚÐÏÌÚ×ÁÊÔÅ C-v ËÏÌËÏÔÏ Å ÎÕÖÎÏ ÐßÔÉ, ÚÁ ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ
-   ÄÏ ÔÕË.
+>> Îïèòàéòå M-< ñåãà, çà äà ñå ïðèäâèæèòå äî íà÷àëîòî íà âúâåäåíèåòî.
+   Ñëåä òîâà èçïîëçâàéòå C-v êîëêîòî å íóæíî ïúòè, çà äà ñå ïðèäâèæèòå
+   äî òóê.
 
->> ïÐÉÔÁÊÔÅ M-> ÓÅÇÁ, ÚÁ ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ ÄÏ ËÒÁÑ ÎÁ ×ß×ÅÄÅÎÉÅÔÏ.
-   óÌÅÄ ÔÏ×Á ÉÚÐÏÌÚ×ÁÊÔÅ M-v ËÏÌËÏÔÏ Å ÎÕÖÎÏ ÐßÔÉ, ÚÁ ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ
-   ÄÏ ÔÕË.
+>> Îïèòàéòå M-> ñåãà, çà äà ñå ïðèäâèæèòå äî êðàÿ íà âúâåäåíèåòî.
+   Ñëåä òîâà èçïîëçâàéòå M-v êîëêîòî å íóæíî ïúòè, çà äà ñå ïðèäâèæèòå
+   äî òóê.
 
-÷ÉÅ ÍÏÖÅÔÅ ÓßÝÏ ÄÁ ÓÅ ÐÒÉÄ×ÉÖ×ÁÔÅ Ó ËÌÁ×ÉÛÉÔÅ-ÓÔÒÅÌËÉ, ÁËÏ ×ÁÛÉÑÔ
-ÔÅÒÍÉÎÁÌ ÉÍÁ ÔÁËÉ×Á.  îÉÅ ÐÒÅÐÏÒßÞ×ÁÍÅ ÄÁ ÎÁÕÞÉÔÅ C-b, C-f, C-n É C-p
-ÐÏ ÔÒÉ ÐÒÉÞÉÎÉ.  ðßÒ×Ï, ÔÅ ÒÁÂÏÔÑÔ ÎÁ ×ÓÉÞËÉ ×ÉÄÏ×Å ÔÅÒÍÉÎÁÌÉ.  ÷ÔÏÒÏ,
-×ÅÄÎßÖ ÓÌÅÄ ËÁÔÏ ÄÏÂÉÅÔÅ ÐÒÁËÔÉËÁ × ÉÚÐÏÌÚ×ÁÎÅÔÏ ÎÁ åÍÁËÓ, ÝÅ
-ÏÔËÒÉÅÔÅ, ÞÅ ×ß×ÅÖÄÁÎÅÔÏ ÎÁ ÔÅÚÉ Control-ÚÎÁÃÉ Å ÐÏ-ÂßÒÚÏ ÏÔ
-×ß×ÅÖÄÁÎÅÔÏ ÎÁ ËÌÁ×ÉÛÉÔÅ ÓÔÒÅÌËÉ, ÚÁÝÏÔÏ ÎÅ ÔÒÑÂ×Á ÄÁ ÐÒÅÍÅÓÔ×ÁÔÅ
-ÒßËÁÔÁ ÓÉ ÄÁÌÅÞ ÏÔ ÏÂÌÁÓÔÔÁ ÎÁ ËÌÁ×ÉÛÉÔÅ Ó ÂÕË×É.  ôÒÅÔÏ, ×ÅÄÎßÖ ÓÌÅÄ
-ËÁÔÏ ÓÉ ÏÆÏÒÍÉÔÅ ÎÁ×ÉË ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ÔÅÚÉ ËÏÍÁÎÄÉ Ó Control ÚÎÁÃÉ, ×ÉÅ
-ÍÏÖÅÔÅ ÓßÝÏ ÔÁËÁ ÌÅÓÎÏ ÄÁ ÎÁÕÞÉÔÅ ÐÏ-ÎÁÐÒÅÄÎÁÌÉÔÅ ËÏÍÁÎÄÉ ÚÁ Ä×ÉÖÅÎÉÅ
-ÎÁ ËÕÒÓÏÒÁ.
+Âèå ìîæåòå ñúùî äà ñå ïðèäâèæâàòå ñ êëàâèøèòå-ñòðåëêè, àêî âàøèÿò
+òåðìèíàë èìà òàêèâà.  Íèå ïðåïîðú÷âàìå äà íàó÷èòå C-b, C-f, C-n è C-p
+ïî òðè ïðè÷èíè.  Ïúðâî, òå ðàáîòÿò íà âñè÷êè âèäîâå òåðìèíàëè.  Âòîðî,
+âåäíúæ ñëåä êàòî äîáèåòå ïðàêòèêà â èçïîëçâàíåòî íà Åìàêñ, ùå
+îòêðèåòå, ÷å âúâåæäàíåòî íà òåçè Control-çíàöè å ïî-áúðçî îò
+âúâåæäàíåòî íà êëàâèøèòå ñòðåëêè, çàùîòî íå òðÿáâà äà ïðåìåñòâàòå
+ðúêàòà ñè äàëå÷ îò îáëàñòòà íà êëàâèøèòå ñ áóêâè.  Òðåòî, âåäíúæ ñëåä
+êàòî ñè îôîðìèòå íàâèê äà èçïîëçâàòå òåçè êîìàíäè ñ Control çíàöè, âèå
+ìîæåòå ñúùî òàêà ëåñíî äà íàó÷èòå ïî-íàïðåäíàëèòå êîìàíäè çà äâèæåíèå
+íà êóðñîðà.
 
-ðÏ×ÅÞÅÔÏ åÍÁËÓ ËÏÍÁÎÄÉ ÐÒÉÅÍÁÔ ÞÉÓÌÏ× ÁÒÇÕÍÅÎÔ; ÚÁ ÐÏ×ÅÞÅÔÏ ÏÔ ÔÑÈ ÔÏÊ
-ÓÌÕÖÉ ËÁÔÏ ÂÒÏÑÞ ÎÁ ÐÏ×ÔÏÒÅÎÉÑ.  îÁÞÉÎßÔ, ÐÏ ËÏÊÔÏ ÄÁ×ÁÔÅ ÞÉÓÌÏ×
-ÂÒÏÑÞ, Å Ó ×ß×ÅÖÄÁÎÅ ÎÁ C-u, ÐÏÓÌÅÄ×ÁÎÏ ÏÔ ×ß×ÅÖÄÁÎÅ ÎÁ ÃÉÆÒÉÔÅ, É
-×ÓÉÞËÏ ÔÏ×Á ÐÒÅÄÉ ×ß×ÅÖÄÁÎÅ ÎÁ ÓÁÍÁÔÁ ËÏÍÁÎÄÁ.  áËÏ ÉÍÁÔÅ ËÌÁ×ÉÛ META
-(ÉÌÉ EDIT ÉÌÉ ALT), ÉÍÁ ÄÒÕÇ, ÁÌÔÅÒÎÁÔÉ×ÅÎ ÎÁÞÉÎ ÄÁ ×ß×ÅÄÅÔÅ ÞÉÓÌÏ×
-ÁÒÇÕÍÅÎÔ: ×ß×ÅÄÅÔÅ ÃÉÆÒÉÔÅ ÄÏËÁÔÏ ÚÁÄßÒÖÁÔÅ ËÌÁ×ÉÛÁ META.  îÉÅ
-ÐÒÅÐÏÒßÞ×ÁÍÅ ÄÁ ÎÁÕÞÉÔÅ ÎÁÞÉÎÁ Ó C-u, ÚÁÝÏÔÏ ÔÏÊ ÒÁÂÏÔÉ ÎÁ ËÏÊÔÏ É ÄÁ
-Å ÔÅÒÍÉÎÁÌ.  þÉÓÌÏ×ÉÑÔ ÁÒÇÕÍÅÎÔ ÓÅ ÎÁÒÉÞÁ ÓßÝÏ "ÐÒÅÆÉËÓÅÎ ÁÒÇÕÍÅÎÔ",
-ÚÁÝÏÔÏ ÇÏ ×ß×ÅÖÄÁÔÅ ÐÒÅÄÉ ËÏÍÁÎÄÁÔÁ, ÚÁ ËÏÑÔÏ Å ÐÒÅÄÎÁÚÎÁÞÅÎ.
+Ïîâå÷åòî Åìàêñ êîìàíäè ïðèåìàò ÷èñëîâ àðãóìåíò; çà ïîâå÷åòî îò òÿõ òîé
+ñëóæè êàòî áðîÿ÷ íà ïîâòîðåíèÿ.  Íà÷èíúò, ïî êîéòî äàâàòå ÷èñëîâ
+áðîÿ÷, å ñ âúâåæäàíå íà C-u, ïîñëåäâàíî îò âúâåæäàíå íà öèôðèòå, è
+âñè÷êî òîâà ïðåäè âúâåæäàíå íà ñàìàòà êîìàíäà.  Àêî èìàòå êëàâèø META
+(èëè EDIT èëè ALT), èìà äðóã, àëòåðíàòèâåí íà÷èí äà âúâåäåòå ÷èñëîâ
+àðãóìåíò: âúâåäåòå öèôðèòå, äîêàòî çàäúðæàòå êëàâèøà META.  Íèå
+ïðåïîðú÷âàìå äà íàó÷èòå íà÷èíà ñ C-u, çàùîòî òîé ðàáîòè íà êîéòî è äà
+å òåðìèíàë.  ×èñëîâèÿò àðãóìåíò ñå íàðè÷à ñúùî "ïðåôèêñåí àðãóìåíò",
+çàùîòî ãî âúâåæäàòå ïðåäè êîìàíäàòà, çà êîÿòî å ïðåäíàçíà÷åí.
 
-îÁÐÒÉÍÅÒ, C-u 8 C-f ÐÒÉÄ×ÉÖ×Á ÏÓÅÍ ÚÎÁËÁ ÎÁÐÒÅÄ.
+Íàïðèìåð, C-u 8 C-f ïðèäâèæâà îñåì çíàêà íàïðåä.
 
->> ïÐÉÔÁÊÔÅ ÉÚÐÏÌÚ×ÁÎÅÔÏ ÎÁ C-n ÉÌÉ C-p Ó ÞÉÓÌÏ× ÁÒÇÕÍÅÎÔ, ÚÁ ÄÁ
-   ÐÒÉÄ×ÉÖÉÔÅ ËÕÒÓÏÒÁ ÄÏ ÒÅÄ ÂÌÉÚßË ÄÏ ÔÏÚÉ ÓÁÍÏ Ó ÅÄÎÁ ËÏÍÁÎÄÁ.
+>> Îïèòàéòå èçïîëçâàíåòî íà C-n èëè C-p ñ ÷èñëîâ àðãóìåíò, çà äà
+   ïðèäâèæèòå êóðñîðà äî ðåä, áëèçúê äî òîçè, ñàìî ñ åäíà êîìàíäà.
 
-ðÏ×ÅÞÅÔÏ ËÏÍÁÎÄÉ ÉÚÐÏÌÚ×ÁÔ ÞÉÓÌÏ×ÉÑ ÁÒÇÕÍÅÎÔ ËÁÔÏ ÂÒÏÑÞ ÎÁ
-ÐÏ×ÔÏÒÅÎÉÑÔÁ, ÎÏ ÎÑËÏÉ ÇÏ ÉÚÐÏÌÚ×ÁÔ ÚÁ ÄÒÕÇÉ ÃÅÌÉ.  îÑËÏÌËÏ ËÏÍÁÎÄÉ
-(ÎÏ ÎÉËÏÑ ÏÔ ÔÅÚÉ, ËÏÉÔÏ ÓÔÅ ÎÁÕÞÉÌÉ ÄÏÓÅÇÁ) ÇÏ ÉÚÐÏÌÚ×ÁÔ ËÁÔÏ ÆÌÁÇ --
-ÐÒÉÓßÓÔ×ÉÅÔÏ ÎÁ ÞÉÓÌÏ× ÁÒÇÕÍÅÎÔ, ÎÅÚÁ×ÉÓÉÍÏ ÏÔ ÓÔÏÊÎÏÓÔÁ ÍÕ, ËÁÒÁ
-ËÏÍÁÎÄÁÔÁ ÄÁ ×ßÒÛÉ ÎÅÝÏ ÒÁÚÌÉÞÎÏ.
+Ïîâå÷åòî êîìàíäè èçïîëçâàò ÷èñëîâèÿ àðãóìåíò êàòî áðîÿ÷ íà
+ïîâòîðåíèÿòà, íî íÿêîè ãî èçïîëçâàò çà äðóãè öåëè.  Íÿêîëêî êîìàíäè
+(íî íèêîÿ îò òåçè, êîèòî ñòå íàó÷èëè äîñåãà) ãî èçïîëçâàò êàòî ôëàã --
+ïðèñúñòâèåòî íà ÷èñëîâ àðãóìåíò, íåçàâèñèìî îò ñòîéíîñòà ìó, êàðà
+êîìàíäàòà äà âúðøè íåùî ðàçëè÷íî.
 
-C-v É M-v ÓÁ ÄÒÕÇ ×ÉÄ ÉÚËÌÀÞÅÎÉÅ.  ëÏÇÁÔÏ ÉÍ Å ÄÁÄÅÎ ÁÒÇÕÍÅÎÔ, ÔÅ
-ÓËÒÏÌÉÒÁÔ ÅËÒÁÎÁ ÎÁÇÏÒÅ ÉÌÉ ÎÁÄÏÌÕ ÓßÓ ÚÁÄÁÄÅÎÉÑ ÂÒÏÊ ÒÅÄÁ, ×ÍÅÓÔÏ Ó
-ÅËÒÁÎÉ.  îÁÐÒÉÍÅÒ, C-u 8 C-v ÓËÒÏÌÉÒÁ ÅËÒÁÎÁ Ó 8 ÒÅÄÁ.
+C-v è M-v ñà äðóã âèä èçêëþ÷åíèå.  Êîãàòî èì å äàäåí àðãóìåíò, òå
+ñêðîëèðàò åêðàíà íàãîðå èëè íàäîëó ñúñ çàäàäåíèÿ áðîé ðåäîâå, âìåñòî ñ
+åêðàíè.  Íàïðèìåð, C-u 8 C-v ñêðîëèðà åêðàíà ñ 8 ðåäà.
 
->> óÅÇÁ ÏÐÉÔÁÊÔÅ C-u 8 C-v.
+>> Ñåãà îïèòàéòå C-u 8 C-v.
 
-ôÏ×Á ÂÉ ÔÒÑÂ×ÁÌÏ ÄÁ ÓËÒÏÌÉÒÁ ÅËÒÁÎÁ Ó 8 ÒÅÄÁ.  áËÏ ÉÓËÁÔÅ ÄÁ
-ÓËÒÏÌÉÒÁÔÅ ÏÔÎÏ×Ï ÎÁÄÏÌÕ, ÍÏÖÅ ÄÁ ÄÁÄÅÔÅ ÁÒÇÕÍÅÎÔ ÎÁ M-v.
-
-áËÏ ÉÚÐÏÌÚ×ÁÔÅ ÇÒÁÆÉÞÅÎ ÉÎÔÅÒÆÅÊÓ, ËÁÔÏ X11 ÉÌÉ MS-Windows, ÂÉ
-ÔÒÑÂ×ÁÌÏ ÄÁ ÉÍÁ ÔßÎËÁ ÐÒÁ×ÏßÇßÌÎÁ ÏÂÌÁÓÔ ÎÁÒÅÞÅÎÁ ÐÌßÚÇÁÞ (scroll bar)
-× ÌÑ×ÁÔÁ ÓÔÒÁÎÁ ÎÁ ÐÒÏÚÏÒÅÃÁ ÎÁ åÍÁËÓ.  ÷ÉÅ ÍÏÖÅÔÅ ÄÁ ÓËÒÏÌÉÒÁÔÅ
-ÔÅËÓÔÁ ÝÒÁËÁÊËÉ Ó ÍÉÛËÁÔÁ × ÐÌßÚÇÁÞÁ.
+Òîâà áè òðÿáâàëî äà ñêðîëèðà åêðàíà ñ 8 ðåäà.  Àêî èñêàòå äà
+ñêðîëèðàòå îòíîâî íàäîëó, ìîæå äà äàäåòå àðãóìåíò íà M-v.
+
+Àêî èçïîëçâàòå ãðàôè÷åí èíòåðôåéñ, êàòî X11 èëè MS-Windows, áè
+òðÿáâàëî äà èìà òúíêà ïðàâîúãúëíà îáëàñò, íàðå÷åíà ïëúçãà÷ (scroll
+bar), â ëÿâàòà ñòðàíà íà ïðîçîðåöà íà Åìàêñ.  Âèå ìîæåòå äà ñêðîëèðàòå
+òåêñòà, ùðàêàéêè ñ ìèøêàòà â ïëúçãà÷à.
 
->> ïÐÉÔÁÊÔÅ ÄÁ ÎÁÔÉÓÎÅÔÅ ÓÒÅÄÎÉÑ ÂÕÔÏÎ ÎÁ ×ßÒÈÁ ÎÁ ÏÓ×ÅÔÅÎÁÔÁ ÏÂÌÁÓÔ
-   ×ßÔÒÅ × ÐÌßÚÇÁÞÁ.  ôÏ×Á ÂÉ ÔÒÑÂ×ÁÌÏ ÄÁ ÓËÒÏÌÉÒÁ ÔÅËÓÔÁ ËßÍ
-   ÐÏÌÏÖÅÎÉÅ, ÏÐÒÅÄÅÌÅÎÏ ÏÔ ÔÏ×Á ËÏÌËÏ ×ÉÓÏËÏ ÉÌÉ ÎÉÓËÏ ÓÔÅ ÝÒÁËÎÁÌÉ.
+>> Îïèòàéòå äà íàòèñíåòå ñðåäíèÿ áóòîí íà âúðõà íà îñâåòåíàòà îáëàñò
+   âúòðå â ïëúçãà÷à.  Òîâà áè òðÿáâàëî äà ñêðîëèðà òåêñòà êúì
+   ïîëîæåíèå, îïðåäåëåíî îò òîâà êîëêî âèñîêî èëè íèñêî ñòå ùðàêíàëè.
 
->> ïÐÉÔÁÊÔÅ ÓÅ ÄÁ Ä×ÉÖÉÔÅ ÍÉÛËÁÔÁ ÎÁÇÏÒÅ É ÎÁÄÏÌÕ, ÄÏËÁÔÏ ÓÔÅ
-   ÚÁÄßÒÖÁÌÉ ÄÅÓÎÉÑ ÂÕÔÏÎ ÎÁÔÉÓÎÁÔ.  ýÅ ×ÉÄÉÔÅ, ÞÅ ÔÅËÓÔßÔ ÓÅ ÓËÒÏÌÉÒÁ
-   ÎÁÇÏÒÅ É ÎÁÄÏÌÕ ËÁÔÏ Ä×ÉÖÉÔÅ ÍÉÛËÁÔÁ.
+>> Îïèòàéòå ñå äà äâèæèòå ìèøêàòà íàãîðå è íàäîëó, äîêàòî ñòå
+   çàäúðæàëè äåñíèÿ áóòîí íàòèñíàò.  Ùå âèäèòå, ÷å òåêñòúò ñå ñêðîëèðà
+   íàãîðå è íàäîëó, êàòî äâèæèòå ìèøêàòà.
 
 
-* ëïçáôï åíáëó å âìïëéòáì
+* ÊÎÃÀÒÎ ÅÌÀÊÑ Å ÁËÎÊÈÐÀË
 -------------------------
 
-áËÏ åÍÁËÓ ÓÐÒÅ ÄÁ ÏÔÇÏ×ÁÒÑ ÎÁ ×ÁÛÉÔÅ ËÏÍÁÎÄÉ, ×ÉÅ ÍÏÖÅÔÅ ÄÁ ÇÏ ÓÐÒÅÔÅ
-ÂÅÚÏÐÁÓÎÏ ËÁÔÏ ×ß×ÅÄÅÔÅ C-g.  íÏÖÅ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ C-g ÚÁ ÄÁ ÓÐÒÅÔÅ
-ËÏÍÁÎÄÁ, ËÏÑÔÏ ÓÅ ÉÚÐßÌÎÑ×Á Ô×ßÒÄÅ ÄßÌÇÏ.
+Àêî Åìàêñ ñïðå äà îòãîâàðÿ íà âàøèòå êîìàíäè, âèå ìîæåòå äà ãî ñïðåòå
+áåçîïàñíî, êàòî âúâåäåòå C-g.  Ìîæå äà èçïîëçâàòå C-g, çà äà ñïðåòå
+êîìàíäà, êîÿòî ñå èçïúëíÿâà òâúðäå äúëãî.
 
-óßÝÏ ÍÏÖÅÔÅ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ C-g ÚÁ ÄÁ ÏÔÍÅÎÉÔÅ ÞÉÓÌÏ× ÁÒÇÕÍÅÎÔ ÉÌÉ
-ÎÁÞÁÌÏÔÏ ÎÁ ËÏÍÁÎÄÁ, ËÏÑÔÏ ÎÅ ÉÓËÁÔÅ ÄÁ ÚÁ×ßÒÛÉÔÅ.
+Ñúùî ìîæåòå äà èçïîëçâàòå C-g, çà äà îòìåíèòå ÷èñëîâ àðãóìåíò èëè
+íà÷àëîòî íà êîìàíäà, êîÿòî íå èñêàòå äà çàâúðøèòå.
 
->> ÷ß×ÅÄÅÔÅ C-u 100 ÚÁ ÄÁ ÎÁÐÒÁ×ÉÔÅ ÞÉÓÌÏ× ÁÒÇÕÍÅÎÔ 100, É ×ß×ÅÄÅÔÅ
-   C-g.  óÅÇÁ ×ß×ÅÄÅÔÅ C-f.  ôÒÑÂ×Á ÄÁ ÓÅ ÐÒÉÄ×ÉÖÉÔÅ Ó ÔÏÞÎÏ ÅÄÉÎ
-   ÚÎÁË, ÚÁÝÏÔÏ ×ÉÅ ÐÒÅËÒÁÔÉÈÔÅ ÁÒÇÕÍÅÎÔßÔ Ó C-g.
+>> Âúâåäåòå C-u 100, çà äà íàïðàâèòå ÷èñëîâ àðãóìåíò 100, è âúâåäåòå
+   C-g.  Ñåãà âúâåäåòå C-f.  Òðÿáâà äà ñå ïðèäâèæèòå ñ òî÷íî åäèí
+   çíàê, çàùîòî âèå ïðåêðàòèõòå àðãóìåíòúò ñ C-g.
 
-áËÏ ÓÔÅ ×ß×ÅÌÉ <ESC> ÐÏ ÐÏÇÒÅÛËÁ, ÍÏÖÅÔÅ ÄÁ ÓÅ ÉÚÍßËÎÅÔÅ Ó C-g.
+Àêî ñòå âúâåëè <ESC> ïî ïîãðåøêà, ìîæåòå äà ñå èçìúêíåòå ñ C-g.
 
 
-* úáâòáîåîé ëïíáîäé
+* ÇÀÁÐÀÍÅÍÈ ÊÎÌÀÍÄÈ
 -------------------
 
-îÑËÏÉ ËÏÍÁÎÄÉ ÎÁ åÍÁËÓ ÓÁ "ÚÁÂÒÁÎÅÎÉ", ÔÁËÁ ÞÅ ÎÁÞÉÎÁÅÝÉÔÅ ÐÏÔÒÅÂÉÔÅÌÉ
-ÄÁ ÎÅ ÍÏÇÁÔ ÄÁ ÇÉ ÕÐÏÔÒÅÂÑÔ ÐÏ ÐÏÇÒÅÛËÁ.
+Íÿêîè êîìàíäè íà Åìàêñ ñà "çàáðàíåíè", òàêà ÷å íà÷èíàåùèòå ïîòðåáèòåëè
+äà íå ìîãàò äà ãè óïîòðåáÿò ïî ïîãðåøêà.
 
-áËÏ ×ß×ÅÄÅÔÅ ÎÑËÏÑ ÏÔ ÚÁÂÒÁÎÅÎÉÔÅ ËÏÍÁÎÄÉ, åÍÁËÓ ÉÚ×ÅÖÄÁ ÓßÏÂÝÅÎÉÅ,
-ËÁÚ×ÁÊËÉ ËÁË×Á Å ÂÉÌÁ ËÏÍÁÎÄÁÔÁ É ÐÉÔÁÊËÉ ×É ÄÁÌÉ ÉÓËÁÔÅ ÄÁ ÐÒÏÄßÌÖÉÔÅ
-ÎÁÐÒÅÄ É ÄÁ ÉÚÐßÌÎÉÔÅ ËÏÍÁÎÄÁÔÁ.
+Àêî âúâåäåòå íÿêîÿ îò çàáðàíåíèòå êîìàíäè, Åìàêñ èçâåæäà ñúîáùåíèå,
+êàçâàéêè êàêâà å áèëà êîìàíäàòà è ïèòàéêè âè äàëè èñêàòå äà ïðîäúëæèòå
+íàïðåä è äà èçïúëíèòå êîìàíäàòà.
 
-áËÏ ÎÁÉÓÔÉÎÁ ÉÓËÁÔÅ ÄÁ ÉÚÐÒÏÂ×ÁÔÅ ËÏÍÁÎÄÁÔÁ, ×ß×ÅÄÅÔÅ ËÌÁ×ÉÛÁ ÉÎÔÅÒ×ÁÌ
-× ÏÔÇÏ×ÏÒ ÎÁ ×ßÐÒÏÓÁ.  ïÂÉËÎÏ×ÅÎÏ ÁËÏ ÎÅ ÉÓËÁÔÅ ÄÁ ÉÚÐßÌÎÉÔÅ
-ÚÁÂÒÁÎÅÎÁÔÁ ËÏÍÁÎÄÁ, ÏÔÇÏ×ÁÒÑÔÅ ÎÁ ×ßÐÒÏÓÁ Ó "n".
+Àêî íàèñòèíà èñêàòå äà èçïðîáâàòå êîìàíäàòà, âúâåäåòå êëàâèøà èíòåðâàë
+â îòãîâîð íà âúïðîñà.  Îáèêíîâåíî àêî íå èñêàòå äà èçïúëíèòå
+çàáðàíåíàòà êîìàíäà, îòãîâàðÿòå íà âúïðîñà ñ "n".
 
->> ÷ß×ÅÄÅÔÅ C-x C-l (ËÏÑÔÏ Å ÚÁÂÒÁÎÅÎÁ ËÏÍÁÎÄÁ), É ÓÌÅÄ ÔÏ×Á ×ß×ÅÄÅÔÅ
-   "n" × ÏÔÇÏ×ÏÒ ÎÁ ×ßÐÒÏÓÁ.
+>> Âúâåäåòå C-x C-l (êîÿòî å çàáðàíåíà êîìàíäà), è ñëåä òîâà âúâåäåòå
+   "n" â îòãîâîð íà âúïðîñà.
 
 
-* ðòïúïòãé
+* ÏÐÎÇÎÐÖÈ
 ----------
 
-åÍÁËÓ ÍÏÖÅ ÄÁ ÕÐÒÁ×ÌÑ×Á ÎÑËÏÌËÏ ÐÒÏÚÏÒÅÃÁ, ×ÓÅËÉ ÉÚ×ÅÖÄÁÊËÉ Ó×ÏÊ
-ÓÏÂÓÔ×ÅÎ ÔÅËÓÔ.  îÉÅ ÝÅ ÏÂÑÓÎÉÍ ÐÏ-ËßÓÎÏ ËÁË ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ÎÑËÏÌËÏ
-ÐÒÏÚÏÒÅÃÁ.  ôÏÞÎÏ ÓÅÇÁ ÎÉÅ ÉÓËÁÍÅ ÄÁ ÏÂÑÓÎÉÍ ËÁË ÄÁ ÓÅ ÏÔßÒ×ÅÔÅ ÏÔ
-ÄÏÐßÌÎÉÔÅÌÎÉ ÐÒÏÚÏÒÃÉ É ÄÁ ÓÅ ×ßÒÎÅÔÅ ËßÍ ÏÓÎÏ×ÎÏÔÏ ÒÅÄÁËÔÉÒÁÎÅ Ó ÅÄÉÎ
-ÐÒÏÚÏÒÅÃ.  ðÒÏÓÔÏ Å:
+Åìàêñ ìîæå äà óïðàâëÿâà íÿêîëêî ïðîçîðåöà, âñåêè èçâåæäàéêè ñâîé
+ñîáñòâåí òåêñò.  Íèå ùå îáÿñíèì ïî-êúñíî êàê äà èçïîëçâàòå íÿêîëêî
+ïðîçîðåöà.  Òî÷íî ñåãà íèå èñêàìå äà îáÿñíèì êàê äà ñå îòúðâåòå îò
+äîïúëíèòåëíè ïðîçîðöè è äà ñå âúðíåòå êúì îñíîâíîòî ðåäàêòèðàíå ñ åäèí
+ïðîçîðåö.  Ïðîñòî å:
 
-        C-x 1   åÄÉÎ ÐÒÏÚÏÒÅà (Ô.Å. ÐÒÅÍÁÈÎÉ ×ÓÉÞËÉ ÄÒÕÇÉ ÐÒÏÚÏÒÃÉ).
+        C-x 1   Åäèí ïðîçîðåö (ò.å. ïðåìàõíè âñè÷êè äðóãè ïðîçîðöè).
 
-ôÏ×Á Å CONTROL-x ÐÏÓÌÅÄ×ÁÎÏ ÏÔ ÃÉÆÒÁÔÁ 1.  C-x 1 ÒÁÚÛÉÒÑ×Á ÐÒÏÚÏÒÅÃÁ
-ÓßÄßÒÖÁÝ ËÕÒÓÏÒÁ, ÚÁ ÄÁ ÍÏÖÅ ÄÁ ÚÁÐßÌÎÉ ÃÅÌÉÑ ÅËÒÁÎ.  ôÑ ÐÒÅÍÁÈ×Á
-×ÓÉÞËÉ ÄÒÕÇÉ ÐÒÏÚÏÒÃÉ.
+Òîâà å CONTROL-x, ïîñëåäâàí îò öèôðàòà 1.  C-x 1 ðàçøèðÿâà ïðîçîðåöà,
+ñúäúðæàù êóðñîðà, çà äà ìîæå äà çàïúëíè öåëèÿ åêðàí.  Òÿ ïðåìàõâà
+âñè÷êè äðóãè ïðîçîðöè.
 
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÔÏÚÉ ÒÅÄ É ×ß×ÅÄÅÔÅ C-u 0 C-l.
->> ÷ß×ÅÄÅÔÅ C-h k C-f.
-   ÷ÉÖÔÅ ËÁË ÔÏÚÉ ÐÒÏÚÏÒÅà ÓÅ Ó×É×Á, ÄÏËÁÔÏ ÄÒÕÇ ÓÅ ÐÏÑ×Ñ×Á ÚÁ ÄÁ
-   ÉÚ×ÅÄÅ ÄÏËÕÍÅÎÔÁÃÉÑ ÎÁ ËÏÍÁÎÄÁÔÁ C-f.
+>> Ïðèäâèæåòå êóðñîðà äî òîçè ðåä è âúâåäåòå C-u 0 C-l.
+>> Âúâåäåòå C-h k C-f.
+   Âèæòå êàê òîçè ïðîçîðåö ñå ñâèâà, äîêàòî äðóã ñå ïîÿâÿâà, çà äà
+   èçâåäå äîêóìåíòàöèÿòà íà êîìàíäàòà C-f.
 
->> ÷ß×ÅÄÅÔÅ C-x 1 É ×ÉÖÔÅ ËÁË ÐÒÏÚÏÒÅÃÁ Ó ÄÏËÕÍÅÎÔÁÃÉÑÔÁ ÉÚÞÅÚ×Á.
+>> Âúâåäåòå C-x 1 è âèæòå êàê ïðîçîðåöúò ñ äîêóìåíòàöèÿòà èç÷åçâà.
 
-ôÁÚÉ ËÏÍÁÎÄÁ ÎÅ Å ËÁÔÏ ÄÒÕÇÉÔÅ ËÏÍÁÎÄÉ, ËÏÉÔÏ ÓÔÅ ÎÁÕÞÉÌÉ, × ÔÏ×Á
-ÏÔÎÏÛÅÎÉÅ, ÞÅ ÓÅ ÓßÓÔÏÉ ÏÔ Ä×Á ÚÎÁËÁ.  úÁÐÏÞ×Á ÓßÓ ÚÎÁËÁ C-x.  éÍÁ
-ÃÑÌÁ ÒÅÄÉÃÁ ÏÔ ËÏÍÁÎÄÉ, ËÏÉÔÏ ÚÁÐÏÞ×ÁÔ Ó C-x; ÍÎÏÇÏ ÏÔ ÔÑÈ ÉÍÁÔ ÎÅÝÏ
-ÏÂÝÏ Ó ÐÒÏÚÏÒÃÉ, ÆÁÊÌÏ×Å, ÂÕÆÅÒÉ É Ó×ßÒÚÁÎÉÔÅ Ó ÔÑÈ ÎÅÝÁ.  ôÅÚÉ
-ËÏÍÁÎÄÉ ÓÁ ÏÔ Ä×Á, ÔÒÉ ÉÌÉ ÞÅÔÉÒÉ ÚÎÁËÁ.
+Òàçè êîìàíäà íå å êàòî äðóãèòå êîìàíäè, êîèòî ñòå íàó÷èëè, â òîâà
+îòíîøåíèå, ÷å ñå ñúñòîè îò äâà çíàêà.  Çàïî÷âà ñúñ çíàêà C-x.  Èìà
+öÿëà ðåäèöà îò êîìàíäè, êîèòî çàïî÷âàò ñ C-x; ìíîãî îò òÿõ èìàò íåùî
+îáùî ñ ïðîçîðöè, ôàéëîâå, áóôåðè è ñâúðçàíèòå ñ òÿõ íåùà.  Òåçè
+êîìàíäè ñà îò äâà, òðè èëè ÷åòèðè çíàêà.
 
 
-* ÷íÿë÷áîå é éúôòé÷áîå
+* ÂÌÚÊÂÀÍÅ È ÈÇÒÐÈÂÀÍÅ
 ----------------------
 
-áËÏ ÉÓËÁÔÅ ÄÁ ×ÍßËÎÅÔÅ ÔÅËÓÔ, ÐÒÏÓÔÏ ÇÏ ×ß×ÅÄÅÔÅ.  úÎÁÃÉÔÅ, ËÏÉÔÏ
-ÍÏÇÁÔ ÄÁ ÓÅ ×ÉÖÄÁÔ, ËÁÔÏ á, 7, * É Ô.Î., ÓÅ ×ßÚÐÒÉÅÍÁÔ ÏÔ åÍÁËÓ ËÁÔÏ
-ÔÅËÓÔ É ÓÅ ×ÍßË×ÁÔ ×ÅÄÎÁÇÁ.  ÷ß×ÅÄÅÔÅ <Return> (ËÌÁ×ÉÛßÔ ÚÁ ×ÒßÝÁÎÅ ×
-ÎÁÞÁÌÏÔÏ ÎÁ ÒÅÄÁ) ÚÁ ÄÁ ×ÍßËÎÅÔÅ ÚÎÁË ÚÁ ÎÏ× ÒÅÄ.
+Àêî èñêàòå äà âìúêíåòå òåêñò, ïðîñòî ãî âúâåäåòå.  Çíàöèòå, êîèòî
+ìîãàò äà ñå âèæäàò, êàòî À, 7, * è ò.í., ñå âúçïðèåìàò îò Åìàêñ êàòî
+òåêñò è ñå âìúêâàò âåäíàãà.  Âúâåäåòå <Return> (êëàâèøúò çà âðúùàíå â
+íà÷àëîòî íà ðåäà), çà äà âìúêíåòå çíàê çà íîâ ðåä.
 
-íÏÖÅ ÄÁ ÉÚÔÒÉÅÔÅ ÐÏÓÌÅÄÎÉÑ ÚÎÁË, ËÏÊÔÏ ÓÔÅ ×ß×ÅÌÉ, Ó ×ß×ÅÖÄÁÎÅ ÎÁ
-<Delback>.  <Delback> Å ËÌÁ×ÉÛ ÏÔ ËÌÁ×ÉÁÔÕÒÁÔÁ -- ÓßÝÉÑÔ, ËÏÊÔÏ
-ÏÂÉËÎÏ×ÅÎÏ ÉÚÐÏÌÚ×ÁÔÅ ÉÚ×ßÎ åÍÁËÓ ÚÁ ÄÁ ÉÚÔÒÉÅÔÅ ÐÏÓÌÅÄÎÉÑ ×ß×ÅÄÅÎ ÏÔ
-×ÁÓ ÚÎÁË.  ïÂÉËÎÏ×ÅÎÏ Å ÇÏÌÑÍ ËÌÁ×ÉÛ ÎÁ ÎÑËÏÌËÏ ÒÅÄÁ ÒÁÚÓÔÏÑÎÉÅ ÏÔ
-ËÌÁ×ÉÛÁ <Return>, É ÏÂÉËÎÏ×ÅÎÏ Å ÏÔÂÅÌÑÚÁÎ Ó "Delete", "Del" ÉÌÉ
+Ìîæå äà èçòðèåòå ïîñëåäíèÿ çíàê, êîéòî ñòå âúâåëè, ñ âúâåæäàíå íà
+<Delback>.  <Delback> å êëàâèø îò êëàâèàòóðàòà -- ñúùèÿò, êîéòî
+îáèêíîâåíî èçïîëçâàòå èçâúí Åìàêñ, çà äà èçòðèåòå ïîñëåäíèÿ âúâåäåí îò
+âàñ çíàê.  Îáèêíîâåíî å ãîëÿì êëàâèø, íà íÿêîëêî ðåäà ðàçñòîÿíèå îò
+êëàâèøà <Return>, è îáèêíîâåíî å îòáåëÿçàí ñ "Delete", "Del" èëè
 "Backspace".
 
-áËÏ ÇÏÌÅÍÉÑÔ ËÌÁ×ÉÛ ÔÁÍ Å Ó ÅÔÉËÅÔ "Backspace", ÔÏÇÁ×Á ÔÏÊ Å ÔÏÚÉ,
-ËÏÊÔÏ ÝÅ ÉÚÐÏÌÚ×ÁÔÅ ÚÁ <Delback>.  íÏÖÅ ÄÁ ÉÍÁ ÏÝÅ ÅÄÉÎ ËÌÁ×ÉÛ Ó
-ÅÔÉËÅÔ "Delete" ÎÑËßÄÅ ÄÒÕÇÁÄÅ, ÎÏ ÔÏÊ ÎÅ Å <Delback>.
-
-ðÏ-ÏÂÝÏ ËÁÚÁÎÏ, <Delback> ÉÚÔÒÉ×Á ÚÎÁËÁ ÔÏÞÎÏ ÐÒÅÄÉ ÔÅËÕÝÏÔÏ ÍÑÓÔÏ ÎÁ
-ËÕÒÓÏÒÁ.
-
->> îÁÐÒÁ×ÅÔÅ ÔÏ×Á ÓÅÇÁ -- ÎÁÐÉÛÅÔÅ ÎÑËÏÌËÏ ÚÎÁËÁ, ÐÏÓÌÅ ÇÉ ÉÚÔÒÉÊÔÅ Ó
-   ×ß×ÅÖÄÁÎÅ ÎÁ <Delback> ÎÑËÏÌËÏ ÐßÔÉ.  îÅ ÓÅ ÂÅÚÐÏËÏÊÔÅ, ÞÅ ÔÏÚÉ
-   ÆÁÊÌ ÝÅ ÂßÄÅ ÐÒÏÍÅÎÅÎ; ×ÉÅ ÎÑÍÁ ÄÁ ÐÒÏÍÅÎÉÔÅ ÐßÒ×ÏÎÁÞÁÌÎÏÔÏ
-   ×ß×ÅÄÅÎÉÅ.  ôÏ×Á Å ×ÁÛÅ ÌÉÞÎÏ ËÏÐÉÅ.
-
-ëÏÇÁÔÏ ÒÅÄ ÏÔ ÔÅËÓÔÁ ÓÔÁÎÅ Ô×ßÒÄÅ ÄßÌßÇ ÚÁ ÄÁ ÓÅ ÓßÂÅÒÅ × ÒÅÄ ÏÔ
-ÅËÒÁÎÁ, ÒÅÄßÔ ÏÔ ÔÅËÓÔÁ ÓÅ "ÐÒÏÄßÌÖÁ×Á" ÎÁ ÓÌÅÄ×ÁÝÉÑ ÒÅÄ.  ïÂÒÁÔÎÁ
-ÎÁËÌÏÎÅÎÁ ÞÅÒÔÁ ("\") (ÉÌÉ, ÁËÏ ÉÚÐÏÌÚ×ÁÔÅ ÇÒÁÆÉÞÅÎ ÉÎÔÅÒÆÅÊÓ, ÍÁÌËÁ
-ÉÚËÒÉ×ÅÎÁ ÓÔÒÅÌËÁ) × ÄÑÓÎÁÔÁ ÇÒÁÎÉÃÁ ÏÔÂÅÌÑÚ×Á ÒÅÄ, ËÏÊÔÏ Å ÂÉÌ
-ÐÒÏÄßÌÖÅÎ.
+Àêî ãîëåìèÿò êëàâèø òàì å ñ åòèêåò "Backspace", òîãàâà òîé å òîçè,
+êîéòî ùå èçïîëçâàòå çà <Delback>.  Ìîæå äà èìà îùå åäèí êëàâèø ñ
+åòèêåò "Delete" íÿêúäå äðóãàäå, íî òîé íå å <Delback>.
+
+Ïî-îáùî êàçàíî, <Delback> èçòðèâà çíàêà òî÷íî ïðåäè òåêóùîòî ìÿñòî íà
+êóðñîðà.
+
+>> Íàïðàâåòå òîâà ñåãà -- íàïèøåòå íÿêîëêî çíàêà, ïîñëå ãè èçòðèéòå ñ
+   âúâåæäàíå íà <Delback> íÿêîëêî ïúòè.  Íå ñå áåçïîêîéòå, ÷å òîçè
+   ôàéë ùå áúäå ïðîìåíåí; âèå íÿìà äà ïðîìåíèòå ïúðâîíà÷àëíîòî
+   âúâåäåíèå.  Òîâà å âàøå ëè÷íî êîïèå.
+
+Êîãàòî ðåä îò òåêñòà ñòàíå òâúðäå äúëúã, çà äà ñå ñúáåðå â ðåä îò
+åêðàíà, ðåäúò îò òåêñòà ñå "ïðîäúëæàâà" íà ñëåäâàùèÿ ðåä.  Îáðàòíà
+íàêëîíåíà ÷åðòà ("\") (èëè, àêî èçïîëçâàòå ãðàôè÷åí èíòåðôåéñ, ìàëêà
+èçêðèâåíà ñòðåëêà) â äÿñíàòà ãðàíèöà îòáåëÿçâà ðåä, êîéòî å áèë
+ïðîäúëæåí.
 
->> ÷ß×ÅÄÅÔÅ ÔÅËÓÔ ÄÏËÁÔÏ ÓÔÉÇÎÅÔÅ ÄÑÓÎÁÔÁ ÇÒÁÎÉÃÁ, É ÐÒÏÄßÌÖÅÔÅ Ó
-   ×ÍßË×ÁÎÅÔÏ.  ýÅ ×ÉÄÉÔÅ ÐÒÏÄßÌÖÅÎÉÅÔÏ ÄÁ ÒÅÄÁ ÄÁ ÓÅ ÐÏËÁÚ×Á.
-
->> éÚÐÏÌÚ×ÁÊÔÅ ÎÑËÏÌËÏ <Delback> ÚÁ ÄÁ ÉÚÔÒÉÅÔÅ ÔÅËÓÔÁ ÄÏËÁÔÏ ÒÅÄßÔ ÓÅ
-   ×ÍÅÓÔÉ × ÅÄÉÎ ÅËÒÁÎÅÎ ÒÅÄ.  ðÒÏÄßÌÖÅÎÉÅÔÏ ÎÁ ÒÅÄÁ ÉÚÞÅÚ×Á.
-
-íÏÖÅ ÄÁ ÉÚÔÒÉÅÔÅ ÚÎÁËÁ ÚÁ ÎÏ× ÒÅÄ ÔÏÞÎÏ ËÁËÔÏ ×ÓÅËÉ ÄÒÕÇ ÚÎÁË.
-éÚÔÒÉ×ÁÎÅÔÏ ÎÁ ÚÎÁËÁ ÚÁ ÎÏ× ÒÅÄ ÍÅÖÄÕ Ä×Á ÒÅÄÁ ÇÉ ÓÌÉ×Á × ÅÄÉÎ ÒÅÄ.
-áËÏ ÐÏÌÕÞÅÎÉÑÔ ËÏÍÂÉÎÉÒÁÎ ÒÅÄ Å Ô×ßÒÄÅ ÄßÌßÇ, ÚÁ ÄÁ ÓÅ ×ÍÅÓÔÉ ×
-ÛÉÒÉÎÁÔÁ ÎÁ ÅËÒÁÎÁ, ÔÏÊ ÝÅ ÂßÄÅ ÐÏËÁÚÁÎ ËÁÔÏ ÐÒÏÄßÌÖÅÎ ÒÅÄ.
-
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ × ÎÁÞÁÌÏÔÏ ÎÁ ÒÅÄ É ×ß×ÅÄÅÔÅ <Delback>.  ôÏ×Á ÝÅ
-   ÓÌÅÅ ÔÏÚÉ ÒÅÄ Ó ÐÒÅÄÉÛÎÉÑ.
-
->> ÷ß×ÅÄÅÔÅ <Return> ÚÁ ÄÁ ×ÍßËÎÅÔÅ ÎÁÎÏ×Ï ÚÎÁËÁ ÚÁ ÎÏ× ÒÅÄ, ËÏÊÔÏ
-   ÉÚÔÒÉÈÔÅ.
-
-úÁÐÏÍÎÅÔÅ, ÞÅ ÎÁ ÐÏ×ÅÞÅÔÏ ËÏÍÁÎÄÉ ÎÁ åÍÁËÓ ÍÏÖÅ ÄÁ ÂßÄÅ ÚÁÄÁÄÅÎ ÂÒÏÑÞ
-ÎÁ ÐÏ×ÔÏÒÅÎÉÑÔÁ; ÔÏ×Á ×ËÌÀÞ×Á ×ÍßË×ÁÎÅÔÏ ÎÁ ÔÅËÓÔÏ×É ÚÎÁÃÉ.
-ðÏ×ÔÁÒÑÎÅÔÏ ÎÁ ÔÅËÓÔÏ× ÚÎÁË ÇÏ ×ÍßË×Á ÎÑËÏÌËÏ ÐßÔÉ.
-
->> ïÐÉÔÁÊÔÅ ÔÏ×Á ÓÅÇÁ -- ×ß×ÅÄÅÔÅ C-u 8 * ÚÁ ÄÁ ×ÍßËÎÅÔÅ ********.
-
-óÅÇÁ ×ÉÅ ÓÔÅ ÎÁÕÞÉÌÉ ÎÁÊ-ÏÓÎÏ×ÎÉÔÅ ÎÁÞÉÎÉ ÚÁ ×ß×ÅÖÄÁÎÅ ÎÁ ÎÅÝÏ × åÍÁËÓ
-É ÐÏÐÒÁ×ÑÎÅÔÏ ÎÁ ÇÒÅÛËÉ.  íÏÖÅÔÅ ÓßÝÏ ÔÁËÁ ÄÁ ÉÚÔÒÉ×ÁÔÅ ÄÕÍÉ ÉÌÉ
-ÒÅÄÏ×Å.  åÔÏ ÏÂÏÂÝÅÎÉÅ ÎÁ ÉÚÔÒÉ×ÁÝÉÔÅ ÄÅÊÓÔ×ÉÑ:
-
-        <Delback>    ÉÚÔÒÉ×ÁÎÅ ÎÁ ÚÎÁËÁ ÔÏÞÎÏ ÐÒÅÄÉ ËÕÒÓÏÒÁ
-        C-d          ÉÚÔÒÉ×ÁÎÅ ÎÁ ÚÎÁËÁ ÔÏÞÎÏ ÓÌÅÄ ËÕÒÓÏÒÁ
-
-        M-<Delback>  ÉÚÔÒÉ×ÁÎÅ ÎÁ ÄÕÍÁÔÁ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÏ ÐÒÅÄÉ ËÕÒÓÏÒÁ
-        M-d          ÉÚÔÒÉ×ÁÎÅ ÎÁ ÄÕÍÁÔÁ ÓÌÅÄ ËÕÒÓÏÒÁ
-
-        C-k          ÉÚÔÒÉ×ÁÎÅ ÏÔ ÍÑÓÔÏÔÏ ÎÁ ËÕÒÓÏÒÁ ÄÏ ËÒÁÑ ÎÁ ÒÅÄÁ
-        M-k          ÉÚÔÒÉ×ÁÎÅ ÄÏ ËÒÁÑ ÎÁ ÔÅËÕÝÏÔÏ ÉÚÒÅÞÅÎÉÅ
-
-úÁÂÅÌÅÖÅÔÅ, ÞÅ <Delback> É C-d ÓÒÁ×ÎÅÎÉ Ó M-<Delback> É M-d ÒÁÚÛÉÒÑ×ÁÔ
-ÐÏÄÏÂÉÅÔÏ ÚÁÐÏÞÎÁÔÏ ÏÔ C-f É M-f (ÄÏÂÒÅ, <Delback> ÎÅ Å ÎÁÉÓÔÉÎÁ
-ËÏÎÔÒÏÌÉÒÁÝ ÚÎÁË, ÎÏ ÎÅËÁ ÎÅ ÓÅ ÂÅÚÐÏËÏÉÍ ÚÁ ÔÏ×Á).  C-k É M-k ÓÁ
-ÐÏÄÏÂÎÉ ÎÁ C-e É M-e × ÓÍÉÓßÌ, ÞÅ ÅÄÎÉÔÅ ÓÁ ÚÁ ÒÅÄÏ×Å, Á ÄÒÕÇÉÔÅ ÚÁ
-ÉÚÒÅÞÅÎÉÑ.
-
-íÏÖÅÔÅ ÓßÝÏ ÄÁ ÐÒÅÍÁÈÎÅÔÅ ×ÓÑËÁ ÞÁÓÔ ÏÔ ÂÕÆÅÒÁ Ó ÅÄÉÎ ÕÎÉ×ÅÒÓÁÌÅÎ
-ÎÁÞÉÎ.  ðÒÉÄ×ÉÖÅÔÅ ÓÅ ÄÏ ÅÄÉÎÉÑ ËÒÁÊ ÎÁ ÞÁÓÔÔÁ É ×ß×ÅÄÅÔÅ C-@ ÉÌÉ
-C-ÉÎÔÅÒ×ÁÌ (ËÏÅÔÏ É ÄÁ Å ÏÔ Ä×ÅÔÅ).  ðÒÉÄ×ÉÖÅÔÅ ÓÅ ÄÏ ÄÒÕÇÉÑ ËÒÁÊ ÎÁ
-ÞÁÓÔÔÁ É ×ß×ÅÄÅÔÅ C-w.  ôÏ×Á ÝÅ ÐÒÅÍÁÈÎÅ ÃÅÌÉÑ ÔÅËÓÔ ÍÅÖÄÕ ÔÅÚÉ Ä×Á
-ËÒÁÑ.
-
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÚÎÁËÁ í × ÎÁÞÁÌÏÔÏ ÎÁ ÐÒÅÄÉÛÎÉÑ ÁÂÚÁÃ.
->> ÷ß×ÅÄÅÔÅ C-ÉÎÔÅÒ×ÁÌ.  åÍÁËÓ ÔÒÑÂ×Á ÄÁ ÉÚ×ÅÄÅ ÓßÏÂÝÅÎÉÅ "Mark set" ×
-   ÄÏÌÎÉÑ ËÒÁÊ ÎÁ ÅËÒÁÎÁ.
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÂÕË×ÁÔÁ Ò × "ËÒÁÊ", ÎÁ ×ÔÏÒÉÑ ÒÅÄ ÏÔ ÁÂÚÁÃÁ.
->> ÷ß×ÅÄÅÔÅ C-w.  ôÏ×Á ÝÅ ÐÒÅÍÁÈÎÅ ÔÅËÓÔÁ ÚÁÐÏÞ×ÁÝ ÏÔ í É ÚÁ×ßÒÛ×ÁÝ
-   ÔÏÞÎÏ ÐÒÅÄÉ Ò.
-
-òÁÚÌÉËÁÔÁ ÍÅÖÄÕ "ÐÒÅÍÁÈ×ÁÎÅ" (killing) É "ÉÚÔÒÉ×ÁÎÅ" (deleting) Å, ÞÅ
-"ÐÒÅÍÁÈÎÁÔÉÑÔ" ÔÅËÓÔ ÍÏÖÅ ÄÁ ×ÍßËÎÁÔ ÎÁÎÏ×Ï, ÄÏËÁÔÏ "ÉÚÔÒÉÔÉÔÅ" ÎÅÝÁ
-ÎÅ ÍÏÇÁÔ ÄÁ ÓÅ ×ÍßËÎÁÔ ÎÁÎÏ×Ï.  ÷ÍßË×ÁÎÅÔÏ ÎÁÎÏ×Ï ÎÁ ÐÒÅÍÁÈÎÁÔ ÔÅËÓÔ
-ÓÅ ÎÁÒÉÞÁ "ÉÚ×ÁÖÄÁÎÅ" (yanking).  ïÂÝÏ ËÁÚÁÎÏ, ËÏÍÁÎÄÉÔÅ, ËÏÉÔÏ
-ÏÔÓÔÒÁÎÑ×ÁÔ ÍÎÏÇÏ ÔÅËÓÔ, ÇÏ ÐÒÅÍÁÈ×ÁÔ (ÔÁËÁ ÞÅ ÔÏÊ ÄÁ ÍÏÖÅ ÄÁ ÂßÄÅ
-ÉÚ×ÁÄÅÎ), ÄÏËÁÔÏ ËÏÍÁÎÄÉÔÅ, ËÏÉÔÏ ÏÔÓÔÒÁÎÑ×ÁÔ ÓÁÍÏ ÅÄÉÎ ÚÎÁË ÉÌÉ
-ÉÚÔÒÉ×ÁÔ ÓÁÍÏ ÐÒÁÚÎÉ ÒÅÄÏ×Å É ÚÎÁÃÉ, ÉÚ×ßÒÛ×ÁÔ ÉÚÔÒÉ×ÁÎÅ (ÔÁËÁ ÞÅ ÎÅ
-ÍÏÖÅÔÅ ÄÁ ÉÚ×ÁÄÉÔÅ ÔÏÚÉ ÔÅËÓÔ).
-
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÎÁÞÁÌÏÔÏ ÎÁ ÒÅÄ, ËÏÊÔÏ ÎÅ Å ÐÒÁÚÅÎ.  ôÏÇÁ×Á
-   ×ß×ÅÄÅÔÅ C-k ÚÁ ÄÁ ÐÒÅÍÁÈÎÅÔÅ ÔÅËÓÔÁ ÎÁ ÔÏÚÉ ÒÅÄ.
->> ÷ß×ÅÄÅÔÅ C-k ×ÔÏÒÉ ÐßÔ.  ýÅ ×ÉÄÉÔÅ, ÞÅ ÔÏ×Á ÐÒÅÍÁÈ×Á ÚÎÁËÁ ÚÁ ÎÏ×
-   ÒÅÄ, ËÏÊÔÏ ÓÌÅÄ×Á ÒÅÄÁ.
-
-úÁÂÅÌÅÖÅÔÅ, ÞÅ ÅÄÉÎÉÞÎÏ C-k ÐÒÅÍÁÈ×Á ÓßÄßÒÖÁÎÉÅÔÏ ÎÁ ÒÅÄÁ, Á
-ÓÌÅÄ×ÁÝÏÔÏ C-k ÐÒÅÍÁÈ×Á ÃÅÌÉÑ ÒÅÄ, É ÐÒÁ×É ÄÒÕÇÉÔÅ ÒÅÄÏ×Å ÄÁ ÓÅ
-ÐÒÉÄ×ÉÖÁÔ ÎÁÇÏÒÅ.  C-k ÏÂÒÁÂÏÔ×Á ÞÉÓÌÏ×ÉÔÅ ÁÒÇÕÍÅÎÔÉ ÐÏ ÓÐÅÃÉÁÌÅÎ
-ÎÁÞÉÎ: ÐÒÅÍÁÈ×ÁÔ ÓÅ ÔÏÌËÏ×Á ÎÁ ÂÒÏÊ ÒÅÄÏ×Å é ÔÑÈÎÏÔÏ ÓßÄßÒÖÁÎÉÅ.  ôÏ×Á
-ÎÅ Å ÐÒÏÓÔÏ ÐÏ×ÔÏÒÅÎÉÅ.  C-u 2 C-k ÐÒÅÍÁÈ×Á Ä×Á ÒÅÄÁ É ÔÅÈÎÉÔÅ ÚÎÁÃÉ
-ÚÁ ÎÏ× ÒÅÄ; ×ß×ÅÖÄÁÎÅÔÏ ÎÁ C-k Ä×Á ÐßÔÉ ÎÅ ÐÒÁ×É ÔÏ×Á.
-
-÷ÒßÝÁÎÅÔÏ ÏÂÒÁÔÎÏ ÎÁ ÔÅËÓÔ ÓÅ ÎÁÒÉÞÁ "ÉÚ×ÁÖÄÁÎÅ".  (íÉÓÌÅÔÅ ÚÁ ÎÅÇÏ
-ËÁÔÏ ÚÁ ÉÚ×ÁÖÄÁÎÅ ÏÂÒÁÔÎÏ, ÉÌÉ ÄÒßÐ×ÁÎÅ ÏÂÒÁÔÎÏ, ÎÁ ÔÅËÓÔ, ËÏÊÔÏ Å ÂÉÌ
-ÐÒÅÍÁÈÎÁÔ.)  íÏÖÅÔÅ ÄÁ ÉÚ×ÁÖÄÁÔÅ ÐÒÅÍÁÈÎÁÔÉÑ ÔÅËÓÔ ÉÌÉ ÎÁ ÓßÝÏÔÏ
-ÍÑÓÔÏ, ÏÔËßÄÅÔÏ Å ÂÉÌ ÐÒÅÍÁÈÎÁÔ, ÉÌÉ ÎÁ ÄÒÕÇÏ ÍÑÓÔÏ × ÂÕÆÅÒÁ, ÄÁÖÅ É ×
-ÒÁÚÌÉÞÅÎ ÆÁÊÌ.  íÏÖÅÔÅ ÄÁ ÉÚ×ÁÖÄÁÔÅ ÅÄÉÎ É ÓßÝ ÔÅËÓÔ ÎÑËÏÌËÏ ÐßÔÉ;
-ÔÏ×Á ÐÒÁ×É ÎÑËÏÌËÏ ËÏÐÉÑ ÏÔ ÎÅÇÏ.
-
-ëÏÍÁÎÄÁÔÁ ÚÁ ÉÚ×ÁÖÄÁÎÅ Å C-y.  ôÑ ×ÍßË×Á ÎÁÎÏ×Ï ÐÏÓÌÅÄÎÉÑ ÐÒÅÍÁÈÎÁÔ
-ÔÅËÓÔ × ÔÅËÕÝÏÔÏ ÍÑÓÔÏ ÎÁ ËÕÒÓÏÒÁ.
-
->> ïÐÉÔÁÊÔÅ ÇÏ: ×ß×ÅÄÅÔÅ C-y ÚÁ ÄÁ ÉÚ×ÅÄÅÔÅ ÔÅËÓÔÁ ÏÂÒÁÔÎÏ.
-
-áËÏ ÎÁÐÒÁ×ÉÔÅ ÎÑËÏÌËÏ C-k × ÒÅÄ, ×ÓÉÞËÏ ÏÔ ÐÒÅÍÁÈÎÁÔÉÑ ÔÅËÓÔ ÓÅ
-ÚÁÐÁÚ×Á ÚÁÅÄÎÏ, ÔÁËÁ ÞÅ ÅÄÎÏ C-y ÝÅ ÉÚ×ÁÄÉ ×ÓÉÞËÉ ÒÅÄÏ×Å ÎÁ×ÅÄÎßÖ.
-
->> îÁÐÒÁ×ÅÔÅ ÔÏ×Á ÓÅÇÁ, ×ß×ÅÄÅÔÅ C-k ÎÑËÏÌËÏ ÐßÔÉ.
-
-óÅÇÁ ÚÁ ÄÁ ÉÚËÁÒÁÔÅ ÐÒÅÍÁÈÎÁÔÉÑ ÔÅËÓÔ:
-
->> ÷ß×ÅÄÅÔÅ C-y.  óÌÅÄ ÔÏ×Á ÐÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÎÁÄÏÌÕ ÎÑËÏÌËÏ ÒÅÄÁ É
-   ×ß×ÅÄÅÔÅ C-y ÏÔÎÏ×Ï.  óÅÇÁ ×ÉÖÄÁÔÅ ËÁË ÄÁ ËÏÐÉÒÁÔÅ ÎÑËÁËß× ÔÅËÓÔ.
-
-ëÁË×Ï ÄÁ ÐÒÁ×ÉÔÅ ÁËÏ ÉÍÁÔÅ ÎÑËÁËß× ÔÅËÓÔ, ËÏÊÔÏ ÉÓËÁÔÅ ÄÁ ÉÚ×ÁÄÉÔÅ
-ÏÂÒÁÔÎÏ, É ÓÌÅÄ ÔÏ×Á ÐÒÅÍÁÈÎÅÔÅ ÎÅÝÏ ÄÒÕÇÏ?  C-y ÝÅ ÉÚ×ÁÄÉ ÐÏÓÌÅÄÎÏÔÏ
-ÐÒÅÍÁÈ×ÁÎÅ.  îÏ ÐÒÅÄÉÛÎÉÑÔ ÔÅËÓÔ ÎÅ Å ÚÁÇÕÂÅÎ.  íÏÖÅÔÅ ÄÁ ÇÏ ×ßÒÎÅÔÅ
-ÏÂÒÁÔÎÏ ÉÚÐÏÌÚ×ÁÊËÉ ËÏÍÁÎÄÁÔÁ M-y.  óÌÅÄ ËÁÔÏ ÉÚÐßÌÎÉÔÅ C-y ÚÁ ÄÁ
-×ÚÅÍÅÔÅ ÐÏÓÌÅÄÎÏÔÏ ÐÒÅÍÁÈ×ÁÎÅ, ×ß×ÅÖÄÁÎÅÔÏ ÎÁ M-y ÚÁÍÅÎÑ ÔÏÚÉ ÉÚ×ÁÄÅÎ
-ÔÅËÓÔ Ó ÐÒÅÄÉÛÎÏÔÏ ÐÒÅÍÁÈ×ÁÎÅ.  ÷ß×ÅÖÄÁÎÅÔÏ ÎÁ M-y ÏÔÎÏ×Ï É ÏÔÎÏ×Ï
-×ÒßÝÁ ÐÏ-ÒÁÎÎÉ É ÐÏ-ÒÁÎÎÉ ÐÒÅÍÁÈ×ÁÎÉÑ.  ëÏÇÁÔÏ ÓÔÉÇÎÅÔÅ ÔÅËÓÔÁ, ËÏÊÔÏ
-ÔßÒÓÉÔÅ, ÎÅ Å ÎÕÖÎÏ ÄÁ ÐÒÁ×ÉÔÅ ÎÉÝÏ ÐÏ×ÅÞÅ, ÚÁ ÄÁ ÇÏ ÚÁÄßÒÖÉÔÅ.
-ðÒÏÓÔÏ ÐÒÏÄßÌÖÅÔÅ Ó ÒÅÄÁËÔÉÒÁÎÅÔÏ, ÏÓÔÁ×ÑÊËÉ ÉÚ×ÁÄÅÎÉÑ ÔÅËÓÔ ËßÄÅÔÏ ÓÉ
-Å.
-
-áËÏ ×ß×ÅÄÅÔÅ M-y ÄÏÓÔÁÔßÞÅÎ ÂÒÏÊ ÐßÔÉ ÝÅ ÓÅ ×ßÒÎÅÔÅ × ÎÁÞÁÌÎÏÔÏ
-ÐÏÌÏÖÅÎÉÅ (ÐÏÓÌÅÄÎÏÔÏ ÐÒÅÍÁÈ×ÁÎÅ).
-
->> ðÒÅÍÁÈÎÅÔÅ ÒÅÄ, ÐÒÉÄ×ÉÖÅÔÅ ÓÅ ÎÑËßÄÅ, ÐÒÅÍÁÈÎÅÔÅ ÄÒÕÇ ÒÅÄ.
-   éÚÐßÌÎÅÔÅ C-y ÚÁ ÄÁ ×ßÒÎÅÔÅ ÏÂÒÁÔÎÏ ×ÔÏÒÉÑ ÐÒÅÍÁÈÎÁÔ ÒÅÄ.
-   éÚÐßÌÎÅÔÅ M-y É ÔÏÚÉ ×ßÒÎÁÔ ÔÅËÓÔ ÝÅ ÂßÄÅ ÚÁÍÅÎÅÎ Ó ÐßÒ×ÉÑ
-   ÐÒÅÍÁÈÎÁÔ ÒÅÄ.
-   éÚÐßÌÎÅÔÅ ÎÑËÏÌËÏ M-y É ×ÉÖÔÅ ËÁË×Ï ÓÅ ÐÏÌÕÞÁ×Á.  éÚÐßÌÎÑ×ÁÊÔÅ ÔÏ×Á
-   ÄÏËÁÔÏ ×ÔÏÒÉÑÔ ÐÒÅÍÁÈÎÁÔ ÒÅÄ ÓÅ ×ßÒÎÅ, É ÓÌÅÄ ÔÏ×Á ÏÝÅ ÎÑËÏÌËÏ
-   ÐßÔÉ.
-   áËÏ ÉÓËÁÔÅ, ÍÏÖÅ ÄÁ ÐÒÏÂ×ÁÔÅ ÄÁ ÄÁÄÅÔÅ ÎÁ M-y ÐÏÌÏÖÉÔÅÌÎÉ É
-   ÏÔÒÉÃÁÔÅÌÎÉ ÞÉÓÌÏ×É ÁÒÇÕÍÅÎÔÉ.
-
-
-* ïôíñîá
+>> Âúâåäåòå òåêñò, äîêàòî ñòèãíåòå äÿñíàòà ãðàíèöà, è ïðîäúëæåòå ñ
+   âìúêâàíåòî.  Ùå âèäèòå ïðîäúëæåíèåòî íà ðåäà äà ñå ïîêàçâà.
+
+>> Èçïîëçâàéòå íÿêîëêî <Delback>, çà äà èçòðèåòå òåêñòà, äîêàòî ðåäúò
+   ñå âìåñòè â åäèí åêðàíåí ðåä.  Ïðîäúëæåíèåòî íà ðåäà èç÷åçâà.
+
+Ìîæå äà èçòðèåòå çíàêà çà íîâ ðåä òî÷íî êàêòî âñåêè äðóã çíàê.
+Èçòðèâàíåòî íà çíàêà çà íîâ ðåä ìåæäó äâà ðåäà ãè ñëèâà â åäèí ðåä.
+Àêî ïîëó÷åíèÿò êîìáèíèðàí ðåä å òâúðäå äúëúã, çà äà ñå âìåñòè â
+øèðèíàòà íà åêðàíà, òîé ùå áúäå ïîêàçàí êàòî ïðîäúëæåí ðåä.
+
+>> Ïðèäâèæåòå êóðñîðà â íà÷àëîòî íà ðåä è âúâåäåòå <Delback>.  Òîâà ùå
+   ñëåå òîçè ðåä ñ ïðåäèøíèÿ.
+
+>> Âúâåäåòå <Return>, çà äà âìúêíåòå íàíîâî çíàêà çà íîâ ðåä, êîéòî
+   èçòðèõòå.
+
+Çàïîìíåòå, ÷å íà ïîâå÷åòî êîìàíäè íà Åìàêñ ìîæå äà áúäå çàäàäåí áðîÿ÷
+íà ïîâòîðåíèÿòà; òîâà âêëþ÷âà âìúêâàíåòî íà òåêñòîâè çíàöè.
+Ïîâòàðÿíåòî íà òåêñòîâ çíàê ãî âìúêâà íÿêîëêî ïúòè.
+
+>> Îïèòàéòå òîâà ñåãà -- âúâåäåòå C-u 8 *, çà äà âìúêíåòå ********.
+
+Ñåãà âèå ñòå íàó÷èëè íàé-îñíîâíèòå íà÷èíè çà âúâåæäàíå íà íåùî â Åìàêñ
+è ïîïðàâÿíå íà ãðåøêè.  Ìîæåòå ñúùî òàêà äà èçòðèâàòå äóìè èëè ðåäîâå.
+Åòî îáîáùåíèå íà èçòðèâàùèòå äåéñòâèÿ:
+
+        <Delback>    èçòðèâàíå íà çíàêà òî÷íî ïðåäè êóðñîðà
+        C-d          èçòðèâàíå íà çíàêà òî÷íî ñëåä êóðñîðà
+
+        M-<Delback>  èçòðèâàíå íà äóìàòà íåïîñðåäñòâåíî ïðåäè êóðñîðà
+        M-d          èçòðèâàíå íà äóìàòà ñëåä êóðñîðà
+
+        C-k          èçòðèâàíå îò ìÿñòîòî íà êóðñîðà äî êðàÿ íà ðåäà
+        M-k          èçòðèâàíå äî êðàÿ íà òåêóùîòî èçðå÷åíèå
+
+Çàáåëåæåòå, ÷å <Delback> è C-d, ñðàâíåíè ñ M-<Delback> è M-d,
+ðàçøèðÿâàò ïîäîáèåòî, çàïî÷íàòî îò C-f è M-f (äîáðå, <Delback> íå å
+íàèñòèíà êîíòðîëèðàù çíàê, íî íåêà íå ñå áåçïîêîèì çà òîâà).  C-k è
+M-k ñà ïîäîáíè íà C-e è M-e â ñìèñúë, ÷å åäíèòå ñà çà ðåäîâå, à
+äðóãèòå -- çà èçðå÷åíèÿ.
+
+Ìîæåòå ñúùî äà ïðåìàõíåòå âñÿêà ÷àñò îò áóôåðà ñ åäèí óíèâåðñàëåí
+íà÷èí.  Ïðèäâèæåòå ñå äî åäèíèÿ êðàé íà ÷àñòòà è âúâåäåòå C-@ èëè
+C-èíòåðâàë (êîåòî è äà å îò äâåòå).  Ïðèäâèæåòå ñå äî äðóãèÿ êðàé íà
+÷àñòòà è âúâåäåòå C-w.  Òîâà ùå èçðåæå öåëèÿ òåêñò ìåæäó òåçè äâà
+êðàÿ.
+
+>> Ïðèäâèæåòå êóðñîðà äî çíàêà "Ì" â íà÷àëîòî íà ïðåäèøíèÿ àáçàö.
+>> Âúâåäåòå C-èíòåðâàë.  Åìàêñ òðÿáâà äà èçâåäå ñúîáùåíèå "Mark set" â
+   äîëíèÿ êðàé íà åêðàíà.
+>> Ïðèäâèæåòå êóðñîðà äî áóêâàòà "ð" â "êðàé" íà âòîðèÿ ðåä îò àáçàöà.
+>> Âúâåäåòå C-w.  Òîâà ùå èçðåæå òåêñòà, çàïî÷âàù îò "Ì" è çàâúðøâàù
+   òî÷íî ïðåäè "ð".
+
+Ðàçëèêàòà ìåæäó "èçðÿçâàíå" (kill, cut) è "èçòðèâàíå" (delete) å, ÷å
+"èçðÿçàíèÿò" òåêñò ìîæå äà áúäå âìúêíàò íàíîâî, äîêàòî "èçòðèòèòå"
+íåùà íå ìîãàò äà ñå âìúêíàò íàíîâî.  Ïîñòàâÿíåòî íàíîâî íà èçðÿçàí
+òåêñò ñå íàðè÷à "âìúêâàíå" (yank, paste).  Îáùî êàçàíî, êîìàíäèòå,
+êîèòî îòñòðàíÿâàò ìíîãî òåêñò, ãî èçðÿçâàò (òàêà ÷å òîé äà ìîæå äà
+áúäå âìúêíàò), äîêàòî êîìàíäèòå, êîèòî îòñòðàíÿâàò ñàìî åäèí çíàê èëè
+èçòðèâàò ñàìî ïðàçíè ðåäîâå è çíàöè, èçâúðøâàò èçòðèâàíå (òàêà ÷å íå
+ìîæåòå äà âìúêíåòå íàíîâî òîçè òåêñò).
+
+>> Ïðèäâèæåòå êóðñîðà äî íà÷àëîòî íà ðåä, êîéòî íå å ïðàçåí.  Òîãàâà
+   âúâåäåòå C-k, çà äà èçðåæåòå òåêñòà íà òîçè ðåä.
+>> Âúâåäåòå C-k âòîðè ïúò.  Ùå âèäèòå, ÷å òîâà èçðÿçâà çíàêà çà íîâ
+   ðåä, êîéòî ñëåäâà ðåäà.
+
+Çàáåëåæåòå, ÷å åäèíè÷íî C-k èçðÿçâà ñúäúðæàíèåòî íà ðåäà, à ñëåäâàùîòî
+C-k èçðÿçâà öåëèÿ ðåä è ïðàâè äðóãèòå ðåäîâå äà ñå ïðèäâèæàò íàãîðå.
+C-k îáðàáîòâà ÷èñëîâèòå àðãóìåíòè ïî ñïåöèàëåí íà÷èí: ïðåìàõâàò ñå
+òîëêîâà íà áðîé ðåäîâå È òÿõíîòî ñúäúðæàíèå.  Òîâà íå å ïðîñòî
+ïîâòîðåíèå.  C-u 2 C-k èçðÿçâà äâà ðåäà è òåõíèòå çíàöè çà íîâ ðåä;
+âúâåæäàíåòî íà C-k äâà ïúòè íå ïðàâè òîâà.
+
+Âðúùàíåòî îáðàòíî íà òåêñò ñå íàðè÷à "âìúêâàíå".  (Ìèñëåòå çà íåãî
+êàòî çà èçâàæäàíå îáðàòíî, èëè äðúïâàíå îáðàòíî, íà òåêñò, êîéòî å áèë
+èçðÿçàí.)  Ìîæåòå äà âìúêâàòå èçðÿçàíèÿ òåêñò èëè íà ñúùîòî ìÿñòî,
+îòêúäåòî å áèë ïðåìàõíàò, èëè íà äðóãî ìÿñòî â áóôåðà, äàæå è â
+ðàçëè÷åí ôàéë.  Ìîæåòå äà âìúêâàòå åäèí è ñúù òåêñò íÿêîëêî ïúòè; òîâà
+ïðàâè íÿêîëêî êîïèÿ îò íåãî.
+
+Êîìàíäàòà çà âìúêâàíå å C-y.  Òÿ âìúêâà íàíîâî ïîñëåäíèÿ èçðÿçàí òåêñò
+â òåêóùîòî ìÿñòî íà êóðñîðà.
+
+>> Îïèòàéòå ãî: âúâåäåòå C-y, çà äà èçâåäåòå òåêñòà îáðàòíî.
+
+Àêî íàïðàâèòå íÿêîëêî C-k â ðåä, âñè÷êî îò èçðÿçàíèÿ òåêñò ñå çàïàçâà
+çàåäíî, òàêà ÷å åäíî C-y ùå èçâàäè âñè÷êè ðåäîâå íàâåäíúæ.
+
+>> Íàïðàâåòå òîâà ñåãà, âúâåäåòå C-k íÿêîëêî ïúòè.
+
+Ñåãà, çà äà èçêàðàòå èçðÿçàíèÿ òåêñò:
+
+>> Âúâåäåòå C-y.  Ñëåä òîâà ïðèäâèæåòå êóðñîðà íàäîëó íÿêîëêî ðåäà è
+   âúâåäåòå C-y îòíîâî.  Ñåãà âèæäàòå êàê äà êîïèðàòå íÿêàêúâ òåêñò.
+
+Êàêâî äà ïðàâèòå, àêî èìàòå íÿêàêúâ òåêñò, êîéòî èñêàòå äà âìúêíåòå
+îáðàòíî, è ñëåä òîâà èçðåæåòå íåùî äðóãî?  C-y ùå èçâàäè ïîñëåäíîòî
+èçðÿçâàíå.  Íî ïðåäèøíèÿò òåêñò íå å çàãóáåí.  Ìîæåòå äà ãî âúðíåòå
+îáðàòíî, èçïîëçâàéêè êîìàíäàòà M-y.  Ñëåä êàòî èçïúëíèòå C-y, çà äà
+âçåìåòå ïîñëåäíîòî èçðÿçâàíå, âúâåæäàíåòî íà M-y çàìåíÿ òîçè èçâàäåí
+òåêñò ñ ïðåäèøíîòî èçðÿçâàíå.  Âúâåæäàíåòî íà M-y îòíîâî è îòíîâî
+âðúùà ïî-ðàííè è ïî-ðàííè èçðÿçâàíèÿ.  Êîãàòî ñòèãíåòå òåêñòà, êîéòî
+òúðñèòå, íå å íóæíî äà ïðàâèòå íèùî ïîâå÷å, çà äà ãî çàäúðæèòå.
+Ïðîñòî ïðîäúëæåòå ñ ðåäàêòèðàíåòî, îñòàâÿéêè èçâàäåíèÿ òåêñò, êúäåòî
+ñè å.
+
+Àêî âúâåäåòå M-y äîñòàòú÷åí áðîé ïúòè, ùå ñå âúðíåòå â íà÷àëíîòî
+ïîëîæåíèå (ïîñëåäíîòî èçðÿçâàíå).
+
+>> Èçðåæåòå ðåä, ïðèäâèæåòå ñå íÿêúäå, èçðåæåòå äðóã ðåä.
+   Èçïúëíåòå C-y, çà äà âúðíåòå îáðàòíî âòîðèÿ èçðÿçàí ðåä.
+   Èçïúëíåòå M-y è òîçè âúðíàò òåêñò ùå áúäå çàìåíåí ñ ïúðâèÿ
+   èçðÿçàí ðåä.
+   Èçïúëíåòå íÿêîëêî M-y è âèæòå êàêâî ñå ïîëó÷àâà.  Èçïúëíÿâàéòå òîâà,
+   äîêàòî âòîðèÿò èçðÿçàí ðåä ñå âúðíå, è ñëåä òîâà îùå íÿêîëêî ïúòè.
+   Àêî èñêàòå, ìîæå äà ïðîáâàòå äà äàäåòå íà M-y ïîëîæèòåëíè è
+   îòðèöàòåëíè ÷èñëîâè àðãóìåíòè.
+
+
+* ÎÒÌßÍÀ
 --------
 
-áËÏ ÎÁÐÒÁ×ÉÔÅ ÐÒÏÍÑÎÁ × ÔÅËÓÔÁ É ÓÌÅÄ ÔÏ×Á ÒÅÛÉÔÅ, ÞÅ ÔÏ×Á Å ÂÉÌÏ
-ÇÒÅÛËÁ, ×ÉÅ ÍÏÖÅÔÅ ÄÁ ÏÔÍÅÎÉÔÅ ÐÒÏÍÑÎÁÔÁ Ó ËÏÍÁÎÄÁÔÁ ÚÁ ÏÔÍÅÎÑÎÅ, C-x
+Àêî íàïðàâèòå ïðîìÿíà â òåêñòà è ñëåä òîâà ðåøèòå, ÷å òîâà å áèëî
+ãðåøêà, âèå ìîæåòå äà îòìåíèòå ïðîìÿíàòà ñ êîìàíäàòà çà îòìåíÿíå, C-x
 u.
 
-ïÂÉËÎÏ×ÅÎÏ, C-x u ÏÔÍÅÎÑ ÐÒÏÍÅÎÉÔÅ ÎÁÐÒÁ×ÅÎÉ ÏÔ ÅÄÎÁ ËÏÍÁÎÄÁ; ÁËÏ
-ÐÏ×ÔÁÒÑÔÅ C-x u ÎÑËÏÌËÏ ÐßÔÉ ÐÏÓÌÅÄÏ×ÁÔÅÌÎÏ, ×ÓÑËÏ ÐÏ×ÔÏÒÅÎÉÅ ÏÔÍÅÎÑ
-ÏÝÅ ÅÄÎÁ ËÏÍÁÎÄÁ.
+Îáèêíîâåíî C-x u îòìåíÿ ïðîìåíèòå, íàïðàâåíè îò åäíà êîìàíäà; àêî
+ïîâòàðÿòå C-x u íÿêîëêî ïúòè ïîñëåäîâàòåëíî, âñÿêî ïîâòîðåíèå îòìåíÿ
+îùå åäíà êîìàíäà.
 
-îÏ ÉÍÁ Ä×Å ÉÚËÌÀÞÅÎÉÑ: ËÏÍÁÎÄÉÔÅ, ËÏÉÔÏ ÎÅ ÐÒÏÍÅÎÑÔ ÔÅËÓÔÁ ÎÅ ÓÅ ÂÒÏÑÔ
-(ÔÏ×Á ×ËÌÀÞ×Á ÐÒÉÄ×ÉÖ×ÁÎÅÔÏ ÎÁ ËÕÒÓÏÒÁ É ÓËÒÏÌÉÒÁÝÉÔÅ ËÏÍÁÎÄÉ), É
-ÓÁÍÏ×ÍßË×ÁÝÉÔÅ ÓÅ ÚÎÁÃÉ ÏÂÉËÎÏ×ÅÎÏ ÓÅ ÏÂÒÁÂÏÔ×ÁÔ ÎÁ ÇÒÕÐÉ, ×ÓÑËÁ ÄÏ 20
-ÚÎÁËÁ.  (ôÏ×Á ÎÁÍÁÌÑ×Á ÂÒÏÑ ÎÁ C-x u, ËÏÉÔÏ ÔÒÑÂ×Á ÄÁ ×ß×ÅÄÅÔÅ ÚÁ ÄÁ
-ÏÔÍÅÎÉÔÅ ×ß×ÅÄÅÎ ÔÅËÓÔ.)
+Íî èìà äâå èçêëþ÷åíèÿ: êîìàíäèòå, êîèòî íå ïðîìåíÿò òåêñòà, íå ñå
+áðîÿò (òîâà âêëþ÷âà ïðèäâèæâàíåòî íà êóðñîðà è ñêðîëèðàùèòå êîìàíäè),
+è ñàìîâìúêâàùèòå ñå çíàöè îáèêíîâåíî ñå îáðàáîòâàò íà ãðóïè, âñÿêà äî
+20 çíàêà.  (Òîâà íàìàëÿâà áðîÿ íà C-x u, êîèòî òðÿáâà äà âúâåäåòå, çà
+äà îòìåíèòå âúâåäåí òåêñò.)
 
->> ðÒÅÍÁÈÎÅÔÅ ÔÏÚÉ ÒÅÄ Ó C-k, ÓÌÅÄ ÔÏ×Á ×ß×ÅÄÅÔÅ C-x u É ÔÏÊ ÔÒÑÂ×Á ÄÁ
-   ÓÅ ÐÏÑ×É ÏÔÎÏ×Ï.
+>> Èçðåæåòå òîçè ðåä ñ C-k, ñëåä òîâà âúâåäåòå C-x u è òîé òðÿáâà äà
+   ñå ïîÿâè îòíîâî.
 
-C-_ Å ÁÌÔÅÒÎÁÔÉ×ÎÁ ÏÔÍÅÎÑÝÁ ËÏÍÁÎÄÁ; ÔÑ ÒÁÂÏÔÉ ÔÏÞÎÏ ËÁÔÏ C-x u, ÎÏ Å
-ÐÏ-ÌÅÓÎÁ ÚÁ ×ß×ÅÖÄÁÎÅ ÎÑËÏÌËÏ ÐßÔÉ ÐÏÓÌÅÄÏ×ÁÔÅÌÎÏ.  îÅÄÏÓÔÁÔßËßÔ ÎÁ
-C_- Å, ÞÅ ÎÁ ÎÑËÏÉ ËÌÁ×ÉÁÔÕÒÉ ÎÅ Å ÏÞÅ×ÉÄÎÏ ËÁË ÔÒÑÂ×Á ÄÁ ÓÅ ×ß×ÅÄÅ.
-úÁÔÏ×Á ÏÓÉÇÕÒÑ×ÁÍÅ É C-x u.  îÁ ÎÑËÏÉ ÔÅÒÍÉÎÁÌÉ ÍÏÖÅ ÄÁ ×ß×ÅÄÅÔÅ C-_ Ó
-×ß×ÅÖÄÁÎÅ ÎÁ / ÄÏËÁÔÏ ÓÔÅ ÚÁÄßÒÖÁÌÉ CONTROL.
+C-_ å àëòåðíàòèâíà îòìåíÿùà êîìàíäà; òÿ ðàáîòè òî÷íî êàòî C-x u, íî å
+ïî-ëåñíà çà âúâåæäàíå íÿêîëêî ïúòè ïîñëåäîâàòåëíî.  Íåäîñòàòúêúò íà
+C_- å, ÷å íà íÿêîè êëàâèàòóðè íå å î÷åâèäíî êàê òðÿáâà äà ñå âúâåäå.
+Çàòîâà îñèãóðÿâàìå è C-x u.  Íà íÿêîè òåðìèíàëè ìîæå äà âúâåäåòå C-_ ñ
+âúâåæäàíå íà /, äîêàòî çàäúðæàòå CONTROL.
 
-þÉÓÌÏ× ÁÒÇÕÍÅÎÔ ËßÍ C-_ ÉÌÉ C-x u ÄÅÊÓÔ×Á ËÁÔÏ ÂÒÏÑÞ ÎÁ ÐÏ×ÔÏÒÅÎÉÑÔÁ.
+×èñëîâ àðãóìåíò êúì C-_ èëè C-x u äåéñòâà êàòî áðîÿ÷ íà ïîâòîðåíèÿòà.
 
-íÏÖÅ ÄÁ ÏÔÍÅÎÑÔÁ ÉÚÔÒÉ×ÁÎÅ ÎÁ ÔÅËÓÔ ÔÏÞÎÏ ËÁËÔÏ ÏÔÍÅÎÑÔÅ ÐÒÅÍÁÈ×ÁÎÅ ÎÁ
-ÔÅËÓÔ.  òÁÚÌÉÞÉÅÔÏ ÍÅÖÄÕ ÐÒÅÍÁÈ×ÁÎÅÔÏ ÎÁ ÎÅÝÏ É ÉÚÔÒÉ×ÁÎÅÔÏ ÍÕ
-×ßÚÄÅÊÓÔ×Á ÄÁÌÉ ÝÅ ÍÏÖÅ ÄÁ ÇÏ ÉÚ×ÁÄÉÔÅ Ó C-y; ÚÁ ÏÔÍÅÎÑÎÅÔÏ ÎÑÍÁ
-ÒÁÚÌÉËÁ ÍÅÖÄÕ Ä×ÁÔÁ ×ÉÄÁ.
+Ìîæå äà îòìåíÿòà èçòðèâàíå íà òåêñò òî÷íî êàêòî îòìåíÿòå èçðÿçâàíå íà
+òåêñò.  Ðàçëè÷èåòî ìåæäó èçðÿçâàíåòî íà íåùî è èçòðèâàíåòî ìó
+âúçäåéñòâà äàëè ùå ìîæå äà ãî èçâàäèòå ñ C-y; çà îòìåíÿíåòî íÿìà
+ðàçëèêà ìåæäó äâàòà âèäà.
 
 
-* æáêìï÷å
+* ÔÀÉËÎÂÅ
 ---------
 
-úÁ ÄÁ ÎÁÐÒÁ×ÉÔÅ ÔÅËÓÔÁ, ËÏÊÔÏ ÒÅÄÁËÔÉÒÁÔÅ, ÐÏÓÔÏÑÎÅÎ, ÔÒÑÂ×Á ÄÁ ÇÏ
-ÓÌÏÖÉÔÅ ×ß× ÆÁÊÌ.  ÷ ÐÒÏÔÉ×ÅÎ ÓÌÕÞÁÊ ÔÏÊ ÝÅ ÉÚÞÅÚÎÅ, ËÏÇÁÔÏ åÍÁËÓ
-ÐÒÉËÌÀÞÉ.  úÁ ÄÁ ÓÌÏÖÉÔÅ ×ÁÛÉÑ ÔÅËÓÔ ×ß× ÆÁÊÌ, ÔÒÑÂ×Á ÄÁ "ÎÁÍÅÒÉÔÅ"
-ÆÁÊÌÁ ÐÒÅÄÉ ÄÁ ×ß×ÅÖÄÁÔÅ ÔÅËÓÔÁ.  (ôÏ×Á ÓßÝÏ ÓÅ ÎÁÒÉÞÁ "ÐÏÓÅÝÁ×ÁÎÅ" ÎÁ
-ÆÁÊÌÁ.)
-
-îÁÍÉÒÁÎÅ ÎÁ ÆÁÊÌ ÏÚÎÁÞÁ×Á, ÞÅ ×ÉÖÄÁÔÅ ÓßÄßÒÖÁÎÉÅÔÏ ÍÕ × åÍÁËÓ.  ÷
-ÍÎÏÇÏ ÓÌÕÞÁÉ ÔÏ×Á Å ËÁÔÏ ÄÁ ÒÅÄÁËÔÉÒÁÔÅ ÓÁÍÉÑ ÆÁÊÌ.  ïÂÁÞÅ, ÐÒÏÍÅÎÉÔÅ,
-ËÏÉÔÏ ÐÒÁ×ÉÔÅ ÉÚÐÏÌÚ×ÁÊËÉ åÍÁËÓ, ÎÅ ÏÓÔÁ×ÁÔ ÐÏÓÔÏÑÎÎÉ ÄÏËÁÔÏ ÎÅ
-"ÚÁÐÉÛÅÔÅ" ÆÁÊÌÁ.  ôÏ×Á Å ÔÁËÁ ÚÁ ÄÁ ÓÅ ÐÒÅÄÏÔ×ÒÁÔÉ ÏÓÔÁ×ÑÎÅÔÏ ÎÁ
-ÐÏÌÕÐÒÏÍÅÎÅÎ ÆÁÊÌ × ÓÉÓÔÅÍÁÔÁ, ËÏÇÁÔÏ ÎÅ ÉÓËÁÔÅ ÔÏ×Á.  äÏÒÉ ËÏÇÁÔÏ
-ÚÁÐÉÓ×ÁÔÅ, åÍÁËÓ ÏÓÔÁ×Ñ ÎÁÞÁÌÎÉÑ ÆÁÊÌ ÐÏÄ ÐÒÏÍÅÎÅÎÏ ÉÍÅ × ÓÌÕÞÁÊ, ÞÅ
-ÐÏ-ËßÓÎÏ ÒÅÛÉÔÅ, ÞÅ ×ÁÛÉÔÅ ÐÒÏÍÅÎÉ ÓÁ ÂÉÌÉ ÇÒÅÛËÁ.
-
-áËÏ ÐÏÇÌÅÄÎÅÔÅ × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ ÝÅ ×ÉÄÉÔÅ ÒÅÄ, ËÏÊÔÏ ÚÁÐÏÞ×Á É
-ÚÁ×ßÒÛ×Á Ó ÔÉÒÅÔÁ É ÚÁÐÏÞ×Á Ó "--:-- TUTORIAL" ÉÌÉ ÎÅÝÏ ÐÏÄÏÂÎÏ.  ôÁÚÉ
-ÞÁÓÔ ÏÔ ÅËÒÁÎÁ ÐÏËÁÚ×Á ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ, ËÏÊÔÏ ÓÔÅ ÐÏÓÅÔÉÌÉ.  ôÏÞÎÏ ÓÅÇÁ
-×ÉÅ ÓÔÅ ÐÏÓÅÔÉÌÉ ÆÁÊÌ ÎÁÒÅÞÅÎ "TUTORIAL", ËÏÊÔÏ Å ×ÁÛÅÔÏ ÌÉÞÎÏ
-ËÏÐÉÅ-ÞÅÒÎÏ×Á ÎÁ åÍÁËÓ ×ß×ÅÄÅÎÉÅÔÏ.  ëÏÇÁÔÏ ÎÁÍÅÒÉÔÅ ÆÁÊÌ × åÍÁËÓ,
-ÉÍÅÔÏ ÎÁ ÔÏÚÉ ÆÁÊÌ ÝÅ ÓÅ ÐÏÑ×É ÎÁ ÓßÝÏÔÏ ÍÑÓÔÏ.
-
-ïÓÏÂÅÎÏÓÔ ËÏÍÁÎÄÁÔÁ ÚÁ ÎÁÍÉÒÁÎÅ ÎÁ ÆÁÊÌ Å, ÞÅ ÔÒÑÂ×Á ÄÁ ËÁÖÅÔÅ ÉÍÅÔÏ
-ÎÁ ÆÁÊÌÁ, ËÏÊÔÏ ÉÓËÁÔÅ.  îÉÅ ÇÏ ÎÁÒÉÞÁÍÅ "ÞÅÔÅÎÅ ÎÁ ÁÒÇÕÍÅÎÔ ÏÔ
-ÔÅÒÍÉÎÁÌÁ" (× ÔÏÚÉ ÓÌÕÞÁÊ ÁÒÇÕÍÅÎÔßÔ Å ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ).  óÌÅÄ ËÁÔÏ
-×ß×ÅÄÅÔÅ ËÏÍÁÎÄÁÔÁ
-
-        C-x C-f   îÁÍÉÒÁÎÅ ÎÁ ÆÁÊÌ
-
-åÍÁËÓ ×É ÐÏÄËÁÎÑ ÄÁ ×ß×ÅÄÅÔÅ ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ.  éÍÅÔÏ ÎÁ ÆÁÊÌÁ, ËÏÅÔÏ
-ÎÁÐÉÛÅÔÅ, ÓÅ ÐÏÑ×Ñ×Á × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ.  òÅÄßÔ × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ ÓÅ
-ÎÁÒÉÞÁ ÍÉÎÉÂÕÆÅÒ, ËÏÇÁÔÏ ÓÅ ÉÚÐÏÌÚ×Á ÚÁ ÔÏÚÉ ×ÉÄ ×ÈÏÄ.  íÏÖÅÔÅ ÄÁ
-ÉÚÐÏÌÚ×ÁÔÅ ÏÂÉËÎÏ×ÅÎÉÔÅ ËÏÍÁÎÄÉ ÚÁ ÒÅÄÁËÔÉÒÁÎÅ ÎÁ åÍÁËÓ ÚÁ ÄÁ
-ÒÅÄÁËÔÉÒÁÔÅ ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ.
-
-ëÏÇÁÔÏ ×ß×ÅÖÄÁÔÅ ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ (ÉÌÉ ËÁËß×ÔÏ É ÄÁ Å ×ÈÏÄ ×
-ÍÉÎÉÂÕÆÅÒÁ), ÍÏÖÅÔÅ ÄÁ ÐÒÅËÒÁÔÉÔÅ ËÏÍÁÎÄÁÔÁ Ó C-g.
-
->> ÷ß×ÅÄÅÔÅ C-x C-f É ÓÌÅÄ ÔÏ×Á C-g.  ôÏ×Á ÐÒÅËÒÁÔÑ×Á ÍÉÎÉÂÕÆÅÒÁ, Á
-   ÓßÝÏ É ËÏÍÁÎÄÁÔÁ C-x C-f, ËÏÑÔÏ ÓÅ ÉÚÐßÌÎÑ×ÁÛÅ × ÍÉÎÉÂÕÆÅÒÁ.  ôÁËÁ
-   ÞÅ ÎÅ ÎÁÍÉÒÁÔÅ ÆÁÊÌ.
-
-ëÏÇÁÔÏ ÐÒÉËÌÀÞÉÔÅ Ó ×ß×ÅÖÄÁÎÅÔÏ ÎÁ ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ, ×ß×ÅÄÅÔÅ <Return>
-ÚÁ ÄÁ ÐÏËÁÖÅÔÅ ÔÏ×Á.  ôÏÇÁ×Á C-x C-f ÔÒßÇ×Á ÄÁ ÒÁÂÏÔÉ É ÎÁÍÉÒÁ ÆÁÊÌÁ,
-ËÏÊÔÏ ÓÔÅ ÉÚÂÒÁÌÉ.  íÉÎÉÂÕÆÅÒßÔ ÉÚÞÅÚ×Á, ËÏÇÁÔÏ ËÏÍÁÎÄÁÔÁ C-x C-f
-Ó×ßÒÛÉ.
-
-óÌÅÄ ÍÁÌËÏ ÓßÄßÒÖÁÎÉÅÔÏ ÎÁ ÆÁÊÌÁ ÓÅ ÐÏÑ×Ñ×Á ÎÁ ÅËÒÁÎÁ É ×ÉÅ ÍÏÖÅÔÅ ÄÁ
-ÒÅÄÁËÔÉÒÁÔÅ ÓßÄßÒÖÁÎÉÅÔÏ ÍÕ.  ëÏÇÁÔÏ ÐÏÖÅÌÁÅÔÅ ÄÁ ÚÁÐÁÚÉÔÅ ×ÁÛÉÔÅ
-ÐÒÏÍÅÎÉ ÚÁ ÐÏÓÔÏÑÎÎÏ, ×ß×ÅÄÅÔÅ ËÏÍÁÎÄÁÔÁ
-
-        C-x C-s   úÁÐÁÚ×ÁÎÅ ÎÁ ÆÁÊÌÁ
-
-ôÏ×Á ËÏÐÉÒÁ ÔÅËÓÔÁ ÏÔ åÍÁËÓ ×ß× ÆÁÊÌÁ.  ðßÒ×ÉÑÔ ÐßÔ, ËÏÇÁÔÏ ÔÏ×Á ÓÅ
-ÎÁÐÒÁ×É, åÍÁËÓ ÐÒÅÉÍÅÎÕ×Á ÎÁÞÁÌÎÉÑ ÆÁÊÌ Ó ÎÏ×Ï ÉÍÅ, ÔÁËÁ ÞÅ ÔÏÊ ÄÁ ÎÅ
-ÓÅ ÉÚÇÕÂÉ.  îÏ×ÏÔÏ ÉÍÅ ÓÅ ÐÏÓÔÒÏÑ×Á Ó ÄÏÂÁ×ÑÎÅ ÎÁ "~" × ËÒÁÑ ÎÁ ÉÍÅÔÏ
-ÎÁ ÎÁÞÁÌÎÉÑ ÆÁÊÌ.
-
-ëÏÇÁÔÏ ÚÁÐÁÚ×ÁÎÅÔÏ Å Ó×ßÒÛÉÌÏ, åÍÁËÓ ÉÚ×ÅÖÄÁ ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ, ËÏÊÔÏ Å
-ÂÉÌ ÚÁÐÉÓÁÎ.  ôÒÑÂ×Á ÄÁ ÚÁÐÉÓ×ÁÔÅ ÄÏÓÔÁÔßÞÎÏ ÞÅÓÔÏ, ÔÁËÁ ÞÅ ÄÁ ÎÅ
-ÉÚÇÕÂÉÔÅ ÍÎÏÇÏ ÒÁÂÏÔÁ ÁËÏ ÓÉÓÔÅÍÁÔÁ ÓÅ ÓÒÉÎÅ.
-
->> ÷ß×ÅÄÅÔÅ C-x C-s, ÚÁÐÁÚ×ÁÊËÉ ×ÁÛÅÔÏ ËÏÐÉÅ ÏÔ ×ß×ÅÄÅÎÉÅÔÏ.
-   ôÏ×Á ÔÒÑÂ×Á ÄÁ ÉÚ×ÅÄÅ "Wrote ...TUTORIAL" × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ.
-
-úáâåìåöëá: îÁ ÎÑËÏÉ ÓÉÓÔÅÍÉ ×ß×ÅÖÄÁÎÅÔÏ ÎÁ C-x C-s ÝÅ ÚÁÍÒßÚÉ ÅËÒÁÎÁ É
-×ÉÅ ÎÑÍÁ ÄÁ ×ÉÖÄÁÔÅ ÐÏ×ÅÞÅ ÉÚÈÏÄ ÏÔ åÍÁËÓ.  ôÏ×Á ÐÏËÁÚ×Á, ÞÅ ÅÄÎÁ
-"ÓÐÏÓÏÂÎÏÓÔ" ÎÁ ÏÐÅÒÁÃÉÏÎÎÁÔÁ ÓÉÓÔÅÍÁ ÎÁÒÉÞÁÎÁ "ÕÐÒÁ×ÌÅÎÉÅ ÎÁ ÐÏÔÏËÁ"
-(flow control) Å ÐÒÉÈ×ÁÎÁÌÁ C-s É ÎÅ ÇÏ ÐÒÏÐÕÓËÁ ËßÍ åÍÁËÓ.  úÁ ÄÁ
-ÒÁÚÍÒÁÚÉÔÅ ÅËÒÁÎÁ, ×ß×ÅÄÅÔÅ C-q.  ôÏÇÁ×Á ×ÉÖÔÅ ÓÅËÃÉÑÔÁ "óÐÏÎÔÁÎÎÏ
-×ËÌÀÞ×ÁÎÅ ÎÁ ÐÏÓÔßÐËÏ×Ï ÔßÒÓÅÎÅ" (Spontaneous Entry to Incremental
-Search) × ÒßËÏ×ÏÄÓÔ×ÏÔÏ ÎÁ åÍÁËÓ ÚÁ Óß×ÅÔ ËÁË ÄÁ ÓÅ ÓÐÒÁ×ÉÔÅ Ó ÔÁÚÉ
-"ÓÐÏÓÏÂÎÏÓÔ".
-
-íÏÖÅ ÄÁ ÎÁÍÅÒÉÔÅ ÓßÝÅÓÔ×Õ×ÁÝ ÆÁÊÌ, ÄÁ ÇÏ ÒÁÚÇÌÅÄÁÔÅ É ÄÁ ÇÏ
-ÒÅÄÁËÔÉÒÁÔÅ.  íÏÖÅÔÅ ÓßÝÏ ÄÁ ÎÁÍÅÒÉÔÅ ÆÁÊÌ, ËÏÊÔÏ ÎÅ ÓßÝÅÓÔ×Õ×Á.  ôÏ×Á
-Å ÎÁÞÉÎßÔ ÚÁ ÓßÚÄÁ×ÁÎÅ ÎÁ ÎÏ×É ÆÁÊÌÏ×Å × åÍÁËÓ: ÎÁÍÉÒÁÔÅ ÆÁÊÌÁ, ËÏÊÔÏ
-ÝÅ ÂßÄÅ × ÎÁÞÁÌÏÔÏ ÐÒÁÚÅÎ, É ÔÏÇÁ×Á ÚÁÐÏÞ×ÁÔÅ ×ÍßË×ÁÎÅÔÏ ÎÁ ÔÅËÓÔÁ ÚÁ
-ÆÁÊÌÁ.  ëÏÇÁÔÏ ÇÏ×ÏÒÉÔÅ ÚÁ "ÚÁÐÉÓ×ÁÎÅ" ÎÁ ÆÁÊÌÁ, åÍÁËÓ ×ÓßÝÎÏÓÔ ÝÅ
-ÓßÚÄÁÄÅ ÆÁÊÌÁ Ó ÔÅËÓÔÁ, ËÏÊÔÏ ÓÔÅ ×ß×ÅÌÉ.  ïÔ ÔÁÍ ÎÁÔÁÔßË ÍÏÖÅ ÄÁ
-ÓÞÉÔÁÔÅ, ÞÅ ÒÅÄÁËÔÉÒÁÔÅ ×ÅÞÅ ÓßÝÅÓÔ×Õ×ÁÝ ÆÁÊÌ.
-
-
-* âõæåòé
+Çà äà íàïðàâèòå òåêñòà, êîéòî ðåäàêòèðàòå, ïîñòîÿíåí, òðÿáâà äà ãî
+ñëîæèòå âúâ ôàéë.   ïðîòèâåí ñëó÷àé òîé ùå èç÷åçíå, êîãàòî Åìàêñ
+ïðèêëþ÷è.  Çà äà ñëîæèòå âàøèÿ òåêñò âúâ ôàéë, òðÿáâà äà "íàìåðèòå"
+ôàéëà ïðåäè äà âúâåæäàòå òåêñò.  (Òîâà ñúùî ñå íàðè÷à "ïîñåùàâàíå" íà
+ôàéëà.)
+
+Íàìèðàíå íà ôàéë îçíà÷àâà, ÷å âèæäàòå ñúäúðæàíèåòî ìó â Åìàêñ.  Â
+ìíîãî ñëó÷àè òîâà å êàòî äà ðåäàêòèðàòå ñàìèÿ ôàéë.  Îáà÷å ïðîìåíèòå,
+êîèòî ïðàâèòå, èçïîëçâàéêè Åìàêñ, íå îñòàâàò ïîñòîÿííè, äîêàòî íå
+"çàïèøåòå" ôàéëà.  Òîâà å òàêà, çà äà ñå ïðåäîòâðàòè îñòàâÿíåòî íà
+ïîëóïðîìåíåí ôàéë â ñèñòåìàòà, êîãàòî íå èñêàòå òîâà.  Äîðè êîãàòî
+çàïèñâàòå, Åìàêñ îñòàâÿ íà÷àëíèÿ ôàéë ïîä ïðîìåíåíî èìå, â ñëó÷àé, ÷å
+ïî-êúñíî ðåøèòå, ÷å âàøèòå ïðîìåíè ñà áèëè ãðåøêà.
+
+Àêî ïîãëåäíåòå â äúíîòî íà åêðàíà, ùå âèäèòå ðåä, êîéòî çàïî÷âà è
+çàâúðøâà ñ òèðåòà è çàïî÷âà ñ "-R:-- TUTORIAL.bg" èëè íåùî ïîäîáíî.
+Òàçè ÷àñò îò åêðàíà ïîêàçâà èìåòî íà ôàéëà, êîéòî ñòå ïîñåòèëè.  Òî÷íî
+ñåãà âèå ñòå ïîñåòèëè ôàéë, íàðå÷åí "TUTORIAL.bg", êîéòî å âàøåòî
+ëè÷íî êîïèå-÷åðíîâà íà Åìàêñ âúâåäåíèåòî.  Êîãàòî íàìåðèòå ôàéë â
+Åìàêñ, èìåòî íà òîçè ôàéë ùå ñå ïîÿâè íà ñúùîòî ìÿñòî.
+
+Îñîáåíîñò íà êîìàíäàòà çà íàìèðàíå íà ôàéë å, ÷å òðÿáâà äà êàæåòå
+èìåòî íà ôàéëà, êîéòî èñêàòå.  Íèå ãî íàðè÷àìå "÷åòåíå íà àðãóìåíò îò
+òåðìèíàëà" (â òîçè ñëó÷àé àðãóìåíòúò å èìåòî íà ôàéëà).  Ñëåä êàòî
+âúâåäåòå êîìàíäàòà
+
+        C-x C-f   Íàìèðàíå íà ôàéë
+
+Åìàêñ âè ïîäêàíÿ äà âúâåäåòå èìåòî íà ôàéëà.  Èìåòî íà ôàéëà, êîåòî
+íàïèøåòå, ñå ïîÿâÿâà â äúíîòî íà åêðàíà.  Ðåäúò â äúíîòî íà åêðàíà ñå
+íàðè÷à ìèíèáóôåð, êîãàòî ñå èçïîëçâà çà òîçè âèä âõîä.  Ìîæåòå äà
+èçïîëçâàòå îáèêíîâåíèòå êîìàíäè çà ðåäàêòèðàíå íà Åìàêñ, çà äà
+ðåäàêòèðàòå èìåòî íà ôàéëà.
+
+Êîãàòî âúâåæäàòå èìåòî íà ôàéëà (èëè êàêúâòî è äà å âõîä â
+ìèíèáóôåðà), ìîæåòå äà ïðåêðàòèòå êîìàíäàòà ñ C-g.
+
+>> Âúâåäåòå C-x C-f è ñëåä òîâà C-g.  Òîâà ïðåêðàòÿâà ìèíèáóôåðà, à
+   ñúùî è êîìàíäàòà C-x C-f, êîÿòî ñå å èçïúëíÿâàëà â ìèíèáóôåðà.
+   Òàêà ÷å íå íàìèðàòå ôàéë.
+
+Êîãàòî ïðèêëþ÷èòå ñ âúâåæäàíåòî íà èìåòî íà ôàéëà, âúâåäåòå <Return>,
+çà äà ïîêàæåòå òîâà.  Òîãàâà C-x C-f òðúãâà äà ðàáîòè è íàìèðà ôàéëà,
+êîéòî ñòå èçáðàëè.  Ìèíèáóôåðúò èç÷åçâà, êîãàòî êîìàíäàòà C-x C-f
+ñâúðøè.
+
+Ñëåä ìàëêî ñúäúðæàíèåòî íà ôàéëà ñå ïîÿâÿâà íà åêðàíà è âèå ìîæåòå äà
+ðåäàêòèðàòå ñúäúðæàíèåòî ìó.  Êîãàòî ïîæåëàåòå äà çàïàçèòå âàøèòå
+ïðîìåíè çà ïîñòîÿííî, âúâåäåòå êîìàíäàòà
+
+        C-x C-s   Çàïàçâàíå íà ôàéëà
+
+Òîâà êîïèðà òåêñòà îò Åìàêñ âúâ ôàéëà.  Ïúðâèÿ ïúò, êîãàòî òîâà ñå
+íàïðàâè, Åìàêñ ïðåèìåíóâà íà÷àëíèÿ ôàéë ñ íîâî èìå, òàêà ÷å òîé äà íå
+ñå èçãóáè.  Íîâîòî èìå ñå ïîñòðîÿâà ñ äîáàâÿíå íà "~" â êðàÿ íà èìåòî
+íà íà÷àëíèÿ ôàéë.
+
+Êîãàòî çàïàçâàíåòî å ñâúðøèëî, Åìàêñ èçâåæäà èìåòî íà ôàéëà, êîéòî å
+áèë çàïèñàí.  Òðÿáâà äà çàïèñâàòå äîñòàòú÷íî ÷åñòî, òàêà ÷å äà íå
+èçãóáèòå ìíîãî ðàáîòà, àêî ñèñòåìàòà ñå ñðèíå ïî íÿêàêâà ïðè÷èíà.
+
+>> Âúâåäåòå C-x C-s, çàïàçâàéêè âàøåòî êîïèå îò âúâåäåíèåòî.
+   Òîâà òðÿáâà äà èçâåäå "Wrote ...TUTORIAL.bg" â äúíîòî íà åêðàíà.
+
+ÇÀÁÅËÅÆÊÀ: Íà íÿêîè ñèñòåìè âúâåæäàíåòî íà C-x C-s ùå çàìðúçè åêðàíà è
+âèå íÿìà äà âèæäàòå ïîâå÷å èçõîä îò Åìàêñ.  Òîâà ïîêàçâà, ÷å åäíà
+"ñïîñîáíîñò" íà îïåðàöèîííàòà ñèñòåìà, íàðè÷àíà "óïðàâëåíèå íà ïîòîêà"
+(flow control), å ïðèõâàíàëà C-s è íå ãî ïðîïóñêà êúì Åìàêñ.  Çà äà
+ðàçìðàçèòå åêðàíà, âúâåäåòå C-q.  Òîãàâà âèæòå ñåêöèÿòà "Ñïîíòàííî
+âêëþ÷âàíå íà ïîñòúïêîâî òúðñåíå" (Spontaneous Entry to Incremental
+Search) â ðúêîâîäñòâîòî íà Åìàêñ çà ñúâåò êàê äà ñå ñïðàâèòå ñ òàçè
+"ñïîñîáíîñò".
+
+Ìîæå äà íàìåðèòå ñúùåñòâóâàù ôàéë, äà ãî ðàçãëåäàòå è äà ãî
+ðåäàêòèðàòå.  Ìîæåòå ñúùî äà íàìåðèòå ôàéë, êîéòî íå ñúùåñòâóâà.  Òîâà
+å íà÷èíúò çà ñúçäàâàíå íà íîâè ôàéëîâå â Åìàêñ: íàìèðàòå ôàéëà, êîéòî
+ùå áúäå â íà÷àëîòî ïðàçåí, è òîãàâà çàïî÷âàòå âìúêâàíåòî íà òåêñòà çà
+ôàéëà.  Êîãàòî ãîâîðèòå çà "çàïèñâàíå" íà ôàéë, Åìàêñ âñúùíîñò ùå
+ñúçäàäå ôàéëà ñ òåêñòà, êîéòî ñòå âúâåëè.  Îòòàì íàòàòúê ìîæå äà
+ñ÷èòàòå, ÷å ðåäàêòèðàòå âå÷å ñúùåñòâóâàù ôàéë.
+
+
+* ÁÓÔÅÐÈ
 --------
 
-áËÏ ÎÁÍÅÒÉÔÅ ×ÔÏÒÉ ÆÁÊÌ Ó C-x C-f, ÐßÒ×ÉÑÔ ÆÁÊÌ ÏÓÔÁ×Á × åÍÁËÓ.
-íÏÖÅÔÅ ÄÁ ÐÒÅ×ËÌÀÞÉÔÅ ÏÂÒÁÔÎÏ ËßÍ ÎÅÇÏ ËÁÔÏ ÇÏ ÎÁÍÅÒÉÔÅ ÐÁË Ó C-x
-C-f.  ðÏ ÔÏÚÉ ÎÁÞÉÎ ÍÏÖÅ ÄÁ ÐÏÌÕÞÉÔÅ ÄÏÓÔÁ ÎÁ ÂÒÏÊ ÆÁÊÌÏ×Å × åÍÁËÓ.
+Àêî íàìåðèòå âòîðè ôàéë ñ C-x C-f, ïúðâèÿò ôàéë îñòàâà â Åìàêñ.
+Ìîæåòå äà ïðåâêëþ÷èòå îáðàòíî êúì íåãî, êàòî ãî íàìåðèòå ïàê ñ C-x
+C-f.  Ïî òîçè íà÷èí ìîæå äà ïîëó÷èòå äîñòà íà áðîé ôàéëîâå â Åìàêñ.
 
->> óßÚÄÁÊÔÅ ÆÁÊÌ Ó ÉÍÅ "foo" ×ß×ÅÖÄÁÊËÉ C-x C-f foo <Return>.
-   ÷ÍßËÎÅÔÅ ÍÁÌËÏ ÔÅËÓÔ, ÒÅÄÁËÔÉÒÁÊÔÅ ÇÏ É ÇÏ ÚÁÐÁÚÅÔÅ "foo" Ó
-   ×ß×ÅÖÄÁÎÅ ÎÁ C-x C-s.
-   îÁËÒÁÑ ×ß×ÅÄÅÔÅ C-x C-f TUTORIAL <Return> ÚÁ ÄÁ ÓÅ ×ßÒÎÅÔÅ ÏÂÒÁÔÎÏ
-   ×ß× ×ß×ÅÄÅÎÉÅÔÏ.
+>> Ñúçäàéòå ôàéë ñ èìå "foo", âúâåæäàéêè C-x C-f foo <Return>.
+   Âìúêíåòå ìàëêî òåêñò, ðåäàêòèðàéòå ãî è çàïàçåòå "foo" ñ âúâåæäàíå
+   íà C-x C-s.
+   Íàêðàÿ âúâåäåòå C-x C-f TUTORIAL.bg <Return>, çà äà ñå âúðíåòå
+   îáðàòíî âúâ âúâåäåíèåòî.
 
-åÍÁËÓ ÚÁÐÁÚ×Á ÔÅËÓÔÁ ÎÁ ×ÓÅËÉ ÆÁÊÌ × ÏÂÅËÔ ÎÁÒÉÞÁÎ "ÂÕÆÅÒ".
-îÁÍÉÒÁÎÅÔÏ ÎÁ ÆÁÊÌ ÐÒÁ×É ÎÏ× ÂÕÆÅÒ × åÍÁËÓ.  úÁ ÄÁ ×ÉÄÉÔÅ ÓÐÉÓßË ÎÁ
-ÂÕÆÅÒÉÔÅ, ËÏÉÔÏ × ÍÏÍÅÎÔÁ ÓßÝÅÓÔ×Õ×ÁÔ ×ß× ×ÁÛÉÑ åÍÁËÓ, ×ß×ÅÄÅÔÅ
+Åìàêñ çàïàçâà òåêñòà íà âñåêè ôàéë â îáåêò, íàðè÷àí "áóôåð".
+Íàìèðàíåòî íà ôàéë ïðàâè íîâ áóôåð â Åìàêñ.  Çà äà âèäèòå ñïèñúê íà
+áóôåðèòå, êîèòî â ìîìåíòà ñúùåñòâóâàò âúâ âàøèÿ Åìàêñ, âúâåäåòå
 
-        C-x C-b   ðÏËÁÚ×ÁÎÅ ÎÁ ÂÕÆÅÒÉÔÅ
+        C-x C-b   Ïîêàçâàíå íà áóôåðèòå
 
->> ïÐÉÔÁÊÔÅ C-x C-b ÓÅÇÁ.
+>> Îïèòàéòå C-x C-b ñåãà.
 
-÷ÉÖÔÅ ËÁË ×ÓÅËÉ ÂÕÆÅÒ ÉÍÁ ÉÍÅ, Á ÐÏÎÑËÏÇÁ É ÉÍÅ ÎÁ ÆÁÊÌ ÚÁ ÆÁÊÌÁ,
-ÞÉÅÔÏ ÓßÄßÒÖÁÎÉÅ ÄßÒÖÉ.  ÷óåëé ÔÅËÓÔ, ËÏÊÔÏ ×ÉÖÄÁÔÅ × åÍÁËÓ ÐÒÏÚÏÒÅÃ,
-Å ×ÉÎÁÇÉ ÞÁÓÔ ÏÔ ÎÑËÁËß× ÂÕÆÅÒ.
+Âèæòå êàê âñåêè áóôåð èìà èìå, à ïîíÿêîãà è èìå íà ôàéë çà ôàéëà,
+÷èåòî ñúäúðæàíèå äúðæè.  ÂÑÅÊÈ òåêñò, êîéòî âèæäàòå â Åìàêñ ïðîçîðåö,
+å âèíàãè ÷àñò îò íÿêàêúâ áóôåð.
 
->> ÷ß×ÅÄÅÔÅ C-x 1 ÚÁ ÄÁ ÍÁÈÎÅÔÅ ÓÐÉÓßËÁ Ó ÂÕÆÅÒÉÔÅ.
+>> Âúâåäåòå C-x 1, çà äà ìàõíåòå ñïèñúêà ñ áóôåðèòå.
 
-ëÏÇÁÔÏ ÉÍÁÔÅ ÎÑËÏÌËÏ ÂÕÆÅÒÁ, ÓÁÍÏ ÅÄÉÎ ÏÔ ÔÑÈ Å "ÔÅËÕÝ" × ÄÁÄÅÎ ÍÏÍÅÎÔ
-ÏÔ ×ÒÅÍÅ.  ôÏ×Á Å ÂÕÆÅÒßÔ, ËÏÊÔÏ ÒÅÄÁËÔÉÒÁÔÅ.  áËÏ ÉÓËÁÔÅ ÄÁ
-ÒÅÄÁËÔÉÒÁÔÅ ÄÒÕÇ ÂÕÆÅÒ ÓÅ ÎÕÖÄÁÅÔÅ ÏÔ "ÐÒÅ×ËÌÀÞ×ÁÎÅ" ËßÍ ÎÅÇÏ.  áËÏ
-ÉÓËÁÔÅ ÄÁ ÓÅ ÐÒÅ×ËÌÀÞÉÔÅ ËßÍ ÂÕÆÅÒ, ËÏÊÔÏ ÓßÏÔ×ÅÔÓÔ×Á ÎÁ ÆÁÊÌ, ÍÏÖÅÔÅ
-ÄÁ ÇÏ ÎÁÐÒÁ×ÉÔÅ ËÁÔÏ ÐÒÏÓÔÏ ÐÏÓÅÔÉÔÅ ÆÁÊÌÁ ÏÔÎÏ×Ï Ó C-x C-f.  îÏ ÉÍÁ É
-ÐÏ-ÌÅÓÅÎ ÎÁÞÉÎ: ÉÚÐÏÌÚ×ÁÎÅÔÏ ÎÁ ËÏÍÁÎÄÁÔÁ C-x b.  ÷ ÔÁÚÉ ËÏÍÁÎÄÁ
-ÔÒÑÂ×Á ÄÁ ×ß×ÅÄÅÔÅ ÉÍÅÔÏ ÎÁ ÂÕÆÅÒÁ.
+Êîãàòî èìàòå íÿêîëêî áóôåðà, ñàìî åäèí îò òÿõ å "òåêóù" â äàäåí ìîìåíò
+îò âðåìå.  Òîâà å áóôåðúò, êîéòî ðåäàêòèðàòå.  Àêî èñêàòå äà
+ðåäàêòèðàòå äðóã áóôåð, ñå íóæäàåòå îò "ïðåâêëþ÷âàíå" êúì íåãî.  Àêî
+èñêàòå äà ñå ïðåâêëþ÷èòå êúì áóôåð, êîéòî ñúîòâåòñòâà íà ôàéë, ìîæåòå
+äà ãî íàïðàâèòå, êàòî ïðîñòî ïîñåòèòå ôàéëà îòíîâî ñ C-x C-f.  Íî èìà
+è ïî-ëåñåí íà÷èí: èçïîëçâàíåòî íà êîìàíäàòà C-x b.   òàçè êîìàíäà
+òðÿáâà äà âúâåäåòå èìåòî íà áóôåðà.
 
->> ÷ß×ÅÄÅÔÅ C-x b foo <Return> ÚÁ ÄÁ ÓÅ ×ßÒÎÅÔÅ ËßÍ ÂÕÆÅÒÁ "foo",
-   ËÏÊÔÏ ÄßÒÖÉ ÔÅËÓÔÁ ÎÁ ÆÁÊÌÁ "foo".  ôÏÇÁ×Á ×ß×ÅÄÅÔÅ C-x b TUTORIAL
-   <Return> ÚÁ ÄÁ ÓÅ ×ßÒÎÅÔÅ × ÔÏ×Á ×ß×ÅÄÅÎÉÅ.
+>> Âúâåäåòå C-x b foo <Return>, çà äà ñå âúðíåòå êúì áóôåðà "foo",
+   êîéòî äúðæè òåêñòà íà ôàéëà "foo".  Òîãàâà âúâåäåòå C-x b TUTORIAL
+   <Return>, çà äà ñå âúðíåòå â òîâà âúâåäåíèå.
 
-÷ ÐÏ×ÅÞÅÔÏ ÓÌÕÞÁÉ ÉÍÅÔÏ ÎÁ ÂÕÆÅÒÁ Å ÓßÝÏÔÏ ËÁÔÏ ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ (ÂÅÚ
-ÞÁÓÔÔÁ × ËÏÑ ÄÉÒÅËÔÏÒÉÑ ÓÅ ÎÁÍÉÒÁ).  ïÂÁÞÅ ÔÏ×Á ÎÅ ×ÉÎÁÇÉ Å ×ÑÒÎÏ.
-óÐÉÓßËßÔ Ó ÂÕÆÅÒÉÔÅ, ËÏÊÔÏ ÐÒÁ×ÉÔÅ Ó C-x C-b, ×ÉÎÁÇÉ ×É ÐÏËÁÚ×Á ÉÍÅÔÏ
-ÎÁ ×ÓÅËÉ ÂÕÆÅÒ.
+ ïîâå÷åòî ñëó÷àè èìåòî íà áóôåðà å ñúùîòî êàòî èìåòî íà ôàéëà (áåç
+÷àñòòà â êîÿ äèðåêòîðèÿ ñå íàìèðà).  Îáà÷å òîâà íå âèíàãè å âÿðíî.
+Ñïèñúêúò ñ áóôåðèòå, êîéòî ïðàâèòå ñ C-x C-b, âèíàãè âè ïîêàçâà èìåòî
+íà âñåêè áóôåð.
 
-÷óåëé ÔÅËÓÔ, ËÏÊÔÏ ×ÉÖÄÁÔÅ × åÍÁËÓ ÐÒÏÚÏÒÅÃ, Å ×ÉÎÁÇÉ ÞÁÓÔ ÏÔ ÎÑËÁËß×
-ÂÕÆÅÒ.  îÑËÏÉ ÂÕÆÅÒÉ ÎÅ ÓßÏÔ×ÅÔÓÔ×ÁÔ ÎÁ ÆÁÊÌÏ×Å.  îÁÐÒÉÍÅÒ, ÂÕÆÅÒßÔ
-ÉÍÅÎÕ×ÁÎ "*Buffer List*" ÎÅ ÓßÏÔ×ÅÔÓÔ×Á ÎÁ ÆÁÊÌ.  ôÏ×Á Å ÂÕÆÅÒßÔ,
-ËÏÊÔÏ ÓßÄßÒÖÁ ÓÐÉÓßËÁ Ó ÂÕÆÅÒÉÔÅ, ËÏÉÔÏ ÓÔÅ ÎÁÐÒÁ×ÉÌÉ Ó C-x C-b.
-âÕÆÅÒßÔ ÉÍÅÎÕ×ÁÎ "*Messages*" ÓßÝÏ ÎÅ ÓßÏÔ×ÅÔÓÔ×Á ÎÁ ÆÁÊÌ; ÔÏÊ ÓßÄßÒÖÁ
-ÓßÏÂÝÅÎÉÑÔÁ, ËÏÉÔÏ ÓÅ ÐÏÑ×Á×ÁÔ × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ ÐÏ ×ÒÅÍÅ ÎÁ åÍÁËÓ
-ÓÅÓÉÑÔÁ.
+ÂÑÅÊÈ òåêñò, êîéòî âèæäàòå â Åìàêñ ïðîçîðåö, å âèíàãè ÷àñò îò íÿêàêúâ
+áóôåð.  Íÿêîè áóôåðè íå ñúîòâåòñòâàò íà ôàéëîâå.  Íàïðèìåð áóôåðúò,
+èìåíóâàí "*Buffer List*", íå ñúîòâåòñòâà íà ôàéë.  Òîâà å áóôåðúò,
+êîéòî ñúäúðæà ñïèñúêà ñ áóôåðèòå, êîèòî ñòå íàïðàâèëè ñ C-x C-b.
+Áóôåðúò, èìåíóâàí "*Messages*", ñúùî íå ñúîòâåòñòâà íà ôàéë; òîé
+ñúäúðæà ñúîáùåíèÿòà, êîèòî ñå ïîÿâÿâàò â äúíîòî íà åêðàíà ïî âðåìå íà
+Åìàêñ ñåñèÿòà.
 
->> ÷ß×ÅÄÅÔÅ C-x b *Messages* <Return> ÚÁ ÄÁ ×ÉÄÉÔÅ ÂÕÆÅÒÁ ÓßÓ
-   ÓßÏÂÝÅÎÉÑÔÁ.  óÌÅÄ ÔÏ×Á ×ß×ÅÄÅÔÅ C-x C-b TUTORIAL <Return> ÚÁ ÄÁ ÓÅ
-   ×ßÒÎÅÔÅ ËßÍ ÔÏ×Á ×ß×ÅÄÅÎÉÅ.
+>> Âúâåäåòå C-x b *Messages* <Return>, çà äà âèäèòå áóôåðà ñúñ
+   ñúîáùåíèÿòà.  Ñëåä òîâà âúâåäåòå C-x C-b TUTORIAL <Return>, çà äà
+   ñå âúðíåòå êúì òîâà âúâåäåíèå.
 
-áËÏ ÎÁÐÒÁ×ÉÔÅ ÐÒÏÍÅÎÉ × ÔÅËÓÔÁ ÎÁ ÅÄÉÎ ÆÁÊÌ, É ÔÏÇÁ×Á ÎÁÍÅÒÉÔÅ ÄÒÕÇ
-ÆÁÊÌ, ÔÏ×Á ÎÑÍÁ ÄÁ ÚÁÐÉÛÅ ÐßÒ×ÉÑ ÆÁÊÌ.  îÅÇÏ×ÉÔÅ ÐÒÏÍÅÎÉ ÏÓÔÁ×ÁÔ ×ßÔÒÅ
-× åÍÁËÓ, × ÂÕÆÅÒÁ ÎÁ ÆÁÊÌÁ.  óßÚÄÁ×ÁÎÅÔÏ ÉÌÉ ÒÅÄÁËÔÉÒÁÎÅÔÏ ÎÁ ÂÕÆÅÒÁ
-ÎÁ ×ÔÏÒÉÑ ÆÁÊÌ ÎÑÍÁ ÅÆÅËÔ ×ßÒÈÕ ÂÕÆÅÒÁ ÎÁ ÐßÒ×ÉÑ ÆÁÊÌ.  ôÏ×Á Å ÍÎÏÇÏ
-ÐÏÌÅÚÎÏ, ÎÏ ÓßÝÏ ÏÚÎÁÞÁ×Á, ÞÅ ÓÅ ÎÕÖÄÁÅÔÅ ÏÔ ÕÄÏÂÅÎ ÎÁÞÉÎ ÄÁ ÚÁÐÁÚÉÔÅ
-ÂÕÆÅÒÁ ÎÁ ÐßÒ×ÉÑ ÆÁÊÌ.  ýÅ Å ÎÅÕÄÏÂÎÏ ÄÁ ÐÒÅ×ËÌÀÞÉÔÅ ÏÂÒÁÔÎÏ Ó C-x C-f
-ÚÁ ÄÁ ÇÏ ÚÁÐÁÚÉÔÅ Ó C-x C-s.  ôÁËÁ ÞÅ ÉÍÁÍÅ
+Àêî íàïðàâèòå ïðîìåíè â òåêñòà íà åäèí ôàéë è òîãàâà íàìåðèòå äðóã
+ôàéë, òîâà íÿìà äà çàïèøå ïúðâèÿ ôàéë.  Íåãîâèòå ïðîìåíè îñòàâàò âúòðå
+â Åìàêñ, â áóôåðà íà ôàéëà.  Ñúçäàâàíåòî èëè ðåäàêòèðàíåòî íà áóôåðà
+íà âòîðèÿ ôàéë íÿìà åôåêò âúðõó áóôåðà íà ïúðâèÿ ôàéë.  Òîâà å ìíîãî
+ïîëåçíî, íî ñúùî îçíà÷àâà, ÷å ñå íóæäàåòå îò óäîáåí íà÷èí äà çàïàçèòå
+áóôåðà íà ïúðâèÿ ôàéë.  Ùå å íåóäîáíî äà ïðåâêëþ÷èòå îáðàòíî ñ C-x
+C-f, çà äà ãî çàïàçèòå ñ C-x C-s.  Òàêà ÷å èìàìå
 
-        C-x s     úÁÐÁÚ×Á ÎÑËÏÉ ÂÕÆÅÒÉ
+        C-x s     Çàïàçâà íÿêîè áóôåðè
 
-C-x s ÐÉÔÁ ÚÁ ×ÓÅËÉ ÂÕÆÅÒ, ËÏÊÔÏ ÓßÄßÒÖÁ ÐÒÏÍÅÎÉ, ËÏÉÔÏ ÎÅ ÓÔÅ
-ÚÁÐÁÚÉÌÉ.  ÷ßÐÒÏÓßÔ ÚÁ ×ÓÅËÉ ÔÁËß× ÂÕÆÅÒ Å ÄÁÌÉ ÄÁ ÂßÄÅ ÚÁÐÁÚÅÎ.
+C-x s ïèòà çà âñåêè áóôåð, êîéòî ñúäúðæà ïðîìåíè, êîèòî íå ñòå
+çàïàçèëè.  Âúïðîñúò çà âñåêè òàêúâ áóôåð å äàëè äà áúäå çàïàçåí.
 
->> ÷ÍßËÎÅÔÅ ÒÅÄ × ÔÅËÓÔÁ, ÓÌÅÄ ÔÏ×Á ×ß×ÅÄÅÔÅ C-x s.
-   ôÒÑÂ×Á ÄÁ ÂßÄÅÔÅ ÐÏÐÉÔÁÎ ÄÁÌÉ ÄÁ ÚÁÐÁÚÉÔÅ ÂÕÆÅÒÁ ÉÍÅÎÕ×ÁÎ TUTORIAL.
-   ïÔÇÏ×ÏÒÅÔÅ Ó ÄÁ ÎÁ ×ßÐÒÏÓÁ ËÁÔÏ ×ß×ÅÄÅÔÅ "y".
+>> Âìúêíåòå ðåä â òåêñòà, ñëåä òîâà âúâåäåòå C-x s.
+   Òðÿáâà äà áúäåòå ïîïèòàí äàëè äà çàïàçèòå áóôåðà, èìåíóâàí "TUTORIAL".
+   Îòãîâîðåòå ñ "äà" íà âúïðîñà, êàòî âúâåäåòå "y".
 
 
-* òáúûéòñ÷áîå îá îáâïòá ëïíáîäé
+* ÐÀÇØÈÐßÂÀÍÅ ÍÀ ÍÀÁÎÐÀ ÊÎÌÀÍÄÈ
 -------------------------------
 
-éÍÁ ÍÎÏÇÏ, ÍÎÏÇÏ ÐÏ×ÅÞÅ ËÏÍÁÎÄÉ ÎÁ åÍÁËÓ, ÏÔËÏÌËÏÔÏ ÍÏÇÁÔ ÄÁ ÓÅ ÓÌÏÖÁÔ
-ÍÁ ×ÓÉÞËÉ ËÏÎÔÒÏÌÎÉ É ÍÅÔÁ ÚÎÁÃÉ.  åÍÁËÓ ÚÁÏÂÉËÁÌÑ ÔÏ×Á Ó X (eXtended)
-ËÏÍÁÎÄÁÔÁ.  ôÏ×Á ÓÔÁ×Á ÐÏ Ä×Á ÎÁÞÉÎÁ:
-
-        C-x     úÎÁËÏ×Ï ÒÁÚÛÉÒÑ×ÁÎÅ.  ðÏÓÌÅÄ×ÁÎÏ ÏÔ ÅÄÉÎ ÚÎÁË.
-        M-x     òÁÚÛÉÒÑ×ÁÎÅ Ó ÉÍÅÎÕ×ÁÎÁ ËÏÍÁÎÄÁ.  ðÏÓÌÅÄ×ÁÎÏ ÏÔ ÄßÌÇÏ
-                ÉÍÅ.
-
-ôÅÚÉ ËÏÍÁÎÄÉ ÓÁ ÏÂÝÏ ×ÚÅÔÏ ÐÏÌÅÚÎÉ, ÎÏ ÐÏ-ÍÁÌËÏ ÏÔËÏÌËÏÔÏ ËÏÍÁÎÄÉÔÅ,
-ËÏÉÔÏ ÄÏÓÅÇÁ ÓÔÅ ÎÁÕÞÉÌÉ.  ÷ÅÞÅ ×ÉÄÑÈÔÅ Ä×Å ÏÔ ÔÑÈ: ËÏÍÁÎÄÉÔÅ ×ßÒÈÕ
-ÆÁÊÌÏ×Å C-x C-f ÚÁ ÎÁÍÉÒÁÎÅ (Find) É C-x C-s ÚÁ ÚÁÐÁÚ×ÁÎÅ (Save).
-äÒÕÇ ÐÒÉÍÅÒ Å ËÏÍÁÎÄÁÔÁ ÚÁ ËÒÁÊ ÎÁ åÍÁËÓ ÓÅÓÉÑÔÁ -- ÔÏ×Á Å ËÏÍÁÎÄÁÔÁ
-C-x C-c.  (îÅ ÓÅ ÂÅÚÐÏËÏÊÔÅ, ÞÅ ÍÏÖÅ ÄÁ ÉÚÇÕÂÉÔÅ ×ÓÉÞËÉ ÐÒÏÍÅÎÉ, ËÏÉÔÏ
-ÓÔÅ ÎÁÐÒÁ×ÉÌÉ; C-x C-c ÐÒÅÄÌÁÇÁ ÄÁ ÚÁÐÁÚÉ ×ÓÅËÉ ÐÒÏÍÅÎÅÎ ÆÁÊÌ ÐÒÅÄÉ ÄÁ
-ÐÒÅÍÁÈÎÅ åÍÁËÓ.)
-
-C-z Å ËÏÍÁÎÄÁÔÁ ÚÁ ÉÚÌÉÚÁÎÅ ÏÔ åÍÁËÓ *×ÒÅÍÅÎÎÏ* -- ÔÁËÁ ÞÅ ÄÁ ÍÏÖÅÔÅ
-ÄÁ ÓÅ ×ßÒÎÅÔÅ ËßÍ ÓßÝÁÔÁ åÍÁËÓ ÓÅÓÉÑ ÐÏ-ËßÓÎÏ.
-
-îÁ ÓÉÓÔÅÍÉ, ËÏÉÔÏ ÐÏÚ×ÏÌÑ×ÁÔ ÔÏ×Á, C-z "ÉÚÏÓÔÁ×Ñ" (suspend) åÍÁËÓ,
-Ô.Å. ×ÒßÝÁ ËßÍ ÏÂ×É×ËÁÔÁ, ÎÏ ÎÅ ÒÁÚÒÕÛÁ×Á åÍÁËÓ.  ÷ ÐÏ×ÅÞÅÔÏ ÏÂ×É×ËÉ
-ÍÏÖÅÔÅ ÄÁ ÐÒÏÄßÌÖÉÔÅ åÍÁËÓ ÓÅÓÉÑÔÁ Ó ËÏÍÁÎÄÁÔÁ `fg' ÉÌÉ Ó `%emacs'.
-
-îÁ ÓÉÓÔÅÍÉ, ËÏÉÔÏ ÎÅ ÐÏÚ×ÏÌÑ×ÁÔ ÉÚÏÓÔÁ×ÑÎÅ, C-z ÓßÚÄÁ×Á ÎÏ×Á
-ÐÏÄÏÂ×É×ËÁ, ËÏÑÔÏ ×ßÒ×É ÐÏÄ åÍÁËÓ, ÚÁ ÄÁ ×É ÄÁÄÅ ÛÁÎÓ ÄÁ ÓÔÁÒÔÉÒÁÔÅ
-ÄÒÕÇÉ ÐÒÏÇÒÁÍÉ É ÄÁ ÓÅ ×ßÒÎÅÔÅ ËßÍ åÍÁËÓ ÓÌÅÄ ÔÏ×Á; ÔÏ×Á ÎÅ Å ÉÓÔÉÎÓËÏ
-"ÉÚÌÉÚÁÎÅ" ÏÔ åÍÁËÓ.  ÷ ÔÏÚÉ ÓÌÕÞÁÊ ËÏÍÁÎÄÁÔÁ ÎÁ ÏÂ×É×ËÁÔÁ `exit' Å
-ÏÂÉËÎÏ×ÅÎÉÑÔ ÎÁÞÉÎ ÄÁ ÓÅ ×ßÒÎÅÔÅ ÏÂÒÁÔÎÏ ËßÍ åÍÁËÓ ÏÔ ÐÏÄÏÂ×É×ËÁÔÁ.
-
-íÏÍÅÎÔßÔ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ C-x C-c Å, ËÏÇÁÔÏ ÉÓËÁÔÅ ÄÁ ÉÚÌÅÚÅÔÅ ÏÔ
-ÓÉÓÔÅÍÁÔÁ.  ôÏ×Á Å É ÐÒÁ×ÉÌÎÁÔÁ ËÏÍÁÎÄÁ ÚÁ ÉÚÌÉÚÁÎÅ, ËÏÇÁÔÏ åÍÁËÓ Å
-ÉÚ×ÉËÁÎ ÏÔ ÐÏÝÅÎÓËÁ ÐÒÏÇÒÁÍÁ ÉÌÉ ÄÒÕÇÉ ÓÔÒÁÎÉÞÎÉ ÐÒÏÇÒÁÍÉ, ÔßÊ ËÁÔÏ ÔÅ
-ÍÏÖÅ É ÄÁ ÎÅ ÚÎÁÑÔ ËÁË ÄÁ ÓÅ ÓÐÒÁ×ÑÔ Ó ÉÚÏÓÔÁ×ÑÎÅÔÏ ÎÁ åÍÁËÓ.  ðÒÉ
-ÏÂÉËÎÏ×ÅÎÉ ÏÂÓÔÏÑÔÅÌÓÔ×Á, ÏÂÁÞÅ, ÁËÏ ÎÅ ÓÔÅ ÔÒßÇÎÁÌÉ ÄÁ ÉÚÌÉÚÁÔÅ ÏÔ
-ÓÉÓÔÅÍÁÔÁ, ÐÏ-ÄÏÂÒÅ Å ÄÁ ÉÚÏÓÔÁ×ÉÔÅ åÍÁËÓ Ó C-z ×ÍÅÓÔÏ ÄÁ ÉÚÌÉÚÁÔÅ ÏÔ
-åÍÁËÓ.
-
-éÍÁ ÍÎÏÇÏ ËÏÍÁÎÄÉ C-x.  åÔÏ ÓÐÉÓßË ÎÁ ÔÅÚÉ, ËÏÉÔÏ ÓÔÅ ÎÁÕÞÉÌÉ:
-
-        C-x C-f         îÁÍÉÒÁÎÅ ÎÁ ÆÁÊÌ.
-        C-x C-s         úÁÐÁÚ×ÁÎÅ ÎÁ ÆÁÊÌ.
-        C-x C-b         óÐÉÓßË ÎÁ ÂÕÆÅÒÉÔÅ.
-        C-x C-c         éÚÌÉÚÁÎÅ ÏÔ åÍÁËÓ.
-        C-x 1           éÚÔÒÉ×ÁÎÅ ÎÁ ×ÓÉÞËÉ ÐÒÏÚÏÒÃÉ ÏÓ×ÅÎ ÅÄÉÎ.
-        C-x u           ïÔÍÑÎÁ.
-
-éÍÅÎÕ×ÁÎÉÔÅ ÒÁÚÛÉÒÅÎÉ ËÏÍÁÎÄÉ ÓÁ ËÏÍÁÎÄÉ, ËÏÉÔÏ ÓÅ ÉÚÐÏÌÚ×ÁÔ ÄÁÖÅ ÏÝÅ
-ÐÏ-ÒÑÄËÏ, ÉÌÉ ËÏÍÁÎÄÉ, ËÏÉÔÏ ÓÅ ÉÚÐÏÌÚ×ÁÔ ÓÁÍÏ × ÏÐÒÅÄÅÌÅÎÉ ÒÅÖÉÍÉ.
-ðÒÉÍÅÒ Å ËÏÍÁÎÄÁÔÁ replace-string, ËÏÑÔÏ ÚÁÍÅÎÑ ÇÌÏÂÁÌÎÏ ÅÄÉÎ ÎÉÚ Ó
-ÄÒÕÇ.  ëÏÇÁÔÏ ×ß×ÅÄÅÔÅ M-x, åÍÁËÓ ×É ÐÏÄÓËÁÚ×Á × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ Ó
-M-x É ×ÉÅ ÔÒÑÂ×Á ÄÁ ×ß×ÅÄÅÔÅ ÉÍÅÔÏ ÎÁ ËÏÍÁÎÄÁÔÁ, × ÔÏÚÉ ÓÌÕÞÁÊ
-"replace-string".  ðÒÏÓÔÏ ×ß×ÅÄÅÔÅ "repl s<TAB>" É åÍÁËÓ ÝÅ ÚÁ×ßÒÛÉ
-ÉÍÅÔÏ.  (<TAB> Å ËÌÁ×ÉÛßÔ Tab, ÏÂÉËÎÏ×ÅÎÏ ÎÁÍÉÒÁÝ ÓÅ ÎÁÄ ËÌÁ×ÉÛÁ
-CapsLock ÉÌÉ ËÌÁ×ÉÛÁ Shift ÂÌÉÚÏ ÄÏ ÌÅ×ÉÑ ËÒÁÊ ÎÁ ËÌÁ×ÉÁÔÕÒÁÔÁ.)
-úÁ×ßÒÛÅÔÅ ÉÍÅÔÏ ÎÁ ËÏÍÁÎÄÁÔÁ Ó <Return>.
-
-ëÏÍÁÎÄÁÔÁ replace-string ÉÚÉÓË×Á Ä×Á ÁÒÇÕÍÅÎÔÁ -- ÎÉÚßÔ, ËÏÊÔÏ ÝÅ ÂßÄÅ
-ÚÁÍÅÎÑÎ, É ÎÉÚßÔ, ËÏÊÔÏ ÝÅ ÇÏ ÚÁÍÅÎÉ.  ôÒÑÂ×Á ÄÁ ÚÁ×ßÒÛÉÔÅ ×ß×ÅÖÄÁÎÅÔÏ
-ÎÁ ×ÓÅËÉ ÁÒÇÕÍÅÎÔ Ó <Return>.
-
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÐÒÁÚÎÉÑ ÒÅÄ Ä×Á ÒÅÄÁ ÎÁÄÏÌÕ ÐÏÄ ÔÏÚÉ.
-   ôÏÇÁ×Á ×ß×ÅÄÅÔÅ M-x repl s<Return>ÐÒÏÍÅÎÑ<Return><Return>
-
-   úÁÂÅÌÅÖÅÔÅ ËÁË ÔÏÚÉ ÒÅÄ ÓÅ ÐÒÏÍÅÎÑ: ×ÉÅ ÚÁÍÅÎÉÈÔÅ ÄÕÍÁÔÁ
-   Ð-Ò-Ï-Í-Å-Î-Ñ Ó "ÉÚÍÅÎÑ", ËßÄÅÔÏ É ÄÁ ÓÅ ÎÁÍÉÒÁ ÓÌÅÄ ÎÁÞÁÌÎÏÔÏ
-   ÍÑÓÔÏ ÎÁ ËÕÒÓÏÒÁ.
-
-úáâåìåöëá: ðÒÅ×ËÌÀÞ×ÁÎÅÔÏ ËßÍ ×ß×ÅÖÄÁÎÅ ÎÁ ËÉÒÉÌÓËÉ ÂÕË×Á ÓÔÁ×Á Ó C-\.
-
-
-* á÷ôïíáôéþîï úáðáú÷áîå
+Èìà ìíîãî, ìíîãî ïîâå÷å êîìàíäè íà Åìàêñ, îòêîëêîòî ìîãàò äà ñå ñëîæàò
+íà âñè÷êè êîíòðîëíè è ìåòà çíàöè.  Åìàêñ çàîáèêàëÿ òîâà ñ X (eXtended)
+êîìàíäàòà.  Òîâà ñòàâà ïî äâà íà÷èíà:
+
+        C-x     Çíàêîâî ðàçøèðÿâàíå.  Ïîñëåäâàíî îò åäèí çíàê.
+        M-x     Ðàçøèðÿâàíå ñ èìåíóâàíà êîìàíäà.  Ïîñëåäâàíî îò äúëãî
+                èìå.
+
+Òåçè êîìàíäè ñà îáùî âçåòî ïîëåçíè, íî ïî-ìàëêî, îòêîëêîòî êîìàíäèòå,
+êîèòî äîñåãà ñòå íàó÷èëè.  Âå÷å âèäÿõòå äâå îò òÿõ: êîìàíäèòå âúðõó
+ôàéëîâå C-x C-f çà íàìèðàíå (Find) è C-x C-s çà çàïàçâàíå (Save).
+Äðóã ïðèìåð å êîìàíäàòà çà êðàé íà Åìàêñ ñåñèÿòà -- òîâà å êîìàíäàòà
+C-x C-c.  (Íå ñå áåçïîêîéòå, ÷å ìîæå äà èçãóáèòå âñè÷êè ïðîìåíè, êîèòî
+ñòå íàïðàâèëè; C-x C-c ïðåäëàãà äà çàïàçè âñåêè ïðîìåíåí ôàéë, ïðåäè
+äà ïðåìàõíå Åìàêñ.)
+
+C-z å êîìàíäàòà çà èçëèçàíå îò Åìàêñ *âðåìåííî* -- òàêà ÷å äà ìîæåòå
+äà ñå âúðíåòå êúì ñúùàòà Åìàêñ ñåñèÿ ïî-êúñíî.
+
+Íà ñèñòåìè, êîèòî ïîçâîëÿâàò òîâà, C-z "èçîñòàâÿ" (suspend) Åìàêñ,
+ò.å. âðúùà êúì îáâèâêàòà, íî íå ðàçðóøàâà Åìàêñ.   ïîâå÷åòî îáâèâêè
+ìîæåòå äà ïðîäúëæèòå Åìàêñ ñåñèÿòà ñ êîìàíäàòà "fg" èëè ñ "%emacs".
+
+Íà ñèñòåìè, êîèòî íå ïîçâîëÿâàò èçîñòàâÿíå, C-z ñúçäàâà íîâà
+ïîäîáâèâêà, êîÿòî âúðâè ïîä Åìàêñ, çà äà âè äàäå øàíñ äà ñòàðòèðàòå
+äðóãè ïðîãðàìè è äà ñå âúðíåòå êúì Åìàêñ ñëåä òîâà; òîâà íå å èñòèíñêî
+"èçëèçàíå" îò Åìàêñ.   òîçè ñëó÷àé êîìàíäàòà íà îáâèâêàòà "exit" å
+îáèêíîâåíèÿò íà÷èí äà ñå âúðíåòå îáðàòíî êúì Åìàêñ îò ïîäîáâèâêàòà.
+
+Ìîìåíòúò äà èçïîëçâàòå C-x C-c å, êîãàòî èñêàòå äà èçëåçåòå îò
+ñèñòåìàòà.  Òîâà å è ïðàâèëíàòà êîìàíäà çà èçëèçàíå, êîãàòî Åìàêñ å
+èçâèêàí îò ïîùåíñêà ïðîãðàìà èëè äðóãè ñòðàíè÷íè ïðîãðàìè, òúé êàòî òå
+ìîæå è äà íå çíàÿò êàê äà ñå ñïðàâÿò ñ èçîñòàâÿíåòî íà Åìàêñ.  Ïðè
+îáèêíîâåíè îáñòîÿòåëñòâà, îáà÷å, àêî íå ñòå òðúãíàëè äà èçëèçàòå îò
+ñèñòåìàòà, ïî-äîáðå å äà èçîñòàâèòå Åìàêñ ñ C-z, âìåñòî äà èçëèçàòå îò
+Åìàêñ.
+
+Èìà ìíîãî êîìàíäè C-x.  Åòî ñïèñúê íà òåçè, êîèòî ñòå íàó÷èëè:
+
+        C-x C-f         Íàìèðàíå íà ôàéë.
+        C-x C-s         Çàïàçâàíå íà ôàéë.
+        C-x C-b         Ñïèñúê íà áóôåðèòå.
+        C-x C-c         Èçëèçàíå îò Åìàêñ.
+        C-x 1           Èçòðèâàíå íà âñè÷êè ïðîçîðöè îñâåí åäèí.
+        C-x u           Îòìÿíà.
+
+Èìåíóâàíèòå ðàçøèðåíè êîìàíäè ñà êîìàíäè, êîèòî ñå èçïîëçâàò äàæå îùå
+ïî-ðÿäêî, èëè êîìàíäè, êîèòî ñå èçïîëçâàò ñàìî â îïðåäåëåíè ðåæèìè.
+Ïðèìåð å êîìàíäàòà replace-string, êîÿòî çàìåíÿ ãëîáàëíî åäèí íèç ñ
+äðóã.  Êîãàòî âúâåäåòå M-x, Åìàêñ âè ïîäñêàçâà â äúíîòî íà åêðàíà ñ
+M-x è âèå òðÿáâà äà âúâåäåòå èìåòî íà êîìàíäàòà, â òîçè ñëó÷àé
+"replace-string".  Ïðîñòî âúâåäåòå "repl s<TAB>" è Åìàêñ ùå çàâúðøè
+èìåòî.  (<TAB> å êëàâèøúò Tab, îáèêíîâåíî íàìèðàù ñå íàä êëàâèøà
+CapsLock èëè êëàâèøà Shift áëèçî äî ëåâèÿ êðàé íà êëàâèàòóðàòà.)
+Çàâúðøåòå èìåòî íà êîìàíäàòà ñ <Return>.
+
+Êîìàíäàòà replace-string èçèñêâà äâà àðãóìåíòà -- íèçúò, êîéòî ùå áúäå
+çàìåíÿí, è íèçúò, êîéòî ùå ãî çàìåíè.  Òðÿáâà äà çàâúðøèòå âúâåæäàíåòî
+íà âñåêè àðãóìåíò ñ <Return>.
+
+>> Ïðèäâèæåòå êóðñîðà äî ïðàçíèÿ ðåä, äâà ðåäà íàäîëó ïîä òîçè.
+   Òîãàâà âúâåäåòå M-x repl s<Return>ïðîìåíÿ<Return>èçìåíÿ<Return>
+
+   Çàáåëåæåòå êàê òîçè ðåä ñå ïðîìåíÿ: âèå çàìåíèõòå äóìàòà
+   ï-ð-î-ì-å-í-ÿ ñ "èçìåíÿ", êúäåòî è äà ñå íàìèðà ñëåä íà÷àëíîòî
+   ìÿñòî íà êóðñîðà.
+
+ÇÀÁÅËÅÆÊÀ: Ïðåâêëþ÷âàíåòî êúì âúâåæäàíå íà êèðèëñêè áóêâà ñòàâà ñ C-\.
+
+
+* ÀÂÒÎÌÀÒÈ×ÍÎ ÇÀÏÀÇÂÀÍÅ
 -----------------------
 
-ëÏÇÁÔÏ ÓÔÅ ÎÁÐÒÁ×ÉÌÉ ÐÒÏÍÅÎÉ ×ß× ÆÁÊÌ, ÎÏ ÏÝÅ ÎÅ ÓÔÏ ÇÏ ÚÁÐÁÚÉÌÉ, ÔÅ
-ÍÏÇÁÔ ÄÁ ÂßÄÁÔ ÚÁÇÕÂÅÎÉ ÁËÏ ËÏÍÐÀÔßÒßÔ ×ÎÅÚÁÐÎÏ ÓÅ ÉÚËÌÀÞÉ.  úÁ ÄÁ ÓÅ
-ÚÁÐÁÚÉÔÅ ÏÔ ÔÁËÉ×Á ÓÉÔÕÁÃÉÉ, åÍÁËÓ ÐÅÒÉÏÄÉÞÎÏ ÚÁÐÁÚ×Á "Á×ÔÏÍÁÔÉÞÎÏ
-ÚÁÐÁÚ×ÁÎ" ÆÁÊÌ ÚÁ ×ÓÅËÉ ÆÁÊÌ, ËÏÊÔÏ ÒÅÄÁËÔÉÒÁÔÅ.  éÍÅÔÏ ÎÁ Á×ÔÏÍÁÔÉÞÎÏ
-ÚÁÐÁÚ×ÁÎÉÑ ÆÁÊÌ ÉÍÁ # × ÎÁÞÁÌÏÔÏ É × ËÒÁÑ; ÎÁÐÒÉÍÅÒ, ÁËÏ ×ÁÛÉÑÔ ÆÁÊÌ Å
-Ó ÉÍÅ "hello.c", ÉÍÅÔÏ ÎÁ ÎÅÇÏ×ÉÑ Á×ÔÏÍÁÔÉÞÎÏ ÚÁÐÁÚ×ÁÎ ÆÁÊÌ ÝÅ ÂßÄÅ
-"#hello.c#".  ëÏÇÁÔÏ ÚÁÐÁÚ×ÁÔÅ ÆÁÊÌ ÐÏ ÏÂÉËÎÏ×ÅÎÉÑ ÎÁÞÉÎ, åÍÁËÓ
-ÉÚÔÒÉ×Á ÎÅÇÏ×ÉÑ Á×ÔÏÍÁÔÉÞÎÏ ÚÁÐÉÓ×ÁÎ ÆÁÊÌ.
+Êîãàòî ñòå íàïðàâèëè ïðîìåíè âúâ ôàéë, íî îùå íå ñòå ãî çàïàçèëè, òå
+ìîãàò äà áúäàò çàãóáåíè, àêî êîìïþòúðúò âíåçàïíî ñå èçêëþ÷è.  Çà äà âè
+ïðåäïàçè îò òàêèâà ñèòóàöèè, Åìàêñ ïåðèîäè÷íî çàïàçâà "àâòîìàòè÷íî
+çàïàçâàí" ôàéë çà âñåêè ôàéë, êîéòî ðåäàêòèðàòå.  Èìåòî íà àâòîìàòè÷íî
+çàïàçâàíèÿ ôàéë èìà # â íà÷àëîòî è â êðàÿ; íàïðèìåð, àêî âàøèÿò ôàéë å
+ñ èìå "hello.c", èìåòî íà íåãîâèÿ àâòîìàòè÷íî çàïàçâàí ôàéë ùå áúäå
+"#hello.c#".  Êîãàòî çàïàçâàòå ôàéë ïî îáèêíîâåíèÿ íà÷èí, Åìàêñ
+èçòðèâà íåãîâèÿ àâòîìàòè÷íî çàïèñâàí ôàéë.
 
-áËÏ ËÏÍÐÀÔßÒßÔ ÚÁ×ÉÓÎÅ, ÍÏÖÅ ÄÁ ×ßÚÓÔÁÎÏ×ÉÔÅ ×ÁÛÁÔÁ Á×ÔÏÍÁÔÉÞÎÏ
-ÚÁÐÁÚ×ÁÎÁ ÒÅÄÁËÃÉÑ ËÁÔÏ ÎÁÍÅÒÉÔÅ ÆÁÊÌÁ ËÁËÔÏ ÏÂÉËÎÏ×ÅÎÏ (ÆÁÊÌßÔ, ËÏÊÔÏ
-ÓÔÅ ÒÅÄÁËÔÉÒÁÌÉ, ÎÅ Á×ÔÏÍÁÔÉÞÎÏ ÚÁÐÁÚ×ÁÎÉÑ) É ÓÌÅÄ ÔÏ×Á ×ß×ÅÄÅÔÅ M-x
-recover file<Return>.  ëÏÇÁÔÏ ËÏÍÁÎÄÁÔÁ ÉÚÉÓËÁ ÐÏÔ×ßÒÖÄÅÎÉÅ, ×ß×ÅÄÅÔÅ
-yes<Return> ÚÁ ÄÁ ÐÒÏÄßÌÖÉÔÅ É ÄÁ ×ßÚÓÔÁÎÏ×ÉÔÅ Á×ÔÏÍÁÔÉÞÎÏ ÚÁÐÁÚ×ÁÎÉÔÅ
-ÄÁÎÎÉ.
+Àêî êîìïþòúðúò çàâèñíå, ìîæå äà âúçñòàíîâèòå âàøàòà àâòîìàòè÷íî
+çàïàçâàíà ðåäàêöèÿ, êàòî íàìåðèòå ôàéëà êàêòî îáèêíîâåíî (ôàéëúò,
+êîéòî ñòå ðåäàêòèðàëè, íå àâòîìàòè÷íî çàïàçâàíèÿ) è ñëåä òîâà âúâåäåòå
+M-x recover file<Return>.  Êîãàòî êîìàíäàòà èçèñêà ïîòâúðæäåíèå,
+âúâåäåòå yes<Return>, çà äà ïðîäúëæèòå è äà âúçñòàíîâèòå àâòîìàòè÷íî
+çàïàçâàíèòå äàííè.
 
 
-* åèï ïâìáóôôá
+* ÅÕÎ ÎÁËÀÑÒÒÀ
 --------------
 
-áËÏ åÍÁËÓ ×ÉÄÉ, ÞÅ ×ß×ÅÖÄÁÔÅ ÍÎÏÇÏÚÎÁËÏ×É ËÏÍÁÎÄÉ ÂÁ×ÎÏ, ÝÅ ×É ÇÉ
-ÐÏËÁÖÅ × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ × ÏÂÌÁÓÔ ÎÁÒÉÞÁÎÁ "ÅÈÏ ÏÂÌÁÓÔ".  åÈÏ
-ÏÂÌÁÓÔÔÁ ÏÂÈ×ÁÝÁ ÐÏÓÌÅÄÎÉÑ ÒÅÄ ÏÔ ÅËÒÁÎÁ.
+Àêî Åìàêñ âèäè, ÷å âúâåæäàòå ìíîãîçíàêîâè êîìàíäè áàâíî, ùå âè ãè
+ïîêàæå â äúíîòî íà åêðàíà, â îáëàñò, íàðè÷àíà "åõî îáëàñò".  Åõî
+îáëàñòòà îáõâàùà ïîñëåäíèÿ ðåä îò åêðàíà.
 
 
-* òåä îá òåöéíá
----------------
+* ÐÅÄ ÍÀ ÐÅÆÈÌÀ
+----------------
 
-òÅÄßÔ ÔÏÞÎÏ ÎÁÄ ÅÈÏ ÏÂÌÁÓÔÔÁ ÓÅ ÎÁÒÉÞÁ "ÒÅÄ ÎÁ ÒÅÖÉÍÁ" (mode line).
-ôÏÊ ÐÏËÁÚ×Á ÎÅÝÏ ËÁÔÏ:
+Ðåäúò òî÷íî íàä åõî îáëàñòòà ñå íàðè÷à "ðåä íà ðåæèìà" (mode line).
+Òîé ïîêàçâà íåùî êàòî:
 
---:**  TUTORIAL          (Fundamental)--L670--58%----------------
+-R:**  TUTORIAL.bg          (Fundamental)--L670--58%----------------
 
-ôÏÚÉ ÒÅÄ ÄÁ×Á ÐÏÌÅÚÎÁ ÉÎÆÏÒÍÁÃÉÑ ÚÁ ÓßÓÔÏÑÎÉÅÔÏ ÎÁ åÍÁËÓ É ÔÅËÓÔÁ,
-ËÏÊÔÏ ÒÅÄÁËÔÉÒÁÔÅ.
+Òîçè ðåä äàâà ïîëåçíà èíôîðìàöèÿ çà ñúñòîÿíèåòî íà Åìàêñ è òåêñòà,
+êîéòî ðåäàêòèðàòå.
 
-÷ÅÞÅ ÚÎÁÅÔÅ ËÁË×Ï ÏÚÎÁÞÁ×Á ÉÍÅÔÏ ÎÁ ÆÁÊÌÁ -- ÔÏ×Á Å ÆÁÊÌßÔ, ËÏÊÔÏ ÓÔÅ
-ÎÁÍÅÒÉÌÉ.  -NN%-- ÐÏËÁÚ×Á ×ÁÛÁÔÁ ÔÅËÕÝÁ ÐÏÚÉÃÉÑ × ÔÅËÓÔÁ; ÔÏ×Á
-ÏÚÎÁÞÁ×Á, ÞÅ NN ÐÒÏÃÅÎÔÁ ÏÔ ÔÅËÓÔÁ Å ÎÁÄ ×ßÒÈÁ ÎÁ ÅËÒÁÎÁ.  áËÏ
-ÎÁÞÁÌÏÔÏ ÎÁ ÆÁÊÌÁ Å ÎÁ ÅËÒÁÎÁ, ÝÅ ÓÅ ÐÏËÁÚ×Á --Top-- (×ÒßÈ) ×ÍÅÓÔÏ
---00%--.  áËÏ ËÒÁÑ ÎÁ ÆÁÊÌÁ Å ÎÁ ÅËÒÁÎÁ, ÝÅ ÓÅ ÐÏËÁÚ×Á --Bot-- (ÄßÎÏ).
-áËÏ ÇÌÅÄÁÔÅ ÔÅËÓÔ, ËÏÊÔÏ Å ÔÏÌËÏ×Á ÍÁÌßË, ÞÅ ÓÅ ÐÏËÁÚ×Á ÉÚÃÑÌÏ ÎÁ
-ÅËÒÁÎÁ, ÒÅÄßÔ ÎÁ ÒÅÖÉÍÁ ÝÅ ÉÚ×ÅÄÅ --All--.
+Âå÷å çíàåòå êàêâî îçíà÷àâà èìåòî íà ôàéëà -- òîâà å ôàéëúò, êîéòî ñòå
+íàìåðèëè.  -NN%-- ïîêàçâà âàøàòà òåêóùà ïîçèöèÿ â òåêñòà; òîâà
+îçíà÷àâà, ÷å NN ïðîöåíòà îò òåêñòà å íàä âúðõà íà åêðàíà.  Àêî
+íà÷àëîòî íà ôàéëà å íà åêðàíà, ùå ñå ïîêàçâà --Top-- (âðúõ) âìåñòî
+--00%--.  Àêî êðàÿ íà ôàéëà å íà åêðàíà, ùå ñå ïîêàçâà --Bot-- (äúíî).
+Àêî ãëåäàòå òåêñò, êîéòî å òîëêîâà ìàëúê, ÷å ñå ïîêàçâà èçöÿëî íà
+åêðàíà, ðåäúò íà ðåæèìà ùå èçâåäå --All--.
 
-úÎÁËßÔ L É ÃÉÆÒÉÔÅ ÐÏËÁÚ×ÁÔ ÍÑÓÔÏÔÏ ÐÏ ÄÒÕÇ ÎÁÞÉÎ: ÔÏ×Á Å ÎÏÍÅÒßÔ ÎÁ
-ÔÅËÕÝÉÑ ÒÅÄ ÎÁ ÔÏÞËÁÔÁ.
+Çíàêúò L è öèôðèòå ïîêàçâàò ìÿñòîòî ïî äðóã íà÷èí: òîâà å íîìåðúò íà
+òåêóùèÿ ðåä íà òî÷êàòà.
 
-ú×ÅÚÄÉÔÅ ÂÌÉÚÏ ÄÏ ÎÁÞÁÌÏÔÏ ÏÚÎÁÞÁ×ÁÔ, ÞÅ ÓÔÅ ÎÁÐÒÁ×ÉÌÉ ÐÒÏÍÅÎÉ ×
-ÔÅËÓÔÁ.  ÷ÅÄÎÁÇÁ ÓÌÅÄ ËÁÔÏ ÐÏÓÅÔÉÔÅ ÉÌÉ ÚÁÐÁÚÉÔÅ ÆÁÊÌ ÔÁÚÉ ÞÁÓÔ ÏÔ
-ÒÅÄÁ ÎÁ ÒÅÖÉÍÁ ×ÅÞÅ ÎÅ ÐÏËÁÚ×Á Ú×ÅÚÄÉ, Á ÓÁÍÏ ÔÉÒÅÔÁ.
+Çâåçäèòå áëèçî äî íà÷àëîòî îçíà÷àâàò, ÷å ñòå íàïðàâèëè ïðîìåíè â
+òåêñòà.  Âåäíàãà ñëåä êàòî ïîñåòèòå èëè çàïàçèòå ôàéë, òàçè ÷àñò îò
+ðåäà íà ðåæèìà âå÷å íå ïîêàçâà çâåçäè, à ñàìî òèðåòà.
 
-þÁÓÔÔÁ ÏÔ ÒÅÄÁ ÎÁ ÒÅÖÉÍÁ ×ßÔÒÅ × ÓËÏÂÉÔÅ Å ÚÁ ÄÁ ×É ÐÏËÁÖÅ × ËÁËß×
-ÒÅÖÉÍ ÎÁ ÒÅÄÁËÔÉÒÁÎÅ ÓÅ ÎÁÍÉÒÁÔÅ.  ðÏÄÒÁÚÂÉÒÁÝÉÑÔ ÓÅ ÒÅÖÉÍ Å
-Fundamental (ïÓÎÏ×ÅÎ), ËÏÊÔÏ ÉÚÐÏÌÚ×ÁÔÅ × ÍÏÍÅÎÔÁ.  ôÏ×Á Å ÐÒÉÍÅÒ ÚÁ
-"ÇÌÁ×ÅÎ ÒÅÖÉÍ" (major mode).
+×àñòòà îò ðåäà íà ðåæèìà âúòðå â ñêîáèòå å, çà äà âè ïîêàæå â êàêúâ
+ðåæèì íà ðåäàêòèðàíå ñå íàìèðàòå.  Ïîäðàçáèðàùèÿò ñå ðåæèì å
+Fundamental (Îñíîâåí), êîéòî èçïîëçâàòå â ìîìåíòà.  Òîâà å ïðèìåð çà
+"ãëàâåí ðåæèì" (major mode).
 
-åÍÁËÓ ÉÍÁ ÍÎÏÇÏ ÇÌÁ×ÎÉ ÒÅÖÉÍÉ. îÑËÏÉ ÏÔ ÔÑÈ ÓÁ ÐÒÅÄ×ÉÄÅÎÉ ÚÁ
-ÒÅÄÁËÔÉÒÁÎÅ ÎÁ ÒÁÚÌÉÞÎÉ ÅÚÉÃÉ É/ÉÌÉ ×ÉÄÏ×Å ÔÅËÓÔ, ËÁÔÏ ÎÁÐÒÉÍÅÒ ÒÅÖÉÍ
-ìÉÓÐ, ÒÅÖÉÍ ôÅËÓÔ É ÄÒÕÇÉ.  ÷ß× ×ÓÅËÉ ÅÄÉÎ ÍÏÍÅÎÔ ÏÔ ×ÒÅÍÅ ÔÏÞÎÏ ÅÄÉÎ
-ÇÌÁ×ÅÎ ÒÅÖÉÍ Å ÁËÔÉ×ÅÎ É ÎÅÇÏ×ÏÔÏ ÉÍÅ ÍÏÖÅ ×ÉÎÁÇÉ ÄÁ ÂßÄÅ ÎÁÍÅÒÅÎÏ ×
-ÒÅÄÁ ÎÁ ÒÅÖÉÍÁ ÔÏÞÎÏ ËÁËÔÏ "Fundamental" ÓÅÇÁ.
+Åìàêñ èìà ìíîãî ãëàâíè ðåæèìè.  Íÿêîè îò òÿõ ñà ïðåäâèäåíè çà
+ðåäàêòèðàíå íà ðàçëè÷íè åçèöè è/èëè âèäîâå òåêñò, êàòî íàïðèìåð ðåæèì
+Ëèñï, ðåæèì Òåêñò è äðóãè.  Âúâ âñåêè åäèí ìîìåíò îò âðåìå òî÷íî åäèí
+ãëàâåí ðåæèì å àêòèâåí è íåãîâîòî èìå ìîæå âèíàãè äà áúäå íàìåðåíî â
+ðåäà íà ðåæèìà, òî÷íî êàêòî "Fundamental" ñåãà.
 
-÷ÓÅËÉ ÇÌÁ×ÅÎ ÒÅÖÉÍ ÐÒÁ×É ÎÑËÏÉ ËÏÍÁÎÄÉ ÄÁ ÓÅ ÄßÒÖÁÔ ÐÏ ÒÁÚÌÉÞÅÎ
-ÎÁÞÉÎ.  îÁÐÒÉÍÅÒ, ÉÍÁ ËÏÍÁÎÄÉ ÚÁ ÒÅÄÁËÔÉÒÁÎÅ ÎÁ ËÏÍÅÎÔÁÒÉ × ÐÒÏÇÒÁÍÉ,
-É ÔßÊ ËÁÔÏ ×ÓÅËÉ ÐÒÏÇÒÁÍÅÎ ÅÚÉË ÉÍÁ ÒÁÚÌÉÞÎÁ ÉÄÅÑ ÚÁ ÔÏ×Á ËÁË ÔÒÑÂ×Á
-ÄÁ ÉÚÇÌÅÖÄÁÔ ËÏÍÅÎÔÁÒÉÔÅ, ×ÓÅËÉ ÇÌÁ×ÅÎ ÒÅÖÉÍ ÔÒÑÂ×Á ÄÁ ×ÍßË×Á
-ËÏÍÅÎÔÁÒÉ ÐÏ ÒÁÚÌÉÞÅÎ ÎÁÞÉÎ.  ÷ÓÅËÉ ÇÌÁ×ÅÎ ÒÅÖÉÍ Å ÉÍÅ ÎÁ ÒÁÚÛÉÒÅÎÁ
-ËÏÍÁÎÄÁ, Ó ËÏÑÔÏ ÐÒÅ×ËÌÀÞ×ÁÔÅ ËßÍ ÔÏÚÉ ÒÅÖÉÍ.  îÁÐÒÉÍÅÒ, M-x
-fundamental-mode Å ËÏÍÁÎÄÁ ÚÁ ÐÒÅ×ËÌÀÞ×ÁÎÅ ËßÍ ÒÅÖÉÍ Fundamental.
+Âñåêè ãëàâåí ðåæèì ïðàâè íÿêîè êîìàíäè äà ñå äúðæàò ïî ðàçëè÷åí íà÷èí.
+Íàïðèìåð, èìà êîìàíäè çà ðåäàêòèðàíå íà êîìåíòàðè â ïðîãðàìè, è òúé
+êàòî âñåêè ïðîãðàìåí åçèê èìà ðàçëè÷íà èäåÿ çà òîâà êàê òðÿáâà äà
+èçãëåæäàò êîìåíòàðèòå, âñåêè ãëàâåí ðåæèì òðÿáâà äà âìúêâà êîìåíòàðè
+ïî ðàçëè÷åí íà÷èí.  Âñåêè ãëàâåí ðåæèì å èìå íà ðàçøèðåíà êîìàíäà, ñ
+êîÿòî ïðåâêëþ÷âàòå êúì òîçè ðåæèì.  Íàïðèìåð, M-x fundamental-mode å
+êîìàíäà çà ïðåâêëþ÷âàíå êúì ðåæèì Fundamental.
 
-ëÏÇÁÔÏ ÒÅÄÁËÔÉÒÁÔÅ ÔÅËÓÔ ÎÁ ÅÓÔÅÓÔ×ÅÎ ÅÚÉË, ËÁÔÏ ÔÏÚÉ ÆÁÊÌ,
-ÎÁÊ-×ÅÒÏÑÔÎÏ ÔÒÑÂ×Á ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ÒÅÖÉÍ ôÅËÓÔ.
+Êîãàòî ðåäàêòèðàòå òåêñò íà åñòåñòâåí åçèê, êàòî òîçè ôàéë,
+íàé-âåðîÿòíî òðÿáâà äà èçïîëçâàòå ðåæèì Òåêñò (text).
 
->> ÷ß×ÅÄÅÔÅ M-x text mode<Return>.
+>> Âúâåäåòå M-x text mode<Return>.
 
-îÅ ÓÅ ÂÅÚÐÏËÏÊÔÅ, ÎÉËÏÑ ÏÔ åÍÁËÓ ËÏÍÁÎÄÉÔÅ, ËÏÉÔÏ ÓÔÅ ÎÁÕÞÉÌÉ, ÎÑÍÁ ÄÁ
-ÓÅ ÐÒÏÍÅÎÉ ÐÏ ÎÑËÁËß× ÓßÝÅÓÔ×ÅÎ ÎÁÞÉÎ.  îÏ ÍÏÖÅ ÄÁ ÚÁÂÅÌÅÖÉÔÅ, ÞÅ M-f
-É M-b ÓÅÇÁ ×ßÚÐÒÉÅÍÁÔ ÁÐÏÓÔÒÏÆÉÔÅ (') ËÁÔÏ ÞÁÓÔ ÏÔ ÄÕÍÉÔÅ.  ðÒÅÄÉ
-ÔÏ×Á, × ÏÓÎÏ×ÎÉÑ ÒÅÖÉÍ (Fundamental) M-f É M-b ÓÅ ×ßÚÐÒÉÅÍÁÈÁ ËÁÔÏ
-ÒÁÚÄÅÌÉÔÅÌÉ ÎÁ ÄÕÍÉ.
+Íå ñå áåçïîêîéòå, íèêîÿ îò Åìàêñ êîìàíäèòå, êîèòî ñòå íàó÷èëè, íÿìà äà
+ñå ïðîìåíè ïî íÿêàêúâ ñúùåñòâåí íà÷èí.  Íî ìîæå äà çàáåëåæèòå, ÷å M-f
+è M-b ñåãà âúçïðèåìàò àïîñòðîôèòå (') êàòî ÷àñò îò äóìèòå.  Ïðåäè
+òîâà, â îñíîâíèÿ ðåæèì (Fundamental), M-f è M-b ñå âúçïðèåìàõà êàòî
+ðàçäåëèòåëè íà äóìè.
 
-çÌÁ×ÎÉÔÅ ÒÅÖÉÍÉ ÏÂÉËÎÏ×ÅÎÏ ÐÒÁ×ÑÔ ÍÁÌËÉ ÐÒÏÍÅÎÉ ËÁÔÏ ÔÁÚÉ: ÐÏ×ÅÞÅÔÏ
-ËÏÍÁÎÄÉ ×ßÒÛÁÔ "ÓßÝÁÔÁ ÒÁÂÏÔÁ" ×ß× ×ÓÅËÉ ÇÌÁ×ÅÎ ÒÅÖÉÍ, ÎÏ ÒÁÂÏÔÑÔ ÐÏ
-ÍÁÌËÏ ÐÏ-ÒÁÚÌÉÞÅÎ ÎÁÞÉÎ.
+Ãëàâíèòå ðåæèìè îáèêíîâåíî ïðàâÿò ìàëêè ïðîìåíè êàòî òàçè: ïîâå÷åòî
+êîìàíäè âúðøàò "ñúùàòà ðàáîòà" âúâ âñåêè ãëàâåí ðåæèì, íî ðàáîòÿò ïî
+ìàëêî ïî-ðàçëè÷åí íà÷èí.
 
-úÁ ÄÁ ×ÉÄÉÔÅ ÄÏËÕÍÅÎÔÁÃÉÑÔÁ ÎÁ ×ÁÛÉÑ ÔÅËÕÝ ÇÌÁ×ÅÎ ÒÅÖÉÍ, ×ß×ÅÄÅÔÅ C-h
+Çà äà âèäèòå äîêóìåíòàöèÿòà íà âàøèÿ òåêóù ãëàâåí ðåæèì, âúâåäåòå C-h
 m.
 
->> õÐÏÔÒÅÂÅÔÅ C-u C-v ×ÅÄÎßÖ ÉÌÉ ÐÏ×ÅÞÅ ÐßÔÉ ÚÁ ÄÁ ÄÏËÁÒÁÔÅ ÔÏÚÉ ÒÅÄ
-   ÂÌÉÚÏ ÄÏ ×ßÒÈÁ ÎÁ ÅËÒÁÎÁ.
->> ÷ß×ÅÄÅÔÅ C-h m, ÚÁ ÄÁ ×ÉÄÉÔÅ ËÁË ÔÅËÓÔÏ×ÉÑÔ ÒÅÖÉÍ ÓÅ ÒÁÚÌÉÞÁ×Á ÏÔ
-   ÏÓÎÏ×ÎÉÑ ÒÅÖÉÍ.
->> ÷ß×ÅÄÅÔÅ C-x 1 ÚÁ ÄÁ ÐÒÅÍÁÈÎÅÔÅ ÄÏËÕÍÅÎÔÁÃÉÑÔÁ ÏÔ ÅËÒÁÎÁ.
-
-çÌÁ×ÎÉÔÅ ÒÅÖÉÍÉ ÓÅ ÎÁÒÉÞÁÔ ÇÌÁ×ÎÉ, ÚÁÝÏÔÏ ÉÍÁ É ÍÁÌËÉ ÒÅÖÉÍÉ (minor
-modes).  íÁÌËÉÔÅ ÒÅÖÉÍÉ ÎÅ ÓÁ ÁÌÔÅÒÎÁÔÉ×É ÎÁ ÇÌÁ×ÎÉÔÅ, Á ÐÒÏÓÔÏ ÍÁÌËÉ
-ÐÒÏÍÅÎÉ ËßÍ ÔÑÈ.  ÷ÓÅËÉ ÍÁÌßË ÒÅÖÉÍ ÍÏÖÅ ÄÁ ÂßÄÅ ×ËÌÀÞÅÎ ÉÌÉ ÉÚËÌÀÞÅÎ
-ÓÁÍ ÚÁ ÓÅÂÅ ÓÉ, ÎÅÚÁ×ÉÓÉÍÏ ÏÔ ×ÓÉÞËÉ ÄÒÕÇÉ ÍÁÌËÉ ÒÅÖÉÍÉ, É ÎÅÚÁ×ÉÓÉÍÏ
-ÏÔ ×ÁÛÉÑ ÇÌÁ×ÅÎ ÒÅÖÉÍ.  ôÁËÁ ÞÅ ÍÏÖÅ ÄÁ ÎÅ ÉÚÐÏÌÚ×ÁÔÅ ÍÁÌËÉ ÒÅÖÉÍÉ, ÄÁ
-ÉÚÐÏÌÚ×ÁÔÅ ÅÄÉÎ ÍÁÌßË ÒÅÖÉÍ, ÉÌÉ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ÎÑËÁË×Á ËÏÍÂÉÎÁÃÉÑ ÏÔ
-ÎÑËÏÌËÏ ÍÁÌËÉ ÒÅÖÉÍÁ.
-
-åÄÉÎ ÇÌÁ×ÅÎ ÒÅÖÉÍ, ËÏÊÔÏ Å ÍÎÏÇÏ ÐÏÌÅÚÅÎ, ÏÓÏÂÅÎÏ ÚÁ ÒÅÄÁËÔÉÒÁÎÅ ÎÁ
-ÔÅËÓÔ ÎÁ ÅÓÔÅÓÔ×ÅÎ ÅÚÉË, Å ÒÅÖÉÍßÔ ÎÁ Á×ÔÏÍÁÔÉÞÎÏ ÚÁÐßÌ×ÁÎÅ (Auto Fill
-mode).  ëÏÇÁÔÏ ÔÏÚÉ ÒÅÖÉÍ Å ×ËÌÀÞÅÎ, åÍÁËÓ Á×ÔÏÍÁÔÉÞÎÏ ÒÁÚÄÅÌÑ ÒÅÄÁ
-ÐÒÉ ÍÑÓÔÏÔÏ ÍÅÖÄÕ ÄÕÍÉÔÅ, ËÏÇÁÔÏ ×ÍßË×ÁÔÅ ÔÅËÓÔ É ÎÁÐÒÁ×ÉÔÅ ÒÅÄ, ËÏÊÔÏ
-Å Ô×ßÒÄÅ ÄßÌßÇ.
-
-íÏÖÅ ÄÁ ×ËÌÀÞÉÔÅ ÒÅÖÉÍÁ ÎÁ Á×ÔÏÍÁÔÉÞÎÏ ÚÁÐßÌ×ÁÎÅ ËÁÔÏ ÉÚÐßÌÎÉÔÅ M-x
-auto fill mode<Return>.  ëÏÇÁÔÏ ÒÅÖÉÍßÔ Å ×ËÌÀÞÅÎ, ÍÏÖÅ ÄÁ ÇÏ
-ÉÚËÌÀÞÉÔÅ Ó M-x auto fill mode<Return>.  áËÏ ÒÅÖÉÍßÔ Å ÉÚËÌÀÞÅÎ, ÔÁÚÉ
-ËÏÍÁÎÄÁ ÇÏ ×ËÌÀÞ×Á, Á ÁËÏ Å ×ËÌÀÞÅÎ, ÇÏ ÉÚËÌÀÞ×Á.  ëÁÚ×ÁÍÅ, ÞÅ
-ËÏÍÁÎÄÁÔÁ "ÏÂÒßÝÁ ÒÅÖÉÍÁ".
-
->> ÷ß×ÅÄÅÔÅ M-x auto fill mode<Return> ÓÅÇÁ.  óÌÅÄ ÔÏ×Á ×ÍßËÎÅÔÅ ÒÅÄ
-   ÏÔ "asdf " ÏÔÎÏ×Ï É ÏÔÎÏ×Ï ÄÏËÁÔÏ ÎÅ ×ÉÄÉÔÅ, ÞÅ ÔÅËÓÔÁ ÓÅ ÒÁÚÄÅÌÑ
-   ÎÁ Ä×Á ÒÅÄÁ.  ôÒÑÂ×Á ÄÁ ÓÌÁÇÁÔÅ ÉÎÔÅÒ×ÁÌÉ ÍÅÖÄÕ ÄÕÍÉÔÅ, ÚÁÝÏÔÏ
-   Á×ÔÏÍÁÔÉÞÎÏÔÏ ÚÁÐßÌ×ÁÎÅ ÒÁÚÄÅÌÑ ÒÅÄÏ×ÅÔÅ ÓÁÍÏ ÐÒÉ ÉÎÔÅÒ×ÁÌÉÔÅ.
-
-çÒÁÎÉÃÁÔÁ ÏÂÉËÎÏ×ÅÎÏ Å ÚÁÄÁÄÅÎÁ ÎÁ 70 ÚÎÁËÁ, ÎÏ ÍÏÖÅÔÅ ÄÁ Ñ ÐÒÏÍÅÎÉÔÅ
-Ó ËÏÍÁÎÄÁÔÁ C-x f.  ôÒÑÂ×Á ÄÁ ÚÁÄÁ×ÁÔÅ ÔÁÚÉ ÇÒÁÎÉÃÁ ËÁÔÏ ÞÉÓÌÏ×
-ÁÒÇÕÍÅÎÔ ÎÁ ËÏÍÁÎÄÁÔÁ.
-
->> ÷ß×ÅÄÅÔÅ C-x f Ó ÁÒÇÕÍÅÎÔ 20.  (C-u 2 0 C-x f).
-   óÅÇÁ ×ß×ÅÄÅÔÅ ÎÑËÁËß× ÔÅËÓÔ É ×ÉÖÔÅ ËÁË åÍÁËÓ ÚÁÐßÌ×Á ÒÅÄÏ×ÅÔÅ Ó ÐÏ
-   ÎÅ ÐÏ×ÅÞÅ ÏÔ 20 ÚÎÁËÁ.  ðÏÓÌÅ ×ßÒÎÅÔÅ ÏÂÒÁÔÎÏ ÇÒÁÎÉÃÁÔÁ ÎÁ 70
-   ÉÚÐÏÌÚ×ÁÊËÉ C-x f ÏÔÎÏ×Ï.
-
-áËÏ ÎÁÐÒÁ×ÉÔÅ ÐÒÏÍÅÎÉ × ÓÒÅÄÁÔÁ ÎÁ ÁÂÚÁÃ, ÒÅÖÉÍßÔ ÎÁ Á×ÔÏÍÁÔÉÞÎÏ
-ÚÁÐßÌ×ÁÎÅ ÎÑÍÁ ÄÁ ÇÏ ÚÁÐßÌÎÉ ÎÁÎÏ×Ï ÚÁ ×ÁÓ.
-úÁ ÄÁ ÚÁÐßÌÎÉÔÅ ÎÁÎÏ×Ï ÁÂÚÁà ×ß×ÅÖÄÁÊÔÅ M-q (META-q) ÄÏËÁÔÏ ËÕÒÓÏÒßÔ Å
-×ßÔÒÅ × ÁÂÚÁÃÁ.
-
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ×ßÔÒÅ × ÐÒÅÄÉÛÎÉÑ ÁÂÚÁÃ É ×ß×ÅÄÅÔÅ M-q.
-
-
-* ôÿòóåîå
+>> Óïîòðåáåòå C-u C-v âåäíúæ èëè ïîâå÷å ïúòè, çà äà äîêàðàòå òîçè ðåä
+   áëèçî äî âúðõà íà åêðàíà.
+>> Âúâåäåòå C-h m, çà äà âèäèòå êàê òåêñòîâèÿò ðåæèì ñå ðàçëè÷àâà îò
+   îñíîâíèÿ ðåæèì.
+>> Âúâåäåòå C-x 1, çà äà ïðåìàõíåòå äîêóìåíòàöèÿòà îò åêðàíà.
+
+Ãëàâíèòå ðåæèìè ñå íàðè÷àò ãëàâíè, çàùîòî èìà è ìàëêè (âòîðîñòåïåííè)
+ðåæèìè (minor modes).  Ìàëêèòå ðåæèìè íå ñà àëòåðíàòèâè íà ãëàâíèòå, à
+ïðîñòî ìàëêè ïðîìåíè êúì òÿõ.  Âñåêè ìàëúê ðåæèì ìîæå äà áúäå âêëþ÷åí
+èëè èçêëþ÷åí ñàì çà ñåáå ñè, íåçàâèñèìî îò âñè÷êè äðóãè ìàëêè ðåæèìè
+è íåçàâèñèìî îò âàøèÿ ãëàâåí ðåæèì.  Òàêà ÷å ìîæå äà íå èçïîëçâàòå
+ìàëêè ðåæèìè, äà èçïîëçâàòå åäèí ìàëúê ðåæèì, èëè äà èçïîëçâàòå
+íÿêàêâà êîìáèíàöèÿ îò íÿêîëêî ìàëêè ðåæèìà.
+
+Åäèí ãëàâåí ðåæèì, êîéòî å ìíîãî ïîëåçåí, îñîáåíî çà ðåäàêòèðàíå íà
+òåêñò íà åñòåñòâåí åçèê, å ðåæèìúò íà àâòîìàòè÷íî çàïúëâàíå (Auto Fill
+mode).  Êîãàòî òîçè ðåæèì å âêëþ÷åí, Åìàêñ àâòîìàòè÷íî ðàçäåëÿ ðåäà
+ïðè ìÿñòîòî ìåæäó äóìèòå, êîãàòî âìúêâàòå òåêñò è íàïðàâèòå ðåä, êîéòî
+å òâúðäå äúëúã.
+
+Ìîæå äà âêëþ÷èòå ðåæèìà íà àâòîìàòè÷íî çàïúëâàíå, êàòî èçïúëíèòå M-x
+auto fill mode<Return>.  Êîãàòî ðåæèìúò å âêëþ÷åí, ìîæå äà ãî
+èçêëþ÷èòå ñ M-x auto fill mode<Return>.  Àêî ðåæèìúò å èçêëþ÷åí, òàçè
+êîìàíäà ãî âêëþ÷âà, à àêî å âêëþ÷åí, ãî èçêëþ÷âà.  Êàçâàìå, ÷å
+êîìàíäàòà "îáðúùà ðåæèìà".
+
+>> Âúâåäåòå M-x auto fill mode<Return> ñåãà.  Ñëåä òîâà âìúêíåòå ðåä
+   îò "asdf " îòíîâî è îòíîâî, äîêàòî íå âèäèòå, ÷å òåêñòúò ñå ðàçäåëÿ
+   íà äâà ðåäà.  Òðÿáâà äà ñëàãàòå èíòåðâàëè ìåæäó äóìèòå, çàùîòî
+   àâòîìàòè÷íîòî çàïúëâàíå ðàçäåëÿ ðåäîâåòå ñàìî ïðè èíòåðâàëèòå.
+
+Ãðàíèöàòà îáèêíîâåíî å çàäàäåíà íà 70 çíàêà, íî ìîæåòå äà ÿ ïðîìåíèòå
+ñ êîìàíäàòà C-x f.  Òðÿáâà äà çàäàâàòå òàçè ãðàíèöà êàòî ÷èñëîâ
+àðãóìåíò íà êîìàíäàòà.
+
+>> Âúâåäåòå C-x f ñ àðãóìåíò 20.  (C-u 2 0 C-x f).
+   Ñåãà âúâåäåòå íÿêàêúâ òåêñò è âèæòå êàê Åìàêñ çàïúëâà ðåäîâåòå ñ ïî
+   íå ïîâå÷å îò 20 çíàêà.  Ïîñëå âúðíåòå îáðàòíî ãðàíèöàòà íà 70,
+   èçïîëçâàéêè C-x f îòíîâî.
+
+Àêî íàïðàâèòå ïðîìåíè â ñðåäàòà íà àáçàö, ðåæèìúò íà àâòîìàòè÷íî
+çàïúëâàíå íÿìà äà ãî çàïúëíè íàíîâî çà âàñ.
+Çà äà çàïúëíèòå íàíîâî àáçàö, âúâåæäàéòå M-q (META-q), äîêàòî êóðñîðúò
+å âúòðå â àáçàöà.
+
+>> Ïðèäâèæåòå êóðñîðà âúòðå â ïðåäèøíèÿ àáçàö è âúâåäåòå M-q.
+
+
+* ÒÚÐÑÅÍÅ
 ---------
 
-åÍÁËÓ ÍÏÖÅ ÄÁ ÉÚ×ßÒÛ×Á ÔßÒÓÅÎÉÑ ÎÁ ÎÉÚÏ×Å (ÔÏ×Á ÓÁ ÐÏÓÌÅÄÏ×ÁÔÅÌÎÏÓÔÉ
-ÏÔ ÚÎÁÃÉ ÉÌÉ ÄÕÍÉ) ÉÌÉ ÎÁÐÒÅÄ × ÔÅËÓÔÁ ÉÌÉ ÎÁÚÁÄ × ÎÅÇÏ.  ôßÒÓÅÎÅÔÏ ÎÁ
-ÎÉÚ Å ÐÒÉÄ×ÉÖ×ÁÝÁ ËÕÒÓÏÒÁ ËÏÍÁÎÄÁ; ÔÑ ÐÒÅÍÅÓÔ×Á ËÕÒÓÏÒÁ ÎÁ ÓÌÅÄ×ÁÝÏÔÏ
-ÍÑÓÔÏ, ËßÄÅÔÏ ÓÅ ÓÒÅÝÁ ÎÉÚßÔ.
-
-ëÏÍÁÎÄÁÔÁ ÚÁ ÔßÒÓÅÎÅ ÎÁ åÍÁËÓ ÓÅ ÒÁÚÌÉÞÁ×Á ÏÔ ËÏÍÁÎÄÁÔÁ ÚÁ ÔßÒÓÅÎÅ ÎÁ
-ÐÏ×ÅÞÅÔÏ ÒÅÄÁËÔÏÒÉ ÐÏ ÔÏ×Á, ÞÅ ÔÑ Å "ÐÏÓÔßÐËÏ×Á".  ôÏ×Á ÏÚÎÁÞÁ×Á, ÞÅ
-ÔßÒÓÅÎÅÔÏ ÓÅ ÉÚ×ßÒÛ×Á ÏÝÅ ÄÏËÁÔÏ ×ß×ÅÖÄÁÔÅ ÔÅËÓÔÁ, ËÏÊÔÏ ÔßÒÓÉÔÅ.
-
-ëÏÍÁÎÄÁÔÁ ÚÁ ÚÁÐÏÞ×ÁÎÅ ÎÁ ÔßÒÓÅÎÅ Å C-s ÚÁ ÔßÒÓÅÎÅ ÎÁÐÒÅÄ, É C-r ÚÁ
-ÔßÒÓÅÎÅ ÎÁÚÁÄ.  îï ðïþáëáêôå!  îÅ ÇÉ ÐÒÏÂ×ÁÊÔÅ ÓÅÇÁ.
-
-ëÏÇÁÔÏ ×ß×ÅÄÅÔÅ C-s ÝÅ ÚÁÂÅÌÅÖÉÔÅ, ÞÅ ÎÉÚßÔ "I-search" ÓÅ ÐÏÑ×Ñ×Á ËÁÔÏ
-ÐÏÄÓËÁÚËÁ × ÅÈÏ ÏÂÌÁÓÔÔÁ.  ôÏ×Á ×É ËÁÚ×Á, ÞÅ åÍÁËÓ Å × ÔÏ×Á, ËÏÅÔÏ ÓÅ
-ÎÁÒÉÞÁ ÐÏÓÔßÐËÏ×Ï ÔßÒÓÅÎÅ, ÞÁËÁÊËÉ ×É ÄÁ ×ß×ÅÖÄÁÔÅ ÔÅËÓÔÁ, ËÏÊÔÏ
-ÉÓËÁÔÅ ÄÁ ÔßÒÓÉÔÅ.  <Return> ÐÒÉËÌÀÞ×Á ÔßÒÓÅÎÅÔÏ.
-
->> óÅÇÁ ×ß×ÅÄÅÔÅ C-s ÚÁ ÄÁ ÚÁÐÏÞÎÅÔÅ ÔßÒÓÅÎÅÔÏ.  âá÷îï, ÂÕË×Á ÐÏ
-   ÂÕË×Á, ×ß×ÅÄÅÔÅ ÄÕÍÁÔÁ "ÔßÒÓÅÎÅ", ÉÚÞÁË×ÁÊËÉ ÓÌÅÄ ×ß×ÅÖÄÁÎÅÔÏ ÎÁ
-   ×ÓÅËÉ ÚÎÁË, ÚÁ ÄÁ ÍÏÖÅ ÄÁ ÚÁÂÅÌÅÖÉÔÅ ËÁË×Ï ÓÔÁ×Á Ó ËÕÒÓÏÒÁ.  óÅÇÁ
-   ÉÚ×ßÒÛÉÈÔÅ ÔßÒÓÅÎÅ ÎÁ "ÔßÒÓÅÎÅ" ×ÅÄÎßÖ.
->> ÷ß×ÅÄÅÔÅ ÏÔÎÏ×Ï C-s, ÚÁ ÄÁ ÔßÒÓÉÔÅ ÄÒÕÇÏ Óß×ÐÁÄÅÎÉÅ Ó "ÔßÒÓÅÎÅ".
->> óÅÇÁ ×ß×ÅÄÅÔÅ <Delback> ÔÒÉ ÐßÔÉ É ×ÉÖÔÅ ËÁË ÓÅ ÐÒÉÄ×ÉÖ×Á ËÕÒÓÏÒÁ.
->> ÷ß×ÅÄÅÔÅ <Return> ÚÁ ÄÁ ÐÒÅËÒÁÔÉÔÅ ÔßÒÓÅÎÅÔÏ.
-
-úÁÂÅÌÑÚÁÈÔÅ ÌÉ ËÁË×Ï ÓÔÁÎÁ?  åÍÁËÓ, ËÏÇÁÔÏ ÔßÒÓÉ ÐÏÓÔßÐËÏ×Ï, ÓÅ ÏÐÉÔ×Á
-ÄÁ ÎÁÍÅÒÉ ÓÌÅÄ×ÁÝÏÔÏ Óß×ÐÁÄÅÎÉÅ ÎÁ ÎÉÚÁ, ËÏÊÔÏ ÓÅ ×ß×ÅÖÄÁ.  úÁ ÄÁ
-ÏÔÉÄÅÔÅ ÎÁ ÓÌÅÄ×ÁÝÏÔÏ Óß×ÐÁÄÅÎÉÅ ÎÁ "ÔßÒÓÎÅ" ÐÒÏÓÔÏ ÏÔÎÏ×Ï ×ß×ÅÄÅÔÅ
-C-s.  áËÏ ÎÑÍÁ ÔÁËÏ×Á Óß×ÐÁÄÅÎÉÅ, åÍÁËÓ ÂÉÂÉÐ×Á É ×É ËÁÚ×Á, ÞÅ
-ÔßÒÓÅÎÅÔÏ Å "ÐÒÏ×ÁÌÅÎÏ" (failing).  C-g ÓßÝÏ ÐÒÅËÒÁÔÑ×Á ÔßÒÓÅÎÅÔÏ.
-
-úáâåìåöëá: îÁ ÎÑËÏÉ ÓÉÓÔÅÍÉ ×ß×ÅÖÄÁÎÅÔÏ ÎÁ C-s ÝÅ ÚÁÍÒÁÚÉ ÅËÒÁÎÁ É ×ÉÅ
-ÎÑÍÁ ÄÁ ÍÏÖÅ ÄÁ ×ÉÄÉÔÅ ÐÏ×ÅÞÅ ÒÅÁËÃÉÑ ÏÔ åÍÁËÓ.  ôÏ×Á ÐÏËÁÚ×Á, ÞÅ
-"ÓÐÏÓÏÂÎÏÓÔ" ÎÁ ÏÐÅÒÁÃÉÏÎÎÁÔÁ ÓÉÓÔÅÍÁ ÎÁÒÅÞÅÎÁ "ÕÐÒÁ×ÌÅÎÉÅ ÎÁ ÐÏÔÏËÁ"
-Å ÐÒÉÈ×ÁÎÁÌÁ C-s É ÎÅ ÇÏ ÐÕÓËÁ ÄÏ åÍÁËÓ.  úÁ ÄÁ ÒÁÚÍÒÁÚÉÔÅ ÅËÒÁÎÁ
-×ß×ÅÄÅÔÅ C-q.  ôÏÇÁ×Á ×ÉÖÔÅ ÓÅËÃÉÑÔÁ "óÐÏÎÔÁÎÎÏ ×ËÌÀÞ×ÁÎÅ ÎÁ
-ÐÏÓÔßÐËÏ×ÏÔÏ ÔßÒÓÅÎÅ" (Spontaneous Entry to Incremental Search) ×
-ÒßËÏ×ÏÄÓÔ×ÏÔÏ ÎÁ åÍÁËÓ ÚÁ Óß×ÅÔ ËÁË ÄÁ ÓÅ ÓÐÒÁ×ÉÔÅ Ó ÔÁÚÉ
-"ÓÐÏÓÏÂÎÏÓÔ".
-
-áËÏ ÓÔÅ × ÓÒÅÄÁÔÁ ÎÁ ÐÏÓÔßÐËÏ×Ï ÔßÒÓÅÎÅ É ×ß×ÅÄÅÔÅ <Delback> ÝÅ
-ÚÁÂÅÌÅÖÉÔÅ, ÞÅ ÐÏÓÌÅÄÎÉÑÔ ÚÎÁË × ÔßÒÓÅÎÉÑ ÎÉÚ ÓÅ ÉÚÔÒÉ×Á É ÔßÒÓÅÎÅÔÏ
-ÓÅ ×ÒßÝÁ ËßÍ ÐÏÓÌÅÄÎÏÔÏ ÍÑÓÔÏ ÎÁ ÔßÒÓÅÎÅ.  îÁÐÒÉÍÅÒ, ÐÒÅÄÐÏÌÏÖÅÔÅ, ÞÅ
-ÓÔÅ ×ß×ÅÌÉ "Ô", ÚÁ ÄÁ ÎÁÍÅÒÉÔÅ ÐßÒ×ÏÔÏ Óß×ÐÁÄÅÎÉÅ Ó "Ô".  óÅÇÁ ÁËÏ
-×ß×ÅÄÅÔÅ "ß" ËÕÒÓÏÒßÔ ÝÅ ÓÅ ÐÒÉÄ×ÉÖÉ ËßÍ ÐßÒ×ÏÔÏ Óß×ÐÁÄÅÎÉÅ ÎÁ "Ôß".
-óÅÇÁ ×ß×ÅÄÅÔÅ <Delback>.  ôÏ×Á ÉÚÔÒÉ×Á ÚÎÁËÁ "ß" ÏÔ ÎÉÚÁ ÚÁ ÔßÒÓÅÎÅ, É
-ËÕÒÓÏÒßÔ ÓÅ ÐÒÅÍÅÓÔ×Á ÎÁÚÁÄ ÄÏ ÐßÒ×ÏÔÏ Óß×ÐÁÄÅÎÉÅ Ó "Ô".
-
-áËÏ ÓÔÅ × ÓÒÅÄÁÔÁ ÎÁ ÔßÒÓÅÎÅ É ×ß×ÅÄÅÔÅ ËÏÎÔÒÏÌÅÎ ÉÌÉ ÍÅÔÁ ÚÎÁË (Ó
-ÎÑËÏÌËÏ ÉÚËÌÀÞÅÎÉÑ -- ÚÎÁÃÉÔÅ, ËÏÉÔÏ ÓÁ ÓÐÅÃÉÁÌÎÉ ÐÏ ×ÒÅÍÅ ÎÁ ÔßÒÓÅÎÅ,
-ËÁÔÏ C-s É C-r), ÔßÒÓÅÎÅÔÏ ÓÅ ÐÒÅËÒÁÔÑ×Á.
-
-C-s ÚÁÐÏÞ×Á ÔßÒÓÅÎÅ, ËÏÅÔÏ ÇÌÅÄÁ ÚÁ Óß×ÐÁÄÅÎÉÅ Ó ÎÉÚÁ ÄÁÄÅÎ ÚÁ ÔßÒÓÅÎÅ
-óìåä ÔÅËÕÝÏÔÏ ÍÑÓÔÏ ÎÁ ËÕÒÓÏÒÁ.  áËÏ ÉÓËÁÔÅ ÄÁ ÔßÒÓÉÔÅ ÎÅÝÏ ÐÏ-ÒÁÎÎÏ
-ÏÔ ÔÅËÓÔÁ, ×ÍÅÓÔÏ ÔÏ×Á ×ß×ÅÄÅÔÅ C-r.  ÷ÓÉÞËÏ, ËÏÅÔÏ ËÁÚÁÈÍÅ ÚÁ C-s,
-×ÁÖÉ É ÚÁ C-r, ÏÓ×ÅÎ ÞÅ ÐÏÓÏËÁÔÁ ÎÁ ÔßÒÓÅÎÅ Å ÏÂßÒÎÁÔÁ.
-
-
-* íîïöåóô÷ï ðòïúïòãé
+Åìàêñ ìîæå äà èçâúðøâà òúðñåíèÿ íà íèçîâå (òîâà ñà ïîñëåäîâàòåëíîñòè
+îò çíàöè èëè äóìè) èëè íàïðåä â òåêñòà, èëè íàçàä â íåãî.  Òúðñåíåòî
+íà íèç å ïðèäâèæâàùà êóðñîðà êîìàíäà; òÿ ïðåìåñòâà êóðñîðà íà
+ñëåäâàùîòî ìÿñòî, êúäåòî ñå ñðåùà íèçúò.
+
+Êîìàíäàòà çà òúðñåíå íà Åìàêñ ñå ðàçëè÷àâà îò êîìàíäàòà çà òúðñåíå íà
+ïîâå÷åòî ðåäàêòîðè ïî òîâà, ÷å òÿ å "ïîñòúïêîâà".  Òîâà îçíà÷àâà, ÷å
+òúðñåíåòî ñå èçâúðøâà îùå äîêàòî âúâåæäàòå òåêñòà, êîéòî òúðñèòå.
+
+Êîìàíäàòà çà çàïî÷âàíå íà òúðñåíå å C-s çà òúðñåíå íàïðåä, è C-r çà
+òúðñåíå íàçàä.  ÍÎ ÏÎ×ÀÊÀÉÒÅ!  Íå ãè ïðîáâàéòå ñåãà.
+
+Êîãàòî âúâåäåòå C-s, ùå çàáåëåæèòå, ÷å íèçúò "I-search" ñå ïîÿâÿâà
+êàòî ïîäñêàçêà â åõî îáëàñòòà.  Òîâà âè êàçâà, ÷å Åìàêñ å â òîâà,
+êîåòî ñå íàðè÷à ïîñòúïêîâî òúðñåíå, ÷àêàéêè âè äà âúâåæäàòå òåêñòà,
+êîéòî èñêàòå äà òúðñèòå.  <Return> ïðèêëþ÷âà òúðñåíåòî.
+
+>> Ñåãà âúâåäåòå C-s, çà äà çàïî÷íåòå òúðñåíåòî.  ÁÀÂÍÎ, áóêâà ïî
+   áóêâà, âúâåäåòå äóìàòà "òúðñåíå", èç÷àêâàéêè ñëåä âúâåæäàíåòî íà
+   âñåêè çíàê, çà äà ìîæå äà çàáåëåæèòå êàêâî ñòàâà ñ êóðñîðà.  Ñåãà
+   èçâúðøèõòå òúðñåíå íà "òúðñåíå" âåäíúæ.
+>> Âúâåäåòå îòíîâî C-s, çà äà òúðñèòå äðóãî ñúâïàäåíèå ñ "òúðñåíå".
+>> Ñåãà âúâåäåòå <Delback> òðè ïúòè è âèæòå êàê ñå ïðèäâèæâà êóðñîðà.
+>> Âúâåäåòå <Return>, çà äà ïðåêðàòèòå òúðñåíåòî.
+
+Çàáåëÿçàõòå ëè êàêâî ñòàíà?  Åìàêñ, êîãàòî òúðñè ïîñòúïêîâî, ñå îïèòâà
+äà íàìåðè ñëåäâàùîòî ñúâïàäåíèå íà íèçà, êîéòî ñå âúâåæäà.  Çà äà
+îòèäåòå íà ñëåäâàùîòî ñúâïàäåíèå íà "òúðñíå", ïðîñòî îòíîâî âúâåäåòå
+C-s.  Àêî íÿìà òàêîâà ñúâïàäåíèå, Åìàêñ áèáèïâà è âè êàçâà, ÷å
+òúðñåíåòî å "ïðîâàëåíî" (failing).  C-g ñúùî ïðåêðàòÿâà òúðñåíåòî.
+
+ÇÀÁÅËÅÆÊÀ: Íà íÿêîè ñèñòåìè âúâåæäàíåòî íà C-s ùå çàìðàçè åêðàíà è âèå
+íÿìà äà ìîæå äà âèäèòå ïîâå÷å ðåàêöèÿ îò Åìàêñ.  Òîâà ïîêàçâà, ÷å
+"ñïîñîáíîñò" íà îïåðàöèîííàòà ñèñòåìà, íàðå÷åíà "óïðàâëåíèå íà ïîòîêà"
+(flow control), å ïðèõâàíàëà C-s è íå ãî ïðîïóñêà äî Åìàêñ.  Çà äà
+ðàçìðàçèòå åêðàíà, âúâåäåòå C-q.  Òîãàâà âèæòå ñåêöèÿòà "Ñïîíòàííî
+âêëþ÷âàíå íà ïîñòúïêîâîòî òúðñåíå" (Spontaneous Entry to Incremental
+Search) â ðúêîâîäñòâîòî íà Åìàêñ çà ñúâåò êàê äà ñå ñïðàâèòå ñ òàçè
+"ñïîñîáíîñò".
+
+Àêî ñòå â ñðåäàòà íà ïîñòúïêîâî òúðñåíå è âúâåäåòå <Delback>, ùå
+çàáåëåæèòå, ÷å ïîñëåäíèÿò çíàê â òúðñåíèÿ íèç ñå èçòðèâà è òúðñåíåòî
+ñå âðúùà êúì ïîñëåäíîòî ìÿñòî íà òúðñåíå.  Íàïðèìåð, ïðåäïîëîæåòå, ÷å
+ñòå âúâåëè "ò", çà äà íàìåðèòå ïúðâîòî ñúâïàäåíèå ñ "ò".  Ñåãà, àêî
+âúâåäåòå "ú", êóðñîðúò ùå ñå ïðèäâèæè êúì ïúðâîòî ñúâïàäåíèå íà "òú".
+Ñåãà âúâåäåòå <Delback>.  Òîâà èçòðèâà çíàêà "ú" îò íèçà çà òúðñåíå è
+êóðñîðúò ñå ïðåìåñòâà íàçàä, äî ïúðâîòî ñúâïàäåíèå ñ "ò".
+
+Àêî ñòå â ñðåäàòà íà òúðñåíå è âúâåäåòå êîíòðîëåí èëè ìåòà çíàê (ñ
+íÿêîëêî èçêëþ÷åíèÿ -- çíàöèòå, êîèòî ñà ñïåöèàëíè ïî âðåìå íà òúðñåíå,
+êàòî C-s è C-r), òúðñåíåòî ñå ïðåêðàòÿâà.
+
+C-s çàïî÷âà òúðñåíå, êîåòî ãëåäà çà ñúâïàäåíèå ñ íèçà, äàäåí çà
+òúðñåíå ÑËÅÄ òåêóùîòî ìÿñòî íà êóðñîðà.  Àêî èñêàòå äà òúðñèòå íåùî
+ïî-ðàííî îò òåêñòà, âìåñòî òîâà âúâåäåòå C-r.  Âñè÷êî, êîåòî êàçàõìå
+çà C-s, âàæè è çà C-r, îñâåí ÷å ïîñîêàòà íà òúðñåíå å îáúðíàòà.
+
+
+* ÌÍÎÆÅÑÒÂÎ ÏÐÎÇÎÐÖÈ
 ----------------
 
-åÄÎÁ ÏÔ ÐÒÉ×ÌÅËÁÔÅÌÎÉÔÅ ÓÐÏÓÏÂÎÏÓÔÉ ÎÁ åÍÁËÓ Å ÔÁÚÉ, ÞÅ ÍÏÖÅ ÄÁ
-ÇÌÅÄÁÔÅ ÐÏ×ÅÞÅ ÏÔ ÅÄÉÎ ÐÒÏÚÏÒÅà ÎÁ ÅËÒÁÎÁ × ÄÁÄÅÎ ÍÏÍÅÎÔ ÏÔ ×ÒÅÍÅ.
+Åäíà îò ïðèâëåêàòåëíèòå ñïîñîáíîñòè íà Åìàêñ å òàçè, ÷å ìîæå äà
+ãëåäàòå ïîâå÷å îò åäèí ïðîçîðåö íà åêðàíà â äàäåí ìîìåíò îò âðåìå.
 
->> ðÒÉÄ×ÉÖÅÔÅ ËÕÒÓÏÒÁ ÄÏ ÔÏÚÉ ÒÅÄ É ×ß×ÅÄÅÔÅ C-u 0 C-l (ÔÏ×Á Å
-   CONTROL-L, ÎÅ CONTROL-1).
+>> Ïðèäâèæåòå êóðñîðà äî òîçè ðåä è âúâåäåòå C-u 0 C-l (òîâà å
+   CONTROL-L, íå CONTROL-1).
 
->> óÅÇÁ ×ß×ÅÄÅÔÅ C-x 2, ËÏÅÔÏ ÝÅ ÒÁÚÄÅÌÉ ÅËÒÁÎÁ ÎÁ Ä×Á ÏÔÄÅÌÎÉ
-   ÐÒÏÚÏÒÅÃÁ.  ä×ÁÔÁ ÐÒÏÚÏÒÅÃÁ ÐÏËÁÚ×ÁÔ ÔÏ×Á ×ß×ÅÄÅÎÉÅ.  ëÕÒÓÏÒßÔ
-   ÏÓÔÁ×Á ÎÁ ÐÏ-ÇÏÒÎÉÑ ÐÒÏÚÏÒÅÃ.
+>> Ñåãà âúâåäåòå C-x 2, êîåòî ùå ðàçäåëè åêðàíà íà äâà îòäåëíè
+   ïðîçîðåöà.  Äâàòà ïðîçîðåöà ïîêàçâàò òîâà âúâåäåíèå.  Êóðñîðúò
+   îñòàâà íà ïî-ãîðíèÿ ïðîçîðåö.
 
->> ÷ß×ÅÄÅÔÅ C-M-v ÚÁ ÄÁ ÓËÒÏÌÉÒÁÔÅ ÄÏÌÎÉÑ ÐÒÏÚÏÒÅÃ.  (áËÏ ÎÑÍÁÔÅ
-   ÉÓÔÉÎÓËÉ ËÌÁ×ÉÛ META, ×ß×ÅÄÅÔÅ ESC C-v.)
+>> Âúâåäåòå C-M-v, çà äà ñêðîëèðàòå äîëíèÿ ïðîçîðåö.  (Àêî íÿìàòå
+   èñòèíñêè êëàâèø META, âúâåäåòå ESC C-v.)
 
->> ÷ß×ÅÄÅÔÅ C-x o ("o" ÏÔ "other" -- "ÄÒÕÇ") ÚÁ ÄÁ ÐÒÉÄ×ÉÖÉÔÅ ËÕÒÓÏÒÁ
-   × ÄÏÌÎÉÑ ÐÒÏÚÏÒÅÃ.
->> éÚÐÏÌÚ×ÁÊÔÅ C-v É M-v × ÄÏÌÎÉÑ ÐÒÏÚÏÒÅà ÚÁ ÄÁ ÇÏ ÓËÒÏÌÉÒÁÔÅ.
-   ðÒÏÄßÌÖÅÔÅ ÞÅÔÅÎÅÔÏ ÎÁ ÔÅÚÉ ÎÁÓÏËÉ ÏÔ ×ß×ÅÄÅÎÉÔÅÏ × ÇÏÒÎÉÑ
-   ÐÒÏÚÏÒÅÃ.
+>> Âúâåäåòå C-x o ("o" îò "other" -- "äðóã"), çà äà ïðèäâèæèòå
+   êóðñîðà â äîëíèÿ ïðîçîðåö.
+>> Èçïîëçâàéòå C-v è M-v â äîëíèÿ ïðîçîðåö, çà äà ãî ñêðîëèðàòå.
+   Ïðîäúëæåòå ÷åòåíåòî íà òåçè íàñîêè îò âúâåäåíèåòî â ãîðíèÿ
+   ïðîçîðåö.
 
->> ÷ß×ÅÄÅÔÅ C-x o ÏÔÎÏ×Ï ÚÁ ÄÁ ÐÒÉÄ×ÉÖÉÔÅ ËÕÒÓÏÒÁ ÏÔÎÏ×Ï × ÇÏÒÎÉÑ
-   ÐÒÏÚÏÒÅÃ.  ëÕÒÓÏÒßÔ × ÇÏÒÎÉÑ ÐÒÏÚÏÒÅà ŠÔÏÞÎÏ ÔÁÍ, ËßÄÅÔÏ Å ÂÉÌ
-   ÐÒÅÄÉ.
+>> Âúâåäåòå C-x o îòíîâî, çà äà ïðèäâèæèòå êóðñîðà îòíîâî â ãîðíèÿ
+   ïðîçîðåö.  Êóðñîðúò â ãîðíèÿ ïðîçîðåö å òî÷íî òàì, êúäåòî å áèë
+   ïðåäè.
 
-íÏÖÅ ÄÁ ÐÒÏÄßÌÖÉÔÅ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ C-x o ÚÁ ÄÁ ÐÒÅ×ËÌÀÞ×ÁÔÅ ÍÅÖÄÕ
-ÐÒÏÚÏÒÃÉÔÅ.  ÷ÓÅËÉ ÐÒÏÚÏÒÅà ÉÍÁ ÓÏÂÓÔ×ÅÎÏ ÍÑÓÔÏ ÎÁ ËÕÒÓÏÒÁ, ÎÏ ÓÁÍÏ
-ÅÄÉÎ ÐÒÏÚÏÒÅà ÐÏËÁÚ×Á ËÕÒÓÏÒ.  ÷ÓÉÞËÉ ÏÂÉËÎÏ×ÅÎÉ ËÏÍÁÎÄÉ ÚÁ
-ÒÅÄÁËÔÉÒÁÎÅ ÓÅ ÐÒÉÌÁÇÁÔ × ÐÒÏÚÏÒÅÃÁ, × ËÏÊÔÏ Å ËÕÒÓÏÒßÔ.  îÉÅ ÎÁÒÉÞÁÍÅ
-ÔÏÚÉ ÐÒÏÚÏÒÅÃ "ÔÅËÕÝ ÐÒÏÚÏÒÅÃ".
+Ìîæå äà ïðîäúëæèòå äà èçïîëçâàòå C-x o, çà äà ïðåâêëþ÷âàòå ìåæäó
+ïðîçîðöèòå.  Âñåêè ïðîçîðåö èìà ñîáñòâåíî ìÿñòî íà êóðñîðà, íî ñàìî
+åäèí ïðîçîðåö ïîêàçâà êóðñîð.  Âñè÷êè îáèêíîâåíè êîìàíäè çà
+ðåäàêòèðàíå ñå ïðèëàãàò â ïðîçîðåöà, â êîéòî å êóðñîðúò.  Íèå íàðè÷àìå
+òîçè ïðîçîðåö "òåêóù ïðîçîðåö".
 
-ëÏÍÁÎÄÁÔÁ C-M-v Å ÍÎÏÇÏ ÐÏÌÅÚÎÁ, ËÏÇÁÔÏ ÒÅÄÁËÔÉÒÁÔÅ ÔÅËÓÔ × ÅÄÉÎ
-ÐÒÏÚÏÒÅÃ É ÉÚÐÏÌÚ×ÁÔÅ ÄÒÕÇÉÑ ÐÒÏÚÏÒÅà ÐÒÏÓÔÏ ÚÁ ÓÐÒÁ×ËÁ.  íÏÖÅ ÄÁ
-ÄßÒÖÉÔÅ ËÕÒÓÏÒÁ ×ÉÎÁÇÉ × ÐÒÏÚÏÒÅÃÁ, ËßÄÅÔÏ ÒÅÄÁËÔÉÒÁÔÅ, É ÄÁ
-ÎÁÐÒÅÄ×ÁÔÅ ÐÏÓÌÅÄÏ×ÁÔÅÌÎÏ × ÄÒÕÇÉÑ ÐÒÏÚÏÒÅà ÞÒÅÚ C-M-v.
+Êîìàíäàòà C-M-v å ìíîãî ïîëåçíà, êîãàòî ðåäàêòèðàòå òåêñò â åäèí
+ïðîçîðåö è èçïîëçâàòå äðóãèÿ ïðîçîðåö ïðîñòî çà ñïðàâêà.  Ìîæå äà
+äúðæèòå êóðñîðà âèíàãè â ïðîçîðåöà, êúäåòî ðåäàêòèðàòå, è äà
+íàïðåäâàòå ïîñëåäîâàòåëíî â äðóãèÿ ïðîçîðåö ÷ðåç C-M-v.
 
-C-M-v Å ÐÒÉÍÅÒ ÚÁ ÚÎÁË CONTROL-META.  áËÏ ÉÍÁÔÅ ÉÓÔÉÎÓËÉ ËÌÁ×ÉÛ META,
-ÍÏÖÅ ÄÁ ×ß×ÅÖÄÁÔÅ C-M-v ÚÁÄßÒÖÁÊËÉ ÅÄÎÏ×ÒÅÍÅÎÎÏ CONTROL É META ÄÏËÁÔÏ
-×ß×ÅÖÄÁÔÅ v.  îÑÍÁ ÚÎÁÞÅÎÉÅ ÄÁÌÉ CONTROL ÉÌÉ META "Å ÎÁÔÉÓÎÁÔ ÐßÒ×É",
-ÚÁÝÏÔÏ É Ä×ÁÔÁ ËÌÁ×ÉÛÁ ÄÅÊÓÔ×ÁÔ ÍÏÄÉÆÉÃÉÒÁÊËÉ ÚÎÁËÁ, ËÏÊÔÏ ÓÔÅ ×ß×ÅÌÉ.
+C-M-v å ïðèìåð çà çíàê CONTROL-META.  Àêî èìàòå èñòèíñêè êëàâèø META,
+ìîæå äà âúâåæäàòå C-M-v, çàäúðæàéêè åäíîâðåìåííî CONTROL è META,
+äîêàòî âúâåæäàòå v.  Íÿìà çíà÷åíèå äàëè CONTROL èëè META "å íàòèñíàò
+ïúðâè", çàùîòî è äâàòà êëàâèøà äåéñòâàò, ìîäèôèöèðàéêè çíàêà, êîéòî
+ñòå âúâåëè.
 
-áËÏ ÎÑÍÁÔÅ ÉÓÔÉÎÓËÉ ËÌÁ×ÉÛ META, É ÉÚÐÏÌÚ×ÁÔÅ ESC ×ÍÅÓÔÏ ÔÏ×Á, ÒÅÄßÔ
-ÉÍÁ ÚÎÁÞÅÎÉÅ: ÔÒÑÂ×Á ÄÁ ×ß×ÅÖÄÁÔÅ ESC ÐÏÓÌÅÄ×ÁÎ ÏÔ CONTROL-v, ÚÁÝÏÔÏ
-CONTROL-ESC v ÎÑÍÁ ÄÁ ÒÁÂÏÔÉ.  ôÏ×Á Å ÔÁËÁ, ÚÁÝÏÔÏ ESC Å ÓÏÂÓÔ×ÅÎ
-ÚÎÁË, Á ÎÅ ÍÏÄÉÆÉËÁÔÏÒ.
+Àêî íÿìàòå èñòèíñêè êëàâèø META è èçïîëçâàòå ESC âìåñòî òîâà, ðåäúò
+èìà çíà÷åíèå: òðÿáâà äà âúâåæäàòå ESC, ïîñëåäâàí îò CONTROL-v, çàùîòî
+CONTROL-ESC v íÿìà äà ðàáîòè.  Òîâà å òàêà, çàùîòî ESC å ñîáñòâåí
+çíàê, à íå ìîäèôèêàòîð.
 
->> ÷ß×ÅÄÅÔÅ C-x 1 (× ÇÏÒÎÉÑ ÐÒÏÚÏÒÅÃ) ÚÁ ÄÁ ÍÁÈÎÅÔÅ ÄÏÌÎÉÑ ÐÒÏÚÏÒÅÃ.
+>> Âúâåäåòå C-x 1 (â ãîðíèÿ ïðîçîðåö), çà äà ìàõíåòå äîëíèÿ ïðîçîðåö.
 
-(áËÏ ÓÔÅ ×ß×ÅÌÉ C-x 1 × ÄÏÌÎÉÑ ÐÒÏÚÏÒÅÃ, ÔÏ×Á ÝÅ ÍÁÈÎÅ ÇÏÒÎÉÑ.
-íÉÓÌÅÔÅ ÚÁ ÔÁÚÉ ËÏÍÁÎÄÁ ËÁÔÏ "úÁÄÒßÖ ÔÏÞÎÏ ÅÄÉÎ ÐÒÏÚÏÒÅà -- ÔÏÚÉ, ×
-ËÏÊÔÏ ÓßÍ ÓÅÇÁ".)
+(Àêî ñòå âúâåëè C-x 1 â äîëíèÿ ïðîçîðåö, òîâà ùå ìàõíå ãîðíèÿ.
+Ìèñëåòå çà òàçè êîìàíäà êàòî "Çàäðúæ òî÷íî åäèí ïðîçîðåö -- òîçè, â
+êîéòî ñúì ñåãà".)
 
-îÑÍÁ ÎÕÖÄÁ ÄÁ ÉÚ×ÅÖÄÁÔÅ ÅÄÉÎ É ÓßÝÉ ÂÕÆÅÒ × Ä×ÁÔÁ ÐÒÏÚÏÒÅÃÁ.  áËÏ
-ÉÚÐÏÌÚ×ÁÔÅ C-x C-f ÚÁ ÄÁ ÎÁÍÅÒÉÔÅ ÆÁÊÌ × ÅÄÉÎÉÑ ÐÒÏÚÏÒÅÃ, ÄÒÕÇÉÑÔ
-ÐÒÏÚÏÒÅà ÎÅ ÓÅ ÐÒÏÍÅÎÑ.  íÏÖÅ ÄÁ ÎÁÍÉÒÁÔÅ ÆÁÊÌ ÏÔÄÅÌÎÏ ×ß× ×ÓÅËÉ ÆÁÊÌ.
+Íÿìà íóæäà äà èçâåæäàòå åäèí è ñúùè áóôåð â äâàòà ïðîçîðåöà.  Àêî
+èçïîëçâàòå C-x C-f, çà äà íàìåðèòå ôàéë â åäèíèÿ ïðîçîðåö, äðóãèÿò
+ïðîçîðåö íå ñå ïðîìåíÿ.  Ìîæå äà íàìèðàòå ôàéë âúâ âñåêè ïðîçîðåö,
+íåçàâèñèìî îò òîâà êàêâî èìà â äðóãèòå ïðîçîðöè.
 
-åÔÏ ÏÝÅ ÅÄÉÎ ÎÁÞÉÎ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ Ä×Á ÐÒÏÚÏÒÅÃÁ ÚÁ ÄÁ ÐÏËÁÖÅÔÅ Ä×Å
-ÒÁÚÌÉÞÎÉ ÎÅÝÁ:
+Åòî îùå åäèí íà÷èí äà èçïîëçâàòå äâà ïðîçîðåöà, çà äà ïîêàæåòå äâå
+ðàçëè÷íè íåùà:
 
->> ÷ß×ÅÄÅÔÅ C-x 4 C-f ÐÏÓÌÅÄ×ÁÎÏ ÏÔ ÉÍÅÔÏ ÎÁ ÅÄÉÎ ÏÔ ×ÁÛÉÔÅ ÆÁÊÌÏ×Å.
-   úÁ×ßÒÛÅÔÅ Ó <Return>.  ÷ÉÖÔÅ ËÁË ÔÏÚÉ ÆÁÊÌ ÓÅ ÐÏÑ×Ñ×Á × ÄÏÌÎÉÑ
-   ÐÒÏÚÏÒÅÃ.  ëÕÒÓÏÒßÔ ÓßÝÏ ÏÔÉ×Á ÔÁÍ.
+>> Âúâåäåòå C-x 4 C-f, ïîñëåäâàíî îò èìåòî íà åäèí îò âàøèòå ôàéëîâå.
+   Çàâúðøåòå ñ <Return>.  Âèæòå êàê òîçè ôàéë ñå ïîÿâÿâà â äîëíèÿ
+   ïðîçîðåö.  Êóðñîðúò ñúùî îòèâà òàì.
 
->> ÷ß×ÅÄÅÔÅ C-x o, ÚÁ ÄÁ ÓÅ ×ßÒÎÅÔÅ × ÇÏÒÎÉÑ ÐÒÏÚÏÒÅÃ, É C-x 1 ÚÁ ÄÁ
-   ÉÚÔÒÉÅÔÅ ÄÏÌÎÉÑ.
+>> Âúâåäåòå C-x o, çà äà ñå âúðíåòå â ãîðíèÿ ïðîçîðåö, è C-x 1, çà äà
+   èçòðèåòå äîëíèÿ.
 
 
-* ÷ìïöåîé îé÷á îá òåäáëôéòáîå
---------------------------------
+* ÂËÎÆÅÍÈ ÍÈÂÀ ÍÀ ÐÅÄÀÊÒÈÐÀÍÅ
+-----------------------------
 
-ðÏÎÑËÏÇÁ ÝÅ ÓÅ ÏÚÏ×ÅÔÅ × ÔÏ×Á, ËÏÅÔÏ ÓÅ ÎÁÒÉÞÁ "×ÌÏÖÅÎÏ ÎÉ×Ï ÎÁ
-ÒÅÄÁËÔÉÒÁÎÅ" (recursive editing level).  ôÏ×Á ÓÅ ÏÔÂÅÌÑÚ×Á ÏÔ
-Ë×ÁÄÒÁÔÎÉ ÓËÏÂÉ × ÒÅÄÁ ÎÁ ÒÅÖÉÍÁ, ËÏÉÔÏ ÏÇÒÁÖÄÁÔ ÓËÏÂÉÔÅ ÏËÏÌÏ ÉÍÅÔÏ
-ÎÁ ÇÌÁ×ÎÉÑ ÒÅÖÉÍ.  îÁÐÒÉÍÅÒ, ÍÏÖÅ ÄÁ ×ÉÄÉÔÅ [(Fundamental)] ×ÍÅÓÔÏ
+Ïîíÿêîãà ùå ñå îçîâåòå â òîâà, êîåòî ñå íàðè÷à "âëîæåíî íèâî íà
+ðåäàêòèðàíå" (recursive editing level).  Òîâà ñå îòáåëÿçâà îò
+êâàäðàòíè ñêîáè â ðåäà íà ðåæèìà, êîèòî îãðàæäàò ñêîáèòå îêîëî èìåòî
+íà ãëàâíèÿ ðåæèì.  Íàïðèìåð, ìîæå äà âèäèòå [(Fundamental)] âìåñòî
 (Fundamental).
 
-úÁ ÄÁ ÓÅ ÍÁÈÎÅÔÅ ÏÔ ×ÌÏÖÅÎÏÔÏ ÎÉ×Ï ÎÁ ÒÅÄÁËÔÉÒÁÎÅ, ×ß×ÅÄÅÔÅ ESC ESC
-ESC.  ôÏ×Á Å ÏÂÝÁ ËÏÍÁÎÄÁ ÚÁ "ÉÚÌÉÚÁÎÅ".  íÏÖÅ É ÄÁ Ñ ÉÚÐÏÌÚ×ÁÔÅ ÚÁ
-ÍÁÈÁÎÅ ÎÁ ÄÏÐßÌÎÉÔÅÌÎÉ ÐÒÏÚÏÒÃÉ, É ÍÁÈÁÎÅ ÏÔ ÍÉÎÉÂÕÆÅÒÁ.
+Çà äà ñå ìàõíåòå îò âëîæåíîòî íèâî íà ðåäàêòèðàíå, âúâåäåòå ESC ESC
+ESC.  Òîâà å îáùà êîìàíäà çà "èçëèçàíå".  Ìîæå è äà ÿ èçïîëçâàòå çà
+ìàõàíå (ñêðèâàíå) íà äîïúëíèòåëíè ïðîçîðöè, êàêòî è çà äà ñå ìàõíåòå
+îò ìèíèáóôåðà.
 
->> ÷ß×ÅÄÅÔÅ M-x ÚÁ ÄÁ ×ÌÅÚÅÔÅ × ÍÉÎÉÂÕÆÅÒ; ÔÏÇÁ×Á ×ß×ÅÄÅÔÅ ESC ESC ESC
-   ÚÁ ÄÁ ÉÚÌÅÚÅÔÅ.
+>> Âúâåäåòå M-x, çà äà âëåçåòå â ìèíèáóôåð; òîãàâà âúâåäåòå ESC ESC
+   ESC, çà äà èçëåçåòå.
 
-îÅ ÍÏÖÅÔÅ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ C-g ÚÁ ÄÁ ÉÚÌÅÚÅÔÅ ÏÔ ×ÌÏÖÅÎÏ ÎÉ×Ï ÎÁ
-ÒÅÄÁËÔÉÒÁÎÅ.  ôÏ×Á Å ÔÁËÁ, ÚÁÝÏÔÏ C-g ÓÅ ÉÚÐÏÌÚ×Á ÚÁ ÐÒÅËÒÁÔÑ×ÁÎÅ ÎÁ
-ËÏÍÁÎÄÉ É ÁÒÇÕÍÅÎÔÉ ÷ÿôòå ×ß× ×ÌÏÖÅÎÏ ÎÉ×Ï ÎÁ ÒÅÄÁËÔÉÒÁÎÅ.
+Íå ìîæåòå äà èçïîëçâàòå C-g, çà äà èçëåçåòå îò âëîæåíî íèâî íà
+ðåäàêòèðàíå.  Òîâà å òàêà, çàùîòî C-g ñå èçïîëçâà çà ïðåêðàòÿâàíå íà
+êîìàíäè è àðãóìåíòè ÂÚÒÐÅ âúâ âëîæåíî íèâî íà ðåäàêòèðàíå.
 
 
-* ðïìõþá÷áîå îá äïðÿìîéôåìîá ðïíïý
+* ÏÎËÓ×ÀÂÀÍÅ ÍÀ ÄÎÏÚËÍÈÒÅËÍÀ ÏÎÌÎÙ
 ----------------------------------
 
-÷ ÔÏ×Á ×ß×ÅÄÅÎÉÅ ÓÅ ÏÐÉÔÁÈÍÅ ÄÁ ÏÓÉÇÕÒÉÍ ÄÏÓÔÁÔßÞÎÏ ÉÎÆÏÒÍÁÃÉÑ, ÚÁ ÄÁ
-ÚÁÐÏÞÎÅÔÅ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ åÍÁËÓ.  éÍÁ ÔÏÌËÏ×Á ÍÎÏÇÏ ÏÝÅ × åÍÁËÓ, ÞÅ ÎÅ Å
-×ßÚÍÏÖÎÏ ÔÏ ÄÁ ÂßÄÅ ÏÂÑÓÎÅÎÏ ×ÓÉÞËÏÔÏ ÔÕË.  ïÂÁÞÅ ÍÏÖÅ ÄÁ ÐÏÉÓËÁÔÅ ÄÁ
-ÎÁÕÞÉÔÅ ÐÏ×ÅÞÅ ÚÁ åÍÁËÓ, ÔßÊ ËÁÔÏ ÔÏÊ ÐÒÉÔÅÖÁ×Á ÏÝÅ ÍÎÏÇÏ ÐÏÌÅÚÎÉ
-ÓÐÏÓÏÂÎÏÓÔÉ.  åÍÁËÓ ÉÍÁ ËÏÍÁÎÄÉ ÚÁ ÞÅÔÅÎÅ ÎÁ ÄÏËÕÍÅÎÔÁÃÉÑÔÁ ÎÁ åÍÁËÓ
-ËÏÍÁÎÄÉÔÅ.  ôÅÚÉ "ÐÏÍÏÝÎÉ" ËÏÍÁÎÄÉ ×ÓÉÞËÉ ÚÁÐÏÞ×ÁÔ ÓßÓ ÚÎÁËÁ
-CONTROL-h, ËÏÊÔÏ ÓÅ ÎÁÒÉÞÁ "ÚÎÁËßÔ ÚÁ ÐÏÍÏÝ".
-
-úÁ ÄÁ ÉÚÐÏÌÚ×ÁÔÅ ÓÐÏÓÏÂÎÏÓÔÉÔÅ ÎÁ ÔÁÚÉ ÐÏÍÏÝ, ×ß×ÅÄÅÔÅ ÚÎÁËÁ C-h, É
-ÓÌÅÄ ÔÏ×Á ÚÎÁËÁ, ËÁÚ×ÁÝ ËÁËß× ×ÉÄ ÐÏÍÏÝ ÉÓËÁÔÅ.  áËÏ îáéóôéîá ÓÔÅ ÓÅ
-ÉÚÇÕÂÉÌÉ ×ß×ÅÄÅÔÅ C-h ? É åÍÁËÓ ÝÅ ×É ËÁÖÅ Ó ËÁË×Ï ÍÏÖÅ ÄÁ ×É
-ÐÏÍÏÇÎÅ.  áËÏ ÓÔÅ ×ß×ÅÌÉ C-h É ÒÅÛÉÔÅ, ÞÅ ÎÅ ÓÅ ÎÕÖÄÁÅÔÅ ÏÔ ÐÏÍÏÝ,
-ÐÒÏÓÔÏ ×ß×ÅÄÅÔÅ C-g ÚÁ ÄÁ Ñ ÐÒÅËÒÁÔÉÔÅ.
-
-(îÑËÏÉ ËÏÍÐÀÔÒÉ ÐÒÏÍÅÎÑÔ ÚÎÁÞÅÎÉÅÔÏ ÎÁ ÚÎÁËÁ C-h.  ôÅ ÎÁÉÓÔÉÎÁ ÎÅ
-ÔÒÑÂ×Á ÄÁ ÐÒÁ×ÑÔ ÔÏ×Á ËÁÔÏ ÓÌÑÐÁ ÍÑÒËÁ ÚÁ ×ÓÉÞËÉ ÐÏÔÒÅÂÉÔÅÌÉ, ÔÁËÁ ÞÅ
-ÉÍÁÔÅ ÏÓÎÏ×ÁÎÉÅ ÄÁ ÓÅ ÏÐÌÁÞÅÔÅ ÎÁ ÓÉÓÔÅÍÎÉÑ ÁÄÍÉÎÉÓÔÒÁÔÏÒ.  íÅÖÄÕ
-ÄÒÕÇÏÔÏ, ÁËÏ C-h ÎÅ ÉÚ×ÅÖÄÁ ÓßÏÂÝÅÎÉÅ ÚÁ ÐÏÍÏÝ × ÄßÎÏÔÏ ÎÁ ÅËÒÁÎÁ,
-ÏÐÉÔÁÊÔÅ ËÌÁ×ÉÛÁ F1 ÉÌÉ M-x help <Return> ×ÍÅÓÔÏ ÔÏ×Á.)
-
-îÁÊ-ÏÓÎÏ×ÎÁÔÁ ÐÏÍÏÝÎÁ ÓÐÏÓÏÂÎÏÓÔ Å C-h c.  ÷ß×ÅÄÅÔÅ C-h, ÚÎÁËÁ c, É
-ËÏÍÁÎÄÅÎ ÚÎÁË ÉÌÉ ÐÏÓÌÅÄÏ×ÁÔÅÌÎÏÓÔ ÏÔ ÚÎÁÃÉ ÏÂÒÁÚÕ×ÁÝÁ ËÏÍÁÎÄÁ; ÔÏÇÁ×Á
-åÍÁËÓ ÝÅ ÉÚ×ÅÄÅ ÍÎÏÇÏ ËÒÁÔËÏ ÏÐÉÓÁÎÉÅ ÎÁ ËÏÍÁÎÄÁÔÁ.
+ òîâà âúâåäåíèå ñå îïèòàõìå äà îñèãóðèì äîñòàòú÷íî èíôîðìàöèÿ, çà äà
+çàïî÷íåòå äà èçïîëçâàòå Åìàêñ.  Èìà òîëêîâà ìíîãî îùå â Åìàêñ, ÷å íå å
+âúçìîæíî òî äà áúäå îáÿñíåíî âñè÷êîòî òóê.  Îáà÷å ìîæå äà ïîèñêàòå äà
+íàó÷èòå ïîâå÷å çà Åìàêñ, òúé êàòî òîé ïðèòåæàâà îùå ìíîãî ïîëåçíè
+ñïîñîáíîñòè.  Åìàêñ èìà êîìàíäè çà ÷åòåíå íà äîêóìåíòàöèÿòà íà Åìàêñ
+êîìàíäèòå.  Òåçè "ïîìîùíè" êîìàíäè âñè÷êè çàïî÷âàò ñúñ çíàêà
+CONTROL-h, êîéòî ñå íàðè÷à "çíàêúò çà ïîìîù".
+
+Çà äà èçïîëçâàòå âúçìîæíîñòèòå íà òàçè ïîìîù, âúâåäåòå çíàêà C-h è
+ñëåä òîâà çíàêà, êàçâàù êàêúâ âèä ïîìîù èñêàòå.  Àêî ÍÀÈÑÒÈÍÀ ñòå ñå
+èçãóáèëè, âúâåäåòå C-h ? è Åìàêñ ùå âè êàæå ñ êàêâî ìîæå äà âè
+ïîìîãíå.  Àêî ñòå âúâåëè C-h è ðåøèòå, ÷å íå ñå íóæäàåòå îò ïîìîù,
+ïðîñòî âúâåäåòå C-g, çà äà ÿ ïðåêðàòèòå.
+
+(Íÿêîè êîìïþòðè ïðîìåíÿò çíà÷åíèåòî íà çíàêà C-h.  Òå íàèñòèíà íå
+òðÿáâà äà ïðàâÿò òîâà êàòî ñëÿïà ìÿðêà çà âñè÷êè ïîòðåáèòåëè, òàêà ÷å
+èìàòå îñíîâàíèå äà ñå îïëà÷åòå íà ñèñòåìíèÿ àäìèíèñòðàòîð.  Ìåæäó
+äðóãîòî, àêî C-h íå èçâåæäà ñúîáùåíèå çà ïîìîù â äúíîòî íà åêðàíà,
+îïèòàéòå êëàâèøà F1 èëè M-x help <Return> âìåñòî òîâà.)
+
+Íàé-îñíîâíîòî ïîìîùíî ñðåäñòâî å C-h c.  Âúâåäåòå C-h, çíàêà c è
+êîìàíäåí çíàê èëè ïîñëåäîâàòåëíîñò îò çíàöè, îáðàçóâàùè êîìàíäà;
+òîãàâà Åìàêñ ùå èçâåäå ìíîãî êðàòêî îïèñàíèå íà êîìàíäàòà.
 
 >> Type C-h c C-p.
-   ôÏ×Á ÓßÏÂÝÅÎÉÅ ÔÒÑÂ×Á ÄÁ ÉÚ×ÅÄÅ ÎÅÝÏ ËÁÔÏ
+
+Èçâåäåíîòî îïèñàíèå òðÿáâà äà áúäå íåùî êàòî
 
         C-p runs the command previous-line
-        (C-p ÉÚÐßÌÎÑ×Á ËÏÍÁÎÄÁÔÁ ÐÒÅÄÉÛÅÎ-ÒÅÄ)
+        (C-p èçïúëíÿâà êîìàíäàòà ïðåäèøåí-ðåä)
 
-ôÏ×Á ×É ËÁÚ×Á "ÉÍÅÔÏ ÎÁ ÆÕÎËÃÉÑÔÁ".  éÍÅÎÁÔÁ ÎÁ ÆÕÎËÃÉÉÔÅ ÓÅ ÉÚÐÏÌÚ×ÁÔ
-ÎÁÊ-×ÅÞÅ ÚÁ ÎÁÓÔÒÏÊ×ÁÎÅ É ÒÁÚÛÉÒÑ×ÁÎÅ ÎÁ åÍÁËÓ.  îÏ ÔßÊ ËÁÔÏ ÉÍÅÎÁÔÁ
-ÎÁ ÆÕÎËÃÉÉÔÅ ÓÁ ÉÚÂÒÁÎÉ ÔÁËÁ, ÞÅ ÄÁ ÐÏËÁÚ×ÁÔ ËÁË×Ï ÐÒÁ×É ËÏÍÁÎÄÁÔÁ, ÔÅ
-ÍÏÇÁÔ ÄÁ ÓÌÕÖÁÔ É ÚÁ ÍÎÏÇÏ ËÒÁÔËÁ ÄÏËÕÍÅÎÔÁÃÉÑ -- ÄÏÓÔÁÔßÞÎÁ ÚÁ ÄÁ ×É
-ÐÒÉÐÏÍÎÉ ËÏÍÁÎÄÉ, ËÏÉÔÏ ×ÅÞÅ ÓÔÅ ÕÞÉÌÉ.
+Òîâà âè êàçâà "èìåòî íà ôóíêöèÿòà".  Èìåíàòà íà ôóíêöèèòå ñå èçïîëçâàò
+íàé-âå÷å çà íàñòðîéâàíå è ðàçøèðÿâàíå íà Åìàêñ.  Íî òúé êàòî èìåíàòà
+íà ôóíêöèèòå ñà èçáðàíè òàêà, ÷å äà ïîêàçâàò êàêâî ïðàâè êîìàíäàòà, òå
+ìîãàò äà ñëóæàò è çà ìíîãî êðàòêà äîêóìåíòàöèÿ -- äîñòàòú÷íà, çà äà âè
+ïðèïîìíè êîìàíäè, êîèòî âå÷å ñòå ó÷èëè.
 
-íÎÏÇÏÚÎÁËÏ×É ËÏÍÁÎÄÉ, ËÁÔÏ C-x C-s É (ÁËÏ ÎÑÍÁÔÅ ËÌÁ×ÉÛ META ÉÌÉ EDIT
-ÉÌÉ ALT) <ESC>v ÓßÝÏ ÓÁ ÐÏÚ×ÏÌÅÎÉ ÓÌÅÄ C-h c.
+Ìíîãîçíàêîâè êîìàíäè, êàòî C-x C-s è (àêî íÿìàòå êëàâèø META èëè EDIT
+èëè ALT) <ESC>v, ñúùî ñà ïîçâîëåíè ñëåä C-h c.
 
-úÁ ÄÁ ÐÏÌÕÞÉÔÅ ÏÝÅ ÉÎÆÏÒÍÁÃÉÑ ÚÁ ËÏÍÁÎÄÁ, ÉÚÐÏÌÚ×ÁÊÔÅ C-h k ×ÍÅÓÔÏ C-h
+Çà äà ïîëó÷èòå îùå èíôîðìàöèÿ çà êîìàíäà, èçïîëçâàéòå C-h k âìåñòî C-h
 c.
 
->> ÷ß×ÅÄÅÔÅ C-h k C-p.
+>> Âúâåäåòå C-h k C-p.
 
-ôÏ×Á ÉÚ×ÅÖÄÁ ÄÏËÕÍÅÎÔÁÃÉÑÔÁ ÎÁ ÆÕÎËÃÉÑÔÁ, ËÁËÔÏ É ÎÅÊÎÏÔÏ ÉÍÅ, ×
-ÏÔÄÅÌÅÎ åÍÁËÓ ÐÒÏÚÏÒÅÃ.  ëÏÇÁÔÏ Ñ ÐÒÏÞÅÔÅÔÅ, ×ß×ÅÄÅÔÅ C-x 1 ÚÁ ÄÁ
-ÍÁÈÎÅÔÅ ÐÏÍÏÝÎÉÑ ÔÅËÓÔ.  îÅ Å ÎÕÖÎÏ ÄÁ ÐÒÁ×ÉÔÅ ÔÏ×Á ÔÏÞÎÏ ÓÅÇÁ.  íÏÖÅ
-ÄÁ ÒÅÄÁËÔÉÒÁÔÅ ÄÏËÁÔÏ ÓÅ ÏÂÒßÝÁÔÅ ËßÍ ÐÏÍÏÝÎÉÑ ÔÅËÓÔ ÚÁ ÓÐÒÁ×ËÁ, É
-ÓÌÅÄ ÔÏ×Á ÄÁ ×ß×ÅÄÅÔÅ C-x 1.
+Òîâà èçâåæäà äîêóìåíòàöèÿòà íà ôóíêöèÿòà, êàêòî è íåéíîòî èìå, â
+îòäåëåí Åìàêñ ïðîçîðåö.  Êîãàòî ÿ ïðî÷åòåòå, âúâåäåòå C-x 1, çà äà
+ìàõíåòå ïîìîùíèÿ òåêñò.  Íå å íóæíî äà ïðàâèòå òîâà òî÷íî ñåãà.  Ìîæå
+äà ðåäàêòèðàòå, äîêàòî ñå îáðúùàòå êúì ïîìîùíèÿ òåêñò çà ñïðàâêà, è
+ñëåä òîâà äà âúâåäåòå C-x 1.
 
-åÔÏ ÏÝÅ ÎÑËÏÌËÏ ÐÏÌÅÚÎÉ C-h ×ßÚÍÏÖÎÏÓÔÉ:
+Åòî îùå íÿêîëêî ïîëåçíè C-h âúçìîæíîñòè:
 
-   C-h f        ïÐÉÓ×Á ÆÕÎËÃÉÑ.  ôÒÑÂ×Á ÄÁ ×ß×ÅÄÅÔÅ ÉÍÅÔÏ ÎÁ
-                ÆÕÎËÃÉÑÔÁ.
+   C-h f        Îïèñâà ôóíêöèÿ.  Òðÿáâà äà âúâåäåòå èìåòî íà
+                ôóíêöèÿòà.
 
->> ïÐÉÔÁÊÔÅ Ó ×ß×ÅÖÄÁÎÅ ÎÁ C-h f previous-line<Return>.
-   ôÏ×Á ÉÚ×ÅÖÄÁ ÃÑÌÁÔÁ ÉÎÆÏÒÍÁÃÉÑ, ËÏÑÔÏ åÍÁËÓ ÚÎÁÅ ÚÁ ÆÕÎËÃÉÑÔÁ,
-   ËÏÑÔÏ ÏÓßÝÅÓÔ×Ñ×Á ËÏÍÁÎÄÁÔÁ C-p.
+>> Îïèòàéòå ñ âúâåæäàíå íà C-h f previous-line<Return>.
+   Òîâà èçâåæäà öÿëàòà èíôîðìàöèÿ, êîÿòî Åìàêñ çíàå çà ôóíêöèÿòà,
+   êîÿòî îñúùåñòâÿâà êîìàíäàòà C-p.
 
-ðÏÄÏÂÎÁ ËÏÍÁÎÄÁ, C-h v, ÉÚ×ÅÖÄÁ ÄÏËÕÍÅÎÔÁÃÉÑÔÁ ÎÁ ÐÒÏÍÅÎÌÉ×ÉÔÅ, ËÏÉÔÏ
-ÍÏÖÅ ÄÁ ÐÒÏÍÅÎÑÔÅ, ÚÁ ÄÁ ÎÁÓÔÒÏÊ×ÁÔÅ ÐÏ×ÅÄÅÎÉÅÔÏ ÎÁ åÍÁËÓ.  ôÒÑÂ×Á ÄÁ
-×ß×ÅÄÅÔÅ ÉÍÅÔÏ ÎÁ ÐÒÏÍÅÎÌÉ×ÁÔÁ, ËÏÇÁÔÏ åÍÁËÓ ×É ÐÏÄÓËÁÖÅ ÔÏ×Á.
+Ïîäîáíà êîìàíäà, C-h v, èçâåæäà äîêóìåíòàöèÿòà íà ïðîìåíëèâèòå, êîèòî
+ìîæå äà ïðîìåíÿòå, çà äà íàñòðîéâàòå ïîâåäåíèåòî íà Åìàêñ.  Òðÿáâà äà
+âúâåäåòå èìåòî íà ïðîìåíëèâàòà, êîãàòî Åìàêñ âè ïîäñêàæå òîâà.
 
-   C-h a        ëÏÍÁÎÄÁ áÐÒÏÐÏÓ.  ÷ß×ÅÖÄÁÔÅ ËÌÀÞÏ×Á ÄÕÍÁ É åÍÁËÓ ÝÅ
-                ÐÏËÁÖÅ ÓÐÉÓßË ÎÁ ×ÓÉÞËÉ ËÏÍÁÎÄÉ, ÞÉÅÔÏ ÉÍÅ ÓßÄßÒÖÁ
-                ÔÁÚÉ ËÌÀÞÏ×Á ÄÕÍÁ.  ôÅÚÉ ËÏÍÁÎÄÉ ÍÏÇÁÔ ×ÓÉÞËÉ ÄÁ ÂßÄÁÔ
-                ÉÚ×ÉËÁÎÉ ÞÒÅÚ META-x.  úÁ ÎÑËÏÉ ËÏÍÁÎÄÉ ËÏÍÁÎÄÁÔÁ
-                áÐÒÏÐÏÓ ÝÅ ÉÚ×ÅÄÅ ÄÏÐßÌÎÉÔÅÌÎÏ ÅÄÎÏÚÎÁËÏ×Á ÉÌÉ
-                Ä×ÕÚÎÁËÏ×Á ÐÏÓÌÅÄÏ×ÁÔÅÌÎÏÓÔ ÏÔ ËÌÁ×ÉÛÉ, ËÏÑÔÏ ÐÕÓËÁÔ
-                ÓßÝÁÔÁ ËÏÍÁÎÄÁ.
+   C-h a        Êîìàíäà Àïðîïîñ.  Âúâåäåòå êëþ÷îâà äóìà è Åìàêñ ùå
+                ïîêàæå ñïèñúê íà âñè÷êè êîìàíäè, ÷èåòî èìå ñúäúðæà
+                òàçè êëþ÷îâà äóìà.  Òåçè êîìàíäè ìîãàò âñè÷êè äà áúäàò
+                èçâèêàíè ÷ðåç META-x.  Çà íÿêîè êîìàíäè êîìàíäàòà
+                Àïðîïîñ ùå èçâåäå äîïúëíèòåëíî åäíîçíàêîâà èëè
+                äâóçíàêîâà ïîñëåäîâàòåëíîñò îò êëàâèøè, êîÿòî ïóñêà
+                ñúùàòà êîìàíäà.
 
->> ÷ß×ÅÄÅÔÅ C-h a file<Return>.
+>> Âúâåäåòå C-h a file<Return>.
 
-ôÏ×Á ÉÚ×ÅÖÄÁ × ÄÒÕÇ ÐÒÏÚÏÒÅà ÓÐÉÓßË ÎÁ ×ÓÉÞËÉ M-x ËÏÍÁÎÄÉ, ËÏÉÔÏ
-ÓßÄßÒÖÁÔ "file" × ÔÑÈÎÏÔÏ ÉÍÅ.  ýÅ ×ÉÄÉÔÅ ÚÎÁËÏ×É ËÏÍÁÎÄÉ ËÁÔÏ C-x C-f
-ÉÚÂÒÏÅÎÉ ÉÚÍÅÖÄÕ ÓßÏÔ×ÅÔÎÉÔÅ ÉÍÅÎÁ ÎÁ ËÏÍÁÎÄÉ, ËÁÔÏ find-file.
+Òîâà èçâåæäà â äðóã ïðîçîðåö ñïèñúê íà âñè÷êè M-x êîìàíäè, êîèòî
+ñúäúðæàò "file" â òÿõíîòî èìå.  Ùå âèäèòå çíàêîâè êîìàíäè êàòî C-x
+C-f, èçáðîåíè èçìåæäó ñúîòâåòíèòå èìåíà íà êîìàíäè, êàòî find-file.
 
->> ÷ß×ÅÄÅÔÅ C-M-v ÚÁ ÄÁ ÓËÒÏÌÉÒÁÔÅ ÐÏÍÏÝÎÉÑ ÐÒÏÚÏÒÅÃ.  îÁÐÒÁ×ÅÔÅ ÇÏ
-   ÎÑËÏÌËÏ ÐßÔÉ.
+>> Âúâåäåòå C-M-v, çà äà ñêðîëèðàòå ïîìîùíèÿ ïðîçîðåö.  Íàïðàâåòå ãî
+   íÿêîëêî ïúòè.
 
->> ÷ß×ÅÄÅÔÅ C-x 1 ÚÁ ÄÁ ÉÚÔÒÉÅÔÅ ÐÏÍÏÝÎÉÑ ÐÒÏÚÏÒÅÃ.
+>> Âúâåäåòå C-x 1, çà äà èçòðèåòå ïîìîùíèÿ ïðîçîðåö.
 
-   C-h i        þÅÔÅÎÅ ÎÁ ÒßËÏ×ÏÄÓÔ×Á (Info).  ôÁÚÉ ËÏÍÁÎÄÁ ×É ÐÒÁÝÁ ×
-                ÓÐÅÃÉÁÌÅÎ ÂÕÆÅÒ ÎÁÒÉÞÁÎ `*info*', ËßÄÅÔÏ ÍÏÖÅ ÄÁ
-                ÞÅÔÅÔÅ ÒßËÏ×ÏÄÓÔ×ÁÔÁ ÎÁ ÉÎÓÔÁÌÉÒÁÎÉÔÅ ×ß× ×ÁÛÁÔÁ
-                ÓÉÓÔÅÍÁ ÐÁËÅÔÉ.  ÷ß×ÅÄÅÔÅ m emacs <Return> ÚÁ ÄÁ
-                ÞÅÔÅÔÅ ÒßËÏ×ÏÄÓÔ×ÏÔÏ ÎÁ åÍÁËÓ.  áËÏ ÎÉËÏÇÁ ÐÒÅÄÉ ÔÏ×Á
-                ÎÅ ÓÔÅ ÉÚÐÏÌÚ×ÁÌÉ Info, ×ß×ÅÄÅÔÅ ? É åÍÁËÓ ÝÅ ×ËÌÀÞÉ
-                ×ß×ÅÄÅÎÉÅ ÚÁ ×ßÚÍÏÖÎÏÓÔÉÔÅ ÎÁ ÒÅÖÉÍÁ éÎÆÏ.  ÷ÅÄÎßÖ ÓÌÅÄ
-                ËÁÔÏ ÓÔÅ ÐÒÅÍÉÎÁÌÉ ÔÏ×Á ×ß×ÅÄÅÎÉÅ, ÔÒÑÂ×Á ÄÁ ÓÅ
-                ËÏÎÓÕÌÔÉÒÁÔÅ Ó åÍÁËÓ éÎÆÏ ÒßËÏ×ÏÄÓÔ×ÏÔÏ ËÁÔÏ ×ÁÛÁ
-                ÏÓÎÏ×ÎÁ ÄÏËÕÍÅÎÔÁÃÉÑ.
+   C-h i        ×åòåíå íà ðúêîâîäñòâà (Info).  Òàçè êîìàíäà âè ïðàùà â
+                ñïåöèàëåí áóôåð, íàðè÷àí "*info*", êúäåòî ìîæå äà
+                ÷åòåòå ðúêîâîäñòâàòà íà èíñòàëèðàíèòå âúâ âàøàòà
+                ñèñòåìà ïàêåòè.  Âúâåäåòå m emacs <Return>, çà äà
+                ÷åòåòå ðúêîâîäñòâîòî íà Åìàêñ.  Àêî íèêîãà ïðåäè òîâà
+                íå ñòå èçïîëçâàëè Info, âúâåäåòå ? è Åìàêñ ùå âêëþ÷è
+                âúâåäåíèå âúâ âúçìîæíîñòèòå íà ðåæèìà Èíôî.  Âåäíúæ
+                ñëåä êàòî ñòå ïðåìèíàëè òîâà âúâåäåíèå, òðÿáâà äà ñå
+                êîíñóëòèðàòå ñ Åìàêñ Èíôî ðúêîâîäñòâîòî êàòî âàøà
+                îñíîâíà äîêóìåíòàöèÿ.
 
 
-* ïýå ÷ÿúíïöîïóôé
+* ÎÙÅ ÂÚÇÌÎÆÍÎÑÒÈ
 -----------------
 
-íÏÖÅ ÄÁ ÎÁÕÞÉÔÅ ÐÏ×ÅÞÅ ÚÁ åÍÁËÓ Ó ÞÅÔÅÎÅ ÎÁ ÎÅÇÏ×ÏÔÏ ÒßËÏ×ÏÄÓÔ×Ï, ÉÌÉ
-ËÁÔÏ ËÎÉÇÁ, ÉÌÉ × éÎÆÏ (ÉÚÐÏÌÚ×ÁÊÔÅ ÍÅÎÀÔÏ ÐÏÍÏÝ (Help) ÉÌÉ ×ß×ÅÄÅÔÅ
-F10 h r).  ä×Å ×ßÚÍÏÖÎÏÓÔÉ, ËÏÉÔÏ ÍÏÖÅ ÄÁ ÖÅÌÁÅÔÅ × ÎÁÞÁÌÏÔÏ, ÓÁ
-ÄÏ×ßÒÛ×ÁÎÅ (completion), ËÏÅÔÏ ÓÐÅÓÔÑ×Á ÐÉÓÁÎÅ, É dired, ËÏÊÔÏ
-ÏÐÒÏÓÔÑ×Á ÂÏÒÁ×ÅÎÅÔÏ Ó ÆÁÊÌÏ×Å.
-
-äÏ×ßÒÛ×ÁÎÅÔÏ Å ÎÁÞÉÎ ÄÁ ÉÚÂÑÇ×ÁÔÅ ÎÅÎÕÖÎÏ ÐÉÓÁÎÅ.  îÁÐÉÒÍÅÒ, ÁËÏ
-ÉÓËÁÔÅ ÄÁ ÐÒÅ×ËÌÀÞÉÔÅ ËßÍ ÂÕÆÅÒÁ *Messages*, ÍÏÖÅ ÄÁ ×ß×ÅÄÅÔÅ C-x b
-*M<Tab> É åÍÁËÓ ÝÅ ÚÁÐßÌÎÉ ÏÓÔÁÎÁÌÁÔÁ ÞÁÓÔ ÏÔ ÉÍÅÔÏ ÎÁ ÂÕÆÅÒÁ,
-ÄÏËÏÌËÏÔÏ ÍÏÖÅ ÄÁ ÓÅ ÏÐÒÅÄÅÌÉ ÏÔ ÔÏ×Á, ËÏÊÔÏ ÓÔÅ ×ß×ÅÌÉ.  äÏ×ßÒÛ×ÁÎÅÔÏ
-Å ÏÐÉÓÁÎÏ × éÎÆÏ-ÒßËÏ×ÏÄÓÔ×ÏÔÏ ÎÁ åÍÁËÓ × ÐÁÒÞÅÔÏ "äÏ×ßÒÛ×ÁÎÅ"
+Ìîæå äà íàó÷èòå ïîâå÷å çà Åìàêñ ñ ÷åòåíå íà íåãîâîòî ðúêîâîäñòâî, èëè
+êàòî êíèãà, èëè â Èíôî (èçïîëçâàéòå ìåíþòî ïîìîù (Help) èëè âúâåäåòå
+F10 h r).  Äâå âúçìîæíîñòè, êîèòî ìîæå äà æåëàåòå â íà÷àëîòî, ñà
+äîâúðøâàíå (completion), êîåòî ñïåñòÿâà ïèñàíå, è dired, êîéòî
+îïðîñòÿâà áîðàâåíåòî ñ ôàéëîâå.
+
+Äîâúðøâàíåòî å íà÷èí äà èçáÿãâàòå íåíóæíî ïèñàíå.  Íàïðèìåð, àêî
+èñêàòå äà ïðåâêëþ÷èòå êúì áóôåðà *Messages*, ìîæå äà âúâåäåòå C-x b
+*M<Tab> è Åìàêñ ùå çàïúëíè îñòàíàëàòà ÷àñò îò èìåòî íà áóôåðà,
+äîêîëêîòî ìîæå äà ñå îïðåäåëè îò òîâà, êîåòî ñòå âúâåëè.  Äîâúðøâàíåòî
+å îïèñàíî â Èíôî-ðúêîâîäñòâîòî íà Åìàêñ â ñòðàíèöàòà "Äîâúðøâàíå"
 ("Completion").
 
-Dired ×É ÐÏÚ×ÏÌÑ×Á ÄÁ ÇÌÅÄÁÔÅ ÓÐÉÓßËÁ ÏÔ ÆÁÊÌÏ×Å × ÄÉÒÅËÔÏÒÉÑ (É ËÁÔÏ
-×ßÚÍÏÖÎÏÓÔ ÎÅÊÎÉÔÅ ÐÏÄÄÉÒÅËÔÏÒÉÉ), ÄÁ ÓÅ ÐÒÉÄ×ÉÖ×ÁÔÅ × ÔÏÚÉ ÓÐÉÓßË, ÄÁ
-ÐÏÓÅÝÁ×ÁÔÅ, ÐÒÅÉÍÅÎÕ×ÁÔÅ, ÉÚÔÒÉ×ÁÔÅ É ÉÚÏÂÝÏ ÄÅÊÓÔ×ÁÔÅ ×ßÒÈÕ
-ÆÁÊÌÏ×ÅÔÅ.  Dired Å ÏÐÉÓÁÎ × éÎÆÏ-ÒßËÏ×ÏÄÓÔ×ÏÔÏ ÎÁ åÍÁËÓ × ÐÁÒÞÅÔÏ
+Dired âè ïîçâîëÿâà äà ãëåäàòå ñïèñúêà îò ôàéëîâå â äèðåêòîðèÿ (è êàòî
+âúçìîæíîñò: íåéíèòå ïîääèðåêòîðèè), äà ñå ïðèäâèæâàòå â òîçè ñïèñúê,
+äà ïîñåùàâàòå, ïðåèìåíóâàòå, èçòðèâàòå è èçîáùî äåéñòâàòå âúðõó
+ôàéëîâåòå.  Dired å îïèñàí â Èíôî-ðúêîâîäñòâîòî íà Åìàêñ â ñòðàíèöàòà
 "Dired".
 
-òßËÏ×ÏÄÓÔ×ÏÔÏ ÎÁ åÍÁËÓ ÏÐÉÓ×Á ÏÝÅ ÍÎÏÇÏ ÄÒÕÇÉ ×ßÚÍÏÖÎÏÓÔÉ ÎÁ
-ÒÅÄÁËÔÏÒÁ.
+Ðúêîâîäñòâîòî íà Åìàêñ îïèñâà îùå ìíîãî äðóãè âúçìîæíîñòè íà
+ðåäàêòîðà.
 
 
-* úáëìàþåîéå
+* ÇÀÊËÞ×ÅÍÈÅ
 ------------
 
-úÁÐÏÍÎÅÔÅ, ÚÁ ÄÁ ÉÚÌÅÚÅÔÅ ÂÅÚ×ßÚ×ÒÁÔÎÏ ÏÔ åÍÁËÓ ÉÚÐÏÌÚ×ÁÊÔÅ C-x C-c.
-úÁ ÄÁ ÉÚÌÅÚÅÔÅ ×ÒÅÍÅÎÎÏ × ÏÂ×É×ËÁ, ÔÁËÁ ÞÅ ÄÁ ÓÅ ×ßÒÎÅÔÅ × åÍÁËÓ
-ÐÏ-ËßÓÎÏ, ÉÚÐÏÌÚ×ÁÊÔÅ C-z.
+Çàïîìíåòå: çà äà èçëåçåòå áåçâúçâðàòíî îò Åìàêñ, èçïîëçâàéòå C-x C-c.
+Çà äà èçëåçåòå âðåìåííî â îáâèâêà, òàêà ÷å äà ñå âúðíåòå â Åìàêñ
+ïî-êúñíî, èçïîëçâàéòå C-z.
 
-ôÏ×Á ×ß×ÅÄÅÎÉÅ Å ÐÒÅÄ×ÉÄÅÎÏ ÄÁ ÂßÄÅ ÒÁÚÂÉÒÁÅÍÏ ÚÁ ×ÓÉÞËÉ ÎÏ×É
-ÐÏÔÒÅÂÉÔÅÌÉ, ÔÁËÁ ÞÅ ÁËÏ ÎÁÍÉÒÁÔÅ ÎÅÝÏ ÎÅÑÓÎÏ, ÎÅ ÓÅ ÓÁÍÏÏÂ×ÉÎÑ×ÁÊÔÅ
--- ÏÐÌÁÞÅÔÅ ÓÅ!
+Òîâà âúâåäåíèå å ïðåäâèäåíî äà áúäå ðàçáèðàåìî çà âñè÷êè íîâè
+ïîòðåáèòåëè, òàêà ÷å àêî íàìèðàòå íåùî íåÿñíî, íå ñå ñàìîîáâèíÿâàéòå
+-- îïëà÷åòå ñå!
 
 
-* ëïðéòáîå
+* ÊÎÏÈÐÀÍÅ
 ----------
 
-ôÏ×Á ×ß×ÅÄÅÎÉÅ ÐÒÏÉÚÌÉÚÁ ÏÔ ÄßÌÇÁ ÐÏÒÅÄÉÃÁ ×ß×ÅÄÅÎÉÑ × åÍÁËÓ
-ÚÁÐÏÞ×ÁÊËÉ ÏÔ ÅÄÎÏ ÎÁÐÉÓÁÎÏ ÏÔ óÔÀßÒÔ ëÒÁËÒÁÆÔ ÚÁ ÎÁÞÁÌÎÉÑ åÍÁËÓ.
+Òîâà âúâåäåíèå ïðîèçëèçà îò äúëãà ïîðåäèöà âúâåäåíèÿ â Åìàêñ,
+çàïî÷âàéêè îò åäíî, íàïèñàíî îò Ñòþúðò Êðàêðàôò çà íà÷àëíèÿ Åìàêñ.
 
-ôÁÚÉ ×ÅÒÓÉÑ ÎÁ ×ß×ÅÄÅÎÉÅÔÏ, ËÁËÔÏ É çîõ åÍÁËÓ, Å ÚÁÝÉÔÅÎÁ Ó Á×ÔÏÒÓËÉ
-ÐÒÁ×Á É ÉÄ×Á Ó ÒÁÚÒÅÛÅÎÉÅ ÄÁ ÒÁÚÐÒÏÓÔÒÁÎÑ×ÁÔÅ ËÏÐÉÑ ÐÒÉ ÓÌÅÄÎÉÔÅ
-ÕÓÌÏ×ÉÑ:
+Òàçè âåðñèÿ íà âúâåäåíèåòî, êàêòî è ÃÍÓ Åìàêñ, å çàùèòåíà ñ àâòîðñêè
+ïðàâà è èäâà ñ ðàçðåøåíèå äà ðàçïðîñòðàíÿâàòå êîïèÿ ïðè ñëåäíèòå
+óñëîâèÿ:
 
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
@@ -1181,15 +1183,15 @@ Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
    under the above conditions, provided also that they
    carry prominent notices stating who last altered them.
 
-õÓÌÏ×ÉÑÔÁ ÚÁ ËÏÐÉÒÁÎÅ ÎÁ ÓÁÍÉÑ åÍÁËÓ ÓÁ ÐÏ-ÓÌÏÖÎÉ, ÎÏ × ÓßÝÉÑ ÄÕÈ.
-íÏÌÑ ÐÒÏÞÅÔÅÔÅ ÆÁÊÌÁ COPYING É ÔÏÇÁ×Á ÄÁ×ÁÊÔÅ ËÏÐÉÑ ÎÁ çîõ åÍÁËÓ ÎÁ
-Ó×ÏÉ ÐÒÉÑÔÅÌÉ.  ðÏÍÏÇÎÅÔÅ ÄÁ ÓÐÒÅÍ ÚÁÔ×ÏÒÅÎÏÓÔÔÁ ÎÁ ÐÒÏÇÒÁÍÉÔÅ
-("ÐÒÉÔÅÖÁÎÉÅÔÏ") ËÁÔÏ ÉÚÐÏÌÚ×ÁÍÅ, ÐÉÛÅÍ É ÓÐÏÄÅÌÑÍÅ Ó×ÏÂÏÄÅÎ ÓÏÆÔÕÅÒ!
+Óñëîâèÿòà çà êîïèðàíå íà ñàìèÿ Åìàêñ ñà ïî-ñëîæíè, íî â ñúùèÿ äóõ.
+Ìîëÿ, ïðî÷åòåòå ôàéëà COPYING è òîãàâà äàâàéòå êîïèÿ íà ÃÍÓ Åìàêñ íà
+ñâîè ïðèÿòåëè.  Ïîìîãíåòå äà ñïðåì çàòâîðåíîñòòà íà ïðîãðàìèòå
+("ïðèòåæàíèåòî"), êàòî èçïîëçâàìå, ïèøåì è ñïîäåëÿìå ñâîáîäåí ñîôòóåð!
 
-ðÒÅ×ÏÄßÔ ÎÁ ÂßÌÇÁÒÓËÉ Å ÉÚ×ßÒÛÅÎ ÏÔ ïÇÎÑÎ ëÕÌÅ×
+Ïðåâîäúò íà áúëãàðñêè å èçâúðøåí îò Îãíÿí Êóëåâ
 <ogi@fmi.uni-sofia.bg>.
 
 ;;; Local Variables:
-;;;   coding: koi8-r
+;;;   coding: windows-1251
 ;;; End:
 ;;; arch-tag: 70cf6ad7-c2e4-41fe-8199-74aa52683b0e
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56587ae22ed..97539c809ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,192 @@
+2003-12-30  Eli Zaretskii  <eliz@elta.co.il>
+
+        * mail/rmail.el (rmail-convert-to-babyl-format): Fix off-by-one
+        error in arguments to base64-decode-region.  Remove ^M characters
+        after decoding base64.
+
+2003-12-30  Simon Josefsson  <jas@extundo.com>
+
+        * textmodes/texinfo.el: Change maintainer to FSF.  Suggested by
+        karl@freefriends.org (Karl Berry), since the Texinfo Elisp files
+        have only been distributed with Emacs for some years.
+        (texinfo-mode-hook): Customize.
+
+2003-12-30  Eli Zaretskii  <eliz@elta.co.il>
+
+        * mail/rmail.el (rmail-convert-to-babyl-format): Make the code
+        cleaner (suggested by Richard Stallman).
+
+        * progmodes/gud.el (gud-tool-bar-map): Modify names of icon files
+        for gud-next, gud-nexti, gud-step and gud-stepi to prevent
+        file-name clashes on 8+3 DOS filesystems.
+
+        * toolbar/gud-next.pbm, toolbar/gud-next.xpm
+        * toolbar/gud-nexti.pbm, toolbar/gud-nexti.xpm
+        * toolbar/gud-step.pbm, toolbar/gud-step.xpm
+        * toolbar/gud-stepi.pbm, toolbar/gud-stepi.xpm: Renamed to
+        gud-n.*, gud-ni.*, gud-s.*, and gud-si.*, respectively, to avoid
+        file-name clashes on 8+3 filesystems.
+
+        * emacs-lisp/tcover-unsafep.el, emacs-lisp/tcover-ses.el: Renamed
+        from testcover-unsafep.el and testcover-ses.el to avoid file-name
+        clashes on 8+3 DOS filesystems.
+
+2003-12-29  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/flyspell.el (mail-mode-flyspell-verify):
+        Search for header separator alone on a line, literally,
+        and search for it backward, not forward.
+        (flyspell-abbrev-table): Always use global-abbrev-table
+        if there is no local one.
+
+        * progmodes/sh-script.el (sh-get-indent-info):
+        Don't move point back if at bob.
+
+        * progmodes/antlr-mode.el (save-buffer-state-x): Use with-no-warnings.
+
+        * play/handwrite.el (handwrite): Make the handwrite credit message
+        a comment rather than an output command.
+
+        * obsolete/sc.el: Display message that this file is obsolete.
+
+        * net/ange-ftp.el (ange-ftp-start-process): Copy the environment.
+
+        * mail/rfc822.el (rfc822-address-start): Declare variable.
+        Renamed from address-start.  All uses changed.
+
+        * term.el (term-exec): Set up sentinel.
+        (term-sentinel): New function.
+        (term-handle-exit): New function.
+
+        * subr.el (assoc-ignore-case, assoc-ignore-representation): 
+        Use assoc-string, and mark them obsolete.
+        (delay-mode-hooks): Mark as permanent local.
+
+        * simple.el (sendmail-user-agent-compose): Use assoc-string.
+
+        * register.el (copy-rectangle-to-register): Doc fix.
+
+        * info.el (Info-insert-dir): Use assoc-string.
+
+        * info-look.el (info-lookup): Use assoc-string.
+
+        * frame.el (pop-up-frame-function): Use quote, not `function'.
+        (frame-notice-user-settings): Calculate ADJUSTED-TOP
+        copying with lists as coordinate values.
+
+        * font-lock.el (font-lock-after-change-function): Bind inhibit-quit.
+
+        * find-dired.el (kill-find): New command.
+        (find-dired): Make buffer read-only.
+        Set up a keymap with C-c C-k running kill-find.
+        (find-dired-filter, find-dired-sentinel): Bind inhibit-read-only.
+
+        * files.el (backup-buffer-copy): If MODES is nil, don't set modes.
+
+        * filecache.el (file-cache-ignore-case): New variable.
+        (file-cache-assoc-function): Var deleted.  Use assoc-string instead.
+
+        * comint.el (comint-arguments): Set COUNT after ARGS is complete.
+        (comint-dynamic-complete-as-filename): Rename local vars.
+        (comint-dynamic-list-filename-completions): Likewise.
+
+        * comint.el (comint-dynamic-list-completions-config): New var.
+        (comint-dynamic-list-completions): Handle both SPC and TAB right.
+
+        * comint.el (comint-file-name-chars): Add [].
+        (comint-word): Use skip-chars-backward, not search.
+
+        * shell.el (shell-file-name-chars): Add [].
+
+        * shell.el (shell-dynamic-complete-as-command): Rename local vars.
+
+        * bookmark.el (bookmark-get-bookmark): Use assoc-string.
+
+        * generic.el (define-generic-mode): Doc fix.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * files.el (kill-some-buffers): Doc fix.
+
+2003-12-29  David Herring <sdh6@ra.msstate.edu>  (tiny change)
+
+        * comint.el (comint-watch-for-password-prompt): Pass `string' as
+        arg to send-invisible
+        (send-invisible): Doc fix.  The argument is now a prompt, not the
+        string to send.
+        (comint-read-noecho): Doc fix.
+
+2003-12-29  Michael R. Wolf  <MichaelRWolf@att.net>  (tiny change)
+
+        * net/ange-ftp.el (ange-ftp-name-format): Allow USER to contain
+        "@", as required by some ISP hosting service.  Fix defcustom
+        argument syntax errors that prevented use of customization.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * xml.el (xml-get-attribute-or-nil): Doc fix.
+
+2003-12-29  Peter 'Luna' Runestig <peter@runestig.com>
+
+        * net/zone-mode.el (zone-mode): Use write-file-functions, not
+        write-file-hooks.
+
+2003-12-29  Eric Hanchrow <offby1@blarg.net>  (tiny change)
+
+        * autorevert.el (auto-revert-interval): Doc fix.
+
+2003-12-29  Mark A. Hershberger <mah@everybody.org>
+
+        * xml.el (xml-get-attribute-or-nil): New function, like
+        xml-get-attribute, but returns nil if the attribute was not found.
+        (xml-get-attribute): Converted to defsubst, uses
+        xml-get-attribute-or-nil.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * emacs-lisp/easymenu.el (easy-menu-define): Doc fix.
+
+2003-12-29  Alex Schroeder <alex@emacswiki.org>  (tiny change)
+
+        * custom.el (custom-declare-theme): Use `value' when putting
+        properties on `theme'.
+
+2003-12-29  Takaaki Ota <Takaaki.Ota@am.sony.com>
+
+        * subr.el (insert-for-yank): Call insert-for-yank-1 repetitively
+        for each yank-handler segment.
+        (insert-for-yank-1): New function, with the body of the previous
+        insert-for-yank.
+
+        * textmodes/table.el (table-yank-handler): New defcustom.
+        (table--put-cell-indicator-property): Put yank-handler property
+        that indicates the yank handler for the table cell.
+
+2003-12-29  Jesper Harder <harder@ifa.au.dk>  (tiny change)
+
+        * generic-x.el (etc-modules-conf-generic-mode): A more complete
+        set of keywords.
+
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+        * international/mule-cmds.el (reset-language-environment)
+        (set-language-environment): Don't invoke fontset-related functions
+        if fontset-list is not fboundp.
+
+2003-12-29  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (reset-language-environment): Call
+        set-overriding-fontspec-internal with nil.
+        (set-language-environment): Call set-overriding-fontspec-internal
+        if the language environment specify `overriding-fontspec'.
+        (language-info-alist): Doc added.
+
+        * language/cyrillic.el (ccl-encode-koi8-font): Make it work for
+        characters of mule-unicode-0100-24ff.
+        (ccl-encode-windows-1251-font): New CCL program.
+        ("Bulgarian"): Specify overriding-fontspec.
+        ("Belarusian"): Likewise.
+
 2003-12-28  Sam Steingold  <sds@gnu.org>
 
         * net/ange-ftp.el (ange-ftp-file-attributes): Add new optional
@@ -46,6 +235,14 @@
 
         * ffap.el (ffap-read-file-or-url): Revert previous change.
 
+2003-12-25  Robert J. Chassell <bob@rattlesnake.com>
+
+        * textmodes/texnfo-upd.el (texinfo-multi-file-update): Create a
+        new list of included files called `files-with-node-lines', that
+        only have node lines.  This way @include commands can include any
+        file, such as version and update files without node lines, not
+        just files that are chapters.
+
 2003-12-25  Andreas Schwab  <schwab@suse.de>
 
         * jka-compr.el (jka-compr-insert-file-contents): Avoid error when
@@ -542,10 +739,18 @@
 
 2003-11-01  Mark A. Hershberger  <mah@everybody.org>
 
-        * xml.el: Allow comments following the top-level element.
-        Separate out namespace parsing into special functions.
-        Change namespace parsing to return ('ns-uri . "local-name")
-        instead of '{ns-uri}local-name.
+        * xml.el (xml-parse-region): Allow comments to appear after the
+        topmost element has closed.
+        (xml-ns-parse-ns-attrs, xml-ns-expand-el)
+        (xml-ns-expand-attr): New functions to do namespace handling.   
+        (xml-intern-attrlist): Back-compatible handling of attribute
+        names.
+        (xml-parse-tag): Move namespace handling to seperate functions.
+        Now produces elements in the form ((:ns . "element") (attr-list)
+        children) instead of ('ns:element (attr-list) children).
+        (xml-parse-attlist): Fix attribute parsing.
+        (xml-parse-dtd): Change parsing so that it produces strings
+        instead of interned symbols.
 
 2003-11-01  era@iki.fi  <era@iki.fi>  (tiny change)
 
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 9f254b54d69..7ac7a402c3a 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995, 1997, 1998, 2003 Free Software Foundation, Inc.
 
-;; Author: Morten Welinder <terra@diku.dk>
+;; Author: Morten Welinder <terra@gnu.org>
 ;; Keywords: archives msdog editing major-mode
 ;; Favourite-brand-of-beer: None, I hate beer.
 
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f366d5c7547..fac91332a5e 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -97,7 +97,10 @@ Never set this variable directly, use the command `auto-revert-mode' instead.")
 (put 'auto-revert-mode 'permanent-local t)
 
 (defcustom auto-revert-interval 5
-  "Time, in seconds, between Auto-Revert Mode file checks."
+  "Time, in seconds, between Auto-Revert Mode file checks.
+Setting this variable has no effect on buffers that are already in
+auto-revert-mode; it only affects buffers that are put into
+auto-revert-mode afterwards."
   :group 'auto-revert
   :type 'integer)
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 762de7323a2..67ae2c84865 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -335,10 +335,7 @@ through a file easier.")
   "Return the full entry for BOOKMARK in bookmark-alist.
 If BOOKMARK is not a string, return nil."
   (when (stringp bookmark)
-    (apply (if bookmark-completion-ignore-case
-               #'assoc-ignore-case
-             #'assoc)
-           (list bookmark bookmark-alist))))
+    (assoc-string bookmark bookmark-alist bookmark-completion-ignore-case)))
 
 
 (defun bookmark-get-bookmark-record (bookmark)
diff --git a/lisp/comint.el b/lisp/comint.el
index 5509e71d984..6bc40a01bd3 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1344,16 +1344,16 @@ Argument 0 is the command name."
             ;; Put the previous arg, if there was one, onto ARGS.
             (setq str (substring string beg pos)
                   args (if quotes (cons str args)
-                         (nconc (comint-delim-arg str) args))
-                  count (1+ count)))
+                         (nconc (comint-delim-arg str) args))))
+        (setq count (length args))
         (setq quotes (match-beginning 1))
         (setq beg (match-beginning 0))
         (setq pos (match-end 0))))
     (if beg
         (setq str (substring string beg pos)
               args (if quotes (cons str args)
-                     (nconc (comint-delim-arg str) args))
-              count (1+ count)))
+                     (nconc (comint-delim-arg str) args))))
+    (setq count (length args))
     (let ((n (or nth (1- count)))
           (m (if mth (1- (- count mth)) 0)))
       (mapconcat
@@ -1901,7 +1901,8 @@ RET, LFD, or ESC.  DEL or C-h rubs out.  C-u kills line.  C-g aborts (if
 filter and C-g is pressed, this function returns nil rather than a string).
 
 Note that the keystrokes comprising the text can still be recovered
-\(temporarily) with \\[view-lossage].  Some people find this worrysome.
+\(temporarily) with \\[view-lossage].  Some people find this worrysome (see,
+however, `clear-this-command-keys').
 Once the caller uses the password, it can erase the password
 by doing (clear-string STRING)."
   (let ((ans "")
@@ -1948,24 +1949,22 @@ by doing (clear-string STRING)."
       (message "")
       ans)))
 
-(defun send-invisible (str)
+(defun send-invisible (&optional prompt)
   "Read a string without echoing.
 Then send it to the process running in the current buffer.
 The string is sent using `comint-input-sender'.
 Security bug: your string can still be temporarily recovered with
-\\[view-lossage]."
+\\[view-lossage]; `clear-this-command-keys' can fix that."
   (interactive "P")                     ; Defeat snooping via C-x ESC ESC
   (let ((proc (get-buffer-process (current-buffer))))
-    (cond ((not proc)
-           (error "Current buffer has no process"))
-          ((stringp str)
-           (comint-snapshot-last-prompt)
-           (funcall comint-input-sender proc str))
-          (t
-           (let ((str (comint-read-noecho "Non-echoed text: " t)))
-             (if (stringp str)
-                 (send-invisible str)
-               (message "Warning: text will be echoed")))))))
+    (if proc
+        (let ((str (comint-read-noecho (or prompt "Non-echoed text: ") t)))
+          (if (stringp str)
+              (progn
+                (comint-snapshot-last-prompt)
+                (funcall comint-input-sender proc str))
+            (message "Warning: text will be echoed")))
+      (error "Current buffer has no process"))))
 
 (defun comint-watch-for-password-prompt (string)
   "Prompt in the minibuffer for password and send without echoing.
@@ -1977,8 +1976,7 @@ This function could be in the list `comint-output-filter-functions'."
   (when (string-match comint-password-prompt-regexp string)
     (when (string-match "^[ \n\r\t\v\f\b\a]+" string)
       (setq string (replace-match "" t t string)))
-    (let ((pw (comint-read-noecho string t)))
-      (send-invisible pw))))
+    (send-invisible string)))
 
 ;; Low-level process communication
 
@@ -2084,7 +2082,7 @@ between the process-mark and point."
   (comint-skip-input)
   (interrupt-process nil comint-ptyp)
 ;;  (process-send-string nil "\n")
-  )
+)
 
 (defun comint-kill-subjob ()
   "Send kill signal to the current subjob.
@@ -2553,7 +2551,7 @@ directory tracking functions.")
 (defvar comint-file-name-chars
   (if (memq system-type '(ms-dos windows-nt cygwin))
       "~/A-Za-z0-9_^$!#%&{}@`'.,:()-"
-    "~/A-Za-z0-9+@:_.$#%,={}-")
+    "[]~/A-Za-z0-9+@:_.$#%,={}-")
   "String of characters valid in a file name.
 Note that all non-ASCII characters are considered valid in a file name
 regardless of what this variable says.
@@ -2579,15 +2577,19 @@ Word constituents are considered to be those in WORD-CHARS, which is like the
 inside of a \"[...]\" (see `skip-chars-forward'),
 plus all non-ASCII characters."
   (save-excursion
-    (let ((non-word-chars (concat "[^\\\\" word-chars "]")) (here (point)))
-      (while (and (re-search-backward non-word-chars nil 'move)
-                  ;;(memq (char-after (point)) shell-file-name-quote-list)
-                  (or (>= (following-char) 128)
-                      (eq (preceding-char) ?\\)))
-        (backward-char 1))
-      ;; Don't go forward over a word-char (this can happen if we're at bob).
-      (when (or (not (bobp)) (looking-at non-word-chars))
-        (forward-char 1))
+    (let ((here (point))
+          giveup)
+      (while (not giveup)
+        (let ((startpoint (point)))
+          (skip-chars-backward (concat "\\\\" word-chars))
+          (if (and (> (- (point) 2) (point-min))
+                   (= (char-after (- (point) 2)) ?\\))
+              (forward-char -2))
+          (if (and (> (- (point) 1) (point-min))
+                   (>= (char-after (- (point) 1)) 128))
+              (forward-char -1))
+          (if (= (point) startpoint)
+              (setq giveup t))))
       ;; Set match-data to match the entire string.
       (when (< (point) here)
         (set-match-data (list (point) here))
@@ -2699,10 +2701,10 @@ See `comint-dynamic-complete-filename'.  Returns t if successful."
                            (t
                             (cdr comint-completion-addsuffix))))
          (filename (or (comint-match-partial-filename) ""))
-         (pathdir (file-name-directory filename))
-         (pathnondir (file-name-nondirectory filename))
-         (directory (if pathdir (comint-directory pathdir) default-directory))
-         (completion (file-name-completion pathnondir directory)))
+         (filedir (file-name-directory filename))
+         (filenondir (file-name-nondirectory filename))
+         (directory (if filedir (comint-directory filedir) default-directory))
+         (completion (file-name-completion filenondir directory)))
     (cond ((null completion)
            (message "No completions of %s" filename)
            (setq success nil))
@@ -2716,21 +2718,21 @@ See `comint-dynamic-complete-filename'.  Returns t if successful."
            (let ((file (concat (file-name-as-directory directory) completion)))
              (insert (comint-quote-filename
                       (substring (directory-file-name completion)
-                                 (length pathnondir))))
+                                 (length filenondir))))
              (cond ((symbolp (file-name-completion completion directory))
                     ;; We inserted a unique completion.
                     (insert (if (file-directory-p file) dirsuffix filesuffix))
                     (unless minibuffer-p
                       (message "Completed")))
                    ((and comint-completion-recexact comint-completion-addsuffix
-                         (string-equal pathnondir completion)
+                         (string-equal filenondir completion)
                          (file-exists-p file))
                     ;; It's not unique, but user wants shortest match.
                     (insert (if (file-directory-p file) dirsuffix filesuffix))
                     (unless minibuffer-p
                       (message "Completed shortest")))
                    ((or comint-completion-autolist
-                        (string-equal pathnondir completion))
+                        (string-equal filenondir completion))
                     ;; It's not unique, list possible completions.
                     (comint-dynamic-list-filename-completions))
                    (t
@@ -2814,10 +2816,10 @@ See also `comint-dynamic-complete-filename'."
          ;; but subsequent changes may have made this unnecessary.  sm.
          ;;(file-name-handler-alist nil)
          (filename (or (comint-match-partial-filename) ""))
-         (pathdir (file-name-directory filename))
-         (pathnondir (file-name-nondirectory filename))
-         (directory (if pathdir (comint-directory pathdir) default-directory))
-         (completions (file-name-all-completions pathnondir directory)))
+         (filedir (file-name-directory filename))
+         (filenondir (file-name-nondirectory filename))
+         (directory (if filedir (comint-directory filedir) default-directory))
+         (completions (file-name-all-completions filenondir directory)))
     (if (not completions)
         (message "No completions of %s" filename)
       (comint-dynamic-list-completions
@@ -2829,6 +2831,8 @@ See also `comint-dynamic-complete-filename'."
 ;; command is repeatedly used without the set of completions changing.
 (defvar comint-displayed-dynamic-completions nil)
 
+(defvar comint-dynamic-list-completions-config nil)
+
 (defun comint-dynamic-list-completions (completions)
   "List in help buffer sorted COMPLETIONS.
 Typing SPC flushes the help buffer."
@@ -2858,30 +2862,35 @@ Typing SPC flushes the help buffer."
               (select-window window)
               (scroll-up))))
 
-      (let ((conf (current-window-configuration)))
-        (with-output-to-temp-buffer "*Completions*"
-          (display-completion-list completions))
-        (message "Type space to flush; repeat completion command to scroll")
-        (let (key first)
-          (if (save-excursion
-                (set-buffer (get-buffer "*Completions*"))
-                (set (make-local-variable
-                      'comint-displayed-dynamic-completions)
-                     completions)
-                (setq key (read-key-sequence nil)
-                      first (aref key 0))
-                (and (consp first) (consp (event-start first))
-                     (eq (window-buffer (posn-window (event-start first)))
-                         (get-buffer "*Completions*"))
-                     (eq (key-binding key) 'mouse-choose-completion)))
-              ;; If the user does mouse-choose-completion with the mouse,
-              ;; execute the command, then delete the completion window.
-              (progn
-                (mouse-choose-completion first)
-                (set-window-configuration conf))
-            (if (eq first ?\ )
-                (set-window-configuration conf)
-              (setq unread-command-events (listify-key-sequence key)))))))))
+      ;; Display a completion list for the first time.
+      (setq comint-dynamic-list-completions-config
+            (current-window-configuration))
+      (with-output-to-temp-buffer "*Completions*"
+        (display-completion-list completions))
+      (message "Type space to flush; repeat completion command to scroll"))
+
+    ;; Read the next key, to process SPC.
+    (let (key first)
+      (if (save-excursion
+            (set-buffer (get-buffer "*Completions*"))
+            (set (make-local-variable
+                  'comint-displayed-dynamic-completions)
+                 completions)
+            (setq key (read-key-sequence nil)
+                  first (aref key 0))
+            (and (consp first) (consp (event-start first))
+                 (eq (window-buffer (posn-window (event-start first)))
+                     (get-buffer "*Completions*"))
+                 (eq (key-binding key) 'mouse-choose-completion)))
+          ;; If the user does mouse-choose-completion with the mouse,
+          ;; execute the command, then delete the completion window.
+          (progn
+            (mouse-choose-completion first)
+            (set-window-configuration comint-dynamic-list-completions-config))
+        (unless (eq first ?\ )
+          (setq unread-command-events (listify-key-sequence key)))
+        (unless (eq first ?\t)
+          (set-window-configuration comint-dynamic-list-completions-config))))))
 
 
 (defun comint-get-next-from-history ()
diff --git a/lisp/custom.el b/lisp/custom.el
index aa4d0d8353f..ea0567d3109 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -558,17 +558,17 @@ from THEME by `custom-make-theme-feature'."
           (error "Keyword %s is missing an argument" keyword))
         (setq args (cdr args))
         (cond ((eq keyword :short-description)
-               (put theme 'theme-short-description short-description))
+               (put theme 'theme-short-description value))
               ((eq keyword :immediate)
-               (put theme 'theme-immediate immediate))
+               (put theme 'theme-immediate value))
               ((eq keyword :variable-set-string)
-               (put theme 'theme-variable-set-string variable-set-string))
+               (put theme 'theme-variable-set-string value))
               ((eq keyword :variable-reset-string)
-               (put theme 'theme-variable-reset-string variable-reset-string))
+               (put theme 'theme-variable-reset-string value))
               ((eq keyword :face-set-string)
-               (put theme 'theme-face-set-string face-set-string))
+               (put theme 'theme-face-set-string value))
               ((eq keyword :face-reset-string)
-               (put theme 'theme-face-reset-string face-reset-string)))))))
+               (put theme 'theme-face-reset-string value)))))))
 
 (defmacro deftheme (theme &optional doc &rest args)
   "Declare custom theme THEME.
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index a5b35a7d018..5a2a33575e7 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -59,8 +59,8 @@ It may be followed by the following keyword argument pairs
 
    :filter FUNCTION
 
-FUNCTION is a function with one argument, the menu.  It returns the actual
-menu displayed.
+FUNCTION is a function with one argument, the rest of menu items.
+It returns the remaining items of the displayed menu.
 
    :visible INCLUDE
 
diff --git a/lisp/emacs-lisp/testcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 48ec9fa64da..48ec9fa64da 100644
--- a/lisp/emacs-lisp/testcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
diff --git a/lisp/emacs-lisp/testcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 4359209b4d4..4359209b4d4 100644
--- a/lisp/emacs-lisp/testcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
diff --git a/lisp/filecache.el b/lisp/filecache.el
index d315a3b1c8b..71b67af355f 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -212,13 +212,10 @@ Defaults to the value of `case-fold-search'."
   :group 'file-cache
   )
 
-(defcustom file-cache-assoc-function
-  (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
-      'assoc-ignore-case
-    'assoc)
-  "Function to use to check completions in the file cache.
-Defaults to `assoc-ignore-case' on DOS and Windows, and `assoc' on
-other systems."
+(defcustom file-cache-ignore-case
+  (memq system-type (list 'ms-dos 'windows-nt 'cygwin))
+  "Non-nil means ignore case when checking completions in the file cache.
+Defaults to nil on DOS and Windows, and t on other systems."
   :type 'sexp
   :group 'file-cache
   )
@@ -301,8 +298,9 @@ in each directory, not to the directory list itself."
       (message "File %s does not exist" file)
     (let* ((file-name (file-name-nondirectory file))
            (dir-name  (file-name-directory    file))
-           (the-entry (funcall file-cache-assoc-function
-                               file-name file-cache-alist))
+           (the-entry (assoc-string
+                       file-name file-cache-alist
+                       file-cache-ignore-case))
            )
       ;; Does the entry exist already?
       (if the-entry
@@ -402,7 +400,7 @@ or the optional REGEXP argument."
   (interactive
    (list (completing-read "Delete file from cache: " file-cache-alist)))
   (setq file-cache-alist
-        (delq (funcall file-cache-assoc-function file file-cache-alist)
+        (delq (assoc-string file file-cache-alist file-cache-ignore-case)
               file-cache-alist)))
 
 (defun file-cache-delete-file-list (file-list)
@@ -458,8 +456,9 @@ or the optional REGEXP argument."
 
 ;; Returns the name of a directory for a file in the cache
 (defun file-cache-directory-name  (file)
-  (let* ((directory-list (cdr (funcall file-cache-assoc-function
-                                       file file-cache-alist)))
+  (let* ((directory-list (cdr (assoc-string
+                               file file-cache-alist
+                               file-cache-ignore-case)))
          (len            (length directory-list))
          (directory)
          (num)
@@ -556,7 +555,8 @@ the name is considered already unique; only the second substitution
       ;; If we've already inserted a unique string, see if the user
       ;; wants to use that one
       (if (and (string= string completion-string)
-               (funcall file-cache-assoc-function string file-cache-alist))
+               (assoc-string string file-cache-alist
+                             file-cache-ignore-case))
           (if (and (eq last-command this-command)
                    (string= file-cache-last-completion completion-string))
               (progn
@@ -725,7 +725,8 @@ match REGEXP."
   "Debugging function."
   (interactive
    (list (completing-read "File Cache: " file-cache-alist)))
-  (message "%s" (funcall file-cache-assoc-function file file-cache-alist))
+  (message "%s" (assoc-string file file-cache-alist
+                              file-cache-ignore-case))
   )
 
 (defun file-cache-display  ()
diff --git a/lisp/files.el b/lisp/files.el
index 1dc6e5454df..4983b1287e8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2552,7 +2552,8 @@ BACKUPNAME is the backup file name, which is the old file renamed."
               (not (file-writable-p to-name)))
          (delete-file to-name))
      (copy-file from-name to-name t t)))
-  (set-file-modes to-name (logand modes #o1777)))
+  (and modes
+       (set-file-modes to-name (logand modes #o1777))))
 
 (defun file-name-sans-versions (name &optional keep-backup-version)
   "Return file NAME sans backup versions or strings.
@@ -3727,8 +3728,9 @@ This command is used in the special Dired buffer created by
       (kill-buffer buffer))))
 
 (defun kill-some-buffers (&optional list)
-  "For each buffer in LIST, ask whether to kill it.
-LIST defaults to all existing live buffers."
+  "Kill some buffers.  Asks the user whether to kill each one of them.
+Non-interactively, if optional argument LIST is non-`nil', it
+specifies the list of buffers to kill, asking for approval for each one."
   (interactive)
   (if (null list)
       (setq list (buffer-list)))
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index b1051acf7fd..9407afc3862 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -123,6 +123,10 @@ as the final argument."
                        (car find-ls-option)))
     ;; The next statement will bomb in classic dired (no optional arg allowed)
     (dired-mode dir (cdr find-ls-option))
+    (let ((map (make-sparse-keymap)))
+      (set-keymap-parent map (current-local-map))
+      (define-key map "\C-c\C-k" 'kill-find)
+      (use-local-map map))
     (make-local-variable 'dired-sort-inhibit)
     (setq dired-sort-inhibit t)
     (set (make-local-variable 'revert-buffer-function)
@@ -144,6 +148,7 @@ as the final argument."
     ;; Make second line a ``find'' line in analogy to the ``total'' or
     ;; ``wildcard'' line.
     (insert "  " args "\n")
+    (setq buffer-read-only t)
     ;; Start the find process.
     (let ((proc (start-process-shell-command find-dired-find-program (current-buffer) args)))
       (set-process-filter proc (function find-dired-filter))
@@ -152,6 +157,16 @@ as the final argument."
       (move-marker (process-mark proc) 1 (current-buffer)))
     (setq mode-line-process '(":%s"))))
 
+(defun kill-find ()
+  "Kill the `find' process running in the current buffer."
+  (interactive)
+  (let ((find (get-buffer-process (current-buffer))))
+    (and find (eq (process-status find) 'run)
+         (eq (process-filter find) (function find-dired-filter))
+         (condition-case nil
+             (delete-process find)
+           (error nil)))))
+
 ;;;###autoload
 (defun find-name-dired (dir pattern)
   "Search DIR recursively for files matching the globbing pattern PATTERN,
@@ -192,7 +207,8 @@ Thus ARG can also contain additional grep options."
 
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.
-  (let ((buf (process-buffer proc)))
+  (let ((buf (process-buffer proc))
+        (inhibit-read-only t))
     (if (buffer-name buf)               ; not killed?
         (save-excursion
           (set-buffer buf)
@@ -229,7 +245,8 @@ Thus ARG can also contain additional grep options."
 
 (defun find-dired-sentinel (proc state)
   ;; Sentinel for \\[find-dired] processes.
-  (let ((buf (process-buffer proc)))
+  (let ((buf (process-buffer proc))
+        (inhibit-read-only t))
     (if (buffer-name buf)
         (save-excursion
           (set-buffer buf)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 1be0b724590..b76c818a517 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1031,7 +1031,8 @@ what properties to clear before refontifying a region.")
 
 ;; Called when any modification is made to buffer text.
 (defun font-lock-after-change-function (beg end old-len)
-  (let ((inhibit-point-motion-hooks t))
+  (let ((inhibit-point-motion-hooks t)
+        (inhibit-quit t))
     (save-excursion
       (save-match-data
         ;; Rescan between start of lines enclosing the region.
diff --git a/lisp/frame.el b/lisp/frame.el
index 1dbf8321bf3..96c9b596289 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -85,8 +85,9 @@ for pop-up frames."
   :group 'frames)
 
 (setq pop-up-frame-function
-      (function (lambda ()
-                  (make-frame pop-up-frame-alist))))
+      ;; Using `function' here caused some sort of problem.
+      '(lambda ()
+         (make-frame pop-up-frame-alist)))
 
 (defcustom special-display-frame-alist
   '((height . 14) (width . 80) (unsplittable . t))
@@ -335,10 +336,22 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
                                            frame-initial-geometry-arguments)))
                    (top (frame-parameter frame-initial-frame 'top)))
               (when (and (consp initial-top) (eq '- (car initial-top)))
-                (setq newparms
-                      (append newparms
-                              `((top . ,(+ top (* lines char-height))))
-                              nil)))
+                (let ((adjusted-top
+                       (cond ((and (consp top)
+                                   (eq '+ (car top)))
+                              (list '+
+                                    (+ (cadr top)
+                                       (* lines char-height))))
+                             ((and (consp top)
+                                   (eq '- (car top)))
+                              (list '-
+                                    (- (cadr top)
+                                       (* lines char-height))))
+                             (t (+ top (* lines char-height))))))
+                  (setq newparms
+                        (append newparms
+                                `((top . ,adjusted-top))
+                                nil))))
               (modify-frame-parameters frame-initial-frame newparms)
               (tool-bar-mode -1)))))
 
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index fcc84a4a1d6..88703af799f 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1868,7 +1868,38 @@ you must reload generic-x to enable the specified modes."
   ;;List of comment characters
   (list ?#)
   ;;List of keywords
-  (list "alias" "pre-install" "post-install" "options" "probeall")
+  (list
+   "above"
+   "alias"
+   "below"
+   "define"
+   "depfile"
+   "else"
+   "elseif"
+   "endif"
+   "if"
+   "include"
+   "insmod_opt"
+   "install"
+   "keep"
+   "options"
+   "path"
+   "generic_stringfile"
+   "pcimapfile"
+   "isapnpmapfile"
+   "usbmapfile"
+   "parportmapfile"
+   "ieee1394mapfile"
+   "pnpbiosmapfile"
+   "probe"
+   "probeall"
+   "prune"
+   "post-install"
+   "post-remove"
+   "pre-install"
+   "pre-remove"
+   "remove"
+   "persistdir")
   ;;List of additional font-lock-expressions
   nil
   ;;List of additional automode-alist expressions
diff --git a/lisp/generic.el b/lisp/generic.el
index 8f13dc375e7..bd6fa0608aa 100644
--- a/lisp/generic.el
+++ b/lisp/generic.el
@@ -54,7 +54,7 @@
 ;;
 ;; * Additional expressions to font-lock.  This should be a list of
 ;;   expressions, each of which should be of the same form
-;;   as those in `font-lock-defaults-alist'.
+;;   as those in `font-lock-keywords'.
 ;;
 ;; * List of regular expressions to be placed in auto-mode-alist.
 ;;
@@ -206,7 +206,7 @@ KEYWORD-LIST is a list of keywords to highlight with `font-lock-keyword-face'.
 Each keyword should be a string.
 
 FONT-LOCK-LIST is a list of additional expressions to highlight. Each entry
-in the list should have the same form as an entry in `font-lock-defaults-alist'
+in the list should have the same form as an entry in `font-lock-keywords'.
 
 AUTO-MODE-LIST is a list of regular expressions to add to `auto-mode-alist'.
 These regexps are added to `auto-mode-alist' as soon as `define-generic-mode'
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 21f265199dd..a184567ea9c 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -321,7 +321,7 @@ If optional argument QUERY is non-nil, query for the help mode."
   (let* ((completions (info-lookup->completions topic mode))
          (ignore-case (info-lookup->ignore-case topic mode))
          (entry (or (assoc (if ignore-case (downcase item) item) completions)
-                    (assoc-ignore-case item completions)
+                    (assoc-string item completions t)
                     (error "Not documented as a %s: %s" topic (or item ""))))
          (modes (info-lookup->all-modes topic mode))
          (window (selected-window))
diff --git a/lisp/info.el b/lisp/info.el
index 9616dbb1feb..3438320beb4 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -918,7 +918,7 @@ a case-insensitive match is tried."
                 (beginning-of-line)
                 (setq end (point))
                 (push (list nodename other beg end) this-buffer-nodes)))
-            (if (assoc-ignore-case "top" this-buffer-nodes)
+            (if (assoc-string "top" this-buffer-nodes t)
                 (setq nodes (nconc this-buffer-nodes nodes))
               (setq problems t)
               (message "No `top' node in %s" Info-dir-file-name)))))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5e957d6b8ab..dca8b80744e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1006,6 +1006,12 @@ Meaningful values for KEY include
                         environment.
   features           value is a list of features requested in this
                         language environment.
+  ctext-non-standard-encodings
+                     value is a list of non-standard encoding
+                     names used in extended segments of CTEXT.
+                     See the variable
+                     `ctext-non-standard-encodings' for more
+                     detail.
 
 The following keys take effect only when multibyte characters are
 globally disabled, i.e. the value of `default-enable-multibyte-characters'
@@ -1685,7 +1691,12 @@ The default status is as follows:
   ;; (set-keyboard-coding-system-internal nil)
 
   (setq nonascii-translation-table nil
-        nonascii-insert-offset 0))
+        nonascii-insert-offset 0)
+
+  ;; Don't invoke fontset-related functions if fontsets aren't
+  ;; supported in this build of Emacs.
+  (and (fboundp 'fontset-list)
+       (set-overriding-fontspec-internal nil)))
 
 (reset-language-environment)
 
@@ -1791,6 +1802,15 @@ specifies the character set for the major languages of Western Europe."
     (while required-features
       (require (car required-features))
       (setq required-features (cdr required-features))))
+
+  ;; Don't invoke fontset-related functions if fontsets aren't
+  ;; supported in this build of Emacs.
+  (when (fboundp 'fontset-list)
+    (let ((overriding-fontspec (get-language-info language-name 
+                                                  'overriding-fontspec)))
+      (if overriding-fontspec
+          (set-overriding-fontspec-internal overriding-fontspec))))
+
   (let ((func (get-language-info language-name 'setup-function)))
     (if (functionp func)
         (funcall func)))
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 19ff671834b..60ebf52fe35 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -204,6 +204,9 @@ This works whether or not the table is Unicode-based or
 ;; The table is set up later to encode both Unicode and 8859-5.
 (define-ccl-program ccl-encode-koi8-font
   `(0
+    (if (r2 >= 0)
+        ((r1 <<= 7)
+         (r1 += r2)))
     (translate-character cyrillic-koi8-r-encode-table r0 r1))
   "CCL program to encode Cyrillic chars to KOI font.")
 
@@ -472,10 +475,25 @@ Support for Russian using koi8-r and the russian-computer input method.")
       (setcdr slot (cdr elt))
     (push elt ctext-non-standard-encodings-alist)))
 
+(define-ccl-program ccl-encode-windows-1251-font
+  '(0
+    ((r1 <<= 7)
+     (r1 += r2)
+     (translate-character encode-windows-1251 r0 r1)
+     )))
+
+(add-to-list 'font-ccl-encoder-alist
+             '("microsoft-cp1251" . ccl-encode-windows-1251-font))
+
 (set-language-info-alist
  "Bulgarian" `((coding-system windows-1251)
                (coding-priority windows-1251)
                (ctext-non-standard-encodings "microsoft-cp1251")
+               (overriding-fontspec
+                (,(get 'encode-windows-1251 'translation-table)
+                 . (nil . "microsoft-cp1251"))
+                (,(get 'cyrillic-koi8-r-encode-table 'translation-table)
+                 . (nil . "koi8-r")))
                (nonascii-translation
                 . ,(get 'decode-windows-1251 'translation-table))
                (input-method . "bulgarian-bds")
@@ -488,6 +506,11 @@ Support for Russian using koi8-r and the russian-computer input method.")
  "Belarusian" `((coding-system windows-1251)
                 (coding-priority windows-1251)
                 (ctext-non-standard-encodings "microsoft-cp1251")
+                (overriding-fontspec
+                 (,(get 'encode-windows-1251 'translation-table)
+                  . (nil . "microsoft-cp1251"))
+                 (,(get 'cyrillic-koi8-r-encode-table 'translation-table)
+                  . (nil . "koi8-r")))
                 (nonascii-translation
                  . ,(get 'decode-windows-1251 'translation-table))
                 (input-method . "belarusian")
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 9b3d5c18d4c..1a5dfad67f8 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -30,11 +30,13 @@
 
 ;;; Code:
 
-;; uses address-start free, throws to address
+(defvar rfc822-address-start)
+
+;; uses rfc822-address-start free, throws to address
 (defun rfc822-bad-address (reason)
   (save-restriction
     (insert "_^_")
-    (narrow-to-region address-start
+    (narrow-to-region rfc822-address-start
                       (if (re-search-forward "[,;]" nil t)
                           (max (point-min) (1- (point)))
                         (point-max)))
@@ -52,7 +54,7 @@
                                     ": \"")
     (goto-char (point-max)) (insert "\")"))
   (rfc822-nuke-whitespace)
-  (throw 'address (buffer-substring address-start (point))))
+  (throw 'address (buffer-substring rfc822-address-start (point))))
 
 (defun rfc822-nuke-whitespace (&optional leave-space)
   (let (ch)
@@ -179,7 +181,7 @@
   ;;  domain-literal is  "[" *(dtext | quoted-pair) "]"
   ;;  dtext is "[^][\\n"
   ;;  domain-ref is atom
-  (let ((address-start (point))
+  (let ((rfc822-address-start (point))
         (n 0))
     (catch 'address
       ;; optimize common cases:
@@ -198,14 +200,14 @@
             (or (bobp) (/= (preceding-char) ?\ ) (delete-char -1))
             ;; relying on the fact that rfc822-looking-at <char>
             ;;  doesn't mung match-data
-            (throw 'address (buffer-substring address-start (match-end 0)))))
-      (goto-char address-start)
+            (throw 'address (buffer-substring rfc822-address-start (match-end 0)))))
+      (goto-char rfc822-address-start)
       (while t
         (cond ((and (= n 1) (rfc822-looking-at ?@))
                ;; local-part@domain
                (rfc822-snarf-domain)
                (throw 'address
-                 (buffer-substring address-start (point))))
+                 (buffer-substring rfc822-address-start (point))))
               ((rfc822-looking-at ?:)
                (cond ((not allow-groups)
                       (rfc822-bad-address "A group name may not appear here"))
@@ -261,7 +263,7 @@
                (throw 'address nil))
               ((= n 1) ; allow "foo" (losing unix seems to do this)
                (throw 'address
-                 (buffer-substring address-start (point))))
+                 (buffer-substring rfc822-address-start (point))))
               ((> n 1)
                (rfc822-bad-address "Missing comma between addresses or badly-formatted address"))
               ((or (eobp) (= (following-char) ?,))
@@ -289,12 +291,12 @@
             (replace-match "\\1 " t))
 
           (goto-char (point-min))
-          (rfc822-nuke-whitespace)
           (let ((list ())
                 tem
-                address-start); this is for rfc822-bad-address
+                rfc822-address-start); this is for rfc822-bad-address
+            (rfc822-nuke-whitespace)
             (while (not (eobp))
-              (setq address-start (point))
+              (setq rfc822-address-start (point))
               (setq tem
                     (catch 'address ; this is for rfc822-bad-address
                       (cond ((rfc822-looking-at ?\,)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index acc7e4839dd..6185fd12286 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1687,19 +1687,22 @@ It returns t if it got any new messages."
                          (delete-region (point) (search-backward ":"))
                          (insert ": 8bit")))
                    (if base64-header-field-end
-                       (condition-case nil
-                           (save-excursion
-                             (base64-decode-region (1+ header-end)
-                                                   (- (point) 2))
-                             ;; Change "base64" to "8bit", to reflect the
-                             ;; decoding we just did.
-                             (goto-char (1+ header-end))
-                             (while (search-forward "\r\n" (point-max) t)
-                               (replace-match "\n"))
-                             (goto-char base64-header-field-end)
-                             (delete-region (point) (search-backward ":"))
-                             (insert ": 8bit"))
-                         (error nil)))
+                       (save-excursion
+                         (when
+                             (condition-case nil
+                                 (progn
+                                   (base64-decode-region (1+ header-end)
+                                                         (- (point) 2))
+                                   t)
+                               (error nil))
+                           ;; Change "base64" to "8bit", to reflect the
+                           ;; decoding we just did.
+                           (goto-char (1+ header-end))
+                           (while (search-forward "\r\n" (point-max) t)
+                             (replace-match "\n"))
+                           (goto-char base64-header-field-end)
+                           (delete-region (point) (search-backward ":"))
+                           (insert ": 8bit"))))
                    (setq last-coding-system-used nil)
                    (or rmail-enable-mime
                        (not rmail-enable-multibyte)
@@ -1829,15 +1832,21 @@ It returns t if it got any new messages."
                        (delete-region (point) (search-backward ":"))
                        (insert ": 8bit")))
                  (if base64-header-field-end
-                     (condition-case nil
-                         (save-excursion
-                           (base64-decode-region header-end (point))
-                           ;; Change "base64" to "8bit", to reflect the
-                           ;; decoding we just did.
-                           (goto-char base64-header-field-end)
-                           (delete-region (point) (search-backward ":"))
-                           (insert ": 8bit"))
-                       (error nil))))
+                     (save-excursion
+                       (when
+                           (condition-case nil
+                               (progn
+                                 (base64-decode-region (1+ header-end) (point))
+                                 t)
+                             (error nil))
+                         (goto-char header-end)
+                         (while (search-forward "\r\n" (point-max) t)
+                           (replace-match "\n"))
+                         ;; Change "base64" to "8bit", to reflect the
+                         ;; decoding we just did.
+                         (goto-char base64-header-field-end)
+                         (delete-region (point) (search-backward ":"))
+                         (insert ": 8bit")))))
 
                (save-excursion
                  (save-restriction
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index b96e7f1a298..0277bd0aabc 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -686,7 +686,7 @@
   :prefix "ange-ftp-")
 
 (defcustom ange-ftp-name-format
-  '("^/\\(\\([^@/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4))
+  '("^/\\(\\([^/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4))
   "*Format of a fully expanded remote file name.
 
 This is a list of the form \(REGEXP HOST USER NAME\),
@@ -694,7 +694,7 @@ where REGEXP is a regular expression matching
 the full remote name, and HOST, USER, and NAME are the numbers of
 parenthesized expressions in REGEXP for the components (in that order)."
   :group 'ange-ftp
-  :type '(list regexp
+  :type '(list (regexp  :tag "Name regexp")
                (integer :tag "Host group")
                (integer :tag "User group")
                (integer :tag "Name group")))
@@ -1918,7 +1918,8 @@ on the gateway machine to do the ftp instead."
     ;; but that doesn't work: ftp never responds.
     ;; Can anyone find a fix for that?
     (let ((process-connection-type t)
-          (process-environment process-environment)
+          ;; Copy this so we don't alter it permanently.
+          (process-environment (copy-tree process-environment))
           (buffer (get-buffer-create name)))
       (save-excursion
         (set-buffer buffer)
diff --git a/lisp/net/zone-mode.el b/lisp/net/zone-mode.el
index 591deee3144..6b4d22f9b13 100644
--- a/lisp/net/zone-mode.el
+++ b/lisp/net/zone-mode.el
@@ -92,7 +92,7 @@ Zone-mode does two things:
 
         - fontification"
 
-  (add-hook 'write-file-hooks 'zone-mode-update-serial-hook nil t)
+  (add-hook 'write-file-functions 'zone-mode-update-serial-hook nil t)
 
   (if (null zone-mode-syntax-table)
       (zone-mode-load-time-setup)) ;; should have been run at load-time
diff --git a/lisp/obsolete/sc.el b/lisp/obsolete/sc.el
index e9798a0a253..26486577aa4 100644
--- a/lisp/obsolete/sc.el
+++ b/lisp/obsolete/sc.el
@@ -11,5 +11,7 @@
 (require 'supercite)
 (provide 'sc)
 
+(message "The name `sc' works but is obsolete; please use `supercite' instead")
+
 ;;; arch-tag: 31e8ae19-689e-4b7d-9161-6d7dd60c6ece
 ;;; sc.el ends here
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 5c6aa8f3abf..11499444920 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -159,8 +159,7 @@ Variables: handwrite-linespace     (default 12)
     (setq next-line-add-newlines t)
     (switch-to-buffer ps-buf-name)
     (handwrite-insert-header buf-name)
-    (insert "\n(\\nCreated by GNU Emacs' handwrite version "
-            emacs-version  "\\n\\n)=print flush\n")
+    (insert "%%Creator: GNU Emacs' handwrite version " emacs-version  "\n")
     (handwrite-insert-preamble)
     (handwrite-insert-info)
     (handwrite-insert-font)
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f3a540fc491..b7bf99efa2e 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -161,7 +161,7 @@
 ;; More compile-time-macros
 (eval-when-compile
   (defmacro save-buffer-state-x (&rest body) ; similar to EMACS/lazy-lock.el
-    (let ((modified (gensym "save-buffer-state-x-modified-")))
+    (let ((modified (with-no-warnings (gensym "save-buffer-state-x-modified-"))))
       `(let ((,modified (buffer-modified-p)))
          (unwind-protect
              (let ((buffer-undo-list t) (inhibit-read-only t)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 48a007aef27..76e00cc4438 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -162,11 +162,14 @@ Used to grey out relevant toolbar icons.")
                      (gud-run . "gud-run")
                      (gud-until . "gud-until")
                      (gud-cont . "gud-cont")
-                     (gud-step . "gud-step")
-                     (gud-next . "gud-next")
+                     ;; gud-s, gud-si etc. instead of gud-step,
+                     ;; gud-stepi, to avoid file-name clashes on DOS
+                     ;; 8+3 filesystems.
+                     (gud-step . "gud-s")
+                     (gud-next . "gud-n")
                      (gud-finish . "gud-finish")
-                     (gud-stepi . "gud-stepi")
-                     (gud-nexti . "gud-nexti")
+                     (gud-stepi . "gud-si")
+                     (gud-nexti . "gud-ni")
                      (gud-up . "gud-up")
                      (gud-down . "gud-down"))
                    map)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e63dda1c663..a23dc0a307e 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2052,7 +2052,8 @@ STRING	     This is ignored for the purposes of calculating
                     (progn
                       (setq result (append result val))
                       (setq align-point (point))))
-                (forward-char -1)
+                (or (bobp)
+                    (forward-char -1))
                 (skip-chars-forward "[a-z0-9]*?")
                 )
                ((string-match "[])}]" x)
diff --git a/lisp/register.el b/lisp/register.el
index 8185ae4bc44..0ba6a9addd6 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -304,8 +304,10 @@ START and END are buffer positions indicating what to prepend."
 
 (defun copy-rectangle-to-register (register start end &optional delete-flag)
   "Copy rectangular region into register REGISTER.
-With prefix arg, delete as well.
-Called from program, takes four args: REGISTER, START, END and DELETE-FLAG.
+With prefix arg, delete as well.  To insert this register
+in the buffer, use \\[insert-register].
+
+Called from a program, takes four args: REGISTER, START, END and DELETE-FLAG.
 START and END are buffer positions giving two corners of rectangle."
   (interactive "cCopy rectangle to register: \nr\nP")
   (set-register register
diff --git a/lisp/shell.el b/lisp/shell.el
index cc83dcf1429..1817a1fd3b4 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -167,7 +167,7 @@ This is a fine thing to set in your `.emacs' file.")
 (defvar shell-file-name-chars
   (if (memq system-type '(ms-dos windows-nt cygwin))
       "~/A-Za-z0-9_^$!#%&{}@`'.,:()-"
-    "~/A-Za-z0-9+@:_.$#%,={}-")
+    "[]~/A-Za-z0-9+@:_.$#%,={}-")
   "String of characters valid in a file name.
 This variable is used to initialize `comint-file-name-chars' in the
 shell buffer.  The value may depend on the operating system or shell.
@@ -941,36 +941,37 @@ Returns t if successful."
   "Dynamically complete at point as a command.
 See `shell-dynamic-complete-filename'.  Returns t if successful."
   (let* ((filename (or (comint-match-partial-filename) ""))
-         (pathnondir (file-name-nondirectory filename))
-         (paths (cdr (reverse exec-path)))
+         (filenondir (file-name-nondirectory filename))
+         (path-dirs (cdr (reverse exec-path)))
          (cwd (file-name-as-directory (expand-file-name default-directory)))
          (ignored-extensions
           (and comint-completion-fignore
                (mapconcat (function (lambda (x) (concat (regexp-quote x) "$")))
                           comint-completion-fignore "\\|")))
-         (path "") (comps-in-path ()) (file "") (filepath "") (completions ()))
-    ;; Go thru each path in the search path, finding completions.
-    (while paths
-      (setq path (file-name-as-directory (comint-directory (or (car paths) ".")))
-            comps-in-path (and (file-accessible-directory-p path)
-                               (file-name-all-completions pathnondir path)))
+         (dir "") (comps-in-dir ()) 
+         (file "") (abs-file-name "") (completions ()))
+    ;; Go thru each dir in the search path, finding completions.
+    (while path-dirs
+      (setq dir (file-name-as-directory (comint-directory (or (car path-dirs) ".")))
+            comps-in-dir (and (file-accessible-directory-p dir)
+                              (file-name-all-completions filenondir dir)))
       ;; Go thru each completion found, to see whether it should be used.
-      (while comps-in-path
-        (setq file (car comps-in-path)
-              filepath (concat path file))
+      (while comps-in-dir
+        (setq file (car comps-in-dir)
+              abs-file-name (concat dir file))
         (if (and (not (member file completions))
                  (not (and ignored-extensions
                            (string-match ignored-extensions file)))
-                 (or (string-equal path cwd)
-                     (not (file-directory-p filepath)))
+                 (or (string-equal dir cwd)
+                     (not (file-directory-p abs-file-name)))
                  (or (null shell-completion-execonly)
-                     (file-executable-p filepath)))
+                     (file-executable-p abs-file-name)))
             (setq completions (cons file completions)))
-        (setq comps-in-path (cdr comps-in-path)))
-      (setq paths (cdr paths)))
+        (setq comps-in-dir (cdr comps-in-dir)))
+      (setq path-dirs (cdr path-dirs)))
     ;; OK, we've got a list of completions.
     (let ((success (let ((comint-completion-addsuffix nil))
-                     (comint-dynamic-simple-complete pathnondir completions))))
+                     (comint-dynamic-simple-complete filenondir completions))))
       (if (and (memq success '(sole shortest)) comint-completion-addsuffix
                (not (file-directory-p (comint-match-partial-filename))))
           (insert " "))
diff --git a/lisp/simple.el b/lisp/simple.el
index ade177c5b8e..d23ed11c6c3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3735,9 +3735,9 @@ See also `read-mail-command' concerning reading mail."
             (same-window-buffer-names nil)
             (same-window-regexps nil))
         (funcall switch-function "*mail*")))
-  (let ((cc (cdr (assoc-ignore-case "cc" other-headers)))
-        (in-reply-to (cdr (assoc-ignore-case "in-reply-to" other-headers)))
-        (body (cdr (assoc-ignore-case "body" other-headers))))
+  (let ((cc (cdr (assoc-string "cc" other-headers t)))
+        (in-reply-to (cdr (assoc-string "in-reply-to" other-headers t)))
+        (body (cdr (assoc-string "body" other-headers t))))
     (or (mail continue to subject in-reply-to cc yank-action send-actions)
         continue
         (error "Message aborted"))
diff --git a/lisp/subr.el b/lisp/subr.el
index 2996f2903e0..a2b09d6b63b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -298,27 +298,19 @@ If TEST is omitted or nil, `equal' is used."
       (setq tail (cdr tail)))
     value))
 
+(make-obsolete 'assoc-ignore-case 'assoc-string)
 (defun assoc-ignore-case (key alist)
   "Like `assoc', but ignores differences in case and text representation.
 KEY must be a string.  Upper-case and lower-case letters are treated as equal.
 Unibyte strings are converted to multibyte for comparison."
-  (let (element)
-    (while (and alist (not element))
-      (if (eq t (compare-strings key 0 nil (car (car alist)) 0 nil t))
-          (setq element (car alist)))
-      (setq alist (cdr alist)))
-    element))
+  (assoc-string key alist t))
 
+(make-obsolete 'assoc-ignore-representation 'assoc-string)
 (defun assoc-ignore-representation (key alist)
   "Like `assoc', but ignores differences in text representation.
 KEY must be a string.
 Unibyte strings are converted to multibyte for comparison."
-  (let (element)
-    (while (and alist (not element))
-      (if (eq t (compare-strings key 0 nil (car (car alist)) 0 nil))
-          (setq element (car alist)))
-      (setq alist (cdr alist)))
-    element))
+  (assoc-string key alist nil))
 
 (defun member-ignore-case (elt list)
   "Like `member', but ignores differences in case and text representation.
@@ -1563,7 +1555,18 @@ Replaces `category' properties with their defined properties."
 (defvar yank-undo-function)
 
 (defun insert-for-yank (string)
+  "Calls `insert-for-yank-1' repetitively for each `yank-handler' segment.
+
+See `insert-for-yank-1' for more details."
+  (let (to)
+    (while (setq to (next-single-property-change 0 'yank-handler string))
+      (insert-for-yank-1 (substring string 0 to))
+      (setq string (substring string to))))
+  (insert-for-yank-1 string))
+
+(defun insert-for-yank-1 (string)
   "Insert STRING at point, stripping some text properties.
+
 Strip text properties from the inserted text according to
 `yank-excluded-properties'.  Otherwise just like (insert STRING).
 
@@ -1809,6 +1812,7 @@ in BODY."
 (defvar delayed-mode-hooks nil
   "List of delayed mode hooks waiting to be run.")
 (make-variable-buffer-local 'delayed-mode-hooks)
+(put 'delay-mode-hooks 'permanent-local t)
 
 (defun run-mode-hooks (&rest hooks)
   "Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS.
diff --git a/lisp/term.el b/lisp/term.el
index d2088a29785..b329004c083 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1290,6 +1290,7 @@ buffer.  The hook term-exec-hook is run after each exec."
       (goto-char (point-max))
       (set-marker (process-mark proc) (point))
       (set-process-filter proc 'term-emulate-terminal)
+      (set-process-sentinel proc 'term-sentinel)
       ;; Feed it the startfile.
       (cond (startfile
              ;;This is guaranteed to wait long enough
@@ -1306,6 +1307,49 @@ buffer.  The hook term-exec-hook is run after each exec."
     (run-hooks 'term-exec-hook)
     buffer)))
 
+(defun term-sentinel  (proc msg)
+  "Sentinel for term buffers.
+The main purpose is to get rid of the local keymap."
+  (let ((buffer (process-buffer proc)))
+    (if (memq (process-status proc) '(signal exit))
+        (progn
+          (if (null (buffer-name buffer))
+              ;; buffer killed
+              (set-process-buffer proc nil)
+            (let ((obuf (current-buffer)))
+              ;; save-excursion isn't the right thing if
+              ;; process-buffer is current-buffer
+              (unwind-protect
+                  (progn
+                    ;; Write something in the compilation buffer
+                    ;; and hack its mode line.
+                    (set-buffer buffer)
+                    ;; Get rid of local keymap.
+                    (use-local-map nil)
+                    (term-handle-exit (process-name proc)
+                                      msg)
+                    ;; Since the buffer and mode line will show that the
+                    ;; process is dead, we can delete it now.  Otherwise it
+                    ;; will stay around until M-x list-processes.
+                    (delete-process proc))
+                (set-buffer obuf))))
+          ))))
+
+(defun term-handle-exit (process-name msg)
+  "Write process exit (or other change) message MSG in the current buffer."
+  (let ((buffer-read-only nil)
+        (omax (point-max))
+        (opoint (point)))
+    ;; Record where we put the message, so we can ignore it
+    ;; later on.
+    (goto-char omax)
+    (insert ?\n "Process " process-name " " msg)
+    ;; Force mode line redisplay soon.
+    (force-mode-line-update)
+    (if (and opoint (< opoint omax))
+        (goto-char opoint))))
+
+
 ;;; Name to use for TERM.
 ;;; Using "emacs" loses, because bash disables editing if TERM == emacs.
 (defvar term-term-name "eterm")
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index dc4f521c018..e71eb440c12 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -267,7 +267,9 @@ property of the major mode name.")
 (defun mail-mode-flyspell-verify ()
   "This function is used for `flyspell-generic-check-word-p' in Mail mode."
   (let ((in-headers (save-excursion
-                      (re-search-forward mail-header-separator nil t)))
+                      ;; When mail-header-separator is "",
+                      ;; it is likely to be found in both directions.
+                      (not (re-search-backward (concat "^" (regexp-quote mail-header-separator) "$") nil t))))
         (in-signature (save-excursion
                         (re-search-backward message-signature-separator nil t))))
     (cond (in-headers
@@ -1628,7 +1630,7 @@ misspelled words backwards."
 (defun flyspell-abbrev-table ()
   (if flyspell-use-global-abbrev-table-p
       global-abbrev-table
-    local-abbrev-table))
+    (or local-abbrev-table global-abbrev-table)))
 
 ;*---------------------------------------------------------------------*/
 ;*    flyspell-define-abbrev ...                                       */
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 44e82efc5b7..93ea3cc0c14 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -5,7 +5,7 @@
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
 ;; Created: Sat Jul 08 2000 13:28:45 (PST)
-;; Revised: jue jun 05 2003 22:00:02 (Hora de verano romance)
+;; Revised: Tue Dec 09 2003 14:36:50 (PST)
 
 ;; This file is part of GNU Emacs.
 
@@ -837,6 +837,9 @@ simply by any key input."
   :type 'hook
   :group 'table-hooks)
 
+(defcustom table-yank-handler '(nil nil t nil)
+  "*yank-handler for table.")
+
 (setplist 'table-disable-incompatibility-warning nil)
 
 (defvar table-disable-menu (null (and (locate-library "easymenu")
@@ -5228,7 +5231,8 @@ and the right cell border character."
 
 (defun table--put-cell-indicator-property (beg end &optional object)
   "Put cell property which indicates that the location is within a table cell."
-  (put-text-property beg end 'table-cell t object))
+  (put-text-property beg end 'table-cell t object)
+  (put-text-property beg end 'yank-handler table-yank-handler object))
 
 (defun table--put-cell-face-property (beg end &optional object)
   "Put cell face property."
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 1bead17e10c..25670e8c310 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -5,7 +5,7 @@
 
 ;; Author: Robert J. Chassell
 ;; Date:   [See date below for texinfo-version]
-;; Maintainer: bug-texinfo@gnu.org
+;; Maintainer: FSF
 ;; Keywords: maint, tex, docs
 
 ;; This file is part of GNU Emacs.
@@ -59,6 +59,12 @@
   :type 'string
   :group 'texinfo)
 
+(defcustom texinfo-mode-hook nil
+  "Normal hook run when entering Texinfo mode."
+  :type 'hook
+  :options '(turn-on-auto-fill flyspell-mode)
+  :group 'texinfo)
+
 
 ;;; Autoloads:
 
diff --git a/lisp/toolbar/gud-next.pbm b/lisp/toolbar/gud-n.pbm
index dc2a15323e3..dc2a15323e3 100644
--- a/lisp/toolbar/gud-next.pbm
+++ b/lisp/toolbar/gud-n.pbm
diff --git a/lisp/toolbar/gud-next.xpm b/lisp/toolbar/gud-n.xpm
index 0e631de18e1..0e631de18e1 100644
--- a/lisp/toolbar/gud-next.xpm
+++ b/lisp/toolbar/gud-n.xpm
diff --git a/lisp/toolbar/gud-nexti.pbm b/lisp/toolbar/gud-ni.pbm
index ecad2965b0d..ecad2965b0d 100644
--- a/lisp/toolbar/gud-nexti.pbm
+++ b/lisp/toolbar/gud-ni.pbm
diff --git a/lisp/toolbar/gud-nexti.xpm b/lisp/toolbar/gud-ni.xpm
index cdb8c38e8d4..cdb8c38e8d4 100644
--- a/lisp/toolbar/gud-nexti.xpm
+++ b/lisp/toolbar/gud-ni.xpm
diff --git a/lisp/toolbar/gud-step.pbm b/lisp/toolbar/gud-s.pbm
index de7caa50ed5..de7caa50ed5 100644
--- a/lisp/toolbar/gud-step.pbm
+++ b/lisp/toolbar/gud-s.pbm
diff --git a/lisp/toolbar/gud-step.xpm b/lisp/toolbar/gud-s.xpm
index 7b4eb876235..7b4eb876235 100644
--- a/lisp/toolbar/gud-step.xpm
+++ b/lisp/toolbar/gud-s.xpm
diff --git a/lisp/toolbar/gud-stepi.pbm b/lisp/toolbar/gud-si.pbm
index eed55cc4a33..eed55cc4a33 100644
--- a/lisp/toolbar/gud-stepi.pbm
+++ b/lisp/toolbar/gud-si.pbm
diff --git a/lisp/toolbar/gud-stepi.xpm b/lisp/toolbar/gud-si.xpm
index d2667fc70b6..d2667fc70b6 100644
--- a/lisp/toolbar/gud-stepi.xpm
+++ b/lisp/toolbar/gud-si.xpm
diff --git a/lisp/xml.el b/lisp/xml.el
index a6159554b3f..dbd991f5583 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -104,15 +104,22 @@ CHILD-NAME should be a lower case symbol."
               (push child match))))
     (nreverse match)))
 
-(defun xml-get-attribute (node attribute)
+(defun xml-get-attribute-or-nil (node attribute)
   "Get from NODE the value of ATTRIBUTE.
-An empty string is returned if the attribute was not found."
-  (if (xml-node-attributes node)
-      (let ((value (assoc attribute (xml-node-attributes node))))
-        (if value
-            (cdr value)
-          ""))
-    ""))
+Return `nil' if the attribute was not found.
+
+See also `xml-get-attribute'."
+  (when (xml-node-attributes node)
+    (let ((value (assoc attribute (xml-node-attributes node))))
+      (when value
+        (cdr value)))))
+
+(defsubst xml-get-attribute (node attribute)
+  "Get from NODE the value of ATTRIBUTE.
+An empty string is returned if the attribute was not found.
+
+See also `xml-get-attribute-or-nil'."
+  (or (xml-get-attribute-or-nil node attribute) ""))
 
 ;;*******************************************************************
 ;;**
@@ -286,7 +293,6 @@ If PARSE-NS is non-nil, then QNAMES are expanded."
    attr-list)
   attr-list)
 
-
 (defun xml-intern-attrlist (attr-list)
   "Convert attribute names to symbols for backward compatibility."
   (mapcar (lambda (attr)
@@ -349,12 +355,12 @@ Returns one of:
       (let* ((node-name (match-string 1))
              (attr-list (xml-parse-attlist))
              (children (if  (consp xml-ns) ;; take care of namespace parsing
-                            (progn 
+                            (progn
                               (setq xml-ns (xml-ns-parse-ns-attrs
                                             attr-list xml-ns))
-                              (list (xml-ns-expand-attr 
+                              (list (xml-ns-expand-attr
                                      attr-list xml-ns)
-                                    (xml-ns-expand-el 
+                                    (xml-ns-expand-el
                                      node-name xml-ns)))
                             (list (xml-intern-attrlist attr-list)
                                   (intern node-name))))
diff --git a/lispintro/texinfo.tex b/lispintro/texinfo.tex
index 4ef8dd7a01e..af648f19e17 100644
--- a/lispintro/texinfo.tex
+++ b/lispintro/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2003-07-16.18}
+\def\texinfoversion{2003-12-30.09}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -6772,4 +6772,6 @@ should work if nowhere else does.}
 @c time-stamp-end: "}"
 @c End:
 
-% arch-tag: 53261dd3-7df7-4ec3-9d90-af7a955d3c87
+@ignore
+   arch-tag: 53261dd3-7df7-4ec3-9d90-af7a955d3c87
+@end ignore
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 1b9aabffe46..f591037daab 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,53 @@
+2003-12-29  Richard M. Stallman  <rms@gnu.org>
+
+        * windows.texi (Choosing Window): Add same-window-p, special-display-p.
+        (Window Configurations): Add window-configuration-frame.
+
+        * variables.texi (Creating Buffer-Local): Add local-variable-if-set-p.
+
+        * text.texi (Examining Properties): Add get-char-property-and-overlay.
+        Change arg name in get-char-property.
+        (Special Properties): Update handling of keymap property.
+
+        * strings.texi (Modifying Strings): Add clear-string.
+        (Text Comparison): Add assoc-string and remove
+        assoc-ignore-case, assoc-ignore-representation.
+
+        * os.texi (Time of Day): Add set-time-zone-rule.
+
+        * numbers.texi (Math Functions): asin, acos, log, log10
+        report domain-error errors.     
+
+        * nonascii.texi (Converting Representations): 
+        Add multibyte-char-to-unibyte and unibyte-char-to-multibyte.
+        (Encoding and I/O): Add file-name-coding-system.
+
+        * modes.texi (Search-based Fontification): Explain that
+        face specs are symbols with face names as values.
+
+        * minibuf.texi (Minibuffer Misc): Add set-minibuffer-window.
+
+        * lists.texi (Building Lists): remq moved elsewhere.
+        (Sets And Lists): remq moved here.
+        (Association Lists): Refer to assoc-string.
+
+        * internals.texi (Garbage Collection): Add memory-use-counts.
+
+        * frames.texi (Frames and Windows): Add set-frame-selected-window
+        and frame-root-window.
+
+        * files.texi (Contents of Directories): 
+        Add directory-files-and-attributes.
+
+        * display.texi (Refresh Screen): Add force-window-update.
+        (Invisible Text): Explain about moving point out of invis text.
+        (Overlay Properties): Add overlay-properties.
+        (Managing Overlays): Add overlayp.
+        (GIF Images): Invalid image number displays a hollow box.
+
+        * buffers.texi (Buffer Modification): Add restore-buffer-modified-p.
+        (Killing Buffers): Add buffer-live-p.
+
 2003-12-25  Markus Rost  <rost@mathematik.uni-bielefeld.de>
 
         * display.texi (Fringes): Fix typo "set-buffer-window".
diff --git a/lispref/buffers.texi b/lispref/buffers.texi
index 5b1104eb058..634838f903f 100644
--- a/lispref/buffers.texi
+++ b/lispref/buffers.texi
@@ -517,6 +517,11 @@ function @code{force-mode-line-update} works by doing this:
 @end example
 @end defun
 
+@defun restore-buffer-modified-p flag
+Like @code{set-buffer-modified-p}, but does not force redisplay
+of mode lines.
+@end defun
+
 @deffn Command not-modified
 This command marks the current buffer as unmodified, and not needing to
 be saved.  With prefix arg, it marks the buffer as modified, so that it
@@ -953,6 +958,11 @@ variable @code{buffer-offer-save} automatically becomes buffer-local
 when set for any reason.  @xref{Buffer-Local Variables}.
 @end defvar
 
+@defun buffer-live-p buffer
+This function returns @code{t} if @var{object} is a buffer which has
+not been killed, @code{nil} otherwise.
+@end defun
+
 @node Indirect Buffers
 @section Indirect Buffers
 @cindex indirect buffers
diff --git a/lispref/display.texi b/lispref/display.texi
index abbbab0ce79..bd415b69697 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -53,6 +53,17 @@ Even more powerful is @code{redraw-display}:
 This function clears and redisplays all visible frames.
 @end deffn
 
+  This function forces certain windows to be redisplayed
+but does not clear them.
+
+@defun force-window-update object
+This function forces redisplay of some or all windows.  If
+@var{object} is a window, it forces redisplay of that window.  If
+@var{object} is a buffer or buffer name, it forces redisplay of all
+windows displaying that buffer.  If @var{object} is @code{nil}, it
+forces redisplay of all windows.
+@end defun
+
   Processing user input takes absolute priority over redisplay.  If you
 call these functions when input is available, they do nothing
 immediately, but a full redisplay does happen eventually---after all the
@@ -517,6 +528,7 @@ warnings buffer.  Each element of the list should be a list of
 symbols.  If it matches the first few elements in a warning type, then
 that warning is not logged.
 @end defopt
+
 @node Invisible Text
 @section Invisible Text
 
@@ -613,12 +625,22 @@ major mode should use the mode's own name as an element of
 @end example
 
 @vindex line-move-ignore-invisible
-  Ordinarily, commands that operate on text or move point do not care
+  Ordinarily, functions that operate on text or move point do not care
 whether the text is invisible.  The user-level line motion commands
 explicitly ignore invisible newlines if
 @code{line-move-ignore-invisible} is non-@code{nil}, but only because
 they are explicitly programmed to do so.
 
+  However, if a command ends with point inside or immediately after
+invisible text, the main editing loop moves point further forward or
+further backward (in the same direction that the command already moved
+it) until that condition is no longer true.  Thus, if the command
+moved point back into an invisible range, Emacs moves point back to
+the beginning of that range, following the previous visible character.
+If the command moved point forward into an invisible range, Emacs
+moves point forward past the first visible character that follows the
+invisible text.
+
   Incremental search can make invisible overlays visible temporarily
 and/or permanently when a match includes invisible text.  To enable
 this, the overlay should have a non-@code{nil}
@@ -980,6 +1002,10 @@ This function sets the value of property @var{prop} recorded in
 @var{overlay} to @var{value}.  It returns @var{value}.
 @end defun
 
+@defun overlay-properties overlay
+This returns a copy of the property list of @var{overlay}.
+@end defun
+
   See also the function @code{get-char-property} which checks both
 overlay properties and text properties for a given character.
 @xref{Examining Properties}.
@@ -1155,6 +1181,10 @@ property) rather than replacing it.
   This section describes the functions to create, delete and move
 overlays, and to examine their contents.
 
+@defun overlayp object
+This function returns @code{t} if @var{object} is an overlay.
+@end defun
+
 @defun make-overlay start end &optional buffer front-advance rear-advance
 This function creates and returns an overlay that belongs to
 @var{buffer} and ranges from @var{start} to @var{end}.  Both @var{start}
@@ -3114,8 +3144,8 @@ them, Emacs can display them.
 @item :index @var{index}
 You can use @code{:index} to specify one image from a GIF file that
 contains more than one image.  This property specifies use of image
-number @var{index} from the file.  An error is signaled if the GIF file
-doesn't contain an image with index @var{index}.
+number @var{index} from the file.  If the GIF file doesn't contain an
+image with index @var{index}, the image displays as a hollow box.
 @end table
 
 @ignore
diff --git a/lispref/files.texi b/lispref/files.texi
index 83c33752323..575a90ccf92 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -2165,6 +2165,14 @@ An error is signaled if @var{directory} is not the name of a directory
 that can be read.
 @end defun
 
+@defun directory-files-and-attributes directory &optional full-name match-regexp nosort
+This is similar to @code{directory-files} in deciding which files
+to report on and how to report their names.  However, instead
+of returning a list of file names, it returns for each file a
+list @code{(@var{filename} . @var{attributes})}, where @var{attributes}
+is what @code{file-attributes} would return for that file.
+@end defun
+
 @defun file-name-all-versions file dirname
 This function returns a list of all versions of the file named
 @var{file} in directory @var{dirname}.
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 76b4228cc4f..ec3c1c6dc7c 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -923,9 +923,20 @@ This function returns the window on @var{frame} that is selected within
 @var{frame}.
 @end defun
 
+@defun set-frame-selected-window frame window
+This sets the selected window of frame @var{frame} to @var{window}.
+If @var{frame} is @code{nil}, it operates on the selected frame.  If
+@var{frame} is the selected frame, this makes @var{window} the
+selected window.
+@end defun
+
   Conversely, selecting a window for Emacs with @code{select-window} also
 makes that window selected within its frame.  @xref{Selecting Windows}.
 
+@defun frame-root-window frame
+This function returns the window at the top left corner of @var{frame}.
+@end defun
+
   Another function that (usually) returns one of the windows in a given
 frame is @code{minibuffer-window}.  @xref{Minibuffer Misc}.
 
diff --git a/lispref/internals.texi b/lispref/internals.texi
index 2a4572560a7..907a01df9e9 100644
--- a/lispref/internals.texi
+++ b/lispref/internals.texi
@@ -383,6 +383,12 @@ You can use this to get a general idea of how your actions affect the
 memory usage.
 @end defun
 
+@defun memory-use-counts
+This returns a list of numbers that count the number of objects
+created in this Emacs session.  Each of these counters increments for
+a certain kind of object.  See the documentation string for details.
+@end defun
+
 @defvar gcs-done
 This variable contains the total number of garbage collections
 done so far in this Emacs session.
diff --git a/lispref/lists.texi b/lispref/lists.texi
index 885d1e07f28..b123de5ab10 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -707,31 +707,6 @@ x
 @end example
 @end defun
 
-@defun remq object list
-This function returns a copy of @var{list}, with all elements removed
-which are @code{eq} to @var{object}.  The letter @samp{q} in @code{remq}
-says that it uses @code{eq} to compare @var{object} against the elements
-of @code{list}.
-
-@example
-@group
-(setq sample-list '(a b c a b c))
-     @result{} (a b c a b c)
-@end group
-@group
-(remq 'a sample-list)
-     @result{} (b c b c)
-@end group
-@group
-sample-list
-     @result{} (a b c a b c)
-@end group
-@end example
-@noindent
-The function @code{delq} offers a way to perform this operation
-destructively.  See @ref{Sets And Lists}.
-@end defun
-
 @defun copy-tree tree &optional vecp
 This function returns a copy the tree @code{tree}.  If @var{tree} is a
 cons cell, this makes a new cons cell with the same @sc{car} and
@@ -1346,9 +1321,34 @@ and the @code{(4)} in the @code{sample-list} are not @code{eq}:
 @end group
 @end example
 
-The following two functions are like @code{memq} and @code{delq} but use
-@code{equal} rather than @code{eq} to compare elements.  @xref{Equality
-Predicates}.
+@defun remq object list
+This function returns a copy of @var{list}, with all elements removed
+which are @code{eq} to @var{object}.  The letter @samp{q} in @code{remq}
+says that it uses @code{eq} to compare @var{object} against the elements
+of @code{list}.
+
+@example
+@group
+(setq sample-list '(a b c a b c))
+     @result{} (a b c a b c)
+@end group
+@group
+(remq 'a sample-list)
+     @result{} (b c b c)
+@end group
+@group
+sample-list
+     @result{} (a b c a b c)
+@end group
+@end example
+@noindent
+The function @code{delq} offers a way to perform this operation
+destructively.  See @ref{Sets And Lists}.
+@end defun
+
+The following three functions are like @code{memq}, @code{delq} and
+@code{remq}, but use @code{equal} rather than @code{eq} to compare
+elements.  @xref{Equality Predicates}.
 
 @defun member object list
 The function @code{member} tests to see whether @var{object} is a member
@@ -1541,9 +1541,9 @@ Here is another example, in which the keys and values are not symbols:
 @end smallexample
 @end defun
 
-  The functions @code{assoc-ignore-representation} and
-@code{assoc-ignore-case} are much like @code{assoc} except using
-@code{compare-strings} to do the comparison.  @xref{Text Comparison}.
+  The function @code{assoc-string} is much like @code{assoc} except
+that it ignores certain differences between strings.  @xref{Text
+Comparison}.
 
 @defun rassoc value alist
 This function returns the first association with value @var{value} in
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index 114942ed787..473859ccd6c 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -1645,6 +1645,14 @@ frame---a frame that has no minibuffer of its own necessarily uses some
 other frame's minibuffer window.
 @end defun
 
+@defun set-minibuffer-window window
+This function specifies @var{window} as the minibuffer window to use.
+This affects where the minibuffer is displayed if you put text in it
+without invoking the usual minibuffer commands.  It has no effect on
+the usual minibuffer input functions because they all start by
+choosing the minibuffer window according to the current frame.
+@end defun
+
 @c Emacs 19 feature
 @defun window-minibuffer-p window
 This function returns non-@code{nil} if @var{window} is a minibuffer window.
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 6a55cd75c8a..2292346ffdf 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -2024,9 +2024,10 @@ If you use @code{regexp-opt} to produce the regular expression
 @var{matcher}, then you can use @code{regexp-opt-depth} (@pxref{Syntax
 of Regexps}) to calculate the value for @var{match}.
 
-@item (@var{matcher} . @var{facename})
-In this kind of element, @var{facename} is an expression whose value
-specifies the face name to use for highlighting.
+@item (@var{matcher} . @var{facespec})
+In this kind of element, @var{facespec} is an object which specifies
+the face variable to use for highlighting.  In the simplest case, it
+is a Lisp variable (a symbol), whose value should be a face name.
 
 @example
 ;; @r{Highlight occurrences of @samp{fubar},}
@@ -2034,8 +2035,7 @@ specifies the face name to use for highlighting.
 ("fubar" . fubar-face)
 @end example
 
-The value of @var{facename} is usually a face name (a symbol), but it
-can also be a list of the form
+However, @var{facespec} can also be a list of the form
 
 @example
 (face @var{face} @var{prop1} @var{val1} @var{prop2} @var{val2}@dots{})
@@ -2053,21 +2053,21 @@ which specifies how to highlight matches found by @var{matcher}.
 It has the form
 
 @example
-(@var{subexp} @var{facename} @var{override} @var{laxmatch})
+(@var{subexp} @var{facespec} @var{override} @var{laxmatch})
 @end example
 
 The @sc{car}, @var{subexp}, is an integer specifying which subexpression
 of the match to fontify (0 means the entire matching text).  The second
-subelement, @var{facename}, specifies the face, as described above.
+subelement, @var{facespec}, specifies the face, as described above.
 
 The last two values in @var{highlighter}, @var{override} and
 @var{laxmatch}, are flags.  If @var{override} is @code{t}, this
 element can override existing fontification made by previous elements
 of @code{font-lock-keywords}.  If it is @code{keep}, then each
 character is fontified if it has not been fontified already by some
-other element.  If it is @code{prepend}, the face @var{facename} is
-added to the beginning of the @code{font-lock-face} property.  If it
-is @code{append}, the face @var{facename} is added to the end of the
+other element.  If it is @code{prepend}, the face specified by
+@var{facespec} is added to the beginning of the @code{font-lock-face}
+property.  If it is @code{append}, the face is added to the end of the
 @code{font-lock-face} property.
 
 If @var{laxmatch} is non-@code{nil}, it means there should be no error
@@ -2231,7 +2231,7 @@ textual modes.
 Additional properties (other than @code{font-lock-face}) that are
 being managed by Font Lock mode.  Font Lock mode normally manages only
 the @code{font-lock-face} property; if you want it to manage others as
-well, you must specify them in a @var{facename} in
+well, you must specify them in a @var{facespec} in
 @code{font-lock-keywords} as well as adding them to this list.
 @end defvar
 
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index e66c7d15757..419a23efae7 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -210,6 +210,18 @@ multibyte string.  If @var{string} is a multibyte string, it is
 returned unchanged.
 @end defun
 
+@defun multibyte-char-to-unibyte char
+This convert the multibyte character @var{char} to a unibyte
+character, based on @code{nonascii-translation-table} and
+@code{nonascii-insert-offset}.
+@end defun
+
+@defun unibyte-char-to-multibyte char
+This convert the unibyte character @var{char} to a multibyte
+character, based on @code{nonascii-translation-table} and
+@code{nonascii-insert-offset}.
+@end defun
+
 @node Selecting a Representation
 @section Selecting a Representation
 
@@ -701,6 +713,26 @@ interested in.
   The variable @code{selection-coding-system} specifies how to encode
 selections for the window system.  @xref{Window System Selections}.
 
+@defvar file-name-coding-system
+The variable @code{file-name-coding-system} specifies the coding
+system to use for encoding file names.  Emacs encodes file names using
+that coding system for all file operations.  If
+@code{file-name-coding-system} is @code{nil}, Emacs uses a default
+coding system determined by the selected language environment.  In the
+default language environment, any non-@acronym{ASCII} characters in
+file names are not encoded specially; they appear in the file system
+using the internal Emacs representation.
+@end defvar
+
+  @strong{Warning:} if you change @code{file-name-coding-system} (or
+the language environment) in the middle of an Emacs session, problems
+can result if you have already visited files whose names were encoded
+using the earlier coding system and are handled differently under the
+new coding system.  If you try to save one of these buffers under the
+visited file name, saving may use the wrong file name, or it may get
+an error.  If such a problem happens, use @kbd{C-x C-w} to specify a
+new file name for that buffer.
+
 @node Lisp and Coding Systems
 @subsection Coding Systems in Lisp
 
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index 63f3035dfcf..9c71922c0d0 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -1047,8 +1047,8 @@ pi/2
 @tex
 @math{\pi/2}
 @end tex
-(inclusive) whose sine is @var{arg}; if, however, @var{arg}
-is out of range (outside [-1, 1]), then the result is a NaN.
+(inclusive) whose sine is @var{arg}; if, however, @var{arg} is out of
+range (outside [-1, 1]), it signals a @code{domain-error} error.
 @end defun
 
 @defun acos arg
@@ -1059,8 +1059,8 @@ pi
 @tex
 @math{\pi}
 @end tex
-(inclusive) whose cosine is @var{arg}; if, however, @var{arg}
-is out of range (outside [-1, 1]), then the result is a NaN.
+(inclusive) whose cosine is @var{arg}; if, however, @var{arg} is out
+of range (outside [-1, 1]), it signals a @code{domain-error} error.
 @end defun
 
 @defun atan y &optional x
@@ -1112,8 +1112,8 @@ If you don't specify @var{base}, the base
 @ifnottex
 @i{e}
 @end ifnottex
-is used.  If @var{arg}
-is negative, the result is a NaN.
+is used.  If @var{arg} is negative, it signals a @code{domain-error}
+error.
 @end defun
 
 @ignore
@@ -1132,8 +1132,9 @@ lose accuracy.
 
 @defun log10 arg
 This function returns the logarithm of @var{arg}, with base 10.  If
-@var{arg} is negative, the result is a NaN.  @code{(log10 @var{x})}
-@equiv{} @code{(log @var{x} 10)}, at least approximately.
+@var{arg} is negative, it signals a @code{domain-error} error.
+@code{(log10 @var{x})} @equiv{} @code{(log @var{x} 10)}, at least
+approximately.
 @end defun
 
 @defun expt x y
diff --git a/lispref/os.texi b/lispref/os.texi
index 5706c33d607..5401701b973 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1010,6 +1010,13 @@ integers.  Thus, you can use times obtained from @code{current-time}
 (see above) and from @code{file-attributes} (@pxref{File Attributes}).
 @end defun
 
+@defun set-time-zone-rule tz
+This function specifies the local time zone according to @var{tz}.  If
+@var{tz} is @code{nil}, that means to use an implementation-defined
+default time zone.  If @var{tz} is @code{t}, that means to use
+Universal Time.
+@end defun
+
 @defun float-time &optional time-value
 This function returns the current time as a floating-point number of
 seconds since the epoch.  The argument @var{time-value}, if given,
diff --git a/lispref/strings.texi b/lispref/strings.texi
index acab7286d0d..7cc182cc058 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -379,6 +379,14 @@ or if any new character requires a different number of bytes from the
 character currently present at that point in @var{string}.
 @end defun
 
+  To clear out a string that contained a password, use
+@code{clear-string}:
+
+@defun clear-string string
+This clears the contents of @var{string} to zeros
+and may change its length.
+@end defun
+
 @need 2000
 @node Text Comparison
 @section Comparison of Characters and Strings
@@ -518,13 +526,10 @@ two strings.  The sign is negative if @var{string1} (or its specified
 portion) is less.
 @end defun
 
-@defun assoc-ignore-case key alist
-@defunx assoc-ignore-representation key alist
-These functions work like @code{assoc}, except that @var{key} must be
-a string, all elements of @var{alist} must be cons cells whose
-@sc{car} is a string, and comparison is done using
-@code{compare-strings}.  @code{assoc-ignore-case} ignores case
-differences, whereas @code{assoc-ignore-representation} does not.
+@defun assoc-string key alist &optional case-fold
+This function works like @code{assoc}, except that @var{key} must be a
+string, and comparison is done using @code{compare-strings}.  If
+@var{case-fold} is non-@code{nil}, it ignores case differences.
 @xref{Association Lists}.
 @end defun
 
diff --git a/lispref/text.texi b/lispref/text.texi
index b72ce8a263d..1b460aa5077 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -1890,7 +1890,8 @@ begins.  @xref{Usual Display}.
 
   Column number computations ignore the width of the window and the
 amount of horizontal scrolling.  Consequently, a column value can be
-arbitrarily high.  The first (or leftmost) column is numbered 0.
+arbitrarily high.  The first (or leftmost) column is numbered 0.  They
+also ignore overlays and text properties, aside from invisibility.
 
 @defun current-column
 This function returns the horizontal position of point, measured in
@@ -2409,7 +2410,7 @@ has a category that is a symbol, then @code{get-text-property} returns
 the @var{prop} property of that symbol.
 @end defun
 
-@defun get-char-property pos prop &optional object
+@defun get-char-property position prop &optional object
 This function is like @code{get-text-property}, except that it checks
 overlays first and then text properties.  @xref{Overlays}.
 
@@ -2422,6 +2423,20 @@ string, only text properties are considered, since strings never have
 overlays.
 @end defun
 
+@defun get-char-property-and-overlay position prop &optional object
+This is like @code{get-char-property}, but gives extra information
+about the overlay that the property value comes from.
+
+Its value is a cons cell whose @sc{car} is the property value, the
+same value @code{get-char-property} would return with the same
+arguments.  Its @sc{cdr} is the overlay in which the property was
+found, or @code{nil}, if it was found as a text property or not found
+at all.
+
+If @var{position} is at the end of @var{object}, both the @sc{car} and
+the @sc{cdr} of the value are @code{nil}.
+@end defun
+
 @defvar char-property-alias-alist
 This variable holds an alist which maps property names to a list of
 alternative property names.  If a character does not specify a direct
@@ -2860,11 +2875,13 @@ The @code{keymap} property specifies an additional keymap for
 commands.  The property's value for the character before point applies
 if it is non-@code{nil} and rear-sticky, and the property's value for
 the character after point applies if it is non-@code{nil} and
-front-sticky.  When the value applies, it is used for key lookup
-before the buffer's local map.  (For mouse clicks, the position of the
-click is used instead of the position of point.)  If the property
-value is a symbol, the symbol's function definition is used as the
-keymap.  @xref{Active Keymaps}.
+front-sticky.  (For mouse clicks, the position of the click is used
+instead of the position of point.)  If the property value is a symbol,
+the symbol's function definition is used as the keymap.
+
+When this keymap applies, it is used for key lookup before the minor
+mode keymaps and before the buffer's local map.  @xref{Active
+Keymaps}.
 
 @item local-map
 @kindex local-map @r{(text property)}
diff --git a/lispref/variables.texi b/lispref/variables.texi
index bbe7358b5d7..4ff40120ca4 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -1335,6 +1335,12 @@ This returns @code{t} if @var{variable} is buffer-local in buffer
 @code{nil}.
 @end defun
 
+@defun local-variable-if-set-p variable &optional buffer
+This returns @code{t} if @var{variable} will become buffer-local in
+buffer @var{buffer} (which defaults to the current buffer) if it is
+set there.
+@end defun
+
 @defun buffer-local-value variable buffer
 This function returns the buffer-local binding of @var{variable} (a
 symbol) in buffer @var{buffer}.  If @var{variable} does not have a
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 158ab354057..425d5601ec9 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -1027,6 +1027,14 @@ list is the regular expression, and the rest of the list says how to
 create the frame.  See above, under @code{special-display-buffer-names}.
 @end defopt
 
+@defun special-display-p buffer-name
+This function returns non-@code{nil} if displaying a buffer
+named @var{buffer-name} with @code{display-buffer} would
+create a special frame.  The value is @code{t} if it would
+use the default frame paramaters, or else the specified list
+of frame parameters.
+@end defun
+
 @defvar special-display-function
 This variable holds the function to call to display a buffer specially.
 It receives the buffer as an argument, and should return the window in
@@ -1075,6 +1083,12 @@ the regular expressions in this list, @code{display-buffer} handles the
 buffer by switching to it in the selected window.
 @end defopt
 
+@defun same-window-p buffer-name
+This function returns @code{t} if displaying a buffer
+named @var{buffer-name} with @code{display-buffer} would
+put it in the selected window.
+@end defun
+
 @c Emacs 19 feature
 @defvar display-buffer-function
 This variable is the most flexible way to customize the behavior of
@@ -2163,10 +2177,15 @@ regards configurations as unequal if they differ in any respect, even a
 saved point or mark.
 @end defun
 
-  Primitives to look inside of window configurations would make sense,
-but none are implemented.  It is not clear they are useful enough to
-be worth implementing.  See the file @file{winner.el} for some more
-operations on windows configurations.
+@defun window-configuration-frame config
+This function returns the frame for which the window configuration
+@var{config} was made.
+@end defun
+
+  Other primitives to look inside of window configurations would make
+sense, but are not implemented because we did not need them.  See the
+file @file{winner.el} for some more operations on windows
+configurations.
 
 @node Window Hooks
 @section Hooks for Window Scrolling and Changes
diff --git a/man/ChangeLog b/man/ChangeLog
index 978b1e03d41..e57e5fbb4fe 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-29  Kevin Ryde <user42@zip.com.au>
+
+        * viper.texi (Vi Macros): Fix reference to the Emacs manual.
+
+        * programs.texi (C Modes): Fix the xref.
+
 2003-12-23  Nick Roberts  <nick@nick.uklinux.net>
 
         * building.texi (Watch Expressions): Update.
diff --git a/man/programs.texi b/man/programs.texi
index e3775569860..6b3776e0ac3 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -1398,8 +1398,8 @@ Mode}).  The Foldout package provides folding-editor features
 
   This section gives a brief description of the special features
 available in C, C++, Objective-C, Java, CORBA IDL, and Pike modes.
-(These are called ``C mode and related modes.'')  @xref{Top, CC Mode,
-ccmode, , CC Mode}, for a more extensive description of these modes
+(These are called ``C mode and related modes.'')  @xref{Top, , CC Mode,
+ccmode, CC Mode}, for a more extensive description of these modes
 and their special features.
 
 @menu
diff --git a/man/viper.texi b/man/viper.texi
index 2012ee58875..a31ce9a003d 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -2779,7 +2779,7 @@ As if all that is not enough, Viper (through its interface to Emacs
 macros) lets the user define keyboard macros that ask for confirmation or
 even prompt the user for input and then continue.  To do this, one should
 type @kbd{C-x q} (for confirmation) or @kbd{C-u C-x q} (for prompt).
-For details, @pxref{Kbd Macro Query,,Customization,emacs,The GNU Emacs
+For details, @pxref{Keyboard Macro Query,,Customization,emacs,The GNU Emacs
 Manual} @refill
 
 When the user finishes defining a macro (which is done by typing @kbd{C-x)} ---
diff --git a/src/ChangeLog b/src/ChangeLog
index f471cc99230..121142703c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2003-12-29  James Clark <jjc@jclark.com>  (tiny change)
+
+        * fns.c (internal_equal): Return t for two NaN arguments.
+
+2003-12-29  Richard M. Stallman  <rms@gnu.org>
+
+        * data.c (store_symval_forwarding): Handle setting
+        default-fill-column, etc., by changing the value in
+        buffers that use the default.
+
+        * minibuf.c (Fset_minibuffer_window): Doc fix.
+
+        * fileio.c (choose_write_coding_system): Ignore auto_saving
+        if using the visited file for auto saves.
+        (Fwrite_region): Don't update SAVE_MODIFF
+        if auto-saving in visited file.
+
+2003-12-29  Kenichi Handa  <handa@m17n.org>
+
+        * dispextern.h (face_font_available_p): Extern it.
+
+        * fontset.c (Voverriding_fontspec_alist): New variable.
+        (lookup_overriding_fontspec): New function.
+        (fontset_ref_via_base): Call lookup_overriding_fontspec if
+        necessary.
+        (fontset_font_pattern): Likewise.
+        (regulalize_fontname): New function.
+        (Fset_fontset_font): Call regulalize_fontname.
+        (Fset_overriding_fontspec_internal): New function.
+        (syms_of_fontset): Initialize and staticprop
+        Voverriding_fontspec_alist. Defsubr
+        Sset_overriding_fontspec_internal.
+
+        * xfaces.c (face_font_available_p): New function.
+
+2003-12-28  Richard M. Stallman  <rms@gnu.org>
+
+        * buffer.c (Fother_buffer): Don't crash if BUF is nil
+        or if its name is nil.
+
+        * buffer.c (Fkill_buffer): Don't delete auto-save file
+        if it's the same as the visited file.
+
 2003-12-28  Luc Teirlinck  <teirllm@auburn.edu>
 
         * coding.c (Fcheck_coding_system): Doc fix.
diff --git a/src/buffer.h b/src/buffer.h
index 14d3aa6d5ee..930424b0b49 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -906,8 +906,26 @@ extern int last_per_buffer_idx;
        (B)->local_flags[IDX] = (VAL);                   \
      } while (0)
 
-/* Return the index of the per-buffer variable at offset OFFSET in the
-   buffer structure.  */
+/* Return the index value of the per-buffer variable at offset OFFSET
+   in the buffer structure.
+
+   If the slot OFFSET has a corresponding default value in
+   buffer_defaults, the index value is positive and has only one
+   nonzero bit.  When a buffer has its own local value for a slot, the
+   bit for that slot (found in the same slot in this structure) is
+   turned on in the buffer's local_flags array.
+
+   If the index value is -1, even though there may be a
+   DEFVAR_PER_BUFFER for the slot, there is no default value for it;
+   and the corresponding slot in buffer_defaults is not used.
+
+   If the index value is -2, then there is no DEFVAR_PER_BUFFER for
+   the slot, but there is a default value which is copied into each
+   new buffer.
+
+   If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
+   zero, that is a bug */
+
 
 #define PER_BUFFER_IDX(OFFSET) \
       XINT (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_flags))
diff --git a/src/data.c b/src/data.c
index a246271c1f6..c4e3937f3fa 100644
--- a/src/data.c
+++ b/src/data.c
@@ -873,6 +873,8 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
      register Lisp_Object valcontents, newval;
      struct buffer *buf;
 {
+  int offset;
+
   switch (SWITCH_ENUM_CAST (XTYPE (valcontents)))
     {
     case Lisp_Misc:
@@ -892,6 +894,36 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
 
         case Lisp_Misc_Objfwd:
           *XOBJFWD (valcontents)->objvar = newval;
+
+          /* If this variable is a default for something stored
+             in the buffer itself, such as default-fill-column,
+             find the buffers that don't have local values for it
+             and update them.  */
+          if (XOBJFWD (valcontents)->objvar > (Lisp_Object *) &buffer_defaults
+              && XOBJFWD (valcontents)->objvar < (Lisp_Object *) (&buffer_defaults + 1))
+            {
+              int offset = ((char *) XOBJFWD (valcontents)->objvar
+                            - (char *) &buffer_defaults);
+              int idx = PER_BUFFER_IDX (offset);
+
+              Lisp_Object tail, buf;
+
+              if (idx <= 0)
+                break;
+
+              for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
+                {
+                  Lisp_Object buf;
+                  struct buffer *b;
+
+                  buf = Fcdr (XCAR (tail));
+                  if (!BUFFERP (buf)) continue;
+                  b = XBUFFER (buf);
+
+                  if (! PER_BUFFER_VALUE_P (b, idx))
+                    PER_BUFFER_VALUE (b, offset) = newval;
+                }
+            }
           break;
 
         case Lisp_Misc_Buffer_Objfwd:
diff --git a/src/dispextern.h b/src/dispextern.h
index cb0a7a7d91d..e53f36d4a01 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2582,6 +2582,7 @@ void clear_face_cache P_ ((int));
 unsigned long load_color P_ ((struct frame *, struct face *, Lisp_Object,
                               enum lface_attribute_index));
 void unload_color P_ ((struct frame *, unsigned long));
+int face_font_available_p P_ ((struct frame *, Lisp_Object));
 int ascii_face_of_lisp_face P_ ((struct frame *, int));
 void prepare_face_for_display P_ ((struct frame *, struct face *));
 int xstricmp P_ ((const unsigned char *, const unsigned char *));
diff --git a/src/eval.c b/src/eval.c
index e5dba1b888f..8a6d0d3ff54 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2641,6 +2641,8 @@ call6 (fn, arg1, arg2, arg3, arg4, arg5, arg6)
 #endif /* not NO_ARG_ARRAY */
 }
 
+/* The caller should GCPRO all the elements of ARGS.  */
+
 DEFUN ("funcall", Ffuncall, Sfuncall, 1, MANY, 0,
        doc: /* Call first argument as a function, passing remaining arguments to it.
 Return the value that function returns.
diff --git a/src/fileio.c b/src/fileio.c
index e586407cecc..a2b207169cf 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4685,7 +4685,9 @@ choose_write_coding_system (start, end, filename,
 {
   Lisp_Object val;
 
-  if (auto_saving)
+  if (auto_saving
+      && NILP (Fstring_equal (current_buffer->filename,
+                              current_buffer->auto_save_file_name)))
     {
       /* We use emacs-mule for auto saving... */
       setup_coding_system (Qemacs_mule, coding);
@@ -5221,7 +5223,14 @@ This does code conversion according to the value of
       update_mode_lines++;
     }
   else if (quietly)
-    return Qnil;
+    {
+      if (auto_saving
+          && ! NILP (Fstring_equal (current_buffer->filename,
+                                    current_buffer->auto_save_file_name)))
+        SAVE_MODIFF = MODIFF;
+
+      return Qnil;
+    }
 
   if (!auto_saving)
     message_with_string ((INTEGERP (append)
@@ -5776,11 +5785,14 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
   minibuffer_auto_raise = 0;
   auto_saving = 1;
 
-  /* First, save all files which don't have handlers.  If Emacs is
-     crashing, the handlers may tweak what is causing Emacs to crash
-     in the first place, and it would be a shame if Emacs failed to
-     autosave perfectly ordinary files because it couldn't handle some
-     ange-ftp'd file.  */
+  /* On first pass, save all files that don't have handlers.
+     On second pass, save all files that do have handlers.
+
+     If Emacs is crashing, the handlers may tweak what is causing
+     Emacs to crash in the first place, and it would be a shame if
+     Emacs failed to autosave perfectly ordinary files because it
+     couldn't handle some ange-ftp'd file.  */
+
   for (do_handled_files = 0; do_handled_files < 2; do_handled_files++)
     for (tail = Vbuffer_alist; GC_CONSP (tail); tail = XCDR (tail))
       {
diff --git a/src/fns.c b/src/fns.c
index e4252c98ca5..ff40c706edd 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2169,7 +2169,15 @@ internal_equal (o1, o2, depth)
   switch (XTYPE (o1))
     {
     case Lisp_Float:
-      return (extract_float (o1) == extract_float (o2));
+      {
+        double d1, d2;
+
+        d1 = extract_float (o1);
+        d2 = extract_float (o2);
+        /* If d is a NaN, then d != d. Two NaNs should be `equal' even
+           though they are not =. */
+        return d1 == d2 || (d1 != d1 && d2 != d2);
+      }
 
     case Lisp_Cons:
       if (!internal_equal (XCAR (o1), XCAR (o2), depth + 1))
diff --git a/src/fontset.c b/src/fontset.c
index e462387beae..b199f53df17 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -140,6 +140,10 @@ static int next_fontset_id;
    font for each characters.  */
 static Lisp_Object Vdefault_fontset;
 
+/* Alist of font specifications.  It override the font specification
+   in the default fontset.  */
+static Lisp_Object Voverriding_fontspec_alist;
+
 Lisp_Object Vfont_encoding_alist;
 Lisp_Object Vuse_default_ascent;
 Lisp_Object Vignore_relative_composition;
@@ -184,11 +188,13 @@ void (*check_window_system_func) P_ ((void));
 
 /* Prototype declarations for static functions.  */
 static Lisp_Object fontset_ref P_ ((Lisp_Object, int));
+static Lisp_Object lookup_overriding_fontspec P_ ((Lisp_Object, int));
 static void fontset_set P_ ((Lisp_Object, int, Lisp_Object));
 static Lisp_Object make_fontset P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
 static int fontset_id_valid_p P_ ((int));
 static Lisp_Object fontset_pattern_regexp P_ ((Lisp_Object));
 static Lisp_Object font_family_registry P_ ((Lisp_Object, int));
+static Lisp_Object regulalize_fontname P_ ((Lisp_Object));
 
 
 /********** MACROS AND FUNCTIONS TO HANDLE FONTSET **********/
@@ -241,6 +247,46 @@ fontset_ref (fontset, c)
 }
 
 
+static Lisp_Object
+lookup_overriding_fontspec (frame, c)
+     Lisp_Object frame;
+     int c;
+{
+  Lisp_Object tail;
+
+  for (tail = Voverriding_fontspec_alist; CONSP (tail); tail = XCDR (tail))
+    {
+      Lisp_Object val, target, elt;
+
+      val = XCAR (tail);
+      target = XCAR (val);
+      val = XCDR (val);
+      /* Now VAL is (NO-FRAME-LIST OK-FRAME-LIST CHAR FONTNAME).  */
+      if (NILP (Fmemq (frame, XCAR (val)))
+          && (CHAR_TABLE_P (target)
+              ? ! NILP (CHAR_TABLE_REF (target, c))
+              : XINT (target) == CHAR_CHARSET (c)))
+        {
+          val = XCDR (val);
+          elt = XCDR (val);
+          if (NILP (Fmemq (frame, XCAR (val))))
+            {
+              if (! face_font_available_p (XFRAME (frame), XCDR (elt)))
+                {
+                  val = XCDR (XCAR (tail));
+                  XSETCAR (val, Fcons (frame, XCAR (val)));
+                  continue;
+                }
+              XSETCAR (val, Fcons (frame, XCAR (val)));
+            }
+          if (NILP (XCAR (elt)))
+            XSETCAR (elt, make_number (c));
+          return elt;
+        }
+    }
+  return Qnil;
+}
+
 #define FONTSET_REF_VIA_BASE(fontset, c) fontset_ref_via_base (fontset, &c)
 
 static Lisp_Object
@@ -254,8 +300,12 @@ fontset_ref_via_base (fontset, c)
   if (SINGLE_BYTE_CHAR_P (*c))
     return FONTSET_ASCII (fontset);
 
-  elt = FONTSET_REF (FONTSET_BASE (fontset), *c);
-  if (NILP (elt) && ! EQ (fontset, Vdefault_fontset))
+  elt = Qnil;
+  if (! EQ (FONTSET_BASE (fontset), Vdefault_fontset))
+    elt = FONTSET_REF (FONTSET_BASE (fontset), *c);
+  if (NILP (elt))
+    elt = lookup_overriding_fontspec (FONTSET_FRAME (fontset), *c);
+  if (NILP (elt) && ! EQ (FONTSET_BASE (fontset), Vdefault_fontset))
     elt = FONTSET_REF (Vdefault_fontset, *c);
   if (NILP (elt))
     return Qnil;
@@ -551,6 +601,13 @@ fontset_font_pattern (f, id, c)
       elt = FONTSET_REF (fontset, c);
     }
   if (NILP (elt))
+    {
+      Lisp_Object frame;
+
+      XSETFRAME (frame, f);
+      elt = lookup_overriding_fontspec (frame, c);
+    }
+  if (NILP (elt))
     elt = FONTSET_REF (Vdefault_fontset, c);
 
   if (!CONSP (elt))
@@ -980,6 +1037,33 @@ check_fontset_name (name)
   return FONTSET_FROM_ID (id);
 }
 
+/* Downcase FONTNAME or car and cdr of FONTNAME.  If FONTNAME is a
+   string, maybe change FONTNAME to (FAMILY . REGISTRY).  */
+
+static Lisp_Object
+regulalize_fontname (Lisp_Object fontname)
+{
+  Lisp_Object family, registry;
+
+  if (STRINGP (fontname))
+    return font_family_registry (Fdowncase (fontname), 0);
+
+  CHECK_CONS (fontname);
+  family = XCAR (fontname);
+  registry = XCDR (fontname);
+  if (!NILP (family))
+    {
+      CHECK_STRING (family);
+      family = Fdowncase (family);
+    }
+  if (!NILP (registry))
+    {
+      CHECK_STRING (registry);
+      registry = Fdowncase (registry);
+    }
+  return Fcons (family, registry);
+}
+
 DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0,
        doc: /* Modify fontset NAME to use FONTNAME for CHARACTER.
 
@@ -1043,34 +1127,12 @@ name of a font, REGISTRY is a registry name of a font.  */)
         error ("Can't change font for a single byte character");
     }
 
-  if (STRINGP (fontname))
-    {
-      fontname = Fdowncase (fontname);
-      elt = Fcons (make_number (from), font_family_registry (fontname, 0));
-    }
-  else
-    {
-      CHECK_CONS (fontname);
-      family = XCAR (fontname);
-      registry = XCDR (fontname);
-      if (!NILP (family))
-        {
-          CHECK_STRING (family);
-          family = Fdowncase (family);
-        }
-      if (!NILP (registry))
-        {
-          CHECK_STRING (registry);
-          registry = Fdowncase (registry);
-        }
-      elt = Fcons (make_number (from), Fcons (family, registry));
-    }
-
   /* The arg FRAME is kept for backward compatibility.  We only check
      the validity.  */
   if (!NILP (frame))
     CHECK_LIVE_FRAME (frame);
 
+  elt = Fcons (make_number (from), regulalize_fontname (fontname));
   for (; from <= to; from++)
     FONTSET_SET (fontset, from, elt);
   Foptimize_char_table (fontset);
@@ -1445,6 +1507,60 @@ DEFUN ("fontset-list", Ffontset_list, Sfontset_list, 0, 0, 0,
   return list;
 }
 
+DEFUN ("set-overriding-fontspec-internal", Fset_overriding_fontspec_internal,
+       Sset_overriding_fontspec_internal, 1, 1, 0,
+       doc: /* Internal use only.
+
+FONTLIST is an alist of TARGET vs FONTNAME, where TARGET is a charset
+or a char-table, FONTNAME have the same meanings as in
+`set-fontset-font'.
+
+It overrides the font specifications for each TARGET in the default
+fontset by the corresponding FONTNAME.
+
+If TARGET is a charset, targets are all characters in the charset.  If
+TARGET is a char-table, targets are characters whose value is non-nil
+in the table.
+
+It is intended that this function is called only from
+`set-language-environment'.  */)
+     (fontlist)
+     Lisp_Object fontlist;
+{
+  Lisp_Object tail;
+
+  fontlist = Fcopy_sequence (fontlist);
+  /* Now FONTLIST is ((TARGET . FONTNAME) ...).  Reform it to ((TARGET
+     nil nil nil FONTSPEC) ...), where TARGET is a charset-id or a
+     char-table.  */
+  for (tail = fontlist; CONSP (tail); tail = XCDR (tail))
+    {
+      Lisp_Object elt, target;
+
+      elt = XCAR (tail);
+      target = Fcar (elt);
+      elt = Fcons (Qnil, regulalize_fontname (Fcdr (elt)));
+      if (! CHAR_TABLE_P (target))
+        {
+          int charset, c;
+
+          CHECK_SYMBOL (target);
+          charset = get_charset_id (target);
+          if (charset < 0)
+            error ("Invalid charset %s", SDATA (SYMBOL_NAME (target)));
+          target = make_number (charset);
+          c = MAKE_CHAR (charset, 0, 0);
+          XSETCAR (elt, make_number (c));
+        }
+      elt = Fcons (target, Fcons (Qnil, Fcons (Qnil, elt)));
+      XSETCAR (tail, elt);
+    }
+  Voverriding_fontspec_alist = fontlist;
+  clear_face_cache (0);
+  ++windows_or_buffers_changed;
+  return Qnil;
+}
+
 void
 syms_of_fontset ()
 {
@@ -1483,6 +1599,9 @@ syms_of_fontset ()
   AREF (Vfontset_table, 0) = Vdefault_fontset;
   next_fontset_id = 1;
 
+  Voverriding_fontspec_alist = Qnil;
+  staticpro (&Voverriding_fontspec_alist);
+
   DEFVAR_LISP ("font-encoding-alist", &Vfont_encoding_alist,
                doc: /* Alist of fontname patterns vs corresponding encoding info.
 Each element looks like (REGEXP . ENCODING-INFO),
@@ -1548,6 +1667,7 @@ at the vertical center of lines.  */);
   defsubr (&Sfontset_info);
   defsubr (&Sfontset_font);
   defsubr (&Sfontset_list);
+  defsubr (&Sset_overriding_fontspec_internal);
 }
 
 /* arch-tag: ea861585-2f5f-4e5b-9849-d04a9c3a3537
diff --git a/src/minibuf.c b/src/minibuf.c
index baeb0cef7b5..9a05a4d1ce0 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -189,7 +189,7 @@ choose_minibuf_frame_1 (ignore)
 DEFUN ("set-minibuffer-window", Fset_minibuffer_window,
        Sset_minibuffer_window, 1, 1, 0,
        doc: /* Specify which minibuffer window to use for the minibuffer.
-This effects where the minibuffer is displayed if you put text in it
+This affects where the minibuffer is displayed if you put text in it
 without invoking the usual minibuffer commands.  */)
      (window)
      Lisp_Object window;
diff --git a/src/xfaces.c b/src/xfaces.c
index 84d49e30a9b..47f406d7012 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2564,6 +2564,69 @@ x_face_list_fonts (f, pattern, pfonts, nfonts, try_alternatives_p)
 }
 
 
+/* Check if a font matching pattern_offset_t on frame F is available
+   or not.  PATTERN may be a cons (FAMILY . REGISTRY), in which case,
+   a font name pattern is generated from FAMILY and REGISTRY.  */
+
+int
+face_font_available_p (f, pattern)
+     struct frame *f;
+     Lisp_Object pattern;
+{
+  Lisp_Object fonts;
+
+  if (! STRINGP (pattern))
+    {
+      Lisp_Object family, registry;
+      char *family_str, *registry_str, *pattern_str;
+
+      CHECK_CONS (pattern);
+      family = XCAR (pattern);
+      if (NILP (family))
+        family_str = "*";
+      else
+        {
+          CHECK_STRING (family);
+          family_str = (char *) SDATA (family);
+        }
+      registry = XCDR (pattern);
+      if (NILP (registry))
+        registry_str = "*";
+      else
+        {
+          CHECK_STRING (registry);
+          registry_str = (char *) SDATA (registry);
+        }
+
+      pattern_str = (char *) alloca (strlen (family_str)
+                                     + strlen (registry_str)
+                                     + 10);
+      strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-");
+      strcat (pattern_str, family_str);
+      strcat (pattern_str, "-*-");
+      strcat (pattern_str, registry_str);
+      if (!index (registry_str, '-'))
+        {
+          if (registry_str[strlen (registry_str) - 1] == '*')
+            strcat (pattern_str, "-*");
+          else
+            strcat (pattern_str, "*-*");
+        }
+      pattern = build_string (pattern_str);
+    }
+
+  /* Get the list of fonts matching PATTERN.  */
+#ifdef WINDOWSNT
+  BLOCK_INPUT;
+  fonts = w32_list_fonts (f, pattern, 0, 1);
+  UNBLOCK_INPUT;
+#else
+  fonts = x_list_fonts (f, pattern, -1, 1);
+#endif
+  return XINT (Flength (fonts));
+}
+
+
 /* Determine fonts matching PATTERN on frame F.  Sort resulting fonts
    using comparison function CMPFN.  Value is the number of fonts
    found.  If value is non-zero, *FONTS is set to a vector of