diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index ab17c84eab9..5815aa784b2 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -43,6 +43,12 @@ a bitmap appearence.
 
 * BUGS
 
+** Reiner Steib's 23 Jan 2006 bug report that tool bar icons don't update.
+
+** Ralf Angeli's 4 Jul 2005 bug report about scroll-preserve-screen-position.
+
+** Martin Rudalics' 30 Jan 2006 bug report about overlays at end of buffer.
+
 ** TCP server processes do not work on Windows.
 
 TCP/IP server processes created with `make-network-process' consume
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 565b2d3e220..8c1e5782db5 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,17 @@
+2006-02-18  Bill Wohler  <wohler@newt.com>
+
+	Release MH-E version 7.92.
+
+	* NEWS, MH-E-NEWS: Update for MH-E release 7.92.
+
+2006-02-17  Kenichi Handa  <handa@m17n.org>
+
+	* TUTORIAL.translators (TUTORIAL.cn): Update the maintainer.
+
+2006-02-17  Sun Yijiang  <sunyijiang@gmail.com>
+
+	* TUTORIAL.cn: Reworked.
+
 2006-02-14  Chong Yidong  <cyd@stupidchicken.com>
 
 	* NEWS: Changes in handling of file local variables.
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index ada1d02785d..67345efe090 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,8 @@
 ERC NEWS                                                       -*- outline -*-
 
-* Changes in ERC 5.1.2 (unreleased)
+* Changes in ERC 5.2 (unreleased)
+
+* Changes in ERC 5.1.2
 
 ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
 
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 8dc89e3cbcf..74470e47e25 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -6,6 +6,14 @@ Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
 
+* Changes in MH-E 7.92
+
+Version 7.92, the third 8.0 beta release, removes the "sed -i" in the
+Makefile (SF #1432060), tunes the setting of `mh-image-load-path',
+works around systems that do not have face inheritance, fixes several
+issues with searching on XEmacs, and creates the correct MIME type
+when including OpenOffice documents.
+
 * Changes in MH-E 7.91
 
 Version 7.91 is the second 8.0 beta release and fixes several bugs
diff --git a/etc/NEWS b/etc/NEWS
index def357fcdfe..c2b818940a1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1870,24 +1870,32 @@ behavior in older versions of Emacs).
 
 *** Topic cryptography added, enabling easy gpg topic encryption and
 decryption.  Per-topic basis enables interspersing encrypted-text and
-clear-text within a single file to your hearts content, using symmetric
+clear-text within a single file to your heart's content, using symmetric
 and/or public key modes.  Time-limited key caching, user-provided
 symmetric key hinting and consistency verification, auto-encryption of
 pending topics on save, and more, make it easy to use encryption in
 powerful ways.
 
-*** many substantial fixes and refinements, including:
+*** Default command prefix changed to "\C-c " (control-c space), to avoid
+intruding on user's keybinding space.  Customize the
+`allout-command-prefix' variable to your preference.
+
+*** Allout now uses text overlay's `invisible' property (and others) for
+concealed text, instead of selective-display.  This simplifies the code, in
+particularly avoiding the need for kludges for isearch dynamic-display,
+discretionary handling of edits of concealed text, undo concerns, etc.
+
+*** Many substantial fixes and refinements, including:
 
    - repaired inhibition of inadvertent edits to concealed text
    - repaired retention of topic body hanging indent upon topic depth shifts
-   - prevent "containment discontinuities" where a topic is shifted deeper
-     than the offspring-depth of its container
-   - easy to adopt the distinctive bullet of a topic in a topic created
-     relative to it, or select a new one, or use the common topic bullet
-   - plain bullets, by default, now alternate between only two characters
-     ('.' and ','), yielding less cluttered outlines
-   - many internal fixes
-   - version number incremented to 2.1
+   - refuse to create "containment discontinuities", where a
+     topic is shifted deeper than the offspring-depth of its' container
+   - bulleting variation is simpler and more accommodating, both in the
+     default behavior and in ability to vary when creating new topics
+   - many internal fixes and refinements
+   - many module and function docstring clarifications
+   - version number incremented to 2.2
 
 ** The variable `woman-topic-at-point' was renamed
 to `woman-use-topic-at-point' and behaves differently: if this
@@ -2999,7 +3007,7 @@ See the file GNUS-NEWS or the node "Oort Gnus" in the Gnus manual for details.
 ---
 ** MH-E changes.
 
-Upgraded to MH-E version 7.91. There have been major changes since
+Upgraded to MH-E version 7.92. There have been major changes since
 version 5.0.2; see MH-E-NEWS for details.
 
 ** Calendar changes:
diff --git a/etc/TUTORIAL.cn b/etc/TUTORIAL.cn
index ce22ac0b349..2546b84e465 100644
--- a/etc/TUTORIAL.cn
+++ b/etc/TUTORIAL.cn
@@ -1,150 +1,136 @@
-Emacs 快速指南.
+Emacs 快速指南（查看版权声明请至本文末尾）
 
-Emacs 指令通常包含有 CONTROL 键（有时候以 CTRL 或 CTL 来标示）或是 
-META 键（有时候以 EDIT 或 ALT 来标示）。为了避免每一次都要写出其全名，
-我们将会使用下述的缩写：
+【注意：位于【】之间的内容是译注，比如本行，下同。】
 
- C-<chr>  表示当键入字元 <chr> 时 按住 CONTROL 键。
-          因此，C-f 就是：按住 CONTROL 键再键入 f 。
- M-<chr>  表示当键入字元 <chr> 时 按住 META 或 EDIT 或 ALT 键。
-          如果没有 META 、 EDIT 或 ALT 键时，则可以用
-          「按一下 ESC 键然后放开，再键入 <chr> 的步骤」
-          来作为替代。我们以 <ESC> 来表示 ESC 键。
+Emacs 键盘命令通常包含 CONTROL 键（有时候以 CTRL 或 CTL 来标示）和
+META 键（有时候用 EDIT 或 ALT 来标示）。为了避免每次都要写出全名，我们
+约定使用下述缩写：
 
-重要备忘录：要离开 Emacs 操作阶段（ session ），键入 C-x C-c （两个字
-元）。位在左侧边界的「>>」字元是让您可以试著使用的指令的提示。举例来说：
+ C-<chr>  表示当输入字符 <chr> 时按住 CONTROL 键。
+          因此 C-f 就表示：按住 CONTROL 键再输入 f。
+
+ M-<chr>  表示当输入字符 <chr> 时按住 META（或 EDIT 或 ALT）键。
+          如果你的键盘上没有 META 、EDIT 或 ALT 键，用下述方法也等效：
+          先按一下 ESC 键然后放开，再输入 <chr>。我们用 <ESC> 来表示
+          ESC 键。
+
+重要提示：要退出 Emacs，请用 C-x C-c（两个连续的组合键）。下文中左边顶
+行的“>>”字样用来提示你尝试键盘命令。比如：
 <<Blank lines inserted around following line by help-with-tutorial>>
-[Middle of page left blank for didactic purposes.  Text continues below] 
->> 现在键入 C-v （ View next screen ）以移到下个萤幕。
-    （试试看，键入字元 v 时，按住 CONTROL 键）
-    从现在开始，您应该在每次阅读完目前的萤幕时做一次这个动作。
+[本页当中特意留出一些空白是出于教学目的，请继续往后看]
+>> 现在输入 C-v （查看下一屏文字）移动到下一屏。
+   （别紧张，在输入字符 v 的同时注意要按住 CONTROL 键）
+   从现在开始，每读完当前一屏你都需要这样做一次。
 
-要注意的是，当您从一个萤幕移到另一个时，中间会有两行重复；这样做是为了
-提供一些连续性，让您可以接续地阅读文字。
+值得注意的是，当你从上一屏滚到下一屏时，中间会有两行的重复；这样做是为
+了维持滚屏的连续性，方便你顺畅、连续地阅读。
 
-您需要知道的第一件事是如何在文字中移动。您已经知道了可以 C-v 来向前移
-动一个萤幕。要向后移动一个萤幕，则键入 M-v （按住 META 键，然后键入 v 
-，或是如果您没有 META 、 EDIT 或 ALT 键时键入 <ESC>v ）。
+用编辑器，开门第一件事就是学会在文字中移动。你已经知道了 C-v 可以向下移
+动一屏，要往上移，请用 M-v （也就是按住 META 键，然后输入v，如果你没有
+META、EDIT 或 ALT 键那么就先按 <ESC> 再按 v）。
 
->>  试著键入 M-v 然后 C-v ，连续个几次。
-
-【现在您可以 C-v 指令移到后面「翻译」一节，以取得关於本文的翻译相关事
-项；然后以 M-v 指令回到这里。】
+>>  试试 M-v，然后再试试 C-v，来回遛几次。
 
 
-* 摘要（ SUMMARY ）
--------------------
+* 小结（SUMMARY）
+-----------------
 
-以下的指令在检阅萤幕时相当有用：【我们现在以「萤幕」来表示「显示档案内
-容的区域」，因为目前是处在 Emacs 中的单窗格（ window ）显示状态，如果
-是在多窗格的状态下，这里所介绍的指令则作用在「工作中的窗格」。有关於窗
-格的介绍，请见窗格（ windows ）一节。】
+以下命令在翻页浏览时相当有用：
 
-        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 和 PageDn，也可以用这两个键来滚屏。不过使用
+C-v 和 M-v 的效率要更高一些。
 
 
-* 基本的游标控制（ BASIC CURSOR CONTROL ）
-------------------------------------------
+* 基本的光标控制（BASIC CURSOR CONTROL）
+----------------------------------------
 
-萤幕到萤幕的移动是很有用，但是您如何移动到位於萤幕内文字中的特定位置呢？
+整屏的移动很有用，但是如何在文字中精确定位呢？
 
-有几种方式可以进行。您可以使用方向键，但是将您的手放在标准的〔键盘〕位
-置，并且使用指令 C-p 、 C-b 、 C-f 和 C-n 将比较有效率。这些字元和四个
-方向键〔的功能〕是同等的，如下所示：
+有几种方式可以选择。用方向键当然可以，不过更有效率的方法是保持双手位于
+主键盘区，然后使用 C-p 、 C-b 、 C-f 和 C-n 这四个命令。它们的功能和方
+向键是一样的，如下图所示：
 
-                             前一行 C-p
+                             上一行 C-p
                                   :
                                   :
-            向后移 C-b .... 目前游标位置 .... 向前移 C-f
+            向左移 C-b .... 目前光标位置 .... 向右移 C-f
                                   :
                                   :
-                             后一行 C-n
+                             下一行 C-n
 
->> 以 C-n 或 C-p 将游标移到图形的中央。
-   键入 C-l 会看到整个图形显示在萤幕的中央。
+>> 用 C-n 或 C-p 将光标移到上图的中央。
+   按 C-l，整幅图会被显示在屏幕的中央。
 
-您会发现用字母所代表的意义来记忆它们很容易：P 表示 previous 、 N 表示 
-next 、 B 表示 backward 、而 F 则表示 forward 。您将「总是」用到这些游
-标移动指令。
+“P N B F”四个字母分别代表了四个词，用这四个词记忆这些组合键会更容易：
+P 代表 previous（上一行），N 代表 next（下一行），B 代表 backward（回
+退），而 F 则代表 forward（前进）。这些组合键今后将与你形影不离。
 
->> 按几次 C-n 把游标往下移动到这行。
+>> 按几次 C-n 把光标往下挪到这里。
 
->> 按几次 C-f 往前移到这行，然后再以 C-p 往后移动。
-   看看当游标在本行中央时，C-p 的动作是怎样。
+>> 用 C-f 把光标移动到这一行，然后再用 C-p 往上挪。
+   注意观察当光标在一行的中央时 C-p 命令的行为。
 
-每一个文字行都以一个 Newline 字元作为结束，它是用来与下一行作为分别。
-在您档案中的最后一行应该要有一个 Newline 来作为结束（但是 Emacs 并不一
-定需要它来编辑档案）。
+每行文字都以一个“换行符”结束，“换行符”把行与行区分开来。文件的最后
+一行也应该也有一个换行符（不过 Emacs 并不强制要求这一点）。
 
->> 试著在一行开始的地方键入 C-b 。结果应该会移动到前一行的最后面。
-   这是因为它往后移动时越过了 Newline 字元。
+>> 在一行的行头输入 C-b。
+   光标应该会移动到前一行的行尾，因为光标在回退过程中越过了换行符。
 
-C-f 也可以和 C-b 一样地越过 Newline 字元。【Newline 字元是「不可见
-（ invisible ）字元」，在编辑器中一般看不到它，这里只是告诉您：在行首
-再往前走，那么游标会跑到前一行（如果有前一行的话）；在行尾再往后走，那
-么游标会跑到后一行（如果有后一行的话）。「越过 Newline 字元」会让游标
-跑到另外一行。】
+同样 C-f 也可以像 C-b 一样越过换行符。
 
->> 多按几次 C-b，自己感觉一下游标在哪。
-   然后按几次 C-f 回到这行的尾巴。
-   再按一次 C-f 就可以移到下一行了。
+>> 连按几次 C-b，感受一下光标的移动。
+   然后按几次 C-f 回到本行的行尾。
+   再按一次 C-f，光标会移动到下一行。
 
-当您移动游标穿越萤幕的上方或下方时，在边界外的文字会移位进入萤幕内。这
-称为「卷动」。它让 Emacs 可以将游标移动到文字中的任意特定位置，同时
-（游标）不会跑出萤幕外。
+当你移动光标穿越屏幕的上下边界时，在边界外的文字会移动到屏幕内，这称为
+“滚动”（scrolling）。滚动使得光标可以被移动到文字中的任何位置，并且还
+不会让光标跑到屏幕外边去。
 
->> 试著以 C-n 将游标越过萤幕下方，然后看看发生了什么事。
+>> 用 C-n 将光标下移，一直越过屏幕边界，同时观察发生了什么变化。
 
-如果一个字元一个字元地移动太慢的话，您可以一个字一个字地移动。M-f
-(META-f) 往前移动一个字，M-b 则往后移动一个字。【对中文来说，则是移动
-到下一个或下一个标点符号的所在。】
+如果你嫌一个字符一个字符地挪光标太慢，你还可以一个词一个词地跳。M-f
+(META-f) 可以将光标往前移动一个词，而 M-b 则是往后移。【这里的“词”指
+英文单词，对中文来说，则是指移动到下一个标点符号。】
 
->> 键入一些 M-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，再按两次 C-e。
+   按两次 M-a，再按两次 M-e。
 
-看一下为什么重复的 C-a 指令会没有作用，而重复的 M-a 指令则继续移动到下
-一个句子。虽然这并不能说是完全类比，但是其中每个指令的行为看起来都十分
-自然。
+想一想为什么重复的 C-a 命令会没有作用，而重复的 M-a 命令则会让光标不断
+地回退到上一个句子。虽然这个类比规律并不严格，但是很自然。
 
-游标在文字中的位置也可以称作「点位（ point ）」。简单来说就是：游标表
-现出萤幕中「点位」所在的文字位置。
+光标停留的位置也可以称作“点位”（point）。或者干脆说，光标指示出了屏幕
+上“点位”在文本中的位置。
 
-这里是一些简单「游标移动（ cursor-moving ）操作」的整理，其中也包括了
-「字和句」的移动指令：
+这里对简单的光标移动命令做一个总结，其中也包括了整词和整句的移动：
 
-        C-f     往前移动一个字元
-        C-b     往回移动一个字元
+        C-f     向右移动一个字符
+        C-b     向左移动一个字符
 
-        M-f     往前移动一个字【中文是移动到下一个标点符号】
-        M-b     往回移动一个字【中文是移动到上一个标点符号】
+        M-f     向右移动一个词【中文是移动到下一个标点符号】
+        M-b     向左移动一个词【中文是移动到上一个标点符号】
 
         C-n     移动到下一行
         C-p     移动到上一行
@@ -152,906 +138,852 @@ META 
         C-a     移动到行首
         C-e     移动到行尾
 
-        M-a     移回句首
-        M-e     移到句尾
+        M-a     移动到句首
+        M-e     移动到句尾
 
->> 练习几次这些指令。这些都是最常使用到的指令。
+>> 把上面所有的命令都练习几次，这些可都是最常用的命令。
 
-还有两个重要的游标动作（ cursor-motion ）指令，M-<（ META Less-than ），
-移动到文字的最开始，以及M->（ META Greater-than ），移动到文字的最后。
+这里还要介绍两个重要的光标移动命令：M-< （META 小于号）可以将光标移动到
+所有文字的最开头；M-> （META 大于号）可以将光标移动到所有文字的最末尾。
 
-在大部份的终端机，「<」是在 comma 上方，所以您必须要使用 shift 键来键
-入。在这些终端机上，您必须使用 shift 键来键入 M-<；没有使用 shift 键，
-您就变成键入 M-comma 了。
+注意，在大部分键盘上，小于号（<）需要用上档键（Shift）来输入，所以在这
+些键盘上你应该用 Shift 键来输入 M-<，如果不按 Shift 键，你输入的会是
+M-comma（META 逗号）。
 
->> 现在试一下 M-< ，移到本快速指南的最开始。
-   然后再重复地使用 C-v 回到这里。
+>> 试一试 M-< ，移到本快速指南的最开始。
+   然后再按几次 C-v 回到这里。
 
->> 现在试一下 M-> ，移到本快速指南的最后。
-   然后再重复地使用 M-v 回到这里。
+>> 试一试 M-> ，移到本快速指南的最末尾。
+   然后再按几次 M-v 回到这里。
 
-如果您的终端机有方向键的话，您也可以用方向键移动游标。我们有三个理由建
-议您学习 C-b 、 C-f 、 C-n 、 和 C-p ：(1) 任何的终端机都能使用。(2) 
-一旦您使用 Emacs 相当熟练了，您会发现键入这些 CONTROL 字元，比起使用方
-向键快多了（因为您不需要将手移开打字区）。(3) 一旦您使用这些 CONTROL 
-字元指令成为习惯，您也可以很容易地学会其他进阶的游标动作指令。
+如果你的键盘上有方向键的话，也可以用它们来移动光标。不过我们有三个理由
+推荐你学习 C-b 、C-f 、C-n 、和 C-p：（1）它们在任何键盘上都能用。（2）
+当你熟练使用 Emacs 之后，你会发现用这些组合键比用方向键要快得多，因为你
+的手不需要离开打字区。（3）一旦你习惯了使用这些组合键，你也可以很容易地
+适应其它更高级的光标移动命令。
 
-大部份的 Emacs 指令接受数字参数；对大部份的指令而言，它的作用是指定重
-复次数。您要指定一个指令的重复次数的作法是：先键入 C-u，然后在您键入指
-令前，键入代表重复次数的数位。如果您有一个 META（或 EDIT 或 ALT ）键，
-那么您还有另外一个替代作法来输入数字参数：按住 META 键时打入这数字。我
-们建议您学习 C-u 的方法，因为它在任何终端机都可以使用。此一数字参数也
-称作为「字首参数」，因为您在这参数所作用到的指令前键入它。
+大部分的 Emacs 命令接受数字参数，并且对于多数命令而言，这些数字参数的作
+用是指定命令的重复次数。为一个命令指定数字参数（也就是重复次数）的方法
+是：先输入 C-u，然后输入数字作为参数，最后再输入命令。如果你有META （或
+EDIT 或 ALT）键，那么还有另一种办法：按住 META 键不动，然后输入数字。不
+过我们还是建议你用 C-u，因为它在任何终端机上都能用。这种数字参数也称为
+“前缀参数”，意思是说这个参数是先于使用它的命令而输入的。
 
-举例来说， C-u 8 C-f 向前移动 8 个字元。
+举例来说， C-u 8 C-f 会向前移动 8 个字符。
 
->> 试著以一个数字参数来使用 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 行，
+而不是 8 屏。
 
->> 现在试著键入 C-u 8 C-v。
+>> 现在试试看，输入 C-u 8 C-v。
 
-这指令应该已经将萤幕向上移了 8 行。若您想将它再次地向下卷动，您可以在
-执行 M-v 时给定一个参数。
+这个命令应该已经将文字向上滚动了 8 行。如果你想将它再次地向下滚动，你可
+以给定一个参数然后执行 M-v。
 
-如果您正在使用 X 窗口系统，在 Emacs 窗口左手侧应该有一个称为「卷动轴」
-的长方型区域。您可以用滑鼠在卷动轴按一下来卷动文字。
+如果你正在使用一个窗口系统，比如 X11 或者微软的 Windows，那么在 Emacs
+窗口的左边或者右边应该有一个长方形的区域叫“滚动条”，你可以用鼠标操纵
+滚动条来滚动文字。
 
->> 试著在「卷动轴内反白区域上」压一下中间钮。这应该会将文字卷动到
-   「由您所按一下滑鼠的地方」所决定的位置。
+>> 试着在“滚动条内的反白区域”上按一下鼠标中键。
+   文字应该会滚动到鼠标所指示的位置。
 
->> 当按住中间时，试著将滑鼠上下移动。
-   您会看到文字随著您移动滑鼠而上下移动。
+>> 当按住中键时，试着将鼠标上下移动。
+   你会看到文字随着鼠标的移动而上下滚动。
+   【Windows 版本符合 Windows 程序的传统操作习惯，上述操作不适用。】
 
 
-* 当 EMACS 发呆时（ WHEN EMACS IS HUNG ）
------------------------------------------
+* 在 EMACS 失去响应的时候（WHEN EMACS IS HUNG）
+-----------------------------------------------
 
-如果 Emacs 停止回应您的指令，您可以键入 C-g 来安全地停止它。您也可以使
-用 C-g 来停止执行过久的指令。
+如果 Emacs 对你的命令失去响应，你可以很安全地用 C-g 来终止这个命令。
+C-g 也可以被用来终止一个执行过久的命令。
 
-您也可以使用 C-g 来取消数字参数或您不想要完成的指令。
+C-g 还可以被来取消数字参数和那些输入到一半的命令。
 
->> 键入 C-u 100 以设定一个 100 的数字参数，然后键入 C-g。
-   现在键入 C-f。它应该只会移动一个字元，因为您已经以 C-g
-   取消了参数。
+>> 输入 C-u 100 设定一个值为 100 的数字参数，然后按 C-g。
+   现在再按 C-f，光标应该只会移动一个字符，因为你已经用 C-g 取消了参数。
 
-如果您已经不小心地键入一个 <ESC>，您可以 C-g 来取消它。
+如果你不小心按了一下 <ESC>，你也可以用 C-g 来取消它。
+【这个说法似乎有问题，因为按照这个按键顺序输入的应该是 C-M-g。
+  取消<ESC> 的正确做法是再连按两次 <ESC>。】
 
 
-* 无效化的指令（ DISABLED COMMANDS ）
--------------------------------------
+* 被禁用的命令（DISABLED COMMANDS）
+-----------------------------------
 
-有一些 Emacs 指令被「无效化」了，因此初学者不会意外地使用到它们。
+有一些 Emacs 命令被“禁用”了，以避免初学者在不了解其确切功能的情况下误
+用这些命令，造成麻烦。
 
-如果您键入了某一个无效化的指令，Emacs 会显示一个讯息，说明这个指令是什
-么，并且询问您是否想要继续，然后执行这指令。
+如果你用到了一个被禁用的命令，Emacs 会显示一个提示消息，告诉你这个命令
+到底是干什么的，询问你是否要继续，并在得到你的肯定之后再执行这命令。
 
-如果您真的想要试一下这个指令，那么在当 Emacs 询问您时，请键入空白。一
-般来说，如果您不想要执行这个无效化的指令，请以『n』来回答它。
+你要是真的想执行被禁用的命令，那么在 Emacs 询问你的时候应该按空格。一般
+来说，如果你不想执行，按“n”就行了。
 
->> 键入 C-x C-l （这是个无效化的指令）
-   然后键入 n 来回答问题。
+>> 试试 C-x C-l （这是一个被禁用的命令）
+   然后用 n 来回答问题。
 
 
-* 窗格（ WINDOWS ）
--------------------
+* 窗格（WINDOWS）
+-----------------
 
-Emacs 可以有数个窗格，每一个显示它自己的文字。我们在稍后会解释如何使用
-多重窗格。现在我们想要解释如何除去多余的窗格，然后回到基本的单窗格编辑。
-它很简单：
+Emacs 可以有多个窗格，每个窗格都显示不同的文字。我们后面再介绍怎么对付
+多个窗格，现在先让我们先搞明白如何关掉多余的窗格。其实也很简单：
 
-        C-x 1   One window （即，除去其他所有的窗格）。
+        C-x 1   只保留一个窗格（也就是关掉其他所有的窗格）。
 
-那是个 CONTROL-x 后面跟著数字 1 。C-x 1 将含有游标的窗格扩大到整个萤幕。
-它将所有其他的窗格除去。
+也就是先按 CONTROL-x 然后再按 1。C-x 1 会保留光标所在的窗格，并将其扩大
+到整个屏幕，同时关掉所有其它的窗格。
 
->> 移动游标到本行并且键入 C-u 0 C-l。
->> 键入 CONTROL-h k CONTROL-f。
-   看看这个窗格在当一个新的窗格出现
-   （以显示有关 CONTROL-f 指令的文档时），它是如何缩小的。
+>> 把光标移到本行然后输入 C-u 0 C-l。
 
->> 键入 C-x 1 以使文档列表窗格消失。
+>> 输入 CONTROL-h k CONTROL-f。观察当一个新窗格出现时当前窗格（用来显示
+   CONTROL-f 命令的文档）是如何缩小的。
 
-这个指令并不像您先前所学过的指令那般，它包括了两个字元。它是以字元 
-CONTROL-x 作为开始。有一整个系列的指令是以 CONTROL-x 作为开始；它们之
-中有许多是与「窗格、档案、暂存区以及相关事物」有关的。这些指令有 2 、 
-3 或 4 个字元长。
+>> 输入 C-x 1 关掉文档窗格。
 
+这个命令跟先前学到的命令不太一样，因为它包含了两个字符，以 CONTROL-x 开
+始。有一系列命令都是以 CONTROL-x 开始的，这些命令许多都跟“窗格、文件、
+缓冲区【缓冲区（buffer）会在后文详细介绍】”等等诸如此类的东西有关，其
+中有些命令可能有 2 个、3 个或者 4 个字符长。
 
-* 插入与删除（ INSERTING AND DELETING ）
-----------------------------------------
 
-如果您想要插入文字，把它键入就是了。您可以看到的字元，像是 A 、 7 、 * 
-等，被 Emacs 视为文字并且可以直接插入。键入 <Return> 
-（ carriage-return 键）以插入一个 Newline 字元。
+* 插入与删除（INSERTING AND DELETING）
+--------------------------------------
 
-您可以键入 <Delback> 以删除您最后键入的字元。<Delback> 是一个的键盘键 
--- 就是您通常在 Emacs 外，使用来「删除您最后键入字元」的同一个。一般来
-说是个在 <Return> 上方数行的大键，通常标示为『Delete』、『Del』或
-『Backspace』。
+插入文字很简单，敲键盘就行了。你能看到的字符，比如 A、7、* 等等，都被
+Emacs 视为文字并且可以直接插入。敲 <Return>（回车键）会插入一个换行符。
 
-如果在那里有个标示为『Backspace』的大键，那么那一个就是您使用来作为 
-<Delback> 的键了。某个地方可能也会有另一个标示为『Delete』的键，但那个
-并不是 <Delback> 。
+你可以用 <Delback> 来删除最后输入的的一个字符，这个跟你在 Emacs 之外的
+用法应该一样。一般来说 <Delback> 就是位于 <Return> 键上方某处的一个大号
+键，通常被标示为“Delete”、“Del”或者“Backspace”。
 
-更一般地说， <Delback> 将位於目前游标位置前一个字元加以删除。
+如果你找到了标着“Backspace”的键，那么它应该就是 <Delback>；即便你又在
+键盘其它地方找到了一个标示为“Del”的键，那么它也应该不是 <Delback>。
 
->> 现在做 -- 键入一些字元，然后键入几次 <Delback> 来删除它们。
-   不要担心这个档案会被更动；您不会影响到原来的快速指南。
-   （您现在看到的）这一个是您的个人拷贝。
+一种更通用的说法是，<Delback> 将位于光标前的一个字符删除。
 
-当一行文字变得比「在窗格中的一行」长时，这一行文字会「接续」到第二行窗
-格行。这时一个反斜线「\」（或如果您使用窗口化的显示，则是一个小小弯弯
-的箭头）会位在其右边界以指出此行接续著。
+>> 现在就试试——敲点字，然后按几下 <Delback> 删除它们。
+   不用担心你会修改文件，你干什么都没关系，这里就是专给你练习用的。
 
->> 插入文字，一直到您达到右边界，然后再继续插入。
-   您会看到一个接续行出现。
+如果一行文字很长、超出了窗格的宽度，显示不下的部分会在紧邻的下一行继续
+显示。这时会有一个反斜线（控制台下是反斜线，如果你用图形窗口系统，则应
+该是一个小小的转弯箭头）显示在右边沿，表明这是某一行的接续显示。
 
->> 使用 <Delback> 删除一些文字，直到此行再次成为一个窗格行。
-   接续行消失了。
+>> 输入文字，一直到屏幕的右边界，然后继续，你会看到一个接续行出现。
 
-您可以像删除其他字元一样地删除 Newline 字元。将位在两行中的 Newline 字
-元删除会让它们合并成为一行。如果合并的结果使这一行太长，以致无法符合窗
-格的宽度，它会以一个接续行来显示。
+>> 用 <Delback> 删掉一些文字，直到此行长度小于窗格宽度，接续行就消失了。
 
->> 移动游标到本行的开头并键入 <Delback>。
-   这会将本行与其前一行结合为一行。
+你可以像删除其他字符一样删除换行符。删除两行中间的换行符会将两行合并成
+一行。如果合并的结果使这一行太长，超出了窗格的宽度，它就会以一个接续行
+来显示。
 
->> 键入 <Return> 以重新插入您刚才删除的 Newline 字元。
+>> 移动光标到本行的开头并输入 <Delback>。
+   这时本行与其前一行将被合并为一行。
 
-记得大部份的 Emacs 指令都可以给予一个重复计数（ repeat count ）；这也
-包括了文字字元。重复一个文字字元会将它插入数次。
+>> 输入 <Return> 重新插入你刚才删除的换行符。
 
->>  现在就试一下 -- 键入 C-u 8 * 以插入 ********。
+前面说过，大部分的 Emacs 命令都可以指定重复次数，这其中也包括输入字符的
+命令。重复执行输入字符的命令实际上就是输入多个一样的字符。
 
-您现在已经学到了「键入个什么东西进 Emacs 以及修正错误」的大部份基本方
-法。您也可以「以字或行为单位」地删除。这里有份关於「删除操作」的摘要：
+>>  试试 C-u 8 *，这将会插入 ********。
 
-        <Delback>     删除游标所在的 前一个字元
-        C-d          删除游标所在的 后一个字元
+好，现在你应该已经掌握了最基本的的文本插入和修改功能，其实删除还可以
+“以词为单位”进行，下面是一个关于“删除”操作的小结：
 
-        M-<Delback>   删除游标所在的 前一个字
-        M-d          删除游标所在的 后一个字
+        <Delback>    删除光标前的一个字符
+        C-d          删除光标后的一个字符
 
-        C-k          删除从游标所在到「行尾」间的字元
-        M-k          删除从游标所在到「句尾」间的字元
+        M-<Delback>  移除光标前的一个词
+        M-d          移除光标后的一个词
 
-注意「<Delback> 和 C-d」还有「M-<Delback> 和 M-d」是平行地自 C-f 和 
-M-f 扩充出来的（嗯，<Delback> 并不是控制字元，但是没什么好担心的）。
-C-k 和 M-k 在某种程度上与 C-e 和 M-e 一样，如果把「一行」和「一句」作
-为类比的话。
+        C-k          移除从光标到“行尾”间的字符
+        M-k          移除从光标到“句尾”间的字符
 
-您也可以只以一种方法来删除缓冲区内的任何部份，先移动到您想要删除的部份
-的一端，然后键入 C-@ 或 C-SPC （任一个即可）。（ SPC 指的是 Space Bar 
-）再移到那部份的另一端，接著键入 C-w 。这样就会把介於这两个位置间的所
-有文字删除。
+【可能你已经注意到了“删除（delete）”和“移除（kill）”的用词区别，后
+文会有详细说明。】
 
->> 移动游标到上一段开头的「您」字。
->> 键入 C-SPC 。 Emacs 应该会在萤幕的下方显示一个「Mark set」讯息。
->> 移动游标到第二行中的「端」字。
->> 键入 C-w 。这样会把从「您」开始到刚好「端」之前的文字删除。
+注意“<Delback> 和 C-d”还有“M-<Delback> 和 M-d”是根据前述惯例从 C-f
+和 M-f 衍生出来的（其实<Delback>不是控制字符，我们先忽略这一点）。C-k
+和 M-k 的关系在某种程度上与 C-e 和 M-e 一样——如果把“一行”和“一句”
+作一个类比的话。
 
-要注意的是「杀掉（ killing ）」和「删除（ deleting ）」的不同在於被杀
-掉的可以拉回，而被删除的则不能。【有点难以理解，您可以这么想：(1)「被
-杀掉的」尚存尸骨，而「被删除的」则尸骨无存了！可见得对电脑资料来说，
-「删除」比「杀掉」严重多了。(2)实际上，就算被删除了，我们还是有技术可
-以把它救回来，尤其是文字资料，前提是删除后不能进行实体记忆体的格式化动
-作。但这对於一般使用者而言是不可能的，因此就不考虑这情形了。】重新插入
-被杀掉的文字称为「拉回（ yanking ）」。一般而言，可以移除掉很多文字的
-指令会把那些文字储存起来（它们设定成您可以将文字拉回），而那些只是删除
-一个字元或者只是除去空白行或空白的指令，则不会储存这些被删除的文字（因
-此您不能将那文字拉回）。
+你也可以用一种统一的办法来移除缓冲区里的任何一部分：首先把光标移动到你
+想要移除的区域的一端，然后按 C-@ 或 C-SPC（任一即可，SPC指空格）【注意，
+C-SPC 往往被中文用户设定成输入法热键，如果这样，C-SPC 就被系统拦截而无
+法输入给 Emacs 了，因此这里还是推荐使用C-@。】，然后再移动到另一端，再
+按 C-w 就可以把位于这两点之间的所有文字移除了。
 
->> 移动游标到一非空白行的开始。
-   然后键入 C-k 杀掉在那一行上的文字。
->> 第二次键入 C-k。您将会看到它杀掉跟在那一行后面的 Newline 字元。
+>> 移动光标到上一段开头的“你”字。
+>> 输入 C-@ 。Emacs 应该会在屏幕的下方显示一个“Mark set”的消息。
+>> 移动光标到第二行中的“端”字。
+>> 输入 C-w，就会把从“你”开始到“端”之前的文字全部移除。
 
-请注意单独的 C-k 会把一行的内容杀掉，而第二个 C-k 则会杀掉那一行本身，
-并且使得所有其他的行向上移动。C-k 以很特别的方式来处理数字参数，它会杀
-掉很多行以及它们的内容，这不仅仅是重复而已，C-u 2 C-k 会把两行以及它们
-的 Newline 字元杀掉；如果只是键入 C-k 两次并不会这样。
+注意,“移除（kill）”和“删除（delete）”的不同在于被移除的东西可以找回
+来，而被删除的就不行了。【实际上，移除掉的东西虽然看起来“消失”了，但
+实际上被 Emacs 记录了下来，因此还可以找回来；而删除掉的东西虽然也可能还
+在内存里，但是已经被Emacs“抛弃”了，所以就找不回来了。】重新插入被移除
+的文字称为“召回（yank）”。一般而言，那些会去除很多文字的命令会把去除
+掉的文字储存起来（它们被设定成了“可召回”），而那些只是去除一个字符或
+者只是去除空白的命令就不会储存那些被去除掉的东西（因此你就无法召回）。
 
-将被杀掉的文字回复的动作称为「拉回（ yanking ）」。（把它想像成您把别
-人从您身上夺去的东西猛力地拉回来）您可以在您删除文字的地方拉回，也可以
-在文字的其他地方拉回。您可以拉回数次同样的文字，以制作它的数份拷贝。
+>> 移动光标到一非空白行的行头，然后输入 C-k 移除那一行上的文字。
 
-拉回的指令为 C-y。它会在目前游标的位置重新插入最后杀掉的文字。
+>> 再次 C-k，你可以看到它移除了跟在那一行后面的换行符。
 
->> 试试看；键入 C-y 将文字拉回。
+注意，单独的 C-k 会把一行的内容移除，而第二个 C-k 则会移除换行符，并使
+其后所有的行都向上移动。C-k 处理数字参数的方式很特别，它会把参数指定的
+那么多行连同其后的换行符一起移除，而不仅仅是重复 C-k 而已。比如 C-u 2
+C-k 会把两行以及它们的换行符移除；而如果只是输入 C-k 两次显然不是这个结
+果。
 
-如果您连续地做了数次 C-k，所有被杀掉的文字都会被储存在一起，因此做一次 
-C-y 就会把所有这些行都拉回来。
+将被移除的文字恢复的动作称为“召回（yanking）”。（就好像你把别人从你身
+边移走的东西又猛力地拉回来。）你可以在你删除文字的地方召回，也可以在别
+的地方召回，还可以多次召回同样的文字以得到它的多个拷贝。
 
->> 现在做一下，键入 C-k 数次。
+召回的命令是 C-y。它会在光标所在处插入你最后移除的文字。
 
-现在要回复那些杀掉的文字：
+>> 试试看，输入 C-y 将文字召回。
 
->> 键入 C-y。然后把游标往下移动个几行，再一次键入 C-y。
-   您现在知道如何复制某些文字了。
+如果你一次连按了好几下 C-k，那么所有被移除的行会被存储在一起，只要一个
+C-y 就可以把它们都召回。
 
-如果您有一些文字想要拉回来，但是后来您又杀了某些东西，那么该怎么做呢？
-C-y 会把最近杀掉的拉回来，但是先前的文字并没有消失，您可以用 M-y 来回
-到它。当您已经使用 C-y 把最近杀掉的拉回来之后，再键入 M-y 来把这些拉回
-来的文字替换为先前所杀掉的。一次又一次地键入 M-y 会把先前再先前所杀掉
-的文字带回来。当您到了您想找的文字时，您不需要做任何事来保存它，只要继
-续您的编辑，把这些已拉回的文字留在那里就好。
+>> 在这里试试，连续按几次 C-k。
 
-如果您 M-y 做了很多次，您可能会回到起始点，也就是最近杀掉的。
+现在再来恢复刚刚被我们移除的文字：
 
->> 杀掉一行，到处绕绕，再杀掉另一行。
-   然后用 C-y 将第二次杀掉的那行带回来。
-   然后再用 M-y，它将会被第一次杀掉的那行取代。
-   再做几次 M-y 看看您会得到什么。
-   不间断地做，直到第二个杀掉行回来，再做个几次。
-   如果您想的话，您可以试著给 M-y 正的或是负的参数。
+>> 按 C-y。然后把光标往下移动几行，再按一次 C-y。
+   现在你应该知道怎么复制文字了。
 
+C-y 可以把最近移除的文字召回，但如果你想召回的东西不是最近移除的，该怎
+么办呢？它们当然没有丢，你可以用 M-y 来召回它们。在用 C-y 召回最近移除
+的文字之后，紧接着再用 M-y 就可以召回再前一次被移除的文字，再按一次
+M-y 又可以召回再上一次的，因此只要多按几次 M-y 就可以找到你想要召回的东
+西了。找到了之后，你什么也不用做，把它们晾在那里，继续你的编辑就行了。
 
-* 取消动作（ UNDO ）
---------------------
+如果你一次按 M-y 按了很多下，你可能会回到起始点，也就是最近移除的文字。
+【看得出这实际上是一个环。】
 
-如果您对文字做了一些改变，后来觉得它是个错误，您可以 Undo 指令取消这一
-个改变，C-x u。
+>> 移除一行，移动一下光标，然后再移除另外一行。
+   按 C-y 将第二次移除的那行召回来。
+   紧接着再按 M-y，它将会被第一次移除的那行取代。
+   试着再按几下 M-y 看看会发生什么。
+   再继续，直到第二行被召回来，然后再做个几次。
+   如果你愿意，你可以试着给 M-y 指定一个正的或负的参数。
 
-通常 C-x u 会把一个指令所造成的改变取消掉；如果您在一行中重复了许多次 
-C-x u，每一个重复都会取消额外的指令。
+
+* 撤销（UNDO）
+--------------
+
+如果你修改了一段文字，又觉得改得不好，可以用 undo 命令进行撤销：
+C-x u。
+
+通常 C-x u 会消除一个命令所造成的所有改变；如果你在一行中连续多次地使用
+C-x u，你会把以前的命令也依次撤销。
 
 但是有两个例外：
-(1) 没有改变文字的指令不算（这包括了游标移动的指令还有卷轴指令）；
-(2) 自行键入的字元以一群一群 -- 每群最多 20 个 -- 来进行处理。
-    （这是为了减少您在取消「插入文字动作」所必须键入 C-x u 的次数）
+1） 没有改变文字的命令不算（包括光标移动命令和滚动命令）
+2） 从键盘输入的字符以组为单位——每组 20 个字符——来进行处理。
+    （这是为了减少你在撤销“插入文字”动作时需要输入 C-x u 的次数）
 
->> 以 C-k 将这一行杀掉，然后键入 C-x u 后它会再次出现。
+>> 用 C-k 将这一行移除，然后输入 C-x u ，它会再次出现。
 
-C-_ 是另一个取消指令；它的作用就和 C-x u 一样，但是在一行中它比较容易
-键入许多次。C-_ 的缺点是在某些键盘中不太清楚如何键入它，这也是为什么我
-们同时提供 C-x u 的原因。在某些终端机，您可以按住 CONTROL 再键入 / ，
-来键入 C-_。
+C-_ 也是撤销命令；它的作用跟 C-x u 一样，但是它比较容易多次输入。C-_ 的
+缺点是在某些键盘上可能不太容易按，这也正是我们同时提供 C-x u 的原因。在
+某些终端上，你可以按住 CONTROL 再按“/”来输入 C-_。
 
-一个数字参数对 C-_ or C-x u 来说，是作为重复的次数。
+数字参数对于 C-_ 和 C-x u 的意义是执行撤销的重复次数。
 
 
-* 档案（ FILE ）
-----------------
+* 文件（FILE）
+--------------
 
-为了使您编辑的文字永久保存，您必须把它放到一个档案中。不然，当您离开 
-Emacs 后，它就会随之消失。为了把您的文字放在档案中，您必须在您键入这些
-文字前「找（ find ）」档案。（这也称之为「拜访（ visiting ）」档案）
+想保存工作成果就要记得存盘，否则一旦退出 Emacs 你编辑的文字就都丢了。要
+存盘，就要在编辑前“寻找”到一个存盘文件。（这个过程通常也被称为“访问”
+文件。）
 
-找一个档案表示您可以在 Emacs 中看到档案的内容。从许多方面来看，它就像
-是您直接编辑那个档案一样。然而，直到您「储存」这个档案之前，您使用 
-Emacs 编辑所做出的改变并不会保存下来。这就是为什么当您不想要时，您可以
-避免留下修改到一半的档案在系统中。即使当您储存了，Emacs 也会把原本的档
-案以一个不同的名称保留下来，若您稍后觉得您的改变是一个错误的话，就可以
-使用它。
+寻找到一个文件意味着你可以在 Emacs 里查看这个文件的内容。从很多角度讲，
+这就等于你在直接编辑这个文件。但是你所做的修改只有在“存盘”的时候才会
+被写入文件。也正因为如此，你可以丢弃一个改到一半的文件而不必把这个残废
+文件也保存到计算机上。最后就算你真正存了盘，Emacs 也会把存盘前的文件重
+命名保存，以防你改完之后又想反悔。
 
-在靠近萤幕的下方，您可以看到由破折号开始与结束的一行 -- 通常是以「--:--
-TUTORIAL.cn」或其他类似的东西作为开始。这是萤幕的一部分，通常用来表示
-您正在拜访的档案。现在，您正在拜访的档案叫做「TUTORIAL.cn」，它是您个
-人的拷贝。当您以 Emacs 找出一个档案时，那个档案的名字就会出现在那个地
-方。
+在屏幕的下方，你应该能够看到头尾都是短线“-”的一行，其开头通常都是诸如
+“--:-- TUTORIAL.cn”这样的东西，这些文字就代表了你当前正在访问的文件。
+现在你访问的文件叫“TUTORIAL.cn”，它只是给你个人临时使用的一个拷贝。只
+要你用 Emacs 寻找到一个文件，文件名就会出现在上述位置。
 
-关於寻找档案的指令中，有一个很特别的是，您必须说出这个您想要的档案名称。
-我们说这个指令「从终端机中读进了一个参数」。（在这个例子中，这参数就是
-档案的名称）当您键入这个指令后，
+寻找文件的命令有一个特别之处，那就是你必须给出文件名。我们称这个命令
+“从终端读入了一个参数”（在这里，这个参数显然就是文件名）。当你输入了
+这个命令之后：
 
-        C-x C-f   找一个档案
+        C-x C-f   寻找一个文件
 
-Emacs 会要您键入档名。您所键入的档名会出现在萤幕的底行。在被用来作为这
-种形式的输入时，底行被称为小缓冲区（ minibuffer ）。您可以使用正常的 
-Emacs 编辑指令来编辑这个档名。
+Emacs 会提示你输入文件名。你输入的文件名会出现在屏幕最底端的一行，这一
+行被称为小缓冲（minibuffer），在小缓冲里你可以使用通常的 Emacs 编辑命令
+来编辑文件名。
 
-当您正在键入档名时（或是任何的小缓冲区输入时），您可以用 C-g 这个指令
-来取消它。
+在小缓冲里输入文件名（其实输入别的东西也一样）时可以用 C-g 取消。
 
->> 键入 C-x C-f，然后键入 C-g。这会取消小缓冲区，
-   并且也会取消使用这个小缓冲区的 C-x C-f 指令。
-   因此您没有找任何档案。
+>> 输入 C-x C-f，然后输入 C-g
+   这会关掉小缓冲，同时也会取消使用小缓冲的 C-x C-f 命令。
+   当然了，你也没有找任何文件。
 
-当您已经键入了这个档名，请键入 <Return> 来结束它。然后 C-x C-f 指令就
-会开始运作，并且找到您所选择的档案。小缓冲区在当 C-x C-f 指令结束时就
-会消失。
+输入完文件名之后用 <Return> 结束，然后 C-x C-f 命令开始工作并找到你指定
+的文件。小缓冲在 C-x C-f 命令结束之后也会消失。
 
-过了一会儿，档案的内容就会出现在萤幕，然后您就可以编辑它的内容。当您想
-要您的改变永久保存时，键入这个指令：
+眨眼间文件就会显示在屏幕上，你可以开始编辑了。存盘用这个命令：
 
-        C-x C-s   储存这个档案
+        C-x C-s   储存这个文件
 
-这会把在 Emacs 中的文字复制到档案中。当您第一次做这个动作时，Emacs 会
-将原始的档案重新命名成一个新的名字，这样它才不会消失。新的名字通常会加
-入「~」到原始档案的名字后面。
+这个命令把 Emacs 中的文字存储到文件中。第一次存盘的时候 Emacs 会将原文
+件重命名以保留原文。重命名的规则通常是在原文件名之后添加一个“~”字符。
 
-当储存结束时，Emacs 会把写入档案的名字列出来。您应该经常地进行储存，这
-样子如果系统当机时，您就不会损失太多工作。
+存盘结束后，Emacs 会显示写入文件的文件名。你最好养成经常存盘的习惯，这
+样在系统崩溃或者死机的时候你不会损失太多。
 
->> 键入 C-x C-s 以储存本快速指南的您的拷贝。
-   这会把「Wrote ...TUTORIAL.cn」这个讯息显示在萤幕的下方。
+>> 输入 C-x C-s 把本快速指南存下来。
+   你会看到“Wrote ...TUTORIAL.cn”这样的消息显示在屏幕的下方。
 
-注意：在某些系统中，键入 C-x C-s 将会把萤幕冻结，您将看不到从 Emacs 来
-的任何输出。这表示操作系统一个称为「流程控制」的「功能」将 C-s 指令拦
-截住，并且不让它传到 Emacs。要取消萤幕的冻结，请键入 C-q。然后到 Emacs 
-使用手册中看看对於「渐进式搜寻的同时进入（ Spontaneous Entry to
-Incremental Search ）」这个主题，以取得处理这个「功能」的建议。
+注意：使用某些终端的时候，输入 C-x C-s 会冻结屏幕【屏幕没有任何输出】，
+这样你就看不到 Emacs 的任何变化。其原因是操作系统的“流量控制”功能把
+C-s 拦截了，并且冻结了屏幕，Emacs 自然也就看不到这个输入了。用 C-q 可以
+解除屏幕冻结。要解决这个问题，请参考 Emacs 手册里的“Spontaneous Entry
+to Incremental Search”一节【Emacs 手册可能还没有中文翻译】，那里可能有
+一些有用的建议。
 
-您可以找出一个已经存在的档案，然后观看它或编辑它。您也可以找一个还没有
-存在过的档案。这是以 Emacs 建立一个档案的方法：找这个档案，就从零开始，
-然后开始插入文字到这个档案中。当您要求「储存」这个档案，Emacs 会真的建
-立一个档案，并把您所插入的文字摆到档案中。从那时候开始，您就可以当自己
-是在编辑一个已经存在的档案了。
+你可以寻找一个已有的文件然后查看或者编辑，你还可以寻找一个不存在的文件。
+实际上这正是用 Emacs 创建新文件的方法：找到不存在的新文件，然后从零开始。
+在存盘的时候，Emacs 才真正创建这个文件然后再存盘。在这之后一切就跟你编
+辑一个已有文件一样了。
 
 
-* 缓冲区（ BUFFER ）
---------------------
+* 缓冲区（BUFFER）
+------------------
 
-如果您以 C-x C-f「找」第二个档案，第一个档案仍然存在 Emacs 内。要切换
-回它，您可以 C-x C-f 再找它一次。依此方式，您可以在 Emacs 内开启不少档
-案。
+如果你用 C-x C-f 找到第二个文件，第一个文件仍然会在 Emacs 里。要切回第
+一个文件，你可以 C-x C-f 再次寻找它。这样，你可以在 Emacs 里同时打开很
+多文件。
 
->> 以键入 C-x C-f foo <Return> 的方式建立一个名为「foo」的档案。
-   然后插入一些文字，编辑它，然后再以 C-x C-s 储存「foo」。
-   最后，键入 C-x C-f TUTORIAL.cn <Return> 回到本快速指南。
+>> 用 C-x C-f foo <Return> 的方式建立一个名为“foo”的文件。
+   然后敲入一些文字，再用 C-x C-s 保存文件“foo”。
+   最后，输入 C-x C-f TUTORIAL.cn <Return> 回到这里。
 
-Emacs 储存每个档案的文字在一个称为「缓冲区（ buffer ）」的物件中。找一
-个档案会在 Emacs 内部建立一个缓冲区。想要看目前存在您的 Emacs 的工作中
-缓冲区列表，键入
+Emacs 把每个编辑中的文件都放在一个称为“缓冲区（buffer）”的地方。每寻
+找到一个文件，Emacs 就在其内部开辟一个缓冲区。用下面的命令可以列出当前
+所有的缓冲区：
 
         C-x C-b   列出缓冲区
 
 >> 现在就试一下 C-x C-b
 
-看看每一个缓冲区是如何命名的，它也可能同时拥有一个「储存其内容的档案」
-的名称。您在一个 Emacs 窗格所见到的「任何」文字都是某个缓冲区的一部份。
+观察一下缓冲区是如何命名的，它很可能跟其对应的文件同名。事实上，你在一
+个 Emacs 窗格里看到的任何文字都是某个缓冲区的一部分。
 
->> 键入 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」的文字的缓冲区。
-   然后建入 C-x b TUTORIAL <Return> 以回到本快速指南。
+>> 输入 C-x b foo <Return> 以回到文件“foo”的缓冲区。
+   然后输入 C-x b TUTORIAL.cn <Return> 回到这里。
 
-就大部份的情况来说，缓冲区的名称与档案的名称是相同的（除去了档名中的目
-录部份）。然而并不总是如此。您以 C-x C-b 所制作出的缓冲区列表总是会显
-示给您每一个缓冲区的名称。
+大多数情况下，缓冲区和与其对应的文件是同名的（不包括目录名），不过这也
+不是绝对的。用 C-x C-b 得到的缓冲区列表中显示的总是缓冲区的名称。
 
-您在一个 Emacs 窗格中所见到的「任何」文字总是某个缓冲区的一部份。有一
-些缓冲区并没有连接到档案。举例来说，命名为「*Buffer List*」的缓冲区并
-没有任何档案。它是包含有您以 C-x C-b 指令所制作出来的缓冲区列表的缓冲
-区。命名为「*Messages*」的缓冲区也没有连接到任何档案；它在您的 Emacs 
-操作阶段中包含出现在底行的讯息。
+你在 Emacs 窗格里看到的“任何”文字都一定是属于某个缓冲区的。也有些缓冲
+区并没有对应文件：比如显示缓冲区列表的缓冲区就是这样，再比如一个名叫
+“*Messages*”的缓冲区也没有对应的文件，这个缓冲区里存放的都是在 Emacs
+底部出现的消息。
 
->> 键入 C-x b *Messages* <Return> 来看看讯息的缓冲区。
-   然后键入 C-x b TUTORIAL <Return> 回到本快速指南。
+>> 输入 C-x b *Messages* <Return> 瞅瞅消息缓冲区里都有什么东西。
+   然后再输入 C-x b TUTORIAL.cn <Return> 回到这里。
 
-如果您对档案中的文字做了修改，然后找另一档案，这个动作并不会储存第一个
-档案。它的修改仍旧存在 Emacs 中，也就是在那个档案的缓冲区中。对於第二
-个档案的建立或编辑并不会影响到第一个档案的缓冲区。这样子非常有用，但这
-个情形也表明了您需要「一个方便的方法」来储存第一个档案的缓冲区。只是为
-储存第一个档案就必须以 C-x C-f 切换缓冲区，才能以 C-x C-s 将它储存，总
-是个让人讨厌的过程。因此我们有
+如果你对文件做了修改，然后切换到另一个文件，这个动作并不会帮你把第一个
+文件存盘，对第一个文件的修改仍然仅限于 Emacs 中，也就是在它对应的缓冲区
+里。同时对第二个文件的修改也不会影响到第一个文件。这很有用，但是也挺麻
+烦，因为如果你又想要存储第一个文件，你还需要先用 C-x C-f 切换回去，然后
+再用 C-x C-s 存盘，这显然太麻烦了。你需要一个更简便的方法，而 Emacs 当
+然已经替你想到了：
 
-        C-x s   储存一些缓冲区
+        C-x s   保存多个缓冲区
 
-C-x s 会询问您关於您已做出修改但还没储存的每一个缓冲区。它会问您，对於
-每一个这样的缓冲区，是否要储存？
+C-x s 会找到所有已被修改但尚未存盘的缓冲区，然后向你逐个询问，是否需要
+存盘？
 
->> 插入一行文字，然后键入 C-x s。
-   它应该会问您是否要储存名为 TUTORIAL.cn 的缓冲区。
-   键入『y』以回答要储存。
+>> 插入一行文字，然后输入 C-x s。
+   它应该会问你，是否要储存名为 TUTORIAL.cn 的缓冲区？
+   按“y”告诉它你想存盘。
 
 
-* 扩充指令集（ EXTENDING THE COMMAND SET ）
--------------------------------------------
+* 命令集扩展（EXTENDING THE COMMAND SET）
+-----------------------------------------
 
-由於 Emacs 拥有太多指令，即便使用上所有的 CONTROL 和 META 字元，也没办
-法完全摆上。Emacs 以 X（扩充『eXtend』）指令来解决这个问题。扩充指令有
-两种型式：
+Emacs 的命令就像天上的星星，数也数不清。把它们都对应到 CONTROL 和 META
+组合键上显然是不可能的事情。Emacs 用扩展（eXtend）命令来解决这个问题，
+扩展命令有两种风格：
 
-        C-x     字元扩充。后面跟著一个字元。
-        M-x     有名称的指令扩充。后面跟著一个长的名称。
+        C-x     字符扩展。  C-x 之后输入另一个字符或者组合键。
+        M-x     命令名扩展。M-x 之后输入一个命令名。
 
-还有一些指令通常来说是很有用的，但是比您已经学到的指令较少使用。您已经
-看过其中两个：档案指令中的 C-x C-f 去寻找，以及 C-x C-s 去储存。其他的
-例子则有结束 Emacs 阶段的指令 -- 这个指令是 C-x C-c。（不要担心您会失
-去已经做出的改变，C-x C-c 在它杀掉 Emacs 之前会提供储存每一个变动的档
-案的机会。）
+很多扩展命令都很有用，虽然与你已经学过的命令比起来，他们可能不那么常用。
+你应该已经见过一些扩展命令了，比如用 C-x C-f 寻找文件和用 C-x C-s 保存
+文件。退出 Emacs 用的 C-x C-c 也是扩展命令。（不用担心退出 Emacs 会给你
+带来什么损失，Emacs 会在退出之前提醒你保存文件的）
 
-C-z 是 *暂时* 离开 Emacs 的指令 -- 因此您稍后可以回到同样的 Emacs 阶段。
+在控制台下，C-z 可以暂时离开 Emacs——当然，你还可以再回来。
 
-在某些允许它的作用的系统中， C-z 会「暂停住（ suspends ）」Emacs，也就
-是说，它会回到 shell 但不会把 Emacs 毁掉。在最常用的 shell 中，您可以
-用『fg』或『%emacs』两种指令恢复 Emacs。
+在允许 C-z 的系统中，C-z 会把 Emacs“挂起”，也就是说，它会回到 shell
+但不退出 Emacs。在那些最常用的 shell 中，通常可以用“fg”或者“%emacs”
+命令再次回到 Emacs 中。
 
-在没有提供暂停功能的系统中，C-z 会在 Emacs 底下建立一个 subshell 以让
-您有机会执行其他的程式，并且在稍后回到 Emacs，它并没有真的离开 Emacs。
-在这个例子中，shell 指令『exit』是从subshell 回到 Emacs 的通常方式。
+在没有提供挂起功能的系统中，C-z 会在 Emacs 之下创建一个子 shell 来让你
+运行其它程序，并且再次“回到” Emacs 中——虽然我们并没有真正离开过。这
+种情况下，通常用shell 命令“exit”从子 shell 回到 Emacs。
 
-使用 C-x C-c 的时机是当您打算要登出时。它也非常适合用来离开被其他邮件
-处理程式，以及许多不同的应用程式所启动的 Emacs。然而在一般的状况下，如
-果您不打算登出，最好是把 Emacs 暂停而不是离开它。
+C-x C-c 最好在你打算退出登陆的时候再用。在 Emacs 被诸如邮件处理程序之类
+的外部程序调用之后，也可以用 C-x C-c 退出。不过一般来讲，如果你不想退出
+登录，最好还是把 Emacs 挂起而不是退出。
 
-有许多 C-x 的指令。这里是一份您已经学过的列表：
+C-x 的扩展命令有很多，下面列出的是你已经学过的：
 
-        C-x C-f         找档案。
-        C-x C-s         储存档案。
+        C-x C-f         寻找文件。
+        C-x C-s         保存文件。
         C-x C-b         列出缓冲区。
         C-x C-c         离开 Emacs。
-        C-x 1           除了一个外，删去其他所有的窗格。
-        C-x u           取消动作。
+        C-x 1           关掉其它所有窗格，只保留一个。
+        C-x u           撤销。
 
-以扩充来命名的指令通常是不太常使用的指令，或是只在特定的模式下才会使用
-的指令。一个例子是取代字串指令，它会全域地将一个字串以另一个来取代。当
-您键入 M-x 时，Emacs 会在萤幕的底端询问您，然后您也应该键入这个指令的
-名称。在这个例子中是『replace-string』只要键入『repl s<TAB>』，然后 
-Emacs 将会补齐这个名称。以 <Return> 来结束这个指令名称。
+用命令名扩展的命令一般都不太常用，或者只在部分模式下被用到。比如
+replace-string（字符串替换）这个命令，它会在全文范围内把一个字符串替换
+成另一个。在你输入 M-x 的时候，Emacs 会在屏幕底端向你询问，然后你应该输
+入命令名。如果你想输入“replace-string”，其实只需要敲“repl s<TAB>”就
+行了，Emacs 会帮你自动补齐的。输入完之后按 <Return> 。
 
-取代字串指令需要两个参数 -- 被取代的字串以及用来取代它的字串。您必须以 
-Newline 字元来结束每一个参数。
+字符串替换命令需要两个参数——被替换的字符串和用来替换它的字符串。每个
+参数的输入用换行符来结束。
 
->> 将游标移到本行的下两行空白，然后键入
+>> 将光标移到本行的下两行空白，然后输入
    M-x repl s<Return>changed<Return>altered<Return>。
 
-   【为了说明的目的，於下保留一行原文。
+   【为了继续练习，保留一行原文如下：
    Notice how this line has changed: you've replaced... 】
 
-请注意这一行是怎么改变的：在游标的起始位置之后，您已经将 c-h-a-n-g-e-d 
-这个字 -- 不管它在哪里出现 -- 以「altered」这个字来取代了。
+请注意这一行是怎么改变的：在光标之后的范围内，你已经将“changed”这个
+词——不管它在哪里出现——全部用“altered”替换掉了。
 
 
-* 自动存档（ AUTO SAVE ）
--------------------------
-
-当您在一个档案中做了修改，但是还没有将它们储存起来，那么如果您的电脑当
-机，它们将有可能遗失。为了避免这种情形发生在您的身上，Emacs 会定期地将
-您正在编辑的档案写入「自动储存」档案中。自动储存档案在档名的前后会各有
-一个 # 符号；举例来说，如果您的档案名为「hello.c」，那么它的自动储存档
-案的档名就是「#hello.c#」。当您以平常的方式储存档案时，Emacs 就会把它
-的自动储存档删除。
-
-如果当机，您可以经由正常地寻找档案，（指的是您在编辑的档案而不是自动储
-存档）然后键入 M-x recover file<Return> 来回复您的自动储存档。当它要求
-确认时，键入 yes<Return> 以继续并回复自动储存的资料。
-
-
-* 回应区（ ECHO AREA ）
+* 自动保存（AUTO SAVE）
 -----------------------
 
-如果 Emacs 见到您很慢地键入多字元指令，它会将它们显示在位於窗格下方，
-称为「回应区」的区域给您参阅。回应区位在窗格的最后一行。
+如果你修改了一个文件但是还没来得及存盘，然后你的计算机罢工了，那么你编
+辑的东西很可能就找不回来了。为了避免这样的不幸一再发生，Emacs 会定期将
+你正在编辑的文件存入一个“自动保存”文件中。自动保存的文件名的头尾各有
+一个“#”字符，比如你正在编辑“hello.c”，那么它的自动保存文件就叫
+“#hello.c#”。在你正常存盘之后，Emacs 会删除自动保存文件。
+
+假如不幸真的发生了，你大可以从容的打开原来的文件（注意不是自动保存文件）
+然后输入 M-x recover file<Return> 来恢复你的自动保存文件。在提示确认的
+时候，输入 yes<Return> 就行了。
 
 
-* 状态行（ MODE LINE ）
------------------------
-
-位在回应区的正上面是称为「状态行」的一行。状态行显示出一些信息，如：
-
---:**  TUTORIAL.cn       (Fundamental)--L670--58%----------------
-
-本行提供一些关於「Emacs 的状态」以及「您正在编辑的文字」的有用信息。
-
-您已经知道档名的意义是什么了 -- 就是您找的档案。-NN%-- 指出目前您在文
-字档中的位置；它的意思是说：有 NN 百分比的文字位在窗格的上面。如果档案
-的顶端就位在窗格中，那么它就会显示 --Top-- 而不是 --00%--。如果档案的
-底部就位在窗格中，那么它是显示 --Bot--。如果您正在看的文字档很小，在窗
-格中就足以看到全部的内容，那么状态行就会显示 --All--。
-
-L 和数字以另一种方式来表示出位置：它们给出了目前所在的行数（ Line ）。
-
-在靠近前面的星号表示您已经对这些文字做了改变。在您刚拜访或储存一个档案
-之后，状态行的那个部分会没有星号，只有破折号。
-
-状态行中位於小括弧里面的部分，是用来告诉您正在使用什么编辑模式。预设的
-模式是 Fundamental，也就是您现在使用的。它是「主模式」的一个例子。
-
-Emacs 有许多不同的主模式。它们之中有一些是用来编辑不同的语言以及／或不
-同种类的文字，像是 Lisp 模式、 Text 模式等等。在任何的时间只有一个主模
-式可以作用，并且它的名称总可以在状态行中被找到，就在现在的
-「Fundamental」中的位置。
-
-每一个主模式都使得一些指令的行为表现得不太一样。举例来说，在一个程式中
-有一些指令用来制作出注解，而由於每一种程式语言对於一个注解应该长得像什
-么，都有著不同的想法，因此每一个主模式都必须以不同的方式来插入注解。每
-一个主模式是一个延伸指令的名称，使得您可以用来切换至那个模式。举例来说，
-M-x fundamental-mode 就是切换到 Fundamental 模式的一个指令。
-
-如果您想要编辑人类语言的文字档案 -- 像是现在的这一个，您应该使用 Text 
-模式。
-
->> 键入 M-x text mode<Return>。
-
-不要担心，没有任何一个您已经学过的 Emacs 指令，会被改变成任何非常不同
-的形式。但是您可以发现到 M-f 和 M-b 现在把撇号（'）视为字的一部分。先
-前，在 Fundamental 模式中，M-f 和 M-b 将撇号视为字的分隔符号。
-
-主模式通常会像上述那个例子一样，做出一些精巧的改变：大部分的指令在每一
-个主模式中「做同样的事」，但是它们以一点点不同的方式来工作。【再举个例
-子，接续上面所开的头，以程式语言的注解来说。同样一个插入注解的动作，因
-为您使用的程式语言／主模式的不同而不同。若您使用 C 语言，Emacs 插入
-『/* 介於中间的为注解区块 */』；若您使用的是 Fortran 语言，Emacs 插入
-『c 以字元 c 为首的为注解行』；若您使用的是 Basic 语言，Emacs 则插入『' 
-撇号以后的为注解文字』。编辑器的弹性如此，实在没有必要为了不同的语言、
-目的或外观，设计特殊化的编辑器。「求大同，存小异」在这里也是成立的。】
-
-要浏览您现在所处的主模式的文档，键入 C-h m。
-
->> 使用 C-u C-v 一或数次，将本行带到靠近萤幕的上方。
->> 键入 C-h m，看看 Text 模式与 Fundamental 模式是哪里不同。
->> 键入 C-x 1 将文档从萤幕移除掉。
-
-主模式之所以称为「主要（ major ）」的原因是因为它们也有次模式（ minor
-mode ）。次要的模式并不是主模式的其他选择，而只是次要的更改。每一个次
-模式可以被它本身启用或停止，和所有其他的次模式无关，并且也和您的主模式
-无关。所以您可以不使用次模式，或一个，或任何数量的次模式的组合。
-
-有一个叫做 Auto Fill 模式的次模式非常有用，特别是在编辑人类语言的文字
-时。当这个模式启用时， Emacs 在当您插入文字并且使一行太宽时，会将那一
-行，在字与字之间自动地分隔开。
-
-您可以 M-x auto fill mode<Return> 来将 Auto Fill 模式启用。当这个模式
-启用时，您可以使用 M-x auto fill mode<Return> 来将它取消。当这个模式不
-用时，则这个指令会将它启动，而当这个模式启用时，这个指令会将它关闭。我
-们说这个指令用来「切换（ toggle ）」模式。
-
->> 现在键入 M-x auto fill mode<Return>。然后一再地插入字串
-   「 asdf 」，直到您看到它分成两行。您必须在它们之间摆上空白，
-   因为 Auto Fill 只在空白处断行。
-
-边界通常被设定为 70 个字元，但是您可以用 C-x f 指令来改变它。您应该以
-一个数字参数的方式来给定您所希望的边界设定。
-
->> 键入 C-x f 并附上引数 20：『C-u 2 0 C-x f』。
-   然后键入一些文字，看看 Emacs 以 20 个字元，
-   在行与行之间进行 fill 动作。然后再用一次 C-x f 将边界设回 70。
-
-如果您在一个段落的中间做出改变，Auto Fill 模式并不会为您重新进行 fill 
-的动作（ re-fill ）。要 re-fill 这个段落，键入 M-q (META-q)，而游标必
-须处在其中。
-
->> 移动游标到前一段中，然后键入 M-q。
-
-
-* 搜寻（ SEARCHING ）
+* 回显区（ECHO AREA）
 ---------------------
 
-Emacs 可以搜寻字串（字串可以是一群连续的字元或字）【就中文来说，字元和
-字基本上意义相同；此处所指的『字』，是英文中没有被空白隔开的字元集
-合。】，往前或往后搜寻都可以。搜寻一个字串是一种游标移动指令，它会将游
-标移动到字串出现的下一个地方。
-
-Emacs 搜寻指令与大部分编辑器的搜寻指令不同的地方在於，它是「渐进的
-（ incremental ）」。这表示搜寻发生在您键入想要搜寻的文字串后。
-
-要开始搜寻的指令是：C-s 往前搜寻，C-r 往后搜寻。但先等一下！现在先不要
-试。
-
-当您键入 C-s 时，会发现到有一个字串「I-search」出现在回应区中作为提示。
-它告诉您 Emacs 现在正处於称为「渐进式搜寻」的状态中，等待您键入您想要
-搜寻的字串。<Return> 会结束一个搜寻。
-
->> 现在键入 C-s 开始一个搜寻。慢一点，一次键入一个字元，
-   键入『cursor』这个字，每键入一个字元时，稍微停一下，
-   注意看看游标发生了什么事。现在您已曾经搜寻过「cursor」这个字了。
->> 再次键入 C-s 来搜寻「cursor」的下一个出现位置。
->> 现在键入 <Delback> 四次，看看游标是如何移动的。
->> 键入 <Return> 结束搜寻。
-
-您有没有看到发生了什么？在一个渐进式搜寻中，Emacs 试著要走到您键入的字
-串的下一个出现位置。要移动到游标所在的下一个出现位置，只要再键入 C-s 
-一次。如果并没有这样的出现位置存在，Emacs 会哔一声，并告诉您目前的搜寻
-「失败」。另外 C-g 也可以用来结束搜寻。
-
-注意：在某些系统中，键入 C-s 将会把萤幕冻结，您将看不到从 Emacs 来的任
-何输出。这表示操作系统一个称为「流程控制」的「功能」将 C-s 指令拦截住，
-并且不让它传到 Emacs。要取消萤幕的冻结，请键入 C-q。然后到 Emacs 使用
-手册中看看对於「渐进式搜寻的同时进入（ Spontaneous Entry to
-Incremental Search ）」这个主题，以取得处理这个「功能」的建议。
-
-如果您在一个渐进式搜寻的中间，并且键入 <Delback>，您可以发现在搜寻字串
-中的最后一个字元被消除了，并且搜寻会回到这个搜寻的最后一个地方。举例来
-说，假设您已经键入了『c』，用来寻找「c」的第一次出现。现在如果您键入
-『u』，游标会移动到「cu」的第一次出现位置。现在键入 <Delback> ，这会将
-「u」从搜寻字串中消除，并且游标会移回到「c」的第一次出现位置。
-
-如果您在一个搜寻的中间，并且键入一个 CONTROL 或 META 字元的话，（但有
-一些例外 -- 对搜寻而言特别的字元，像是 C-s 和 C-r ），搜寻会被结束。
-
-C-s 会开始一个搜寻，它会寻找搜寻字串在目前游标位置「之后」，的任何出现
-位置。如果您想要在先前文字中搜寻，键入 C-r 作为替代。除了搜寻的方向相
-反之外，我们所说的有关 C-s 的所有事情，同样地可以应用到 C-r 上。
+如果 Emacs 发现你输入多字符命令的节奏很慢，它会在窗格的下方称为“回显区”
+的地方给你提示。回显区位于屏幕的最后一行。
 
 
-* 多重窗格（ MULTIPLE WINDOWS ）
---------------------------------
+* 状态栏（MODE LINE）
+---------------------
 
-Emacs 许多好功能的其中之一是，您可以在萤幕中同时展示超过一个窗格。
+位于回显区的正上方的一行被称为“状态栏”。状态栏上会显示一些信息，比如：
 
->> 移动游标到这一行并且键入 C-u 0 C-l。
+--:**  TUTORIAL.cn       (Fundamental)--L670--54%----------------
 
->> 现在键入 C-x 2，它会将萤幕平分成两个窗格。
-   这两个窗格都显示著这个快速指南。游标则停留在上方的窗格。
+状态栏显示了 Emacs 的状态和你正在编辑的文字的一些信息。
 
->> 键入 C-M-v 以卷动下方的窗格。
-   （如果您并没有一个真的 META 键，则键入 ESC C-v 亦可。）
+你应该知道文件名的意思吧？就是你找到的那个文件嘛。-NN%-- 显示的是光标在
+全文中的位置。如果位于文件的开头，那么就显示 --Top-- 而不是 --00%--；如
+果位于文件的末尾，就显示 --Bot--。如果文件很小，一屏就足以显示全部内容，
+那么状态栏会显示 --All--。
 
->> 键入 C-x o（『o』指的是其他『other』的意思），
-   将游标移动到下方的窗格。
+L 和其后的数字给出了光标所在行的行号。
 
->> 在下方的窗格中，使用 C-v 和 M-v 来卷动它。
-   继续维持在上方的窗格中阅读这些指引。
+最开头的星号（*）表示你已经对文字做过改动。刚刚打开的文件肯定没有被改动
+过，所以状态栏上显示的不是星号而是短线（-）。
 
->> 再一次键入 C-x o 将游标移回到上方的窗格。
-   游标会回到它在上方窗格中，原本所在的位置。
+状态栏上小括号里的内容告诉你当前正在使用的编辑模式。缺省的模式是
+Fundamental，就是你现在正在使用的这个。它是一种“主模式”。
 
-您可以持续使用 C-x o 在窗格之间切换。每一个窗格有它自己的游标位置，但
-是只有一个窗格会真的显示出游标。所有通常的编辑指令只会应用到那个游标所
-在的窗格。我们称这个为「被选择的窗格」。
+Emacs 的主模式林林总总。有用来编辑程序代码的——比如 Lisp 模式；也有用
+来编辑各种自然语言文本的——比如 Text 模式。任何情况下只能应用一个主模
+式，其名称会显示在状态栏上，就在现在显示“Fundamental”的地方。
 
-指令 C-M-v 在当您於一个窗格中编辑文字，并使用其他的窗格作为参考之用时，
-是非常有用的。您可以将游标一直保持在您正在编辑的窗格中，并以 C-M-v 指
-令在其他的窗格循序地前进。【验证工作特别适合以这种方式来进行，如 GNU 
-中译小组：找一个原始英文档案；再找它翻译好的中文档案，编辑这个「被选择
-的窗格」，以 C-M-v 指令跟上验证中的段落……。】
+主模式有时会改变一些命令的行为。比如说，不管编辑什么样的程序代码，你都
+可以用一个统一的命令来添加注释，但是在不同的语言中注释的语法往往是不同
+的，这时相应的主模式就会分别用各自的语法规则来添加注释。主模式都是可以
+用 M-x 启动的命令，所以 M-x fundamental-mode 就可以切换到 Fundamental
+模式。
 
-C-M-v 是 CONTROL-META 字元的一个例子。如果您有一个真的 META 键，您可以
-同时按住 CONTROL 和 META 再键入 v 来键入 C-M-v。CONTROL 或 META 「谁先
-被按住」并没有影响，因为这两个键都是用来修饰您所键入的字元。
+如果你要编辑自然语言文本——比如现在——你应该用 Text 模式。
 
-如果您并没有一个真的 META 键，您可以使用 ESC 来作为替代，这样子顺序就
-有关系了：您必须键入 ESC ，跟著键入 CONTROL-v，CONTROL-ESC v 并不会作
-用。这是因为 ESC 是一个具有本身作用的字元，而不是一个修饰键。
+>> 输入 M-x text mode<Return>。
 
->> （在上方窗格）键入 C-x 1 以除去下方窗格。
+别害怕，没有什么命令会改变功能。不过你可以发现，M-f 和 M-b 现在把单引号
+（'）视为词的一部分了。而在先前，在 Fundamental 模式中，M-f 和 M-b 都将
+单引号视为分隔单词的符号。
 
-（如果您已经在底端的窗格键入 C-x 1，那么将会把上面的窗格隐藏住。将这个
-指令想像成「只保留一个窗格 -- 我正在编辑的这个。」）
+主模式通常都会搞一些类似的小动作，因为很多命令其实完成的是“相同的工
+作”，只是在不同情况下会有不同的工作方式而已。【所谓“求同存异”，在
+Emacs 里得到了很好的体现】
 
-您不需要在两个不同的窗格中显示相同的缓冲区。如果您使用 C-x C-f 在一个
-窗格中找档案，另一个窗格并不因而改变。您可以在独立的任一个窗格中找〔它
-自己的〕一个档案。
+用 C-h m 可以查看当前主模式的文档。
 
-这里有另外一个方式可以用来，使用两个窗格显示两个不同的东西：
+>> 用 C-u C-v 将本行带到靠近屏幕的上方。
+>> 输入 C-h m，看看 Text 模式与 Fundamental 模式有哪些不同。
+>> 输入 C-x 1 关掉文档窗格。
 
->> 键入 C-x 4 C-f，后面跟著您的其中一个档案的名称。
-   以 <Return> 作为结束。看看指定的档案出现在下方的窗格。
-   游标也跑到那里。
+主模式之所以称之为“主（major）”模式，是因为同时还有“辅模式”（minor
+mode）存在。辅模式并不能替代主模式，而是在主模式之外再做一些辅助的修改。
+每个辅模式都可以独立地开启和关闭，跟其它辅模式无关，跟主模式也无关。所
+以你可以不用辅模式，也可以用一个或者多个辅模式。
 
->> 键入 C-x o 以回到上方的窗格，然后以 C-x 1 删除掉下方窗格。
+有一个叫做自动折行（Auto Fill）的辅模式用处很大，特别是在编辑自然语言文
+本的时候。这个辅模式启动后，Emacs 会在你打字超出一行边界时自动替你换行。
+
+用 M-x auto fill mode<Return> 启动自动折行模式。启动之后，如果我们再用
+一次 M-x auto fill mode<Return>，自动折行模式就被关闭了。也就是说，如果
+自动折行模式没有开启，这个命令会开启它；而如果已经开启了，这个命令会关
+闭它。我们说这个命令用来“开关（toggle）”模式。
+
+>> 现在输入 M-x auto fill mode<Return>。然后随便敲点什么，直到你看到它
+   分成两行。必须敲一些空格，因为 Auto Fill 只在空白处进行断行。【空格
+   对英文来说是必须的，而对中文则不必。】
+
+行边界通常被设定为 70 个字符【这里指英文字符】，你可以用 C-x f 命令来重
+新设定之。指定新行边界可以用数字参数来进行传递。
+
+>> 输入 C-x f 并传递参数 20： C-u 2 0 C-x f。
+   然后输入一些文字，观察 Emacs 的自动折行动作
+   最后再用 C-x f 将边界设回 70。
+
+如果你在段落的中间做了一些修改，那么自动折行模式不会替你把整个段落重新
+折行。重新自动折行用 M-q，注意使用的时候光标必须位于你想折行的那一段里。
+
+>> 移动光标到前一段中，然后输入 M-q。
 
 
-* 递归编辑阶层（ RECURSIVE EDITING LEVELS ）
---------------------------------------------
+* 搜索（SEARCHING）
+-------------------
 
-有时候您会进入所谓的「递归编辑阶层」。它是由位在状态行的方括弧所指明，
-并且包含住以小括弧来指明的模式名称。举例来说，您可能会看到 
-[(Fundamental)]，而不是 (Fundamental)。
+Emacs 可以向前或者向后搜索字符串。搜索命令是一个移动光标的命令：搜索成
+功后，光标会停留在搜索目标出现的地方。
 
-要离开递归编辑阶层，请键入 ESC ESC ESC。这是个全功能的「离开」指令。您
-也可以使用它来除去多余的窗格，并且离开小缓冲区。
+Emacs 的搜索命令的独特之处在于，它是“渐进的（incremental）”，意思是搜
+索与输入同时进行：你在这边一个字一个字地输入你想搜索的东西，同时 Emacs
+在那边就替你搜索了。
 
->> 键入 M-x 以进入小缓冲区；然后键入 ESC ESC ESC 离开。
+C-s 是向前搜索，C-r 是向后搜索。不过手别这么快！先等等别着急试。
 
-您无法使用 C-g 来离开递归编辑阶层。这是因为 C-g 是用来取消指令以及「位
-於」递归编辑阶层中的「引数（ arguments ）」之故。
+在你按下 C-s 之后，你会发现回显区里有“I-search”字样出现，这是在提示
+你目前 Emacs 正处于“渐进搜索”状态，正在等待你输入搜索字串。<Return>
+会结束搜索。
+
+>> 输入 C-s 开始一个搜索。注意敲慢一点，一次输入一个字符。
+   慢慢输入“cursor”整个词，每敲一个字就暂停一下，注意观察光标。
+   现在你应该已曾经找到“cursor”这个词了。
+>> 再按一次 C-s，搜索下一个“cursor”出现的位置。
+>> 现在按四次退格键，看看光标是如何移动的。
+>> 敲 <Return> 结束搜索。
+
+刚才看仔细了么？在一个渐进式搜索中，Emacs 会尝试跳到你输入的字符串的出
+现位置。想跳到下一个搜索目标出现的位置，只要再按一次 C-s 就行了。如果找
+不到，Emacs 会发出“哔”的一声，告诉你搜索失败。在整个过程中，都可以用
+C-g 来终止搜索。【你会发现 C-g 之后光标回到了搜索开始前的地方，而
+<Return> 会让光标留在搜索结果上，这是很有用的功能。】
+
+注意：使用某些终端的时候，输入 C-x C-s 会冻结屏幕【屏幕没有任何输出】，
+这样你就看不到 Emacs 的任何变化。其原因是操作系统的“流量控制”功能把
+C-s 拦截了，并且冻结了屏幕，Emacs 自然也就看不到这个输入了。用 C-q 可以
+解除屏幕冻结。要解决这个问题，请参考 Emacs 手册里的“Spontaneous Entry
+to Incremental Search”一节【Emacs 手册可能还没有中文翻译】，那里可能有
+一些有用的建议。
+
+如果你正在渐进式搜索中，按退格键会删除目标字符串的最后一个字符，并且光
+标会回到最近一次搜索的命中位置。比如你已经输入了“c”，光标就停在“c”
+第一次出现的地方，再输入“u”，光标停在“cu”第一次出现的地方，这时再按
+退格键，“u”就从搜索字串中消失了，然后光标会回到“c”第一次出现的地方。
+
+另外如果你在搜索的时候输入了 CONTROL 或者 META 组合键的话，搜索可能会
+结束。（也有例外，比如 C-s 和 M-r 这些对搜索有特别意义的组合键。）
+
+前面说的都是“向下”搜索，如果想“向上”搜索，可以用 C-r。C-r 与 C-s
+相比除了搜索方向相反之外，其它的操作都一样。
 
 
-* 取得更多的帮助（ GETTING MORE HELP ）
----------------------------------------
+* 多窗格（MULTIPLE WINDOWS）
+----------------------------
 
-在本快速指南中，我们试著仅提供刚刚好的信息让您可以开始使用 Emacs。在 
-Emacs 中有太多可取得的信息，想要在这里全部解释是不可能的。然而，您也许
-会想要学习更多 Emacs 相关的信息，因为它有许多其他有用的功能。Emacs 提
-供了「阅读有关 Emacs 指令」的指令。这些「help」指令都以 CONTROL-h 这个
-字元作为开头，称作为「Help 字元」。
+Emacs 的迷人之处很多，能够在屏幕上同时显示多个窗格就是其中之一。
 
-要使用 Help 功能，键入 C-h 字元，然后再键入一个说明您所需要的帮助的字
-元。如果您真的不知道要问什么，那么请键入『C-h ?』，此时 Emacs 将会告诉
-您它能够提供的帮助。如果您已经键入 C-h，但发现您并不需要任何帮助，键入 
-C-g 来取消掉它就是了。
+>> 移动光标到这一行，然后输入 C-u 0 C-l。
 
-（有些网站将 C-h 这个字元的意义改变了。他们真的不应该把它设为对所有使
-用者全部都适用的方法，所以您现在就有了个理由来抱怨系统管理者了。在此同
-时，如果 C-h 并没有在窗格的底部显示任何有关帮助的讯息，试著键入 F1 键，
-或是 M-x help <Return>。）
+>> 现在输入 C-x 2，它会将屏幕划分成两个窗格。
+   这两个窗格里显示的都是本篇快速指南，而光标则停留在上方的窗格里。
 
-最基本的 HELP 功能是 C-h c。键入 C-h，字元 c，以及一个或一串字元；然后 
-Emacs 会显示一个非常简短的有关这个指令的解释。
+>> 试试用 C-M-v 滚动下方的窗格。
+   （如果你并没有 META 键，用 ESC C-v 也可以。）
+   【向上滚动是 C-M-S-v，也就是同时按住 CONTROL、META 和 SHIFT 再按 v】
 
->> 键入 C-h c C-p。
+>> 输入 C-x o（“o”指的是“其它（other）”），
+   将光标转移到下方的窗格。
 
-讯息应该会像是这样：
+>> 在下方的窗格中，用 C-v 和 M-v 来滚动。
+   同时继续在上方的窗格里阅读这些指导。
+
+>> 再输入 C-x o 将光标移回到上方的窗格里。
+   光标会回到它在上方窗格中原本所在的位置。
+
+连续使用 C-x o 可以遍历所有窗格。每一个窗格都有它自己的光标位置，但是只
+有一个窗格会真正显示这个光标。【其它窗格在控制台下不会显示光标，在图形
+窗口下缺省显示为镂空光标。】一般所有的编辑命令都作用于这个光标所在的窗
+格，我们称这个窗格为“被选中的窗格”。
+
+当你在一个窗格中编辑，但是想用另一个窗格作参考的时候，C-M-v 是很有用的
+命令。你可以保持光标始终处于编辑窗格中，然后用 C-M-v 命令在另外一个窗格
+里滚动。【翻译和校对就很适合用这种方式进行。】
+
+C-M-v 是一个 CONTROL-META 组合键。如果你有 META 键，你可以同时按住
+CONTROL 和 META 键然后输入 v。CONTROL 和 META 键哪个先按没有关系，因为
+它们只是用来“修饰（modify）”你输入的字符的。
+
+如果你并没有 META 键，你也可以用 ESC 来代替，不过这样子按键顺序就有关系
+了：你必须输入 ESC ，然后再输入 CONTROL-v。CONTROL-ESC v 是没用的，因为
+ESC 本身是一个字符键，而不是一个修饰键（modifier key）。
+
+>> （在上方窗格里）输入 C-x 1 关掉下方窗格。
+
+（如果你在下方的窗格里输入 C-x 1，那么就会关掉上方的窗格。你可以把这个
+命令看成是“只保留一个窗格”——就是我正在编辑的这个。）
+
+不同的窗格里可以显示不同的缓冲区。如果你在一个窗格里用 C-x C-f 打开了
+一个文件，另一个窗格并不会有什么变化。在任何一个窗格里都可以打开文件。
+
+有一种方式可以让你在另一个窗格里打开文件：
+
+>> 输入 C-x 4 C-f，后面紧跟着输入一个文件名，用 <Return> 结束。
+   可以看到你指定的文件出现在下方的窗格中，同时光标也跳到了那里。
+
+>> 输入 C-x o 回到上方的窗格，然后再用 C-x 1 关掉下方窗格。
+
+
+* 递归编辑（RECURSIVE EDITING LEVELS）
+--------------------------------------
+
+有时候你会进入所谓的“递归编辑”。递归编辑状态由位于状态栏的方括号所指
+示，其中包含了用小括号来指明的模式名称。比如说，你有时可能会看到
+[(Fundamental)]，而不是 (Fundamental)。【比如在用 M-% 进行交互式替换的
+时候你又用了 C-s 进行搜索，这时替换模式并没有结束，但你又进入了搜索模式，
+这就是所谓的递归编辑。】
+
+离开递归编辑可以用 ESC ESC ESC。这是一个最通用的“离开”命令，你甚至可
+以使用它来关掉多余的窗格，或者离开小缓冲。
+
+>> 输入 M-x 进入小缓冲；然后输入 ESC ESC ESC 离开。
+
+你不能用 C-g 来离开递归编辑，因为 C-g 的作用是取消命令和“参数
+（arguments）”，而这些东西都位于本层递归编辑“之内”。
+
+
+* 获得更多帮助（GETTING MORE HELP）
+-----------------------------------
+
+本快速指南的目的仅仅是帮助你学会在 Emacs 的大海里游泳，不至于一上来就淹
+死。有关 Emacs 的话题三天三夜也讲不完，这里自然是写不下了。Emacs 很理解
+你求知若渴的心情，因为它提供的强劲功能实在是太多了。Emacs 提供了一些命
+令来查看 Emacs 命令的文档，这些命令都以 CONTROL-h 开头，这个字符也因此
+被称为“Help（帮助）字符”。
+
+要使用帮助（Help）功能，请先输入 C-h，然后再输入一个说明你需求的字符。
+如果你晕到连需要什么帮助都不知道，那么就输入 C-h ?，Emacs 会告诉你它能
+提供哪些帮助。如果你已经按了 C-h 又想反悔，那么用 C-g 取消它就是了。
+
+（有些站点改变了 C-h 的意思，他们这种以己度人外加一刀切的做法让倒是让你
+可以义正辞严的抱怨系统管理员，真的不是太好。话说回来，如果你按 C-h 之后
+没有任何帮助信息显示出来，那么试试 F1 键或者 M-x help <Return>。）
+
+最基本的帮助功能是 C-h c。输入 C-h c 之后在输入一个组合键，Emacs 会很简
+要地给出这个命令的说明。
+
+>> 输入 C-h c C-p。
+
+显示的消息应该会是这样：
 
         C-p runs the command previous-line
 
-这告诉了您「函数的名称」。函数名称主要是用来自订以及扩充 Emacs。但是由
-於函数名称是由「用来指出这指令在做些什么」而被选定，它们因此也可以作为
-非常简短的文档 -- 足够提醒您已经学过的指令。
+这条消息显示了 C-p 命令对应的函数名，函数名主要用来定制和扩展 Emacs。命
+令的功能由函数完成，所以函数名本身也可以被看成是最简单的文档——至少对
+于你已经学过的命令来说，它们的函数名足以解释它们所完成的工作了。
 
-多字元指令像是 C-x C-s 和 （如果您没有 META 或 EDIT 或 ALT 键）<ESC>v 
-也可以在 C-h c 后面出现。
+多字符命令一样可以用 C-h c 来查看。
 
-要取得更多有关一个指令的信息，用 C-h k 来取代使用 C-h c 。
+想得到更多的信息，请把 C-h c 换成 C-h k 试试看。
 
->> 键入 C-h k C-p。
+>> 输入 C-h k C-p。
 
-这会在一个 Emacs 窗格显示这个函数的说明文档以及它的名称。当您阅读完后，
-键入 C-x 1 以跳离这些帮助文字。您并不需要马上跟著做。您可以做些编辑，
-当参考到帮助文字时再键入 C-x 1。
+上面的命令会新打开一个 Emacs 窗格，并在其中显示函数的名称及其文档。你读
+完之后，可以用 C-x 1 关掉这个帮助窗格。当然你并不需要在 C-h k 之后立即
+这样做，你完全可以先在编辑窗格里做点别的事情，然后再用 C-x 1 关掉帮助。
 
-这里有一些其他有用的 C-h 选项：
+还有一些其他有用的 C-h 命令：
 
-   C-h f        解释一个函数。您要键入此函数的名称。
+   C-h f        解释一个函数。你要输入函数名。
 
->> 试著键入 C-h f previous-line<Return>。
-   这会印出 Emacs 所有的有关「实作出 C-p 这个指令的函数」的信息
+>> 试试看，输入 C-h f previous-line<Return>。
+   Emacs 会给出它所知道的所有有关“实现 C-p 命令功能的函数”的信息。
 
-C-h v 这个类似的指令会显示出「您可以用来自订 Emacs 行为的变数」的文档。
-当 Emacs 要求时，您需要键入这变数的名称。
+C-h v 用来显示 Emacs 变量的文档，Emacs 变量可以被用来“定制 Emacs 的行
+为”。同样，你需要输入变量的名称。
 
-   C-h a        指令相关查找（ Command Apropos ）。
-                键入一个关键字然后 Emacs 会列出所有
-                「在其名称中含有此关键字」的全部指令。
-                这些指令全部都可以经由 META-x 来启动。
-                对於一些指令而言，指令相关查找也会列出
-                「可以执行相同指令」的一个或两个字元的串列。
+   C-h a        相关命令搜索（Command Apropos）。
+                输入一个关键词然后 Emacs 会列出所有命令名中包含此关键词
+                的命令。这些命令全都可以用 M-x 来启动。对于某些命令来说，
+                相关命令搜索还会列出一两个组合键。
 
->> 键入 C-h a file<Return>。
+>> 输入 C-h a file<Return>。
 
-这会在另一个窗格显示一个「在其名称中含有『file』的全部 M-x 指令」的列
-表。您将会看到像是 C-x C-f 的「字元-指令」列在其相对应指令名称（如：
-find-file ）的旁边。
+Emacs 会在另一个窗格里显示一个 M-x 命令列表，这个列表包含了所有名称中含
+有“file”的命令。你可以看到像“C-x C-f”这样的组合键显示在“find-file”
+这样的命令名的旁边。
 
->> 键入 C-M-v 上下移动 help 窗格。试个几次。
+>> 用 C-M-v 来回滚动 help 窗格，多试几次。
 
->> 键入 C-x 1 来删除 help 窗格。
+>> 输入 C-x 1 来删除 help 窗格。
 
-   C-h i        阅读线上使用手册（ a.k.a. Info ）。
-                这个指令将您带到了称为「*info*」的特殊缓冲区，在那，
-                您可以阅读安装在您的系统里的软件包的线上使用手册。
-                键入 m emacs <Return> 以阅读 Emacs 使用手册。
-                如果您在此之前未曾使用过 Info 系统，请键入『?』。
-                Emacs 将会带您进入 Info 模式功能的导览指南。
-                一旦完成了本快速指南的研读，您应该查阅 Emacs Info
-                使用手册，以作为主要的参考文档。
+   C-h i        阅读联机手册（也就是通常讲的 Info）。
+                这个命令会打开一个称为“*info*”的特殊缓冲区，在那里，
+                你可以阅读安装在系统里的软件包使用手册。要读 Emacs 的使
+                用手册，按 m emacs <Return> 就可以了。如果你之前从没用
+                过 Info 系统，那么请按“?”，Emacs 会带你进入 Info 的使
+                用指南。在看完本快速指南之后，Emacs Info 会成为你的主要
+                参考文档。
 
 
-* 更多功能特色（ MORE FEATURES ）
----------------------------------
+* 更多精彩（MORE FEATURES）
+---------------------------
 
-您可以经由阅读 Emacs 使用手册〈不论是一本书或是在 Info 中的线上版本
-（使用 Help 选单或是键入 F10 h r ）〉来学到更多有关它的知识。有两个您
-可能会特别喜欢的功能特色是可以节省打字量的 completion 还有简化档案处理
-的 dired 。
+想了解更多使用 Emacs 的知识，应该去读一读 Emacs 使用手册——可以是纸版
+的书，也可以是电子版的联机帮助（可以从 Help 菜单进入或者按 F10 h r）。
+提两个你可能会很感兴趣的功能吧，一个是可以帮你少敲键盘的 completion（自
+动补全），一个是方便文件处理的 dired（目录编辑）。
 
-Completion 是一种避免不必要的打字的方式。举例来说，如果您想要切换 
-*Messages* 缓冲区，您可以键入 C-x b *M<Tab> ，只要可以从您已经键入的文
-字中确定， Emacs 就会将剩下的缓冲区名称补齐。 Completion 是在 Emacs 使
-用手册的 Info 中，称为「Completion」的节点中所解释的。
+Completion 可以替你节省不必要的键盘输入。比如说你想切换到 *Message* 缓
+冲区，你就可以用 C-x b *M<Tab> 来完成，只要 Emacs 能够从你已经输入的文
+字中判断出你想要输入的东西，它会自动帮你补齐余下的。有关 Completion 的
+详细解释可以在 Emacs Info 中的“Completion”一节里找到。
 
-Dired 使您可以在一个目录中列出档案（次目录则是可选的）、在列表中到处移
-动、拜访、重新命名、删除以及对档案作操作。 Dired 是在 Emacs 使用手册的 
-Info 中，称为「Dired」的节点中所解释的。
+Dired 可以在一个缓冲区里列出一个目录里的所有文件（可以选择是否也列出子
+目录），然后你可以在这个文件列表上完成对文件的移动、访问、改名或者删除
+等等操作。Dired 也在 Emacs Info 中有详细说明，就在“Dired”一节。
 
-使用手册也解释了许多其它 Emacs 的功能特色。
+Emacs 使用手册里还有很多很多的精彩功能等着你来了解。
 
 
-* 结论（ CONCLUSION ）
-----------------------
+* 总结（CONCLUSION）
+--------------------
 
-记住，要完全离开 Emacs 请使用 C-x C-c 。要暂时离开到 shell，稍后再回到 
-Emacs，请使用 C-z 。
+记住，要退出 Emacs 请用 C-x C-c。要暂时切换到 shell 并且稍后再回到
+Emacs 里来，请用 C-z。【切换到 shell 仅对控制台下的 Emacs 有效】
 
-本快速指南对於所有的新手应该都是易於理解的，所以如果您发现了什么地方不
-清楚，不要只是坐著怪自己 -- （向本文作者和翻译）发点牢骚吧！
+本文完全是为零起点新手写的傻瓜教程。如果你觉得哪里还看不明白，千万不要
+觉得不好意思，那一定是我们没有写好。我们永远欢迎你的不满和抱怨。
 
 
-* 翻译（ TRANSLATION ）
------------------------
+* 翻译（TRANSLATION）
+---------------------
 
-本快速指南的翻译人员列表如下，如果您在阅读本文之前，「完全」对 Emacs 
-没有概念，请告诉我们您的意见以作为本文后续的改进依据。翻译也提供了一份
-《GNU Emacs 中文处理说明》在 
-http://www.gnu.org/software/chinese/guide/emacs-chinese.cn.html 〈部份
-内容已经整理到本快速指南〉，也请您自行参阅。
+翻译：孙 一江 <sunyijiang@gmail.com>
+校对：水木社区（www.newsmth.net）Emacs 板众多网友
 
-编辑器是电脑使用者最常接触到的应用程式，因此不应该让初学者感到过於困难，
-就一般的评论来说， Emacs 是不难学会使用的编辑器，但您的意见可以使它更
-为贴近一般的使用者，并使电脑作为工具的角色得以充分发挥。如果您愿意提供
-改进的意见，请寄 email 到<chinese-translators@gnu.org> 。请不要害羞，
-我们欢迎任何有关的讨论；如果您不想寄到邮件清单，请直接 email 给本文翻
-译 <chliu@gnu.org> 。请在 Title 行中包含此字串「Emacs TUTORIAL: <your
-issue here>」。
+Emacs 快速指南（Tutorial）早有两个刘昭宏的中文译本，繁简各一。其简体版本
+（TUTORIAL.cn）基本由繁体版本（TUTORIAL.zh）经词语替换而得。然而繁简中文
+不仅在用词习惯上有所不同，更有诸多表达方式和句法方面的差异。因此一直以来
+阅读 TUTORIAL.cn 都略觉晦涩和生硬。这次重新翻译 TUTORIAL.cn 的动机正是源
+于这种体验，希望我们的工作能够让本文更好的发挥其应有的作用。TUTORIAL.zh
+的译文质量很高，在翻译过程中给予过我们很多借鉴和参考，在此对刘昭宏的工作
+表示感谢。
 
-如果您是 Emacs 老手，GNU Chinese Translators Team (GNU/CTT)
-<http://www.gnu.org/software/chinese/> 欢迎您的加入，我们现在正需要愿
-意投入翻译 Emacs 使用手册的人员。
+翻译过程中最大的挑战莫过于术语译词的选择了。经过水木社区 Emacs 板热心网
+友小范围内的讨论，我们选择了现在的译法。用户的广泛参与是自由软件生命力的
+源泉，所以如果你有任何建议、勘误或更好的想法，请用你喜欢的方式向我们提出
+。你可以直接给我发电子邮件，也可以放到 GNU Emacs 的开发邮件列表或者水木
+社区的 Emacs 板上进行讨论。下面列出主要术语的译词对照，并给出注释说明：
 
-本快速指南并没有采用习惯上编辑器所使用的翻译术语，一方面因为它的实际意
-义与一般的编辑器不同，原文本就不同；另一方面也因为 Emacs 所采用的视觉
-设计概念，早在窗口化系统之前就已经存在，本质也不相同。总之，翻译以为这
-样可以帮助对於 Emacs 整个设计哲学的理解。如果收到的回覆中，大部份要求
-提出修改，我们还是从善如流。
+    command               命令
+    cursor                光标
+    scrolling             滚动
+    numeric argument      数字参数
+    window                窗格 [1]
+    insert                插入
+    delete                删除 [2]
+    kill                  移除 [2]
+    yank                  召回 [2]
+    undo                  撤销
+    file                  文件
+    buffer                缓冲区
+    minibuffer            小缓冲
+    echo area             回显区
+    mode line             状态栏
+    search                搜索
+    incremental search    渐进式搜索 [3]
 
-(0) 为了避免「游标移动指令」论述上的混淆，本文采用的术语为：
-    往「前」移（ move Forward ）；往「后」移（ move Backware ）
-    〔或是往「回」移〕；
-    往「上」移（ Previous line ）；往「下」移（ Next line ）。
-(1) 在本文中，「行」指的是 row，这是采用一般的习惯用法。
-    为了避免误导中文读者，特别在此说明。在正式的用法中：
-    「column」翻译为「行」，以「纵」为行（直行），也译为「栏」；
-    「row」翻译为「列」，以「横」为列（横列）。
-    读者思索一下「合纵连横」应该可以理解。
-    大约是因为中文原本是直书的，我们说「一行字」是没问题；
-    但现在大部份的情形中文是横书的，由於习惯使然也称为一行字了。
-(2) 有关於「文字」及其集合的相关译文，翻译所采用的有：
-    编辑的「文字」：「然后键入一些文字」；
-    用来作为说明功能的「文档」：「这个函数的说明文档」；
-    特指其所说明的内容的「文本」：「实际效力以英文本为准」。
-    即使只是「一行字」，只要它是用来作为说明之用，
-    翻译还是将它视为「文档」。
-(3) 「cut」的动作在 Emacs 中分为「杀掉」和「删除」，之间的差异如下：
-    一般编辑器中的「cut」：只有最近被 cut 的文字摆到 clipboard 中；
-    「杀掉（ killing ）」：被杀掉的文字，全部被加入到 kill ring 中；
-    「删除（ deleting ）」：被删除的文字，就是被删除了。
-    因此在一般编辑器中，您只能 paste「最近」被 cut 的文字；
-    而在 Emacs 中，您可以「拉回」任何先前被杀掉的文字，同时，
-    它的作法很容易。至於被删除的，因为用来作为「删除」功能的指令，
-    所能移去的文字数量都很少，因此也没什么好拉回的；
-    如果真的想回复这些文字，undo 您的动作就是了。
-(4) 「window」同时翻译为「窗口」和「窗格」，
-    前者表示现在一般概念中的窗口系统，如「X 窗口」；
-    后者表示 Emacs 中的窗口，翻译在此通称为「窗格」。
-    Emacs 的「窗格」即使在命令列提示下也可以正常工作，
-    此一基本特性显然值得我们以另一个专用术语来描述它。
-(5) 关於档案的术语，「找」一个档案在 Emacs 中有两种作用：
-    找一个「并不存在」的档案，读者应认知为「开新档案」；
-    找一个「已经存在」的档案，则是「开启旧档」。
-    Emacs 只以一个「找」的动作来解决，主要的原因是「实际上」
-    的软件工作如此。黑客们应该会发现这样比较自然，
-    因为它反应了电脑的工作方式，同时操作起来也较少废话。
-(6) 在【】中的文字为翻译的注解。
-(7) 关於使中文文档结构化的议题，问题已经获得解决。
-(8) 本翻译文本所采用的简繁用语差异列表如下：
-    zh cn
-    文件 文档
-    软体 软件
-    作业 操作
-    套件 包
-    视窗 窗口
-    递回 递归
-    骇客 黑客
-    资讯 信息
+[1] “window”一词在计算机相关的领域一般都被译为“窗口”。但是在 Emacs
+    中，还有一个“frame”的概念。在被广泛使用的 X 窗口系统和微软的视窗
+    （Windows）系列操作系统中，Emacs 的一个“frame”就是一个“窗口”，因
+    此把 Emacs 中的“frame”译成“窗口”更加符合通常的习惯。这样，Emacs
+    中的“window”就只能译成“窗格”了。我们认为 Emacs 中 window 和
+    frame 的关系用窗格和窗口来类比是十分形象的。
 
-另外，我们也十分欢迎读者可以直接修改本快速指南，做出自己的版本，以自己
-认为最为合适的方式来介绍 Emacs 。如果您做出了这样个人化的版本，并且认
-为足供大家参考使用，请寄给 <chinese-coordinators@gnu.org> ，我们会将您
-的版本公开在 GNU/CTT 的网页中提供给中文使用者下载。
+[2] 对于“delete”和“kill”的区别，正文已经给出了详细的说明。“删除”和
+    “移除”相比较起来，前者更多地隐含着“破坏”和“不可恢复”的意思，而
+    后者更多地隐含着“被转移”和“可恢复”的意思。因此分别选择它们作为上
+    述两词的译词，希望能够体现出区别。“yank”在中文文档中鲜有对应译词出
+    现，翻译的困难较大。究其本意是：“a strong sudden pull”（参见韦氏词
+    典），即“猛然拉回”。在原文档中 yank 被引申为“将先前移除的东西再移
+    回来”这个意思，所以我们选择了“召回”一词与其对应。
 
-翻译：刘 昭宏 <chliu@gnu.org>
-验证：马 雪萍
+[3] “incremental”一词在计算机著作中广泛出现，被广泛接受的中文译词有两
+    个：“增量的”和“渐进的”。“incremental search”翻译成“增量式搜索
+    ”或者“渐进式搜索”都讲的通，且都有各自的形象之处。还是参考原文对其
+    的解释：“... means that the search happens while you type in the
+    string to search for”。意思是之所以称其为“incremental search”，是
+    因为“在你输入搜索字符串的过程中，搜索就已经在进行了”。我们认为“增
+    量的”更加强调在现有基础上的变化（比如“增量备份”，“增量编译”）；
+    而“渐进的”更加强调过程的逐渐发展，也更加符合原文的意思。因此我们选
+    择将“incremental search”译作“渐进式搜索”。
 
 
-* 复制（ COPYING ）
--------------------
+* 版权声明（COPYING）
+---------------------
 
-本快速指南沿袭自具有悠久历史的 Emacs 快速指南，由 Stuart Cracraft 为了
-原始的 Emacs 所撰写的版本开始。
+This tutorial descends from a long line of Emacs tutorials
+starting with the one written by Stuart Cracraft for the original Emacs.
 
-这个版本的快速指南和 GNU Emacs 一样都是版权化的，并且允许在某些条件下
-散布其拷贝：
+This version of the tutorial, like GNU Emacs, is copyrighted, and
+comes with permission to distribute copies on certain conditions:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
    2005, 2006 Free Software Foundation, Inc.
-Chinese Translation by Chao-Hong Liu (2002, 2003)
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
@@ -1059,27 +991,37 @@ Chinese Translation by Chao-Hong Liu (2002, 2003)
    and that the distributor grants the recipient permission
    for further redistribution as permitted by this notice.
 
-   本文允许在不变更文档内容的前提下刊登在任何形式的媒体中，
-   但需保留版权声明以及许可声明，
-   散布者也必须给予接受者如同此声明所允许的，进一步散布的许可。
-   【本段译文提供读者作为参考以帮助理解，实际效力以英文本为准。】
-
    Permission is granted to distribute modified versions
    of this document, or of portions of it,
    under the above conditions, provided also that they
    carry prominent notices stating who last altered them.
 
-   本文允许在与上述相同的条件下，散布修改后的版本，或是其中的一部份，
-   但它们也必须带有显著的，说明由谁最后更动了它的声明。
-   【Copyleft 版权除了提供使用者自由外，也维护原始作者，
-   以及后来的修改作者的名誉权（ credit ）。
-   本段译文提供读者作为参考以帮助理解，实际效力以英文本为准。】
+The conditions for copying Emacs itself are more complex, but in the
+same spirit.  Please read the file COPYING and then do give copies of
+GNU Emacs to your friends.  Help stamp out software obstructionism
+("ownership") by using, writing, and sharing free software!
 
-复制 Emacs 本身的条件较为复杂，但是具有相同的精神。请阅读 COPYING 这个
-档案，并且确实给予您的朋友 GNU Emacs 的拷贝。请经由「使用、撰写、以及
-分享自由软件」来帮助消除软件障碍主义（拥有权）！
+【下面为版权声明的译文，仅供参考。实际法律效力以英文原文为准。】
+
+本快速指南沿袭自历史悠久的 Emacs 快速指南，可上溯至 Stuart Cracraft 为最
+初的 Emacs 所作的版本。
+
+本篇文档与 GNU Emacs 一样拥有版权，并允许在下列条件的约束下发行其拷贝：
+
+   Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
+
+   本文档允许在不变更文档内容的情况下由任何人发布在任何媒体上，同时必须
+   完整保留版权和许可声明，且需给予受众与发行者完全相同的、如本声明所允
+   许的再次发行本文档的权利。
+
+   本声明允许在与上述条件相同的情况下发布经过修改的全部或部分文档，同时
+   必须附带显要的文字以申明文档的最后修改者。
+
+Emacs 自身的版权问题虽比本文档要复杂一些，但也基于相同的精神。敬请阅读文
+件“COPYING”，然后向你的朋友们分发 GNU Emacs 拷贝。让我们以使用、编写和
+分享自由软件的实际行动来共同祛除软件障碍主义（所谓的“所有权”）！
 
-;;; DO NOT PUT THIS ON ZHS OR ZHT FILE...
 ;;; Local Variables:
 ;;; coding: chinese-iso-8bit
 ;;; End:
diff --git a/etc/TUTORIAL.translators b/etc/TUTORIAL.translators
index dfda17bedb7..bf89921e59e 100644
--- a/etc/TUTORIAL.translators
+++ b/etc/TUTORIAL.translators
@@ -6,8 +6,8 @@ Author:     Ognyan Kulev <ogi@fmi.uni-sofia.bg>
 Maintainer: Ognyan Kulev <ogi@fmi.uni-sofia.bg>
 
 * TUTORIAL.cn:
-Author:     Chao-Hong Liu <chliu@gnu.org>
-Maintainer: Chao-Hong Liu <chliu@gnu.org>
+Author:     Sun Yijiang <sunyijiang@gmail.com>
+Maintainer: Sun Yijiang <sunyijiang@gmail.com>
 
 * TUTORIAL.cs:
 Author:     Milan Zamazal <pdm@zamazal.org>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 670f6db6282..6276c84d09f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,349 @@
+2006-02-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* buff-menu.el (list-buffers-noselect): Turn also "\n" into a
+	strech spec so it doesn't display as "^J" on the header line
+	when `Buffer-menu-use-header-line' is t.
+
+2006-02-20  Nick Roberts  <nickrob@snap.net.nz>
+
+	* speedbar.el (speedbar-make-button): Keep text properties
+	of string arguments if desired.
+
+	* progmodes/gud.el (gud-speedbar-buttons): Fontify watch
+	expessions.
+
+	* progmodes/gdb-ui.el (gdb-speedbar-expand-node): Force update
+	of speedbar.
+
+2006-02-19  Ryan Yeske  <rcyeske@gmail.com>
+
+	* ffap.el (ffap-read-file-or-url): Bind `completion-ignore-case'
+	to value of `read-file-name-completion-ignore-case'.
+
+2006-02-19  Chong Yidong  <cyd@stupidchicken.com>
+
+	* custom.el (customize-mark-as-set): Push to `user' theme.
+
+	* cus-edit.el (custom-save-variables): Allow unthemed values.
+	(customize-set-variable): Push setting to `user' theme.
+
+2006-02-19  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gud.el: Don't require font-lock as it's now
+	automatically loaded.
+	(gud-speedbar-buttons): Replace gdb-var-changed with
+	gdb-force-update.
+
+	* progmodes/gdb-ui.el (gdb-force-update): Rename from
+	gdb-var-changed.
+	(gdb-post-prompt): Use it.
+	(gdb-var-create-handler, gdb-var-evaluate-expression-handler)
+	(gdb-var-update-handler, gdb-var-delete)
+	(gdb-speedbar-expand-node, gdb-var-list-children-handler-1)
+	(gdb-var-update-handler-1): Don't set gdb-var-changed, just set
+	gdb-force-update in gdb-post-prompt.
+	(gdb-reset): Clear watch expressions from speedbar when quitting.
+
+2006-02-19  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+	* viper-cmd.el (viper-insert-state-post-command-sentinel)
+	(viper-change-state-to-vi, viper-change-state-to-emacs):
+	Make aware of cursor coloring in the Emacs state.
+	(viper-special-read-and-insert-char): Use read-char-exclusive.
+	(viper-minibuffer-trim-tail): Workaround for fields in minibuffer.
+
+	* viper-init.el (viper-emacs-state-cursor-color): New variable.
+
+	* viper-util.el (viper-save-cursor-color)
+	(viper-get-saved-cursor-color-in-replace-mode)
+	(viper-get-saved-cursor-color-in-insert-mode)
+	(viper-restore-cursor-color): Make aware of the cursor color in Emacs
+	state.
+	(viper-get-saved-cursor-color-in-emacs-mode): New function.
+
+	* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option)
+	(ediff-ignore-case-option3, ediff-actual-diff-options)
+	(ediff-actual-diff3-options): New variables to control case sensitivity.
+	(ediff-make-diff2-buffer, ediff-setup-fine-diff-regions)
+	(ediff-setup-diff-regions3): Make aware of case-sensitivity.
+	(ediff-toggle-ignore-case): New function.
+	(ediff-extract-diffs, ediff-extract-diffs3): Preserve point in buffers.
+
+	* ediff-help.el (ediff-long-help-message-narrow2)
+	(ediff-long-help-message-compare2, ediff-long-help-message-compare3)
+	(ediff-long-help-message-word-mode): Add ignore-case command.
+	(ediff-help-for-quick-help): Add ignore-case command.
+
+	* ediff-merg.el: Move provide to the end.
+
+	* ediff-ptch.el: Move provide to the end.
+
+	* ediff-wind.el: Move provide to the end.
+
+	* ediff-mult.el: Move provide to the end.
+	(ediff-set-meta-overlay): Enable follow-link.
+
+	* ediff.el: Move provide to the end.
+	Break recursive load cycle in eval-when-compile.
+	(ediff-patch-buffer): Better heuristics.
+
+	* ediff-util.el: Move provide to the end.
+	Break recursive load cycle in eval-when-compile.
+	(ediff-setup-keymap): Add binding for #c.  Replace some defsubsts with
+	defuns.
+	(ediff-submit-report): Pass the values of ediff-diff3-program,
+	ediff-diff3-options.
+
+2006-02-19  Juanma Barranquero  <lekktu@gmail.com>
+
+	* help-fns.el (help-do-arg-highlight): Recognize also ARG- followed by
+	the opening bracket of the following bracketing pairs: {}, [], (), <>,
+	`' (for example, in the docstring of `windmove-default-keybindings').
+
+2006-02-19  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gud.el (gud-speedbar-buttons): Update properly for
+	shadow face.  Don't provide binding to edit variable when it is
+	out of scope.
+
+	* progmodes/gdb-ui.el (gdb-var-evaluate-expression-handler)
+	(gdb-var-update-handler): Detect out of scope variables with pre
+	GDB 6.4 too.
+	(gdb-post-prompt): Revert changet 2006-02-17 (force update).
+	Reset status of variable objects to nil in update handlers.
+	(gdb-var-update-handler-1): Detect when a variable object comes
+	in scope.  setcar on var changes gdb-var-list directly.
+
+2006-02-17  Juri Linkov  <juri@jurta.org>
+
+	* ffap.el (ffap) <defface>: Add explicit face declaration.
+	(ffap-highlight): Use face `ffap' directly instead of checking
+	for its existence.
+
+	* icomplete.el (icomplete-get-keys): Use `t' for the second arg
+	`visible-ok' of `other-buffer' to find the right original buffer.
+
+	* info.el (Info-search): Skip `Local Variables' node.
+
+2006-02-17  Juri Linkov  <juri@jurta.org>
+
+	* info.el (Info-find-file): Check for symbols `apropos', `history',
+	`toc' in the input filename, and return these symbols as is.
+	(Info-find-node-2): Set Info-current-file to symbols `apropos',
+	`history', `toc' instead of strings.
+	(Info-set-mode-line): For non-string Info-current-file use the
+	symbol's name inside **.
+	(Info-isearch-push-state): Add quote before Info-current-file and
+	Info-current-node.
+	(Info-isearch-pop-state): Use `equal' instead of `string='.
+	(Info-extract-pointer, Info-following-node-name): Use
+	`match-string-no-properties' instead of `match-string'.
+	(Info-up): Check `old-file' for `stringp'.
+	(Info-history): Use `equal' instead of `string-equal'.
+	Check `file' for `stringp'.
+	(Info-history): Use symbol `history' instead of string as first arg
+	of `Info-find-node'.
+	(Info-toc): Check `Info-current-file' for `stringp'.  Use symbol
+	`toc' instead of string.
+	(Info-extract-menu-node-name): Use `buffer-substring-no-properties'
+	instead of `buffer-substring', and `match-string-no-properties'
+	instead of `match-string'.
+	(Info-index-nodes): Check for symbols `apropos', `history', `toc'
+	instead of strings.
+	(info-apropos): Use `Info-find-node' instead of `Info-goto-node'.
+	Use symbol `apropos' instead of string.
+	(Info-copy-current-node-name): Check `Info-current-file' for
+	`stringp' and construct a command with `Info-find-node' from it.
+	(Info-fontify-node): Use `match-string-no-properties' instead of
+	`match-string' and check file names for `stringp'.
+	(Info-desktop-buffer-misc-data): Check for symbols `apropos',
+	`history', `toc' instead of strings.
+
+2006-02-17  Chong Yidong  <cyd@stupidchicken.com>
+
+	* files.el: Rearrange functions and variables in the file local
+	variables section.
+
+2006-02-17  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* files.el: Add truncate-lines, ispell-check-comments and
+	ispell-local-dictionary as safe local variables.
+
+2006-02-18  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gud.el (gud-speedbar-buttons): Use shadow face for
+	out of scope variables.
+	(gud-speedbar-buttons): Use unless.
+
+	* progmodes/gdb-ui.el (gdb-var-list): Update doc string.
+	(gdb-init-1, gdb-var-changed): Set gdb-var-changed to t initially.
+	(gdb-show-changed-values): Also use for out of scope variables.
+	(gdb-var-update-handler-1): Note if variable goes out of scope.
+
+2006-02-17  Ryan Yeske  <rcyeske@gmail.com>
+
+	* net/rcirc.el (rcirc-connect): Make all arguments optional, and
+	default to global variable values for unsupplied args.
+	(rcirc-get-buffer-create): Fix bug with setting the target.
+	(rcirc-any-buffer): Rename from rcirc-get-any-buffer, and include
+	test for rcirc-always-use-server-buffer-flag here.
+	(rcirc-response-formats): Add %N, which is a facified nick.  %n
+	uses the default face.  Change the ACTION format string.  If the
+	"nick" is the server, don't print anything for that field.
+	Comment fixes.
+	(rcirc-target-buffer): Don't test
+	rcirc-always-use-server-buffer-flag here.
+	(rcirc-print): Squeeze extra spaces out of the text before message.
+	(rcirc-put-nick-channel): Strip potential "@" char from nick
+	before adding them to nick table.
+	(rcirc-url-regexp): Improve to match address like "foo.com".
+
+2006-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* allout.el (allout-hidden-p): Move this defsubst before
+	allout-overlay-interior-modification-handler, where it is first
+	used.
+
+2006-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
+
+	* allout.el: Use allout invisible-text overlays instead of
+	selective display for concealed text.  Also, lots of general
+	cleanup, and improved compatibility code.
+
+	(allout-version) Incremented, corrected, revised, and refined
+	module commentary.
+
+	(provide 'allout): Moved to the bottom, added a require of overlay.
+
+	(allout-encrypt-unencrypted-on-saves): Defaults to t instead of
+	`except-current'.
+	(allout-write-file-hook-handler): Minimize delay.
+	(count-trailing-whitespace-region): New function so
+	auto-encryption of current topic can resituate cursor exactly.
+	PGP/GPG encryption trims trailing whitespace from lines, which
+	must be accounted for across encryption then decryption.
+
+	(allout-command-prefix): Now defaults to "\C-c<space>" rather than
+	just plain "\C-c", to avoid intruding on user's keybinding space.
+
+	(allout-toggle-current-subtree-encryption): Pass along fetch-pass
+	parameter, so user request to provide a new password is done.
+
+	(allout-outside-normal-auto-fill-function, allout-auto-fill):
+	Refined mechanism for auto-filling behavior while in allout mode.
+
+	(allout-mode): Explicitly specify the mode map in the docstring.
+	Clarify provision for various write-file hook var names.
+	Adjusted for invisible-text overlays instead of	selective-display.
+
+	(allout-depth): Really return 0 if not within any topic.  This
+	rectifies `allout-beginning-of-level' and sequence numbering
+	errors that occur when cutting and pasting numbered topics.
+	Changed from a in-line subst to a regular function, as well.
+
+	(allout-pre-next-prefix): Renamed from allout-pre-next-preface.
+
+	(allout-end-of-subtree, allout-end-of-subtree)
+	(allout-end-of-entry, allout-end-of-current-heading)
+	(allout-next-visible-heading, allout-open-topic, allout-show-entry)
+	(allout-show-children, allout-show-to-offshoot)
+	(allout-hide-current-entry, allout-show-current-entry): Rectified
+	handling of trailing blank lines between items.
+
+	(allout-line-boundary-regexp, set-allout-regexp, allout-depth)
+	(allout-current-depth, allout-unprotected, allout-hidden-p)
+	(allout-on-current-heading-p, allout-listify-exposed)
+	(allout-chart-subtree, allout-goto-prefix)
+	(allout-back-to-current-heading, allout-get-body-text)
+	(allout-snug-back, allout-flag-current-subtree, allout-show-all)
+	(allout-hide-region-body, allout-toggle-subtree-encryption)
+	(allout-encrypt-string, allout-encrypted-key-info)
+	(allout-next-topic-pending-encryption, allout-encrypt-decrypted)
+	(allout-file-vars-section-data): Adjusted for use with
+	invisible-text overlays instead of selective-display.
+
+	(allout-kill-line, allout-kill-topic, allout-yank-processing):
+	Reworked for use with invisible text overlays.
+
+	(allout-current-topic-collapsed-p): New function.
+
+	(allout-hide-current-subtree): Use allout-current-topic-collapsed-p
+	to know when to close the containing topic.
+
+	(allout-pre-command-business, allout-post-command-business):
+	Simplify undo-batching and dynamic isearch exposure.
+
+	(allout-set-overlay-category): New for invisible-text overlays.
+	Sets properties of allout-overlay-category, used by
+	allout-flag-region to set invisible-text overlay properties.
+	(allout-get-invisibility-overlay): Get the first qualifying
+	invisibility overlay, so we can find the extent of it.
+	(allout-back-to-visible-text): Get to just before the beginnining
+	of the current invisibility overlay, if any.
+
+	(allout-overlay-insert-in-front-handler)
+	(allout-overlay-interior-modification-handler)
+	(allout-before-change-handler, allout-isearch-end-handler): New
+	functions to handle extraordinary actions affecting concealed
+	text.
+
+	(allout-flag-region): Use overlays instead of selective-display
+	for invisible text - by inheritence from the properties of
+	allout-overlay-category in mainline Emacs, and applied
+	property-by-property in XEmacs, some recent versions of which
+	don't inherit the properties from the category.  Provisions to
+	respond to concealed-text edits simplified drastically.
+
+	(allout-isearch-rectification, allout-isearch-was-font-lock)
+	(allout-isearch-expose, allout-enwrap-isearch)
+	(allout-isearch-abort, allout-pre-was-isearching)
+	(allout-isearch-prior-pos, allout-isearch-did-quit)
+	(allout-isearch-dynamic-expose)
+	(allout-hide-current-entry-completely): Functions deleted.
+
+	(allout-undo-aggregation): Explicit undo aggregation no longer
+	necessary due to transition away from selective-display.
+
+	(set-allout-regexp, allout-up-current-level)
+	(allout-next-visible-heading, allout-forward-current-level)
+	(allout-open-topic, allout-reindent-body, allout-rebullet-topic)
+	(allout-kill-line, allout-yank-processing, allout-show-children)
+	(allout-expose-topic, allout-old-expose-topic)
+	(allout-listify-exposed, allout-insert-latex-header)
+	(allout-toggle-subtree-encryption, allout-encrypt-string)
+	(remove-from-invisibility-spec, allout-hide-current-subtree):
+	Ditched unused variables.
+
+2006-02-17  Agustin Martin  <agustin.martin@hispalinux.es>
+
+	* textmodes/ispell.el (ispell-change-dictionary): Call
+	ispell-buffer-local-dict instead of
+	ispell-accept-buffer-local-defs.
+	(ispell-local-dictionary-alist): Accept as valid any coding-system
+	supported by Emacs.
+	(ispell-dictionary-alist-3): Esperanto dictionary's coding system
+	changed to iso-8859-3.
+
+2006-02-17  Nick Roberts  <nickrob@snap.net.nz>
+
+	* speedbar.el (speedbar-frame-width): Make an inline function
+	instead of a macro.  Use frame-width.
+	(speedbar-try-completion, speedbar-update-contents)
+	(speedbar-timer-fn): Use consp.
+	(speedbar-update-localized-contents): Try to preserve point.
+
+	* progmodes/gdb-ui.el (gdba, gdb-var-list): Improve doc strings.
+	(menu): Re-order menu items.
+	(gdb-var-update-regexp, gdb-var-update-regexp-1): Match "in_scope"
+	field.
+	(gdb-var-update-handler-1): Use it for GDB 6.4+.
+	(gdb-post-prompt): Speed things by not forcing update.
+
+2006-02-16  Chong Yidong  <cyd@stupidchicken.com>
+
+	* wid-edit.el (widget-button-click): For mouse-1, cancel button
+	press and perform default action if we get a mouse movement event.
+
 2006-02-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* calendar/icalendar.el (icalendar--get-event-property)
diff --git a/lisp/allout.el b/lisp/allout.el
index 78e61dacde2..69d72506fce 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1,12 +1,12 @@
 ;;; allout.el --- extensive outline mode for use alone and with other modes
 
 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Created: Dec 1991 - first release to usenet
-;; Version: 2.1
+;; Version: 2.2
 ;; Keywords: outlines wp languages
 
 ;; This file is part of GNU Emacs.
@@ -28,36 +28,39 @@
 
 ;;; Commentary:
 
-;; Allout outline mode provides extensive outline formatting and
-;; and manipulation beyond standard emacs outline mode.  It provides
-;; for structured editing of outlines, as well as navigation and
-;; exposure.  It also provides for syntax-sensitive text like
-;; programming languages.  (For an example, see the allout code
-;; itself, which is organized in ;; an outline framework.)
+;; Allout outline minor mode provides extensive outline formatting and
+;; and manipulation beyond standard emacs outline mode.  Some features:
 ;;
-;; Some features:
-;;
-;;  - classic outline-mode topic-oriented navigation and exposure adjustment
-;;  - topic-oriented editing including coherent topic and subtopic
-;;    creation, promotion, demotion, cut/paste across depths, etc
-;;  - incremental search with dynamic exposure and reconcealment of text
-;;  - customizable bullet format enbles programming-language specific
-;;    outlining, for ultimate code-folding editing.  (allout code itself is
-;;    formatted as an outline - do ESC-x eval-current-buffer in allout.el
-;;    to try it out.)
-;;  - configurable per-file initial exposure settings
-;;  - symmetric-key and key-pair topic encryption, plus symmetric passphrase
+;;  - Classic outline-mode topic-oriented navigation and exposure adjustment
+;;  - Topic-oriented editing including coherent topic and subtopic
+;;    creation, promotion, demotion, cut/paste across depths, etc.
+;;  - Incremental search with dynamic exposure and reconcealment of text
+;;  - Customizable bullet format - enables programming-language specific
+;;    outlining, for code-folding editing.  (Allout code itself is to try it;
+;;    formatted as an outline - do ESC-x eval-current-buffer in allout.el; but
+;;    emacs local file variables need to be enabled when the
+;;    file was visited - see `enable-local-variables'.)
+;;  - Configurable per-file initial exposure settings
+;;  - Symmetric-key and key-pair topic encryption, plus symmetric passphrase
 ;;    mnemonic support, with verification against an established passphrase
 ;;    (using a stashed encrypted dummy string) and user-supplied hint
-;;    maintenance.  (see allout-toggle-current-subtree-encryption docstring.)
-;;  - automatic topic-number maintenance
-;;  - "hot-spot" operation, for single-keystroke maneuvering and
+;;    maintenance.  (See allout-toggle-current-subtree-encryption docstring.)
+;;  - Automatic topic-number maintenance
+;;  - "Hot-spot" operation, for single-keystroke maneuvering and
 ;;    exposure control (see the allout-mode docstring)
-;;  - easy rendering of exposed portions into numbered, latex, indented, etc
+;;  - Easy rendering of exposed portions into numbered, latex, indented, etc
 ;;    outline styles
+;;  - Careful attention to whitespace - enabling blank lines between items
+;;    and maintenance of hanging indentation (in paragraph auto-fill and
+;;    across topic promotion and demotion) of topic bodies consistent with
+;;    indentation of their topic header.
 ;;
 ;; and more.
 ;;
+;; See the `allout-mode' function's docstring for an introduction to the
+;; mode.  The development version and helpful notes are available at
+;; http://myriadicity.net/Sundry/EmacsAllout .
+;;
 ;; The outline menubar additions provide quick reference to many of
 ;; the features, and see the docstring of the variable `allout-init'
 ;; for instructions on priming your emacs session for automatic
@@ -75,20 +78,18 @@
 
 ;;; Code:
 
-;;;_* Provide
-;(provide 'outline)
-(provide 'allout)
-
 ;;;_* Dependency autoloads
+(require 'overlay)
 (eval-when-compile (progn (require 'pgg)
                           (require 'pgg-gpg)
-			  (fset 'allout-real-isearch-abort
-				(symbol-function 'isearch-abort))
+                          (require 'overlay)
 			  ))
 (autoload 'pgg-gpg-symmetric-key-p "pgg-gpg"
   "True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.")
 
 ;;;_* USER CUSTOMIZATION VARIABLES:
+
+;;;_ > defgroup allout
 (defgroup allout nil
   "Extensive outline mode for use alone and with other modes."
   :prefix "allout-"
@@ -151,7 +152,7 @@ lines at the bottom of an Emacs Lisp file:
 will, modulo the above-mentioned conditions, cause the mode to be
 activated when the file is visited, followed by the equivalent of
 `\(allout-expose-topic 0 : -1 -1 0)'.  \(This is the layout used for
-the allout.el, itself.)
+the allout.el source file.)
 
 Also, allout's mode-specific provisions will make topic prefixes default
 to the comment-start string, if any, of the language of the file.  This
@@ -450,7 +451,7 @@ variable for details about allout ajustment of file variables."
   :group 'allout)
 (make-variable-buffer-local 'allout-passphrase-hint-handling)
 ;;;_  = allout-encrypt-unencrypted-on-saves
-(defcustom allout-encrypt-unencrypted-on-saves 'except-current
+(defcustom allout-encrypt-unencrypted-on-saves t
   "*When saving, should topics pending encryption be encrypted?
 
 The idea is to prevent file-system exposure of any un-encrypted stuff, and
@@ -485,8 +486,11 @@ disable auto-saves for that file."
 ;;;_ + Miscellaneous customization
 
 ;;;_  = allout-command-prefix
-(defcustom allout-command-prefix "\C-c"
-  "*Key sequence to be used as prefix for outline mode command key bindings."
+(defcustom allout-command-prefix "\C-c "
+  "*Key sequence to be used as prefix for outline mode command key bindings.
+
+Default is '\C-c<space>'; just '\C-c' is more short-and-sweet, if you're
+willing to let allout use a bunch of \C-c keybindings."
   :type 'string
   :group 'allout)
 
@@ -538,23 +542,12 @@ unless optional third, non-nil element is present.")
 	("=t" allout-latexify-exposed)
 	("=p" allout-flatten-exposed-to-buffer)))
 
-;;;_  = allout-isearch-dynamic-expose
-(defcustom allout-isearch-dynamic-expose t
-  "*Non-nil enable dynamic exposure of hidden incremental-search
-targets as they're encountered."
-  :type 'boolean
-  :group 'allout)
-(make-variable-buffer-local 'allout-isearch-dynamic-expose)
-
 ;;;_  = allout-use-hanging-indents
 (defcustom allout-use-hanging-indents t
   "*If non-nil, topic body text auto-indent defaults to indent of the header.
 Ie, it is indented to be just past the header prefix.  This is
 relevant mostly for use with indented-text-mode, or other situations
-where auto-fill occurs.
-
-\[This feature no longer depends in any way on the `filladapt.el'
-lisp-archive package.\]"
+where auto-fill occurs."
   :type 'boolean
   :group 'allout)
 (make-variable-buffer-local 'allout-use-hanging-indents)
@@ -597,7 +590,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring."
 ;;;_ #1 Internal Outline Formatting and Configuration
 ;;;_  : Version
 ;;;_   = allout-version
-(defvar allout-version "2.1"
+(defvar allout-version "2.2"
   "Version of currently loaded outline package.  \(allout.el)")
 ;;;_   > allout-version
 (defun allout-version (&optional here)
@@ -636,9 +629,9 @@ and `allout-distinctive-bullets-string'.")
 (defvar allout-line-boundary-regexp ()
   "`allout-regexp' with outline style beginning-of-line anchor.
 
-\(Ie, C-j, *or* C-m, for prefixes of hidden topics).  This is properly
-set when `allout-regexp' is produced by `set-allout-regexp', so
-that (match-beginning 2) and (match-end 2) delimit the prefix.")
+This is properly set when `allout-regexp' is produced by
+`set-allout-regexp', so that (match-beginning 2) and (match-end
+2) delimit the prefix.")
 (make-variable-buffer-local 'allout-line-boundary-regexp)
 ;;;_   = allout-bob-regexp
 (defvar allout-bob-regexp ()
@@ -753,11 +746,9 @@ Works with respect to `allout-plain-bullets-string' and
         cur-string
         cur-len
         cur-char
-        cur-char-string
-        index
-        new-string)
+        index)
     (while strings
-      (setq new-string "") (setq index 0)
+      (setq index 0)
       (setq cur-len (length (setq cur-string (symbol-value (car strings)))))
       (while (< index cur-len)
         (setq cur-char (aref cur-string index))
@@ -788,7 +779,7 @@ Works with respect to `allout-plain-bullets-string' and
                                allout-primary-bullet
                                "+\\|\^l"))
   (setq allout-line-boundary-regexp
-        (concat "\\([\n\r]\\)\\(" allout-regexp "\\)"))
+        (concat "\\(\n\\)\\(" allout-regexp "\\)"))
   (setq allout-bob-regexp
         (concat "\\(\\`\\)\\(" allout-regexp "\\)"))
   )
@@ -955,42 +946,28 @@ from the list."
           (setq allout-mode-prior-settings rebuild)))))
   )
 ;;;_  : Mode-specific incidentals
-;;;_   = allout-pre-was-isearching nil
-(defvar allout-pre-was-isearching nil
-  "Cue for isearch-dynamic-exposure mechanism, implemented in
-allout-pre- and -post-command-hooks.")
-(make-variable-buffer-local 'allout-pre-was-isearching)
-;;;_   = allout-isearch-prior-pos nil
-(defvar allout-isearch-prior-pos nil
-  "Cue for isearch-dynamic-exposure tracking, used by
-`allout-isearch-expose'.")
-(make-variable-buffer-local 'allout-isearch-prior-pos)
-;;;_   = allout-isearch-did-quit
-(defvar allout-isearch-did-quit nil
-  "Distinguishes isearch conclusion and cancellation.
-
-Maintained by allout-isearch-abort \(which is wrapped around the real
-isearch-abort), and monitored by allout-isearch-expose for action.")
-(make-variable-buffer-local 'allout-isearch-did-quit)
 ;;;_   > allout-unprotected (expr)
 (defmacro allout-unprotected (expr)
-  "Enable internal outline operations to alter read-only text."
-  `(let ((was-inhibit-r-o inhibit-read-only))
-     (unwind-protect
-         (progn
-           (setq inhibit-read-only t)
-           ,expr)
-       (setq inhibit-read-only was-inhibit-r-o)
-       )
-     )
-  )
-;;;_   = allout-undo-aggregation
-(defvar allout-undo-aggregation 30
-  "Amount of successive self-insert actions to bunch together per undo.
+  "Enable internal outline operations to alter invisible text."
+  `(let ((inhibit-read-only t))
+     ,expr))
+;;;_   = allout-mode-hook
+(defvar allout-mode-hook nil
+  "*Hook that's run when allout mode starts.")
+;;;_   = allout-overlay-category
+(defvar allout-overlay-category nil
+  "Symbol for use in allout invisible-text overlays as the category.")
+;;;_   = allout-view-change-hook
+(defvar allout-view-change-hook nil
+  "*Hook that's run after allout outline visibility changes.")
 
-This is purely a kludge variable, regulating the compensation for a bug in
-the way that `before-change-functions' and undo interact.")
-(make-variable-buffer-local 'allout-undo-aggregation)
+;;;_   = allout-outside-normal-auto-fill-function
+(defvar allout-outside-normal-auto-fill-function nil
+  "Value of normal-auto-fill-function outside of allout mode.
+
+Used by allout-auto-fill to do the mandated normal-auto-fill-function
+wrapped within allout's automatic fill-prefix setting.")
+(make-variable-buffer-local 'allout-outside-normal-auto-fill-function)
 ;;;_   = file-var-bug hack
 (defvar allout-v18/19-file-var-hack nil
   "Horrible hack used to prevent invalid multiple triggering of outline
@@ -1059,7 +1036,7 @@ was encrypted automatically as part of a file write or autosave.")
                           (allout-next-topic-pending-encryption except-mark))
           (progn
             (message "auto-encrypting pending topics")
-            (sit-for 2)
+            (sit-for 0)
             (condition-case failure
                 (setq allout-after-save-decrypt
                       (allout-encrypt-decrypted except-mark))
@@ -1184,7 +1161,6 @@ the following two lines in your Emacs init file:
 			((message
 			  "Outline mode auto-activation and -layout enabled.")
 			 'full)))))))
-
 ;;;_  > allout-setup-menubar ()
 (defun allout-setup-menubar ()
   "Populate the current buffer's menubar with `allout-mode' stuff."
@@ -1197,12 +1173,37 @@ the following two lines in your Emacs init file:
       (setq cur (car menus)
 	    menus (cdr menus))
       (easy-menu-add cur))))
+;;;_  > allout-set-overlay-category
+(defun allout-set-overlay-category ()
+  "Set the properties of the allout invisible-text overlay."
+  (setplist 'allout-overlay-category nil)
+  (put 'allout-overlay-category 'invisible 'allout)
+  (put 'allout-overlay-category 'evaporate t)
+  ;; XXX We use isearch-open-invisible *and* isearch-mode-end-hook.  The
+  ;; latter would be sufficient, but it seems that a separate behavior -
+  ;; the _transient_ opening of invisible text during isearch - is keyed to
+  ;; presence of the isearch-open-invisible property - even though this
+  ;; property controls the isearch _arrival_ behavior.  This is the case at
+  ;; least in emacs 21, 22.0, and xemacs 21.4.
+  (put 'allout-overlay-category 'isearch-open-invisible
+       'allout-isearch-end-handler)
+  (if (featurep 'xemacs)
+      (put 'allout-overlay-category 'start-open t)
+    (put 'allout-overlay-category 'insert-in-front-hooks
+         '(allout-overlay-insert-in-front-handler)))
+  (if (featurep 'xemacs)
+      (progn (make-variable-buffer-local 'before-change-functions)
+             (add-hook 'before-change-functions
+                       'allout-before-change-handler))
+    (put 'allout-overlay-category 'modification-hooks
+         '(allout-overlay-interior-modification-handler))))
 ;;;_  > allout-mode (&optional toggle)
 ;;;_   : Defun:
 ;;;###autoload
 (defun allout-mode (&optional toggle)
 ;;;_    . Doc string:
   "Toggle minor mode for controlling exposure and editing of text outlines.
+\\<allout-mode-map>
 
 Optional arg forces mode to re-initialize iff arg is positive num or
 symbol.  Allout outline mode always runs as a minor mode.
@@ -1244,62 +1245,69 @@ The bindings are dictated by the `allout-keybindings-list' and
 \\[allout-forward-current-level] allout-forward-current-level    | \\[allout-show-current-entry] allout-show-current-entry
 \\[allout-backward-current-level] allout-backward-current-level   | \\[allout-show-all] allout-show-all
 \\[allout-end-of-entry] allout-end-of-entry
-\\[allout-beginning-of-current-entry,] allout-beginning-of-current-entry, alternately, goes to hot-spot
+\\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot
 
 	Topic Header Production:
 	-----------------------
-\\[allout-open-sibtopic]  allout-open-sibtopic	Create a new sibling after current topic.
-\\[allout-open-subtopic]  allout-open-subtopic	... an offspring of current topic.
-\\[allout-open-supertopic]  allout-open-supertopic	... a sibling of the current topic's parent.
+\\[allout-open-sibtopic]	allout-open-sibtopic	Create a new sibling after current topic.
+\\[allout-open-subtopic]	allout-open-subtopic	... an offspring of current topic.
+\\[allout-open-supertopic]	allout-open-supertopic	... a sibling of the current topic's parent.
 
 	Topic Level and Prefix Adjustment:
 	---------------------------------
-\\[allout-shift-in]  allout-shift-in	Shift current topic and all offspring deeper.
-\\[allout-shift-out]  allout-shift-out	... less deep.
-\\[allout-rebullet-current-heading]  allout-rebullet-current-heading Prompt for alternate bullet for
+\\[allout-shift-in]	allout-shift-in	Shift current topic and all offspring deeper.
+\\[allout-shift-out]	allout-shift-out	... less deep.
+\\[allout-rebullet-current-heading]	allout-rebullet-current-heading Prompt for alternate bullet for
 					 current topic.
 \\[allout-rebullet-topic]	allout-rebullet-topic	Reconcile bullets of topic and its offspring
 				- distinctive bullets are not changed, others
 				  alternated according to nesting depth.
-\\[allout-number-siblings]  allout-number-siblings	Number bullets of topic and siblings - the
+\\[allout-number-siblings]	allout-number-siblings	Number bullets of topic and siblings - the
 				offspring are not affected.  With repeat
 				count, revoke numbering.
 
 	Topic-oriented Killing and Yanking:
 	----------------------------------
-\\[allout-kill-topic]     allout-kill-topic	Kill current topic, including offspring.
-\\[allout-kill-line]     allout-kill-line	Like kill-line, but reconciles numbering, etc.
-\\[allout-yank]     allout-yank		Yank, adjusting depth of yanked topic to
+\\[allout-kill-topic]	allout-kill-topic	Kill current topic, including offspring.
+\\[allout-kill-line]	allout-kill-line	Like kill-line, but reconciles numbering, etc.
+\\[allout-yank]	allout-yank		Yank, adjusting depth of yanked topic to
 				depth of heading if yanking into bare topic
 				heading (ie, prefix sans text).
-\\[allout-yank-pop]     allout-yank-pop	Is to allout-yank as yank-pop is to yank
+\\[allout-yank-pop]	allout-yank-pop	Is to allout-yank as yank-pop is to yank
+
+	Topic-oriented Encryption:
+	-------------------------
+\\[allout-toggle-current-subtree-encryption]	allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content
 
 	Misc commands:
 	-------------
 M-x outlineify-sticky		Activate outline mode for current buffer,
 				and establish a default file-var setting
 				for `allout-layout'.
-\\[allout-mark-topic]     allout-mark-topic
+\\[allout-mark-topic]   	allout-mark-topic
 \\[allout-copy-exposed-to-buffer]     allout-copy-exposed-to-buffer
 				Duplicate outline, sans concealed text, to
 				buffer with name derived from derived from that
 				of current buffer - \"*BUFFERNAME exposed*\".
-\\[allout-flatten-exposed-to-buffer]     allout-flatten-exposed-to-buffer
+\\[allout-flatten-exposed-to-buffer]	allout-flatten-exposed-to-buffer
 				Like above 'copy-exposed', but convert topic
 				prefixes to section.subsection... numeric
 				format.
-ESC ESC (allout-init t)	Setup Emacs session for outline mode
+\\[eval-expression] (allout-init t)	Setup Emacs session for outline mode
 				auto-activation.
 
-                  Encrypted Entries
+                  Topic Encryption
 
-Outline mode supports easily togglable gpg encryption of topics, with
-niceties like support for symmetric and key-pair modes, passphrase timeout,
-passphrase consistency checking, user-provided hinting for symmetric key
-mode, and auto-encryption of topics pending encryption on save.  The aim is
-to enable reliable topic privacy while preventing accidents like neglected
-encryption, encryption with a mistaken passphrase, forgetting which
-passphrase was used, and other practical pitfalls.
+Outline mode supports gpg encryption of topics, with support for
+symmetric and key-pair modes, passphrase timeout, passphrase
+consistency checking, user-provided hinting for symmetric key
+mode, and auto-encryption of topics pending encryption on save.
+\(Topics pending encryption are, by default, automatically
+encrypted during file saves; if you're editing the contents of
+such a topic, it is automatically decrypted for continued
+editing.)  The aim is reliable topic privacy while preventing
+accidents like neglected encryption before saves, forgetting
+which passphrase was used, and other practical pitfalls.
 
 See `allout-toggle-current-subtree-encryption' function docstring and
 `allout-encrypt-unencrypted-on-saves' customization variable for details.
@@ -1309,22 +1317,21 @@ See `allout-toggle-current-subtree-encryption' function docstring and
 Hot-spot operation provides a means for easy, single-keystroke outline
 navigation and exposure control.
 
-\\<allout-mode-map>
 When the text cursor is positioned directly on the bullet character of
 a topic, regular characters (a to z) invoke the commands of the
 corresponding allout-mode keymap control chars.  For example, \"f\"
-would invoke the command typically bound to \"C-c C-f\"
+would invoke the command typically bound to \"C-c<space>C-f\"
 \(\\[allout-forward-current-level] `allout-forward-current-level').
 
-Thus, by positioning the cursor on a topic bullet, you can execute
-the outline navigation and manipulation commands with a single
-keystroke.  Non-literal chars never get this special translation, so
-you can use them to get away from the hot-spot, and back to normal
-operation.
+Thus, by positioning the cursor on a topic bullet, you can
+execute the outline navigation and manipulation commands with a
+single keystroke.  Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get
+this special translation, so you can use them to get out of the
+hot-spot and back to normal operation.
 
 Note that the command `allout-beginning-of-current-entry' \(\\[allout-beginning-of-current-entry]\)
 will move to the hot-spot when the cursor is already located at the
-beginning of the current entry, so you can simply hit \\[allout-beginning-of-current-entry]
+beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry]
 twice in a row to get to the hot-spot.
 
 			    Terminology
@@ -1332,7 +1339,7 @@ twice in a row to get to the hot-spot.
 Topic hierarchy constituents - TOPICS and SUBTOPICS:
 
 TOPIC:	A basic, coherent component of an Emacs outline.  It can
-	contain other topics, and it can be subsumed by other topics,
+	contain and be contained by other topics.
 CURRENT topic:
 	The visible topic most immediately containing the cursor.
 DEPTH:	The degree of nesting of a topic; it increases with
@@ -1376,13 +1383,13 @@ PREFIX-LEAD:
 	docstring for more detail.
 PREFIX-PADDING:
 	Spaces or asterisks which separate the prefix-lead and the
-	bullet, according to the depth of the topic.
+	bullet, determining the depth of the topic.
 BULLET: A character at the end of the topic prefix, it must be one of
 	the characters listed on `allout-plain-bullets-string' or
         `allout-distinctive-bullets-string'.  (See the documentation
         for these variables for more details.)  The default choice of
-	bullet when generating varies in a cycle with the depth of the
-	topic.
+	bullet when generating topics varies in a cycle with the depth of
+	the topic.
 ENTRY:	The text contained in a topic before any offspring.
 BODY:	Same as ENTRY.
 
@@ -1393,7 +1400,6 @@ EXPOSURE:
 CONCEALED:
 	Topics and entry text whose display is inhibited.  Contiguous
 	units of concealed text is represented by `...' ellipses.
-	(Ref the `selective-display' var.)
 
 	Concealed topics are effectively collapsed within an ancestor.
 CLOSED:	A topic whose immediate offspring and body-text is concealed.
@@ -1415,9 +1421,11 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
 	 ;; allout-mode already called once during this complex command?
 	 (same-complex-command (eq allout-v18/19-file-var-hack
 				  (car command-history)))
-         (write-file-hook-var-name (if (boundp 'write-file-functions)
-                                       'write-file-functions
-                                     'local-write-file-hooks))
+         (write-file-hook-var-name (cond ((boundp 'write-file-functions)
+                                          'write-file-functions)
+                                         ((boundp 'write-file-hooks)
+                                          'write-file-hooks)
+                                         (t 'local-write-file-hooks)))
 	 do-layout
 	 )
 
@@ -1465,9 +1473,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
 	  (progn
 	   (allout-resumptions 'allout-primary-bullet)
 	   (allout-resumptions 'allout-old-style-prefixes)))
-      (allout-resumptions 'selective-display)
-      (if (and (boundp 'before-change-functions) before-change-functions)
-	  (allout-resumptions 'before-change-functions))
+      ;;(allout-resumptions 'selective-display)
+      (remove-from-invisibility-spec '(allout . t))
       (set write-file-hook-var-name
 	   (delq 'allout-write-file-hook-handler
                  (symbol-value write-file-hook-var-name)))
@@ -1476,9 +1483,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
 		 auto-save-hook))
       (allout-resumptions 'paragraph-start)
       (allout-resumptions 'paragraph-separate)
-      (allout-resumptions (if (string-match "^18" emacs-version)
-			      'auto-fill-hook
-			    'auto-fill-function))
+      (allout-resumptions 'auto-fill-function)
+      (allout-resumptions 'normal-auto-fill-function)
       (allout-resumptions 'allout-former-auto-filler)
       (setq allout-mode nil))
 
@@ -1490,6 +1496,8 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
 	   (allout-resumptions 'allout-primary-bullet '("*"))
 	   (allout-resumptions 'allout-old-style-prefixes '(()))))
 
+      (allout-set-overlay-category)     ; Doesn't hurt to redo this.
+
       (allout-infer-header-lead)
       (allout-infer-body-reindent)
 
@@ -1525,25 +1533,24 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
 						(current-local-map)))
 	)
 
-				       ; selective-display is the
-				       ; emacs conditional exposure
-				       ; mechanism:
-      (allout-resumptions 'selective-display '(t))
+      (add-to-invisibility-spec '(allout . t))
+      (make-local-variable 'line-move-ignore-invisible)
+      (setq line-move-ignore-invisible t)
       (add-hook 'pre-command-hook 'allout-pre-command-business)
       (add-hook 'post-command-hook 'allout-post-command-business)
+      (add-hook 'isearch-mode-end-hook 'allout-isearch-end-handler)
       (add-hook write-file-hook-var-name 'allout-write-file-hook-handler)
       (add-hook 'auto-save-hook 'allout-auto-save-hook-handler)
 				       ; Custom auto-fill func, to support
 				       ; respect for topic headline,
 				       ; hanging-indents, etc:
-      (let* ((fill-func-var (if (string-match "^18" emacs-version)
-			       'auto-fill-hook
-			     'auto-fill-function))
-	    (fill-func (symbol-value fill-func-var)))
-	;; Register prevailing fill func for use by allout-auto-fill:
-	(allout-resumptions 'allout-former-auto-filler (list fill-func))
-	;; Register allout-auto-fill to be used if filling is active:
-	(allout-resumptions fill-func-var '(allout-auto-fill)))
+      ;; Register prevailing fill func for use by allout-auto-fill:
+      (allout-resumptions 'allout-former-auto-filler (list auto-fill-function))
+      ;; Register allout-auto-fill to be used if filling is active:
+      (allout-resumptions 'auto-fill-function '(allout-auto-fill))
+      (allout-resumptions 'allout-outside-normal-auto-fill-function
+                          (list normal-auto-fill-function))
+      (allout-resumptions 'normal-auto-fill-function '(allout-auto-fill))
       ;; Paragraphs are broken by topic headlines.
       (make-local-variable 'paragraph-start)
       (allout-resumptions 'paragraph-start
@@ -1563,10 +1570,6 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
       (if allout-layout
 	  (setq do-layout t))
 
-      (if (and allout-isearch-dynamic-expose
-	       (not (fboundp 'allout-real-isearch-abort)))
-	  (allout-enwrap-isearch))
-
       (run-hooks 'allout-mode-hook)
       (setq allout-mode t))
 
@@ -1602,9 +1605,92 @@ OPEN:	A topic that is not closed, though its offspring or body may be."
     allout-mode
     )					; let*
   )  					; defun
+
+;;;_  - Position Assessment
+;;;_   > allout-hidden-p (&optional pos)
+(defsubst allout-hidden-p (&optional pos)
+  "Non-nil if the character after point is invisible."
+  (get-char-property (or pos (point)) 'invisible))
+
 ;;;_  > allout-minor-mode
 (defalias 'allout-minor-mode 'allout-mode)
 
+;;;_  > allout-overlay-insert-in-front-handler (ol after beg end
+;;;                                                &optional prelen)
+(defun allout-overlay-insert-in-front-handler (ol after beg end
+                                                  &optional prelen)
+  "Shift the overlay so stuff inserted in front of it are excluded."
+  (if after
+      (move-overlay ol (1+ beg) (overlay-end ol))))
+;;;_  > allout-overlay-interior-modification-handler (ol after beg end
+;;;                                                      &optional prelen)
+(defun allout-overlay-interior-modification-handler (ol after beg end
+                                                        &optional prelen)
+  "Get confirmation before making arbitrary changes to invisible text.
+
+We expose the invisible text and ask for confirmation.  Refusal or
+keyboard-quit abandons the changes, with keyboard-quit additionally
+reclosing the opened text.
+
+No confirmation is necessary when inhibit-read-only is set - eg, allout
+internal functions use this feature cohesively bunch changes."
+
+  (when (and (not inhibit-read-only) (not after))
+    (let ((start (point))
+          (ol-start (overlay-start ol))
+          (ol-end (overlay-end ol))
+          (msg "Change within concealed text disallowed.")
+          opened
+          first)
+      (goto-char beg)
+      (while (< (point) end)
+        (when (allout-hidden-p)
+          (allout-show-to-offshoot)
+          (if (allout-hidden-p)
+              (save-excursion (forward-char 1)
+                              (allout-show-to-offshoot)))
+          (when (not first)
+            (setq opened t)
+            (setq first (point))))
+        (goto-char (if (featurep 'xemacs)
+                       (next-property-change (1+ (point)) nil end)
+                     (next-char-property-change (1+ (point)) end))))
+      (when first
+        (goto-char first)
+        (condition-case nil
+            (if (not
+                 (yes-or-no-p
+                  (substitute-command-keys
+                   (concat "Modify this concealed text?  (\"no\" aborts,"
+                           " \\[keyboard-quit] also reconceals) "))))
+                (progn (goto-char start)
+                       (error "Concealed-text change refused.")))
+          (quit (allout-flag-region ol-start ol-end nil)
+                (allout-flag-region ol-start ol-end t)
+                (error "Concealed-text change abandoned, text reconcealed."))))
+      (goto-char start))))
+;;;_  > allout-before-change-handler (beg end)
+(defun allout-before-change-handler (beg end)
+  "Protect against changes to invisible text.
+
+See allout-overlay-interior-modification-handler for details.
+
+This before-change handler is used only where modification-hooks
+overlay property is not supported."
+  (if (not allout-mode)
+      nil
+    (allout-overlay-interior-modification-handler nil nil beg end nil)))
+;;;_  > allout-isearch-end-handler (&optional overlay)
+(defun allout-isearch-end-handler (&optional overlay)
+  "Reconcile allout outline exposure on arriving in hidden text after isearch.
+
+Optional OVERLAY parameter is for when this function is used by
+`isearch-open-invisible' overlay property.  It is otherwise unused, so this
+function can also be used as an `isearch-mode-end-hook'."
+
+  (if (and (allout-mode-p) (allout-hidden-p))
+      (allout-show-to-offshoot)))
+
 ;;;_ #3 Internal Position State-Tracking - "allout-recent-*" funcs
 ;;; All the basic outline functions that directly do string matches to
 ;;; evaluate heading prefix location set the variables
@@ -1667,7 +1753,6 @@ to return the current depth of the most recently matched topic."
 
 ;;;_ #4 Navigation
 
-;;;_  - Position Assessment
 ;;;_   : Location Predicates
 ;;;_    > allout-on-current-heading-p ()
 (defun allout-on-current-heading-p ()
@@ -1675,7 +1760,7 @@ to return the current depth of the most recently matched topic."
 
 Actually, returns prefix beginning point."
   (save-excursion
-    (beginning-of-line)
+    (allout-beginning-of-current-line)
     (and (looking-at allout-regexp)
 	 (allout-prefix-data (match-beginning 0) (match-end 0)))))
 ;;;_    > allout-on-heading-p ()
@@ -1686,39 +1771,36 @@ Actually, returns prefix beginning point."
   (and (save-excursion (beginning-of-line)
 		       (looking-at allout-regexp))
        (= (point)(save-excursion (allout-end-of-prefix)(point)))))
-;;;_    > allout-hidden-p ()
-(defmacro allout-hidden-p ()
-  "True if point is in hidden text."
-  '(save-excursion
-     (and (re-search-backward "[\n\r]" () t)
-	  (= ?\r (following-char)))))
-;;;_    > allout-visible-p ()
-(defmacro allout-visible-p ()
-  "True if point is not in hidden text."
-  (interactive)
-  '(not (allout-hidden-p)))
 ;;;_   : Location attributes
 ;;;_    > allout-depth ()
-(defsubst allout-depth ()
-  "Like `allout-current-depth', but respects hidden as well as visible topics."
+(defun allout-depth ()
+  "Return depth of topic most immediately containing point.
+
+Return zero if point is not within any topic.
+
+Like `allout-current-depth', but respects hidden as well as visible topics."
   (save-excursion
-    (if (allout-goto-prefix)
-	(allout-recent-depth)
-      (progn
-	;; Oops, no prefix, zero prefix data:
-	(allout-prefix-data (point)(point))
-	;; ... and return 0:
-	0))))
+    (let ((start-point (point)))
+      (if (and (allout-goto-prefix)
+               (not (< start-point (point))))
+          (allout-recent-depth)
+        (progn
+          ;; Oops, no prefix, zero prefix data:
+          (allout-prefix-data (point)(point))
+          ;; ... and return 0:
+          0)))))
 ;;;_    > allout-current-depth ()
-(defmacro allout-current-depth ()
-  "Return nesting depth of visible topic most immediately containing point."
-  '(save-excursion
-     (if (allout-back-to-current-heading)
-	 (max 1
-	      (- allout-recent-prefix-end
-		 allout-recent-prefix-beginning
-		 allout-header-subtraction))
-       0)))
+(defun allout-current-depth ()
+  "Return depth of visible topic most immediately containing point.
+
+Return zero if point is not within any topic."
+  (save-excursion
+    (if (allout-back-to-current-heading)
+        (max 1
+             (- allout-recent-prefix-end
+                allout-recent-prefix-beginning
+                allout-header-subtraction))
+      0)))
 ;;;_    > allout-get-current-prefix ()
 (defun allout-get-current-prefix ()
   "Topic prefix of the current topic."
@@ -1734,7 +1816,7 @@ Actually, returns prefix beginning point."
 ;;;_    > allout-current-bullet ()
 (defun allout-current-bullet ()
   "Return bullet of current (visible) topic heading, or none if none found."
-  (condition-case err
+  (condition-case nil
       (save-excursion
 	(allout-back-to-current-heading)
 	(buffer-substring (- allout-recent-prefix-end 1)
@@ -1783,7 +1865,31 @@ Outermost is first."
     rev-sibls)
   )
 
-;;;_  - Navigation macros
+;;;_  - Navigation routines
+;;;_   > allout-beginning-of-current-line ()
+(defun allout-beginning-of-current-line ()
+  "Like beginning of line, but to visible text."
+
+  ;; XXX We would use `(move-beginning-of-line 1)', but it gets
+  ;; stuck on some hidden newlines, eg at column 80, as of GNU Emacs 22.0.50.
+  ;; Conversely, `beginning-of-line' can make no progress in other
+  ;; situations.  Both are necessary, in the order used below.
+  (move-beginning-of-line 1)
+  (beginning-of-line)
+  (while (or (not (bolp)) (allout-hidden-p))
+    (beginning-of-line)
+    (if (or (allout-hidden-p) (not (bolp)))
+        (forward-char -1))))
+;;;_   > allout-end-of-current-line ()
+(defun allout-end-of-current-line ()
+  "Move to the end of line, past concealed text if any."
+  ;; XXX This is for symmetry with `allout-beginning-of-current-line' -
+  ;; `move-end-of-line' doesn't suffer the same problem as
+  ;; `move-beginning-of-line'.
+  (end-of-line)
+  (while (allout-hidden-p)
+    (end-of-line)
+    (if (allout-hidden-p) (forward-char 1))))
 ;;;_   > allout-next-heading ()
 (defsubst allout-next-heading ()
   "Move to the heading for the topic \(possibly invisible) before this one.
@@ -1798,7 +1904,7 @@ Returns the location of the heading, or nil if none found."
        (goto-char (or (match-beginning 2)
 		      allout-recent-prefix-beginning))
        (or (match-end 2) allout-recent-prefix-end))))
-;;;_   : allout-this-or-next-heading
+;;;_   > allout-this-or-next-heading
 (defun allout-this-or-next-heading ()
   "Position cursor on current or next heading."
   ;; A throwaway non-macro that is defined after allout-next-heading
@@ -1822,6 +1928,21 @@ Return the location of the beginning of the heading, or nil if not found."
 	    (goto-char (or (match-beginning 2)
 			   allout-recent-prefix-beginning))
 	    (or (match-end 2) allout-recent-prefix-end))))))
+;;;_   > allout-get-invisibility-overlay ()
+(defun allout-get-invisibility-overlay ()
+  "Return the overlay at point that dictates allout invisibility."
+  (let ((overlays (overlays-at (point)))
+        got)
+    (while (and overlays (not got))
+      (if (equal (overlay-get (car overlays) 'invisible) 'allout)
+          (setq got (car overlays))))
+    got))
+;;;_   > allout-back-to-visible-text ()
+(defun allout-back-to-visible-text ()
+  "Move to most recent prior character that is visible, and return point."
+    (if (allout-hidden-p)
+      (goto-char (overlay-start (allout-get-invisibility-overlay))))
+    (point))
 
 ;;;_  - Subtree Charting
 ;;;_   " These routines either produce or assess charts, which are
@@ -1912,11 +2033,11 @@ starting point, and PREV-DEPTH is depth of prior topic."
 					; the original level.  Position
 					; to the end of it:
 	(progn (and (not (eobp)) (forward-char -1))
-	       (and (memq (preceding-char) '(?\n ?\r))
-		    (memq (aref (buffer-substring (max 1 (- (point) 3))
-						  (point))
-				1)
-			  '(?\n ?\r))
+	       (and (= (preceding-char) ?\n)
+		    (= (aref (buffer-substring (max 1 (- (point) 3))
+                                               (point))
+                             1)
+                       ?\n)
 		    (forward-char -1))
 	       (setq allout-recent-end-of-subtree (point))))
 
@@ -1954,7 +2075,7 @@ start point."
 	    (if further (setq result (append further result)))
 	    (setq chart (cdr chart)))
 	(goto-char here)
-	(if (= (preceding-char) ?\r)
+        (if (allout-hidden-p)
 	    (setq result (cons here result)))
 	(setq chart (cdr chart))))
     result))
@@ -2003,7 +2124,7 @@ Returns the point at the beginning of the prefix, or nil if none."
 
   (let (done)
     (while (and (not done)
-		(re-search-backward "[\n\r]" nil 1))
+		(search-backward "\n" nil 1))
       (forward-char 1)
       (if (looking-at allout-regexp)
 	  (setq done (allout-prefix-data (match-beginning 0)
@@ -2042,19 +2163,30 @@ otherwise skip white space between bullet and ensuing text."
    (1- (match-end 0))))
 ;;;_   > allout-back-to-current-heading ()
 (defun allout-back-to-current-heading ()
-  "Move to heading line of current topic, or beginning if already on the line."
+  "Move to heading line of current topic, or beginning if already on the line.
 
-  (beginning-of-line)
-  (prog1 (or (allout-on-current-heading-p)
-             (and (re-search-backward (concat "^\\(" allout-regexp "\\)")
-                                      nil
-                                      'move)
-                  (allout-prefix-data (match-beginning 1)(match-end 1))))
-    (if (interactive-p) (allout-end-of-prefix))))
+Return value of point, unless we started outside of (before any) topics,
+in which case we return nil."
+
+  (allout-beginning-of-current-line)
+  (if (or (allout-on-current-heading-p)
+          (and (re-search-backward (concat "^\\(" allout-regexp "\\)")
+                                   nil 'move)
+               (progn (while (allout-hidden-p)
+                        (allout-beginning-of-current-line)
+                        (if (not (looking-at allout-regexp))
+                            (re-search-backward (concat
+                                                 "^\\(" allout-regexp "\\)")
+                                                nil 'move)))
+                      (allout-prefix-data (match-beginning 1)
+                                          (match-end 1)))))
+      (if (interactive-p)
+          (allout-end-of-prefix)
+        (point))))
 ;;;_   > allout-back-to-heading ()
 (defalias 'allout-back-to-heading 'allout-back-to-current-heading)
-;;;_   > allout-pre-next-preface ()
-(defun allout-pre-next-preface ()
+;;;_   > allout-pre-next-prefix ()
+(defun allout-pre-next-prefix ()
   "Skip forward to just before the next heading line.
 
 Returns that character position."
@@ -2062,12 +2194,16 @@ Returns that character position."
   (if (re-search-forward allout-line-boundary-regexp nil 'move)
       (prog1 (goto-char (match-beginning 0))
              (allout-prefix-data (match-beginning 2)(match-end 2)))))
-;;;_   > allout-end-of-subtree (&optional current)
-(defun allout-end-of-subtree (&optional current)
+;;;_   > allout-end-of-subtree (&optional current include-trailing-blank)
+(defun allout-end-of-subtree (&optional current include-trailing-blank)
   "Put point at the end of the last leaf in the containing topic.
 
-If optional CURRENT is true (default false), then put point at the end of
-the containing visible topic.
+Optional CURRENT means put point at the end of the containing
+visible topic.
+
+Optional INCLUDE-TRAILING-BLANK means include a trailing blank line, if
+any, as part of the subtree.  Otherwise, that trailing blank will be
+excluded as delimiting whitespace between topics.
 
 Returns the value of point."
   (interactive "P")
@@ -2080,18 +2216,21 @@ Returns the value of point."
                 (> (allout-recent-depth) level))
       (allout-next-heading))
     (and (not (eobp)) (forward-char -1))
-    (and (memq (preceding-char) '(?\n ?\r))
-         (memq (aref (buffer-substring (max 1 (- (point) 3)) (point)) 1)
-               '(?\n ?\r))
+    (if (and (not include-trailing-blank) (= ?\n (preceding-char)))
          (forward-char -1))
     (setq allout-recent-end-of-subtree (point))))
-;;;_   > allout-end-of-current-subtree ()
-(defun allout-end-of-current-subtree ()
+;;;_   > allout-end-of-current-subtree (&optional include-trailing-blank)
+(defun allout-end-of-current-subtree (&optional include-trailing-blank)
+
   "Put point at end of last leaf in currently visible containing topic.
 
+Optional INCLUDE-TRAILING-BLANK means include a trailing blank line, if
+any, as part of the subtree.  Otherwise, that trailing blank will be
+excluded as delimiting whitespace between topics.
+
 Returns the value of point."
   (interactive)
-  (allout-end-of-subtree t))
+  (allout-end-of-subtree t include-trailing-blank))
 ;;;_   > allout-beginning-of-current-entry ()
 (defun allout-beginning-of-current-entry ()
   "When not already there, position point at beginning of current topic header.
@@ -2104,18 +2243,23 @@ If already there, move cursor to bullet for hot-spot operation.
     (if (and (interactive-p)
 	     (= (point) start-point))
 	(goto-char (allout-current-bullet-pos)))))
-;;;_   > allout-end-of-entry ()
-(defun allout-end-of-entry ()
-  "Position the point at the end of the current topics' entry."
+;;;_   > allout-end-of-entry (&optional inclusive)
+(defun allout-end-of-entry (&optional inclusive)
+  "Position the point at the end of the current topics' entry.
+
+Optional INCLUSIVE means also include trailing empty line, if any.  When
+unset, whitespace between items separates them even when the items are
+collapsed."
   (interactive)
-  (prog1 (allout-pre-next-preface)
-    (if (and (not (bobp))(looking-at "^$"))
-        (forward-char -1))))
+  (allout-pre-next-prefix)
+  (if (and (not inclusive) (not (bobp)) (= ?\n (preceding-char)))
+      (forward-char -1))
+  (point))
 ;;;_   > allout-end-of-current-heading ()
 (defun allout-end-of-current-heading ()
   (interactive)
   (allout-beginning-of-current-entry)
-  (re-search-forward "[\n\r]" nil t)
+  (search-forward "\n" nil t)
   (forward-char -1))
 (defalias 'allout-end-of-heading 'allout-end-of-current-heading)
 ;;;_   > allout-get-body-text ()
@@ -2123,13 +2267,13 @@ If already there, move cursor to bullet for hot-spot operation.
   "Return the unmangled body text of the topic immediately containing point."
   (save-excursion
     (allout-end-of-prefix)
-    (if (not (re-search-forward "[\n\r]" nil t))
+    (if (not (search-forward "\n" nil t))
         nil
       (backward-char 1)
       (let ((pre-body (point)))
         (if (not pre-body)
             nil
-          (allout-end-of-entry)
+          (allout-end-of-entry t)
           (if (not (= pre-body (point)))
               (buffer-substring-no-properties (1+ pre-body) (point))))
         )
@@ -2189,8 +2333,7 @@ DONT-COMPLAIN is non-nil."
   (allout-back-to-current-heading)
   (let ((present-level (allout-recent-depth))
 	(last-good (point))
-	failed
-	return)
+	failed)
     ;; Loop for iterating arg:
     (while (and (> (allout-recent-depth) 1)
                 (> arg 0)
@@ -2260,11 +2403,9 @@ Presumes point is at the start of a topic prefix."
  (if (or (bobp) (eobp))
      nil
    (forward-char -1))
- (if (or (bobp) (not (memq (preceding-char) '(?\n ?\r))))
+ (if (or (bobp) (not (= ?\n (preceding-char))))
      nil
-   (forward-char -1)
-   (if (or (bobp) (not (memq (preceding-char) '(?\n ?\r))))
-       (forward-char -1)))
+   (forward-char -1))
  (point))
 ;;;_   > allout-beginning-of-level ()
 (defun allout-beginning-of-level ()
@@ -2282,19 +2423,19 @@ Presumes point is at the start of a topic prefix."
 (defun allout-next-visible-heading (arg)
   "Move to the next ARG'th visible heading line, backward if arg is negative.
 
-Move as far as possible in indicated direction \(beginning or end of
-buffer) if headings are exhausted."
+Move to buffer limit in indicated direction if headings are exhausted."
 
   (interactive "p")
   (let* ((backward (if (< arg 0) (setq arg (* -1 arg))))
 	 (step (if backward -1 1))
-	 (start-point (point))
 	 prev got)
 
     (while (> arg 0)			; limit condition
       (while (and (not (if backward (bobp)(eobp))) ; boundary condition
 		  ;; Move, skipping over all those concealed lines:
-		  (< -1 (forward-line step))
+		  (prog1 (condition-case nil (or (line-move step) t)
+                           (error nil))
+                    (allout-beginning-of-current-line))
 		  (not (setq got (looking-at allout-regexp)))))
       ;; Register this got, it may be the last:
       (if got (setq prev got))
@@ -2323,7 +2464,6 @@ Takes optional repeat-count, goes backward if count is negative.
 Returns resulting position, else nil if none found."
   (interactive "p")
   (let ((start-depth (allout-current-depth))
-	(start-point (point))
 	(start-arg arg)
 	(backward (> 0 arg))
 	last-depth
@@ -2386,51 +2526,17 @@ are mapped to the command of the corresponding control-key on the
 - Implement (and clear) `allout-post-goto-bullet', for hot-spot
   outline commands.
 
-- Decrypt topic currently being edited if it was encrypted for a save.
-
-- Massage buffer-undo-list so successive, standard character self-inserts are
-  aggregated.  This kludge compensates for lack of undo bunching when
-  before-change-functions is used."
+- Decrypt topic currently being edited if it was encrypted for a save."
 
 					; Apply any external change func:
   (if (not (allout-mode-p))		; In allout-mode.
       nil
-    (if allout-isearch-dynamic-expose
-	(allout-isearch-rectification))
-    ;; Undo bunching business:
-    (if (and (listp buffer-undo-list)	; Undo history being kept.
-	     (equal this-command 'self-insert-command)
-	     (equal last-command 'self-insert-command))
-	(let* ((prev-stuff (cdr buffer-undo-list))
-	       (before-prev-stuff (cdr (cdr prev-stuff)))
-	       cur-cell cur-from cur-to
-	       prev-cell prev-from prev-to)
-	  (if (and before-prev-stuff	; Goes back far enough to bother,
-		   (not (car prev-stuff)) ; and break before current,
-		   (not (car before-prev-stuff)) ; !and break before prev!
-		   (setq prev-cell (car (cdr prev-stuff))) ; contents now,
-		   (setq cur-cell (car buffer-undo-list)) ; contents prev.
-
-		   ;; cur contents denote a single char insertion:
-		   (numberp (setq cur-from (car cur-cell)))
-		   (numberp (setq cur-to (cdr cur-cell)))
-		   (= 1 (- cur-to cur-from))
-
-		   ;; prev contents denote fewer than aggregate-limit
-		   ;; insertions:
-		   (numberp (setq prev-from (car prev-cell)))
-		   (numberp (setq prev-to (cdr prev-cell)))
-					; Below threshold:
-		   (> allout-undo-aggregation (- prev-to prev-from)))
-	      (setq buffer-undo-list
-		    (cons (cons prev-from cur-to)
-			  (cdr (cdr (cdr buffer-undo-list))))))))
 
     (if (and (boundp 'allout-after-save-decrypt)
              allout-after-save-decrypt)
         (allout-after-saves-handler))
 
-    ;; Implement -post-goto-bullet, if set: (must be after undo business)
+    ;; Implement -post-goto-bullet, if set:
     (if (and allout-post-goto-bullet
 	     (allout-current-bullet-pos))
 	(progn (goto-char (allout-current-bullet-pos))
@@ -2456,10 +2562,6 @@ return to regular interpretation of self-insert characters."
   (if (not (allout-mode-p))
       ;; Shouldn't be invoked if not in allout-mode, but just in case:
       nil
-    ;; Register isearch status:
-    (if (and (boundp  'isearch-mode) isearch-mode)
-	(setq allout-pre-was-isearching t)
-      (setq allout-pre-was-isearching nil))
     ;; Hot-spot navigation provisions:
     (if (and (eq this-command 'self-insert-command)
 	     (eq (point)(allout-current-bullet-pos)))
@@ -2499,110 +2601,6 @@ See `allout-init' for setup instructions."
 	   (not (allout-mode-p))
 	   allout-layout)
       (allout-mode t)))
-;;;_   > allout-isearch-rectification
-(defun allout-isearch-rectification ()
-  "Rectify outline exposure before, during, or after isearch.
-
-Called as part of `allout-post-command-business'."
-
-  (let ((isearching (and (boundp 'isearch-mode) isearch-mode)))
-    (cond ((and isearching (not allout-pre-was-isearching))
-	   (allout-isearch-expose 'start))
-	  ((and isearching allout-pre-was-isearching)
-	   (allout-isearch-expose 'continue))
-	  ((and (not isearching) allout-pre-was-isearching)
-	   (allout-isearch-expose 'final))
-	  ;; Not and wasn't isearching:
-	  (t (setq allout-isearch-prior-pos nil)
-	     (setq allout-isearch-did-quit nil)))))
-;;;_   = allout-isearch-was-font-lock
-(defvar allout-isearch-was-font-lock
-  (and (boundp 'font-lock-mode) font-lock-mode))
-;;;_   > allout-isearch-expose (mode)
-(defun allout-isearch-expose (mode)
-  "MODE is either 'clear, 'start, 'continue, or 'final."
-  ;; allout-isearch-prior-pos encodes exposure status of prior pos:
-  ;; (pos was-vis header-pos end-pos)
-  ;; pos	- point of concern
-  ;; was-vis	- t, else 'topic if entire topic was exposed, 'entry otherwise
-  ;; Do reclosure or prior pos, as necessary:
-  (if (eq mode 'start)
-      (setq allout-isearch-was-font-lock (and (boundp 'font-lock-mode)
-                                               font-lock-mode)
-	    font-lock-mode nil)
-    (if (eq mode 'final)
-	(setq font-lock-mode allout-isearch-was-font-lock))
-    (if (and allout-isearch-prior-pos
-	     (listp allout-isearch-prior-pos))
-	;; Conceal prior peek:
-	(allout-flag-region (car (cdr allout-isearch-prior-pos))
-			     (car (cdr (cdr allout-isearch-prior-pos)))
-			     ?\r)))
-  (if (allout-visible-p)
-      (setq allout-isearch-prior-pos nil)
-    (if (not (eq mode 'final))
-	(setq allout-isearch-prior-pos (cons (point) (allout-show-entry)))
-      (if allout-isearch-did-quit
-	  nil
-	(setq allout-isearch-prior-pos nil)
-	(allout-show-children))))
-  (setq allout-isearch-did-quit nil))
-;;;_   > allout-enwrap-isearch ()
-(defun allout-enwrap-isearch ()
-  "Impose `allout-mode' isearch-abort wrapper for dynamic exposure in isearch.
-
-The function checks to ensure that the rebinding is done only once."
-
-  (add-hook 'isearch-mode-end-hook 'allout-isearch-rectification)
-  (if (fboundp 'allout-real-isearch-abort)
-      ;;
-      nil
-                                        ; Ensure load of isearch-mode:
-    (if (or (and (fboundp 'isearch-mode)
-                 (fboundp 'isearch-abort))
-            (condition-case error
-                (load-library "isearch-mode")
-              ('file-error (message
-			    "Skipping isearch-mode provisions - %s '%s'"
-			    (car (cdr error))
-			    (car (cdr (cdr error))))
-			   (sit-for 1)
-			   ;; Inhibit subsequent tries and return nil:
-			   (setq allout-isearch-dynamic-expose nil))))
-        ;; Isearch-mode loaded, encapsulate specific entry points for
-        ;; outline dynamic-exposure business:
-        (progn
-	  ;; stash crucial isearch-mode funcs under known, private
-	  ;; names, then register wrapper functions under the old
-	  ;; names, in their stead:
-          (fset 'allout-real-isearch-abort (symbol-function 'isearch-abort))
-          (fset 'isearch-abort 'allout-isearch-abort)))))
-;;;_   > allout-isearch-abort ()
-(defun allout-isearch-abort ()
-  "Wrapper for allout-real-isearch-abort \(which see), to register
-actual quits."
-  (interactive)
-  (setq allout-isearch-did-quit nil)
-  (condition-case what
-      (allout-real-isearch-abort)
-    ('quit (setq allout-isearch-did-quit t)
-	  (signal 'quit nil))))
-
-;;; Prevent unnecessary font-lock while isearching!
-(defvar isearch-was-font-locking nil)
-(defun isearch-inhibit-font-lock ()
-  "Inhibit `font-lock' while isearching - for use on `isearch-mode-hook'."
-  (if (and (allout-mode-p) (boundp 'font-lock-mode) font-lock-mode)
-      (setq isearch-was-font-locking t
-	    font-lock-mode nil)))
-(add-hook 'isearch-mode-hook 'isearch-inhibit-font-lock)
-(defun isearch-reenable-font-lock ()
-  "Reenable font-lock after isearching - for use on `isearch-mode-end-hook'."
-  (if (and (boundp 'font-lock-mode) font-lock-mode)
-      (if (and (allout-mode-p) isearch-was-font-locking)
-	  (setq isearch-was-font-locking nil
-		font-lock-mode t))))
-(add-hook 'isearch-mode-end-hook 'isearch-reenable-font-lock)
 
 ;;;_  - Topic Format Assessment
 ;;;_   > allout-solicit-alternate-bullet (depth &optional current-bullet)
@@ -2807,15 +2805,20 @@ index for each successive sibling)."
                                    ((allout-sibling-index))))))
     )
   )
-;;;_   > allout-open-topic (relative-depth &optional before use_recent_bullet)
-(defun allout-open-topic (relative-depth &optional before use_recent_bullet)
+;;;_   > allout-open-topic (relative-depth &optional before offer-recent-bullet)
+(defun allout-open-topic (relative-depth &optional before offer-recent-bullet)
   "Open a new topic at depth DEPTH.
 
 New topic is situated after current one, unless optional flag BEFORE
-is non-nil, or unless current line is complete empty (not even
-whitespace), in which case open is done on current line.
+is non-nil, or unless current line is completely empty - lacking even
+whitespace - in which case open is done on the current line.
 
-If USE_RECENT_BULLET is true, offer to use the bullet of the prior sibling.
+When adding an offspring, it will be added immediately after the parent if
+the other offspring are exposed, or after the last child if the offspring
+are hidden.  \(The intervening offspring will be exposed in the latter
+case.)
+
+If OFFER-RECENT-BULLET is true, offer to use the bullet of the prior sibling.
 
 Nuances:
 
@@ -2839,12 +2842,12 @@ Nuances:
   having to go to its preceding sibling, and then open forward
   from there."
 
+  (allout-beginning-of-current-line)
   (let* ((depth (+ (allout-current-depth) relative-depth))
          (opening-on-blank (if (looking-at "^\$")
                                (not (setq before nil))))
          ;; bunch o vars set while computing ref-topic
          opening-numbered
-         opening-encrypted
          ref-depth
          ref-bullet
          (ref-topic (save-excursion
@@ -2864,13 +2867,6 @@ Nuances:
                                        (allout-descend-to-depth depth))
                                    (if (allout-numbered-type-prefix)
                                        allout-numbered-bullet))))
-                      (setq opening-encrypted
-                            (save-excursion
-                              (and allout-topic-encryption-bullet
-                                   (or (<= relative-depth 0)
-                                       (allout-descend-to-depth depth))
-                                   (if (allout-numbered-type-prefix)
-                                       allout-numbered-bullet))))
                       (point)))
          dbl-space
          doing-beginning)
@@ -2891,122 +2887,98 @@ Nuances:
                          (save-excursion
                            ;; succeeded by a blank line?
                            (allout-end-of-current-subtree)
-                           (bolp)))
+                           (looking-at "\n\n")))
                     (and (= ref-depth 1)
                          (or before
                              (= depth 1)
                              (save-excursion
                                ;; Don't already have following
                                ;; vertical padding:
-                               (not (allout-pre-next-preface)))))))
+                               (not (allout-pre-next-prefix)))))))
 
-                                        ; Position to prior heading,
-                                        ; if inserting backwards, and
-					; not going outwards:
+          ;; Position to prior heading, if inserting backwards, and not
+          ;; going outwards:
           (if (and before (>= relative-depth 0))
 	      (progn (allout-back-to-current-heading)
                             (setq doing-beginning (bobp))
                             (if (not (bobp))
                                 (allout-previous-heading)))
 	    (if (and before (bobp))
-		(allout-unprotected (allout-open-line-not-read-only))))
+		(open-line 1)))
 
           (if (<= relative-depth 0)
               ;; Not going inwards, don't snug up:
               (if doing-beginning
-                  (allout-unprotected
-                   (if (not dbl-space)
-                       (allout-open-line-not-read-only)
-                     (allout-open-line-not-read-only)
-                     (allout-open-line-not-read-only)))
+                  (if (not dbl-space)
+                      (open-line 1)
+                    (open-line 2))
 		(if before
 		    (progn (end-of-line)
-			   (allout-pre-next-preface)
-			   (while (= ?\r (following-char))
+			   (allout-pre-next-prefix)
+                           (while (and (= ?\n (following-char))
+                                       (save-excursion
+                                         (forward-char 1)
+                                         (allout-hidden-p)))
                              (forward-char 1))
 			   (if (not (looking-at "^$"))
-			       (allout-unprotected
-                                (allout-open-line-not-read-only))))
-		  (allout-end-of-current-subtree)))
-            ;; Going inwards - double-space if first offspring is,
-            ;; otherwise snug up.
-            (end-of-line)		; So we skip any concealed progeny.
-            (allout-pre-next-preface)
+                               (open-line 1)))
+		  (allout-end-of-current-subtree)
+                  (if (looking-at "\n\n") (forward-char 1))))
+            ;; Going inwards - double-space if first offspring is
+            ;; double-spaced, otherwise snug up.
+            (allout-end-of-entry)
+            (line-move 1)
+            (allout-beginning-of-current-line)
+            (backward-char 1)
             (if (bolp)
                 ;; Blank lines between current header body and next
                 ;; header - get to last substantive (non-white-space)
                 ;; line in body:
-                (re-search-backward "[^ \t\n]" nil t))
+                (progn (setq dbl-space t)
+                       (re-search-backward "[^ \t\n]" nil t)))
+            (if (looking-at "\n\n")
+                (setq dbl-space t))
             (if (save-excursion
                   (allout-next-heading)
-                  (if (> (allout-recent-depth) ref-depth)
-                      ;; This is an offspring.
-                      (progn (forward-line -1)
-                             (looking-at "^\\s-*$"))))
+                  (when (> (allout-recent-depth) ref-depth)
+                    ;; This is an offspring.
+                    (forward-line -1)
+                    (looking-at "^\\s-*$")))
                 (progn (forward-line 1)
-                       (allout-unprotected
-                        (allout-open-line-not-read-only))
+                       (open-line 1)
                        (forward-line 1)))
-            (end-of-line))
+            (allout-end-of-current-line))
+
           ;;(if doing-beginning (goto-char doing-beginning))
           (if (not (bobp))
               ;; We insert a newline char rather than using open-line to
               ;; avoid rear-stickiness inheritence of read-only property.
               (progn (if (and (not (> depth ref-depth))
                               (not before))
-                         (allout-unprotected
-                          (allout-open-line-not-read-only))
-		       (if (> depth ref-depth)
-                         (allout-unprotected
-                          (allout-open-line-not-read-only))
+                         (open-line 1)
+		       (if (and (not dbl-space) (> depth ref-depth))
+                           (newline 1)
 			 (if dbl-space
-                             (allout-unprotected
-                              (allout-open-line-not-read-only))
+                             (open-line 1)
 			   (if (not before)
-			       (allout-unprotected (newline 1))))))
-                     (if dbl-space
-			 (allout-unprotected (newline 1)))
+                               (newline 1)))))
+                     (if (and dbl-space (not (> relative-depth 0)))
+			 (newline 1))
                      (if (and (not (eobp))
                               (not (bolp)))
                          (forward-char 1))))
           ))
-    (insert (concat (allout-make-topic-prefix opening-numbered
-                                              t
-                                              depth)
-                           " "))
+    (insert (concat (allout-make-topic-prefix opening-numbered t depth)
+                    " "))
 
-    ;;(if doing-beginning (save-excursion (newline (if dbl-space 2 1))))
-
-
-    (allout-rebullet-heading (and use_recent_bullet         ;;; solicit
-                                   ref-bullet)
-                              depth			     ;;; depth
-                              nil 			     ;;; number-control
-                              nil			     ;;; index
-                              t)
+    (allout-rebullet-heading (and offer-recent-bullet ref-bullet)
+                              depth nil nil t)
+    (if (> relative-depth 0)
+        (save-excursion (goto-char ref-topic)
+                        (allout-show-children)))
     (end-of-line)
     )
   )
-;;;_    . open-topic contingencies
-;;;_     ; base topic - one from which open was issued
-;;;_      , beginning char
-;;;_      , amount of space before will be used, unless opening in place
-;;;_      , end char will be used, unless opening before (and it still may)
-;;;_     ; absolute depth of new topic
-;;;_     ! insert in place - overrides most stuff
-;;;_     ; relative depth of new re base
-;;;_     ; before or after base topic
-;;;_     ; spacing around topic, if any, prior to new topic and at same depth
-;;;_     ; buffer boundaries - special provisions for beginning and end ob
-;;;_     ; level 1 topics have special provisions also - double space.
-;;;_     ; location of new topic
-;;;_   > allout-open-line-not-read-only ()
-(defun allout-open-line-not-read-only ()
-  "Open line and remove inherited read-only text prop from new char, if any."
-  (open-line 1)
-  (if (plist-get (text-properties-at (point)) 'read-only)
-      (allout-unprotected
-       (remove-text-properties (point) (+ 1 (point)) '(read-only nil)))))
 ;;;_   > allout-open-subtopic (arg)
 (defun allout-open-subtopic (arg)
   "Open new topic header at deeper level than the current one.
@@ -3055,9 +3027,12 @@ Maintains outline hanging topic indentation if
                                ;; length of topic prefix:
                                (make-string (progn (allout-end-of-prefix)
                                                    (current-column))
-                                            ?\ ))))))
+                                            ?\ )))))
+        (use-auto-fill-function (or allout-outside-normal-auto-fill-function
+                                    auto-fill-function
+                                    'do-auto-fill)))
     (if (or allout-former-auto-filler allout-use-hanging-indents)
-        (do-auto-fill))))
+        (funcall use-auto-fill-function))))
 ;;;_    > allout-reindent-body (old-depth new-depth &optional number)
 (defun allout-reindent-body (old-depth new-depth &optional number)
   "Reindent body lines which were indented at OLD-DEPTH to NEW-DEPTH.
@@ -3071,7 +3046,6 @@ Note that refill of indented paragraphs is not done."
     (allout-end-of-prefix)
     (let* ((new-margin (current-column))
 	   excess old-indent-begin old-indent-end
-	   curr-ind
 	   ;; We want the column where the header-prefix text started
 	   ;; *before* the prefix was changed, so we infer it relative
 	   ;; to the new margin and the shift in depth:
@@ -3081,7 +3055,7 @@ Note that refill of indented paragraphs is not done."
       (allout-unprotected
        (save-match-data
          (while
-	     (and (re-search-forward "[\n\r]\\(\\s-*\\)"
+	     (and (re-search-forward "\n\\(\\s-*\\)"
 				     nil
 				     t)
 		  ;; Register the indent data, before we reset the
@@ -3231,8 +3205,7 @@ Descends into invisible as well as visible topics, however.
 
 With repeat count, shift topic depth by that amount."
   (interactive "P")
-  (let ((start-col (current-column))
-        (was-eol (eolp)))
+  (let ((start-col (current-column)))
     (save-excursion
       ;; Normalize arg:
       (cond ((null arg) (setq arg 0))
@@ -3414,8 +3387,8 @@ depth, however."
               (if (and (> predecessor-depth 0)
                        (> (+ current-depth arg)
                           (1+ predecessor-depth)))
-                  (error (concat "May not shift deeper than offspring depth"
-                                 " of previous topic")))))))
+                  (error (concat "Disallowed shift deeper than"
+                                 " containing topic's children.")))))))
   (allout-rebullet-topic arg))
 ;;;_    > allout-shift-out (arg)
 (defun allout-shift-out (arg)
@@ -3436,84 +3409,72 @@ depth, however."
 
   (interactive "*P")
 
-  (let ((start-point (point))
-        (leading-kill-ring-entry (car kill-ring))
-        binding)
+  (if (or (not (allout-mode-p))
+          (not (bolp))
+          (not (looking-at allout-regexp)))
+      ;; Above conditions do not obtain - just do a regular kill:
+      (kill-line arg)
+    ;; Ah, have to watch out for adjustments:
+    (let* ((beg (point))
+           (beg-hidden (allout-hidden-p))
+           (end-hidden (save-excursion (allout-end-of-current-line)
+                                       (allout-hidden-p)))
+           (depth (allout-depth))
+           (collapsed (allout-current-topic-collapsed-p)))
 
-    (condition-case err
+      (if collapsed
+          (put-text-property beg (1+ beg) 'allout-was-collapsed t)
+        (remove-text-properties beg (1+ beg) '(allout-was-collapsed t)))
 
-        (if (not (and (allout-mode-p)        ; active outline mode,
-                      allout-numbered-bullet ; numbers may need adjustment,
-                      (bolp)                  ; may be clipping topic head,
-                      (looking-at allout-regexp))) ; are clipping topic head.
-            ;; Above conditions do not obtain - just do a regular kill:
-            (kill-line arg)
-          ;; Ah, have to watch out for adjustments:
-          (let* ((depth (allout-depth))
-                 (start-point (point))
-                 binding)
-                                        ; Do the kill, presenting option
-                                        ; for read-only text:
-            (kill-line arg)
+      (if (and (not beg-hidden) (not end-hidden))
+          (allout-unprotected (kill-line arg))
+        (kill-line arg))
                                         ; Provide some feedback:
-          (sit-for 0)
-          (save-excursion
-                                        ; Start with the topic
-                                        ; following killed line:
+      (sit-for 0)
+      (if allout-numbered-bullet
+          (save-excursion               ; Renumber subsequent topics if needed:
             (if (not (looking-at allout-regexp))
                 (allout-next-heading))
-            (allout-renumber-to-depth depth))))
-      ;; condition case handler:
-      (text-read-only
-       (goto-char start-point)
-       (setq binding (where-is-internal 'allout-kill-topic nil t))
-       (cond ((not binding) (setq binding ""))
-             ((arrayp binding)
-              (setq binding (mapconcat 'key-description (list binding) ", ")))
-             (t (setq binding (format "%s" binding))))
-       ;; ensure prior kill-ring leader is properly restored:
-       (if (eq leading-kill-ring-entry (cadr kill-ring))
-           ;; Aborted kill got pushed on front - ditch it:
-           (let ((got (car kill-ring)))
-             (setq kill-ring (cdr kill-ring))
-             got)
-         ;; Aborted kill got appended to prior - resurrect prior:
-         (setcar kill-ring leading-kill-ring-entry))
-       ;; make last-command skip this failed command, so kill-appending
-       ;; conditions track:
-       (setq this-command last-command)
-       (error (concat "read-only text hit - use %s allout-kill-topic to"
-                      " discard collapsed stuff")
-              binding)))
-    )
-  )
+            (allout-renumber-to-depth depth))))))
 ;;;_    > allout-kill-topic ()
 (defun allout-kill-topic ()
   "Kill topic together with subtopics.
 
-Leaves primary topic's trailing vertical whitespace, if any."
+Trailing whitespace is killed with a topic if that whitespace:
+
+ - would separate the topic from a subsequent sibling
+ - would separate the topic from the end of buffer
+ - would not be added to whitespace already separating the topic from the
+   previous one.
+
+Completely collapsed topics are marked as such, for re-collapse
+when yank with allout-yank into an outline as a heading."
 
   ;; Some finagling is done to make complex topic kills appear faster
   ;; than they actually are.  A redisplay is performed immediately
-  ;; after the region is disposed of, though the renumbering process
+  ;; after the region is deleted, though the renumbering process
   ;; has yet to be performed.  This means that there may appear to be
-  ;; a lag *after* the kill has been performed.
+  ;; a lag *after* a kill has been performed.
 
   (interactive)
-  (let* ((beg (prog1 (allout-back-to-current-heading)(beginning-of-line)))
+  (let* ((collapsed (allout-current-topic-collapsed-p))
+         (beg (prog1 (allout-back-to-current-heading) (beginning-of-line)))
          (depth (allout-recent-depth)))
     (allout-end-of-current-subtree)
+    (if (and (/= (current-column) 0) (not (eobp)))
+        (forward-char 1))
     (if (not (eobp))
-	(if (or (not (looking-at "^$"))
-		;; A blank line - cut it with this topic *unless* this
-		;; is the last topic at this level, in which case
-		;; we'll leave the blank line as part of the
-		;; containing topic:
-		(save-excursion
-		  (and (allout-next-heading)
-		       (>= (allout-recent-depth) depth))))
+	(if (and (looking-at "\n")
+                 (or (save-excursion
+                       (or (not (allout-next-heading))
+                           (= depth (allout-recent-depth))))
+                     (and (> (- beg (point-min)) 3)
+                          (string= (buffer-substring (- beg 2) beg) "\n\n"))))
 	    (forward-char 1)))
 
+    (if collapsed
+        (put-text-property beg (1+ beg) 'allout-was-collapsed t)
+      (remove-text-properties beg (1+ beg) '(allout-was-collapsed t)))
     (allout-unprotected (kill-region beg (point)))
     (sit-for 0)
     (save-excursion
@@ -3521,7 +3482,7 @@ Leaves primary topic's trailing vertical whitespace, if any."
 ;;;_    > allout-yank-processing ()
 (defun allout-yank-processing (&optional arg)
 
-  "Incidental outline-specific business to be done just after text yanks.
+  "Incidental allout-specific business to be done just after text yanks.
 
 Does depth adjustment of yanked topics, when:
 
@@ -3542,10 +3503,12 @@ however, are left exactly like normal, non-allout-specific yanks."
   (interactive "*P")
 					; Get to beginning, leaving
 					; region around subject:
-  (if (< (my-mark-marker t) (point))
+  (if (< (allout-mark-marker t) (point))
       (exchange-point-and-mark))
   (let* ((subj-beg (point))
-	 (subj-end (my-mark-marker t))
+         (into-bol (bolp))
+	 (subj-end (allout-mark-marker t))
+         (was-collapsed (get-text-property subj-beg 'allout-was-collapsed))
 	 ;; 'resituate' if yanking an entire topic into topic header:
 	 (resituate (and (allout-e-o-prefix-p)
 			 (looking-at (concat "\\(" allout-regexp "\\)"))
@@ -3554,7 +3517,7 @@ however, are left exactly like normal, non-allout-specific yanks."
 	 ;; `rectify-numbering' if resituating (where several topics may
 	 ;; be resituating) or yanking a topic into a topic slot (bol):
 	 (rectify-numbering (or resituate
-				(and (bolp) (looking-at allout-regexp)))))
+				(and into-bol (looking-at allout-regexp)))))
     (if resituate
                                         ; The yanked stuff is a topic:
 	(let* ((prefix-len (- (match-end 1) subj-beg))
@@ -3575,7 +3538,6 @@ however, are left exactly like normal, non-allout-specific yanks."
 			    (allout-prefix-data (match-beginning 0)
 						 (match-end 0)))
 		       (allout-recent-depth))))
-	       done
 	       (more t))
 	  (setq rectify-numbering allout-numbered-bullet)
 	  (if adjust-to-depth
@@ -3616,7 +3578,7 @@ however, are left exactly like normal, non-allout-specific yanks."
 		    (progn
 		      (beginning-of-line)
 		      (delete-region (point) subj-beg)
-		      (set-marker (my-mark-marker t) subj-end)
+		      (set-marker (allout-mark-marker t) subj-end)
 		      (goto-char subj-beg)
 		      (allout-end-of-prefix))
                                         ; Delete base subj prefix,
@@ -3643,6 +3605,9 @@ however, are left exactly like normal, non-allout-specific yanks."
 					  nil	;;; index
 					  t))
 	    (message ""))))
+    (when (and (or into-bol resituate) was-collapsed)
+      (remove-text-properties subj-beg (1+ subj-beg) '(allout-was-collapsed))
+      (allout-hide-current-subtree))
     (if (not resituate)
       (exchange-point-and-mark))))
 ;;;_    > allout-yank (&optional arg)
@@ -3678,7 +3643,8 @@ works with normal `yank' in non-outline buffers."
   (setq this-command 'yank)
   (yank arg)
   (if (allout-mode-p)
-      (allout-yank-processing)))
+      (allout-yank-processing))
+)
 ;;;_    > allout-yank-pop (&optional arg)
 (defun allout-yank-pop (&optional arg)
   "Yank-pop like `allout-yank' when popping to bare outline prefixes.
@@ -3736,93 +3702,51 @@ by pops to non-distinctive yanks.  Bug..."
 ;;;_  - Fundamental
 ;;;_   > allout-flag-region (from to flag)
 (defun allout-flag-region (from to flag)
-  "Hide or show lines from FROM to TO, via Emacs selective-display FLAG char.
-Ie, text following flag C-m \(carriage-return) is hidden until the
-next C-j (newline) char.
+  "Conceal text from FROM to TO if FLAG is non-nil, else reveal it.
 
-Returns the endpoint of the region."
-  ;; "OFR-" prefixes to avoid collisions with vars in code calling the macro.
-  ;; ie, elisp macro vars are not 'hygenic', so distinct names are necessary.
-  (let ((was-inhibit-r-o inhibit-read-only)
-        (was-undo-list buffer-undo-list)
-        (was-modified (buffer-modified-p))
-        trans)
-    (unwind-protect
-     (save-excursion
-       (setq inhibit-read-only t)
-       (setq buffer-undo-list t)
-       (if (> from to)
-           (setq trans from from to to trans))
-       (subst-char-in-region from to
-                             (if (= flag ?\n) ?\r ?\n)
-                             flag t)
-       ;; adjust character read-protection on all the affected lines.
-       ;; we handle the region line-by-line.
-       (goto-char to)
-       (end-of-line)
-       (setq to (min (+ 2 (point)) (point-max)))
-       (goto-char from)
-       (beginning-of-line)
-       (while (< (point) to)
-         ;; handle from start of exposed to beginning of hidden, or eol:
-         (remove-text-properties (point)
-                                 (progn (if (re-search-forward "[\r\n]"
-                                                               nil t)
-                                            (forward-char -1))
-                                        (point))
-                                 '(read-only nil))
-         ;; handle from start of hidden, if any, to eol:
-         (if (and (not (eobp)) (= (char-after (point)) ?\r))
-             (put-text-property (point) (progn (end-of-line) (point))
-                                'read-only t))
-         ;; Handle the end-of-line to beginning of next line:
-         (if (not (eobp))
-             (progn (forward-char 1)
-                    (remove-text-properties (1- (point)) (point)
-                                            '(read-only nil)))))
-       )
-     (if (not was-modified)
-         (set-buffer-modified-p nil))
-     (setq inhibit-read-only was-inhibit-r-o)
-     (setq buffer-undo-list was-undo-list)
-     )
-    )
-  )
+Text is shown if flag is nil and hidden otherwise."
+  ;; We use outline invisibility spec.
+  (remove-overlays from to 'category 'allout-overlay-category)
+  (when flag
+    (let ((o (make-overlay from to)))
+      (overlay-put o 'category 'allout-overlay-category)
+      (when (featurep 'xemacs)
+        (let ((props (symbol-plist 'allout-overlay-category)))
+          (while props
+            (overlay-put o (pop props) (pop props)))))))
+  (run-hooks 'allout-view-change-hook))
 ;;;_   > allout-flag-current-subtree (flag)
 (defun allout-flag-current-subtree (flag)
-  "Hide or show subtree of currently-visible topic.
-
-See `allout-flag-region' for more details."
+  "Conceal currently-visible topic's subtree if FLAG non-nil, else reveal it."
 
   (save-excursion
     (allout-back-to-current-heading)
-    (let ((from (point))
-          (to (progn (allout-end-of-current-subtree) (1- (point)))))
-      (allout-flag-region from to flag))))
+    (end-of-line)
+    (allout-flag-region (point)
+                        ;; Exposing must not leave trailing blanks hidden,
+                        ;; but can leave them exposed when hiding, so we
+                        ;; can use flag's inverse as the
+                        ;; include-trailing-blank cue:
+                        (allout-end-of-current-subtree (not flag))
+                        flag)))
 
 ;;;_  - Topic-specific
-;;;_   > allout-show-entry ()
-(defun allout-show-entry ()
+;;;_   > allout-show-entry (&optional inclusive)
+(defun allout-show-entry (&optional inclusive)
   "Like `allout-show-current-entry', reveals entries nested in hidden topics.
 
 This is a way to give restricted peek at a concealed locality without the
 expense of exposing its context, but can leave the outline with aberrant
-exposure.  `allout-hide-current-entry-completely' or `allout-show-offshoot'
-should be used after the peek to rectify the exposure."
+exposure.  `allout-show-offshoot' should be used after the peek to rectify
+the exposure."
 
   (interactive)
   (save-excursion
-    (let ((at (point))
-	  beg end)
+    (let (beg end)
       (allout-goto-prefix)
-      (setq beg (if (= (preceding-char) ?\r) (1- (point)) (point)))
-      (re-search-forward "[\n\r]" nil t)
-      (setq end (1- (if (< at (point))
-			;; We're on topic head line - show only it:
-			(point)
-		      ;; or we're in body - include it:
-		      (max beg (or (allout-pre-next-preface) (point))))))
-      (allout-flag-region beg end ?\n)
+      (setq beg (if (allout-hidden-p) (1- (point)) (point)))
+      (setq end (allout-pre-next-prefix))
+      (allout-flag-region beg end nil)
       (list beg end))))
 ;;;_   > allout-show-children (&optional level strict)
 (defun allout-show-children (&optional level strict)
@@ -3843,67 +3767,59 @@ Returns point at end of subtree that was opened, if any.  (May get a
 point of non-opened subtree?)"
 
   (interactive "p")
-  (let (max-pos)
+  (let ((start-point (point)))
     (if (and (not strict)
-	     (allout-hidden-p))
+             (allout-hidden-p))
 
-	(progn (allout-show-to-offshoot) ; Point's concealed, open to
-					  ; expose it.
-	       ;; Then recurse, but with "strict" set so we don't
-	       ;; infinite regress:
-	       (setq max-pos (allout-show-children level t)))
+        (progn (allout-show-to-offshoot) ; Point's concealed, open to
+                                        ; expose it.
+               ;; Then recurse, but with "strict" set so we don't
+               ;; infinite regress:
+               (allout-show-children level t))
 
       (save-excursion
-	(save-restriction
-	  (let* ((start-pt (point))
-		 (chart (allout-chart-subtree (or level 1)))
-		 (to-reveal (allout-chart-to-reveal chart (or level 1))))
-	    (goto-char start-pt)
-	    (if (and strict (= (preceding-char) ?\r))
-		;; Concealed root would already have been taken care of,
-		;; unless strict was set.
-		(progn
-		  (allout-flag-region (point) (allout-snug-back) ?\n)
-		  (if allout-show-bodies
-		      (progn (goto-char (car to-reveal))
-			     (allout-show-current-entry)))))
-	    (while to-reveal
-	      (goto-char (car to-reveal))
-	      (allout-flag-region (point) (allout-snug-back) ?\n)
-	      (if allout-show-bodies
-		  (progn (goto-char (car to-reveal))
-			 (allout-show-current-entry)))
-	      (setq to-reveal (cdr to-reveal)))))))))
-;;;_   > allout-hide-point-reconcile ()
-(defun allout-hide-reconcile ()
-  "Like `allout-hide-current-entry'; hides completely if within hidden region.
-
-Specifically intended for aberrant exposure states, like entries that were
-exposed by `allout-show-entry' but are within otherwise concealed regions."
-  (interactive)
-  (save-excursion
-    (allout-goto-prefix)
-    (allout-flag-region (if (not (bobp)) (1- (point)) (point))
-                         (progn (allout-pre-next-preface)
-                                (if (= ?\r (following-char))
-                                    (point)
-                                  (1- (point))))
-                         ?\r)))
+        (allout-beginning-of-current-line)
+        (save-restriction
+          (let* ((chart (allout-chart-subtree (or level 1)))
+                 (to-reveal (allout-chart-to-reveal chart (or level 1))))
+            (goto-char start-point)
+            (when (and strict (allout-hidden-p))
+              ;; Concealed root would already have been taken care of,
+              ;; unless strict was set.
+              (allout-flag-region (point) (allout-snug-back) nil)
+              (when allout-show-bodies
+                (goto-char (car to-reveal))
+                (allout-show-current-entry)))
+            (while to-reveal
+              (goto-char (car to-reveal))
+              (allout-flag-region (save-excursion (allout-snug-back) (point))
+                                  (progn (search-forward "\n" nil t)
+                                         (1- (point)))
+                                  nil)
+              (when allout-show-bodies
+                (goto-char (car to-reveal))
+                (allout-show-current-entry))
+              (setq to-reveal (cdr to-reveal)))))))
+    ;; Compensate for `save-excursion's maintenance of point
+    ;; within invisible text:
+    (goto-char start-point)))
 ;;;_   > allout-show-to-offshoot ()
 (defun allout-show-to-offshoot ()
   "Like `allout-show-entry', but reveals all concealed ancestors, as well.
 
-As with `allout-hide-current-entry-completely', useful for rectifying
-aberrant exposure states produced by `allout-show-entry'."
-
+Useful for coherently exposing to a random point in a hidden region."
   (interactive)
   (save-excursion
     (let ((orig-pt (point))
 	  (orig-pref (allout-goto-prefix))
 	  (last-at (point))
 	  bag-it)
-      (while (or bag-it (= (preceding-char) ?\r))
-	(beginning-of-line)
+      (while (or bag-it (allout-hidden-p))
+        (while (allout-hidden-p)
+          ;; XXX We would use `(move-beginning-of-line 1)', but it gets
+          ;; stuck on hidden newlines at column 80, as of GNU Emacs 22.0.50.
+          (beginning-of-line)
+          (if (allout-hidden-p) (forward-char -1)))
 	(if (= last-at (setq last-at (point)))
 	    ;; Oops, we're not making any progress!  Show the current
 	    ;; topic completely, and bag this try.
@@ -3926,38 +3842,24 @@ aberrant exposure states produced by `allout-show-entry'."
   (interactive)
   (allout-back-to-current-heading)
   (save-excursion
-   (allout-flag-region (point)
+    (end-of-line)
+    (allout-flag-region (point)
                         (progn (allout-end-of-entry) (point))
-                        ?\r)))
+                        t)))
 ;;;_   > allout-show-current-entry (&optional arg)
 (defun allout-show-current-entry (&optional arg)
 
-  "Show body following current heading, or hide the entry if repeat count."
+  "Show body following current heading, or hide entry with universal argument."
 
   (interactive "P")
   (if arg
       (allout-hide-current-entry)
+    (save-excursion (allout-show-to-offshoot))
     (save-excursion
       (allout-flag-region (point)
-			   (progn (allout-end-of-entry) (point))
-			   ?\n)
+                          (progn (allout-end-of-entry t) (point))
+                          nil)
       )))
-;;;_   > allout-hide-current-entry-completely ()
-; ... allout-hide-current-entry-completely also for isearch dynamic exposure:
-(defun allout-hide-current-entry-completely ()
-  "Like `allout-hide-current-entry', but conceal topic completely.
-
-Specifically intended for aberrant exposure states, like entries that were
-exposed by `allout-show-entry' but are within otherwise concealed regions."
-  (interactive)
-  (save-excursion
-    (allout-goto-prefix)
-    (allout-flag-region (if (not (bobp)) (1- (point)) (point))
-                         (progn (allout-pre-next-preface)
-                                (if (= ?\r (following-char))
-                                    (point)
-                                  (1- (point))))
-                         ?\r)))
 ;;;_   > allout-show-current-subtree (&optional arg)
 (defun allout-show-current-subtree (&optional arg)
   "Show everything within the current topic.  With a repeat-count,
@@ -3970,11 +3872,27 @@ expose this topic and its siblings."
 	    (error "No topics")
 	  ;; got to first, outermost topic - set to expose it and siblings:
 	  (message "Above outermost topic - exposing all.")
-	  (allout-flag-region (point-min)(point-max) ?\n))
+	  (allout-flag-region (point-min)(point-max) nil))
+      (allout-beginning-of-current-line)
       (if (not arg)
-	  (allout-flag-current-subtree ?\n)
+	  (allout-flag-current-subtree nil)
 	(allout-beginning-of-level)
 	(allout-expose-topic '(* :))))))
+;;;_   > allout-current-topic-collapsed-p (&optional include-single-liners)
+(defun allout-current-topic-collapsed-p (&optional include-single-liners)
+  "True if the currently visible containing topic is already collapsed.
+
+If optional INCLUDE-SINGLE-LINERS is true, then include single-line
+topics \(which intrinsically can be considered both collapsed and
+not\), as collapsed.  Otherwise they are considered uncollapsed."
+  (save-excursion
+      (and 
+       (= (progn (allout-back-to-current-heading)
+                 (move-end-of-line 1)
+                 (point))
+          (allout-end-of-current-subtree))
+       (or include-single-liners
+           (progn (backward-char 1) (allout-hidden-p))))))
 ;;;_   > allout-hide-current-subtree (&optional just-close)
 (defun allout-hide-current-subtree (&optional just-close)
   "Close the current topic, or containing topic if this one is already closed.
@@ -3982,35 +3900,21 @@ expose this topic and its siblings."
 If this topic is closed and it's a top level topic, close this topic
 and its siblings.
 
-If optional arg JUST-CLOSE is non-nil, do not treat the parent or
+If optional arg JUST-CLOSE is non-nil, do not close the parent or
 siblings, even if the target topic is already closed."
 
   (interactive)
-  (let ((from (point))
-	(orig-eol (progn (end-of-line)
-			 (if (not (allout-goto-prefix))
-			     (error "No topics found")
-			   (end-of-line)(point)))))
-    (allout-flag-current-subtree ?\r)
-    (goto-char from)
-    (if (and (= orig-eol (progn (goto-char orig-eol)
-				(end-of-line)
-				(point)))
-	     (not just-close)
-             ;; Structure didn't change - try hiding current level:
-	     (goto-char from)
-	     (if (allout-up-current-level 1 t)
-		 t
-	       (goto-char 0)
-	       (let ((msg
-		      "Top-level topic already closed - closing siblings..."))
-		 (message msg)
-		 (allout-expose-topic '(0 :))
-		 (message (concat msg "  Done.")))
-	       nil)
-	     (/= (allout-recent-depth) 0))
-	(allout-hide-current-subtree))
-      (goto-char from)))
+  (let* ((from (point))
+         (sibs-msg "Top-level topic already closed - closing siblings...")
+         (current-exposed (not (allout-current-topic-collapsed-p t))))
+    (cond (current-exposed (allout-flag-current-subtree t))
+          (just-close nil)
+          ((allout-up-current-level 1 t) (allout-hide-current-subtree))
+          (t (goto-char 0)
+             (message sibs-msg)
+             (allout-expose-topic '(0 :))
+             (message (concat sibs-msg "  Done."))))
+    (goto-char from)))
 ;;;_   > allout-show-current-branches ()
 (defun allout-show-current-branches ()
   "Show all subheadings of this heading, but not their bodies."
@@ -4031,7 +3935,7 @@ siblings, even if the target topic is already closed."
   "Show all of the text in the buffer."
   (interactive)
   (message "Exposing entire buffer...")
-  (allout-flag-region (point-min) (point-max) ?\n)
+  (allout-flag-region (point-min) (point-max) nil)
   (message "Exposing entire buffer...  Done."))
 ;;;_   > allout-hide-bodies ()
 (defun allout-hide-bodies ()
@@ -4046,11 +3950,11 @@ siblings, even if the target topic is already closed."
       (narrow-to-region start end)
       (goto-char (point-min))
       (while (not (eobp))
-	(allout-flag-region (point)
-                             (progn (allout-pre-next-preface) (point)) ?\r)
+        (end-of-line)
+	(allout-flag-region (point) (allout-end-of-entry) t)
 	(if (not (eobp))
 	    (forward-char
-	     (if (looking-at "[\n\r][\n\r]")
+	     (if (looking-at "\n\n")
 		 2 1)))))))
 
 ;;;_   > allout-expose-topic (spec)
@@ -4117,9 +4021,7 @@ Examples:
     (let ((depth (allout-depth))
 	  (max-pos 0)
 	  prev-elem curr-elem
-	  stay done
-	  snug-back
-	  )
+	  stay)
       (while spec
 	(setq prev-elem curr-elem
 	      curr-elem (car spec)
@@ -4147,7 +4049,7 @@ Examples:
 		       (setq spec (append (make-list residue prev-elem)
 					  spec)))))))
 	 ((numberp curr-elem)
-	  (if (and (>= 0 curr-elem) (allout-visible-p))
+	  (if (and (>= 0 curr-elem) (not (allout-hidden-p)))
 	      (save-excursion (allout-hide-current-subtree t)
 			      (if (> 0 curr-elem)
 				  nil
@@ -4207,7 +4109,6 @@ Optional FOLLOWERS arguments dictate exposure for succeeding siblings."
 
   (interactive "xExposure spec: ")
   (let ((depth (allout-current-depth))
-	done
 	max-pos)
     (cond ((null spec) nil)
 	  ((symbolp spec)
@@ -4387,7 +4288,7 @@ header and body.  The elements of that list are:
   (save-excursion
     (let*
 	;; state vars:
-	(strings prefix pad result depth new-depth out gone-out bullet beg
+	(strings prefix result depth new-depth out gone-out bullet beg
 		 next done)
 
       (goto-char start)
@@ -4419,16 +4320,11 @@ header and body.  The elements of that list are:
 		       beg
 					;To hidden text or end of line:
 		       (progn
-			 (search-forward "\r"
-					 (save-excursion (end-of-line)
-							 (point))
-					 1)
-			 (if (= (preceding-char) ?\r)
-			     (1- (point))
-			   (point))))
+                         (end-of-line)
+                         (allout-back-to-visible-text)))
 		      strings))
-	  (if (< (point) next)		; Resume from after hid text, if any.
-	      (forward-line 1))
+	  (when (< (point) next)      ; Resume from after hid text, if any.
+            (line-move 1))
 	  (setq beg (point)))
 	;; Accumulate list for this topic:
 	(setq strings (nreverse strings))
@@ -4488,7 +4384,7 @@ header and body.  The elements of that list are:
 ;;;_   > allout-process-exposed (&optional func from to frombuf
 ;;;					    tobuf format)
 (defun allout-process-exposed (&optional func from to frombuf tobuf
-					  format &optional start-num)
+					  format start-num)
   "Map function on exposed parts of current topic; results to another buffer.
 
 All args are options; default values itemized below.
@@ -4694,13 +4590,6 @@ environment.  Leaves point at the end of the line."
 	(page-numbering (if allout-number-pages
 			    "\\pagestyle{empty}\n"
 			  ""))
-	(linesdef (concat "\\def\\beginlines{"
-			  "\\par\\begingroup\\nobreak\\medskip"
-			  "\\parindent=0pt\n"
-			  " \\kern1pt\\nobreak \\obeylines \\obeyspaces "
-			  "\\everypar{\\strut}}\n"
-			  "\\def\\endlines{"
-			  "\\kern1pt\\endgroup\\medbreak\\noindent}\n"))
 	(titlecmd (format "\\newcommand{\\titlecmd}[1]{{%s #1}}\n"
 			  allout-title-style))
 	(labelcmd (format "\\newcommand{\\labelcmd}[1]{{%s #1}}\n"
@@ -4733,7 +4622,7 @@ environment.  Leaves point at the end of the line."
 	(title (format "%s%s%s%s"
 		       "\\titlecmd{"
 		       (allout-latex-verb-quote (if allout-title
-						(condition-case err
+						(condition-case nil
 						    (eval allout-title)
 						  ('error "<unnamed buffer>"))
 					      "Unnamed Outline"))
@@ -4913,7 +4802,7 @@ solicited whenever the passphrase is changed."
   (interactive "P")
   (save-excursion
     (allout-back-to-current-heading)
-    (allout-toggle-subtree-encryption)
+    (allout-toggle-subtree-encryption fetch-pass)
     )
   )
 ;;;_  > allout-toggle-subtree-encryption (&optional fetch-pass)
@@ -4948,20 +4837,23 @@ See `allout-toggle-current-subtree-encryption' for more details."
             (progn (if (= (point-max) after-bullet-pos)
                        (error "no body to encrypt"))
                    (allout-encrypted-topic-p)))
-           (was-collapsed (if (not (re-search-forward "[\n\r]" nil t))
+           (was-collapsed (if (not (search-forward "\n" nil t))
                               nil
                             (backward-char 1)
-                            (looking-at "\r")))
+                            (allout-hidden-p)))
            (subtree-beg (1+ (point)))
            (subtree-end (allout-end-of-subtree))
            (subject-text (buffer-substring-no-properties subtree-beg
                                                          subtree-end))
            (subtree-end-char (char-after (1- subtree-end)))
-           (subtree-trailling-char (char-after subtree-end))
-           (place-holder (if (or (string= "" subject-text)
-                                 (string= "\n" subject-text))
-                             (error "No topic contents to %scrypt"
-                                    (if was-encrypted "de" "en"))))
+           (subtree-trailing-char (char-after subtree-end))
+           ;; kluge - result-text needs to be nil, but we also want to
+           ;;         check for the error condition
+           (result-text (if (or (string= "" subject-text)
+                                (string= "\n" subject-text))
+                            (error "No topic contents to %scrypt"
+                                   (if was-encrypted "de" "en"))
+                          nil))
            ;; Assess key parameters:
            (key-info (or
                       ;; detect the type by which it is already encrypted
@@ -4972,8 +4864,7 @@ See `allout-toggle-current-subtree-encryption' for more details."
                       '(symmetric nil)))
            (for-key-type (car key-info))
            (for-key-identity (cadr key-info))
-           (fetch-pass (and fetch-pass (member fetch-pass '(16 (16)))))
-           result-text)
+           (fetch-pass (and fetch-pass (member fetch-pass '(16 (16))))))
 
       (setq result-text
             (allout-encrypt-string subject-text was-encrypted
@@ -4987,12 +4878,12 @@ See `allout-toggle-current-subtree-encryption' for more details."
          (delete-region subtree-beg subtree-end)
          (insert result-text)
          (if was-collapsed
-             (allout-flag-region subtree-beg (1- (point)) ?\r))
-         ;; adjust trailling-blank-lines to preserve topic spacing:
+             (allout-flag-region (1- subtree-beg) (point) t))
+         ;; adjust trailing-blank-lines to preserve topic spacing:
          (if (not was-encrypted)
-             (if (and (member subtree-end-char '(?\r ?\n))
-                      (member subtree-trailling-char '(?\r ?\n)))
-                 (insert subtree-trailling-char)))
+             (if (and (= subtree-end-char ?\n)
+                      (= subtree-trailing-char ?\n))
+                 (insert subtree-trailing-char)))
          ;; Ensure that the item has an encrypted-entry bullet:
          (if (not (string= (buffer-substring-no-properties
                             (1- after-bullet-pos) after-bullet-pos)
@@ -5060,8 +4951,7 @@ Returns the resulting string, or nil if the transformation fails."
                                       target-prompt-id
                                     (or (buffer-file-name allout-buffer)
                                         target-prompt-id))))
-         (comment "Processed by allout driving pgg")
-         work-buffer result result-text status)
+         result-text status)
 
     (if (and fetch-pass (not passphrase))
         ;; Force later fetch by evicting passphrase from the cache.
@@ -5083,7 +4973,7 @@ Returns the resulting string, or nil if the transformation fails."
                                                        retried fetch-pass)))
         (with-temp-buffer
 
-          (insert (subst-char-in-string ?\r ?\n text))
+          (insert text)
 
           (cond
 
@@ -5319,7 +5209,7 @@ An error is raised if the text is not encrypted."
   (require 'pgg-parse)
   (save-excursion
     (with-temp-buffer
-      (insert (subst-char-in-string ?\r ?\n text))
+      (insert text)
       (let* ((parsed-armor (pgg-parse-armor-region (point-min) (point-max)))
              (type (if (pgg-gpg-symmetric-key-p parsed-armor)
                        'symmetric
@@ -5442,21 +5332,21 @@ must also have content."
     (while (not done)
 
       (if (not (re-search-forward
-                (format "\\(\\`\\|[\n\r]\\)%s *%s[^*]"
+                (format "\\(\\`\\|\n\\)%s *%s[^*]"
                         (regexp-quote allout-header-prefix)
                         (regexp-quote allout-topic-encryption-bullet))
                 nil t))
           (setq got nil
                 done t)
         (goto-char (setq got (match-beginning 0)))
-        (if (looking-at "[\n\r]")
+        (if (looking-at "\n")
             (forward-char 1))
         (setq got (point)))
 
       (cond ((not got)
              (setq done t))
 
-            ((not (re-search-forward "[\n\r]"))
+            ((not (search-forward "\n"))
              (setq got nil
                    done t))
 
@@ -5498,26 +5388,28 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
 
   (interactive "p")
   (save-excursion
-    (let ((current-mark (point-marker))
-          was-modified
-          bo-subtree
-          editing-topic editing-point)
+    (let* ((current-mark (point-marker))
+           (current-mark-position (marker-position current-mark))
+           was-modified
+           bo-subtree
+           editing-topic editing-point)
       (goto-char (point-min))
       (while (allout-next-topic-pending-encryption except-mark)
         (setq was-modified (buffer-modified-p))
-        (if (save-excursion
-              (and (boundp 'allout-encrypt-unencrypted-on-saves)
-                   allout-encrypt-unencrypted-on-saves
-                   (setq bo-subtree (re-search-forward "[\n\r]"))
-                   ;; Not collapsed:
-                   (string= (match-string 0) "\n")
-                   (>= current-mark (point))
-                   (allout-end-of-current-subtree)
-                   (<= current-mark (point))))
+        (when (save-excursion
+                (and (boundp 'allout-encrypt-unencrypted-on-saves)
+                     allout-encrypt-unencrypted-on-saves
+                     (setq bo-subtree (re-search-forward "$"))
+                     (not (allout-hidden-p))
+                     (>= current-mark (point))
+                     (allout-end-of-current-subtree)
+                     (<= current-mark (point))))
             (setq editing-topic (point)
                   ;; we had to wait for this 'til now so prior topics are
                   ;; encrypted, any relevant text shifts are in place:
-                  editing-point (marker-position current-mark)))
+                  editing-point (- current-mark-position
+                                   (count-trailing-whitespace-region
+                                    bo-subtree current-mark-position))))
         (allout-toggle-subtree-encryption)
         (if (not was-modified)
             (set-buffer-modified-p nil))
@@ -5579,11 +5471,11 @@ Returns list `(beginning-point prefix-string suffix-string)'."
         (setq beg (- (point) 16))
         (setq suffix (buffer-substring-no-properties
                       (point)
-                      (progn (if (re-search-forward "[\n\r]" nil t)
+                      (progn (if (search-forward "\n" nil t)
                                  (forward-char -1))
                              (point))))
         (setq prefix (buffer-substring-no-properties
-                      (progn (if (re-search-backward "[\n\r]" nil t)
+                      (progn (if (search-backward "\n" nil t)
                                  (forward-char 1))
                              (point))
                       beg))
@@ -5639,7 +5531,7 @@ enable-local-variables must be true for any of this to happen."
         (allout-show-to-offshoot)
         (if (search-forward (concat "\n" prefix varname ":") nil t)
             (let* ((value-beg (point))
-                   (line-end (progn (if (re-search-forward "[\n\r]" nil t)
+                   (line-end (progn (if (search-forward "\n" nil t)
                                         (forward-char -1))
                                     (point)))
                    (value-end (- line-end (length suffix))))
@@ -5710,26 +5602,29 @@ Optional arg SUCCESSIVE-BACKSLASHES is used internally for recursion."
 		(regexp-sans-escapes (substring regexp 1)))
       ;; Exclude first char, but maintain count:
       (regexp-sans-escapes (substring regexp 1) successive-backslashes))))
-;;;_  - add-hook definition for divergent emacsen
-;;;_   > add-hook (hook function &optional append)
-(if (not (fboundp 'add-hook))
-    (defun add-hook (hook function &optional append)
-      "Add to the value of HOOK the function FUNCTION unless already present.
-\(It becomes the first hook on the list unless optional APPEND is non-nil, in
-which case it becomes the last).  HOOK should be a symbol, and FUNCTION may be
-any valid function.  HOOK's value should be a list of functions, not a single
-function.  If HOOK is void, it is first set to nil."
-      (or (boundp hook) (set hook nil))
-      (or (if (consp function)
-	      ;; Clever way to tell whether a given lambda-expression
-	      ;; is equal to anything in the hook.
-	      (let ((tail (assoc (cdr function) (symbol-value hook))))
-		(equal function tail))
-	    (memq function (symbol-value hook)))
-	  (set hook
-	       (if append
-		   (nconc (symbol-value hook) (list function))
-		 (cons function (symbol-value hook)))))))
+;;;_  > count-trailing-whitespace-region (beg end)
+(defun count-trailing-whitespace-region (beg end)
+  "Return number of trailing whitespace chars between BEG and END.
+
+If BEG is bigger than END we return 0."
+  (if (> beg end)
+      0
+    (save-excursion
+      (goto-char beg)
+      (let ((count 0))
+        (while (re-search-forward "[ 	][ 	]*$" end t)
+          (goto-char (1+ (match-beginning 0)))
+          (setq count (1+ count)))
+        count))))
+;;;_  > allout-mark-marker to accommodate divergent emacsen:
+(defun allout-mark-marker (&optional force buffer)
+  "Accommodate the different signature for `mark-marker' across Emacsen.
+
+XEmacs takes two optional args, while mainline GNU Emacs does not,
+so pass them along when appropriate."
+  (if (featurep 'xemacs)
+      (apply 'mark-marker force buffer)
+    (mark-marker)))
 ;;;_  > subst-char-in-string if necessary
 (if (not (fboundp 'subst-char-in-string))
     (defun subst-char-in-string (fromchar tochar string &optional inplace)
@@ -5742,17 +5637,159 @@ Unless optional argument INPLACE is non-nil, return a new string."
           (if (eq (aref newstr i) fromchar)
               (aset newstr i tochar)))
         newstr)))
-;;;_  : my-mark-marker to accommodate divergent emacsen:
-(defun my-mark-marker (&optional force buffer)
-  "Accommodate the different signature for `mark-marker' across Emacsen.
+;;;_  > wholenump if necessary
+(if (not (fboundp 'wholenump))
+    (defalias 'wholenump 'natnump))
+;;;_  > remove-overlays if necessary
+(if (not (fboundp 'remove-overlays))
+    (defun remove-overlays (&optional beg end name val)
+      "Clear BEG and END of overlays whose property NAME has value VAL.
+Overlays might be moved and/or split.
+BEG and END default respectively to the beginning and end of buffer."
+      (unless beg (setq beg (point-min)))
+      (unless end (setq end (point-max)))
+      (if (< end beg)
+          (setq beg (prog1 end (setq end beg))))
+      (save-excursion
+        (dolist (o (overlays-in beg end))
+          (when (eq (overlay-get o name) val)
+            ;; Either push this overlay outside beg...end
+            ;; or split it to exclude beg...end
+            ;; or delete it entirely (if it is contained in beg...end).
+            (if (< (overlay-start o) beg)
+                (if (> (overlay-end o) end)
+                    (progn
+                      (move-overlay (copy-overlay o)
+                                    (overlay-start o) beg)
+                      (move-overlay o end (overlay-end o)))
+                  (move-overlay o (overlay-start o) beg))
+              (if (> (overlay-end o) end)
+                  (move-overlay o end (overlay-end o))
+                (delete-overlay o)))))))
+  )
+;;;_  > copy-overlay if necessary - xemacs ~ 21.4
+(if (not (fboundp 'copy-overlay))
+    (defun copy-overlay (o)
+      "Return a copy of overlay O."
+      (let ((o1 (make-overlay (overlay-start o) (overlay-end o)
+                              ;; FIXME: there's no easy way to find the
+                              ;; insertion-type of the two markers.
+                              (overlay-buffer o)))
+            (props (overlay-properties o)))
+        (while props
+          (overlay-put o1 (pop props) (pop props)))
+        o1)))
+;;;_  > add-to-invisibility-spec if necessary - xemacs ~ 21.4
+(if (not (fboundp 'add-to-invisibility-spec))
+    (defun add-to-invisibility-spec (element)
+      "Add ELEMENT to `buffer-invisibility-spec'.
+See documentation for `buffer-invisibility-spec' for the kind of elements
+that can be added."
+      (if (eq buffer-invisibility-spec t)
+          (setq buffer-invisibility-spec (list t)))
+      (setq buffer-invisibility-spec
+            (cons element buffer-invisibility-spec))))
+;;;_  > remove-from-invisibility-spec if necessary - xemacs ~ 21.4
+(if (not (fboundp 'remove-from-invisibility-spec))
+    (defun remove-from-invisibility-spec (element)
+      "Remove ELEMENT from `buffer-invisibility-spec'."
+      (if (consp buffer-invisibility-spec)
+          (setq buffer-invisibility-spec (delete element
+                                                 buffer-invisibility-spec)))))
+;;;_  > move-beginning-of-line if necessary - older emacs, xemacs
+(if (not (fboundp 'move-beginning-of-line))
+    (defun move-beginning-of-line (arg)
+      "Move point to beginning of current line as displayed.
+\(This disregards invisible newlines such as those
+which are part of the text that an image rests on.)
 
-XEmacs takes two optional args, while mainline GNU Emacs does not,
-so pass them along when appropriate."
-  (if (featurep 'xemacs)
-      (apply 'mark-marker force buffer)
-    (mark-marker)))
+With argument ARG not nil or 1, move forward ARG - 1 lines first.
+If point reaches the beginning or end of buffer, it stops there.
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
 
-;;;_ #10 Under development
+This function does not move point across a field boundary unless that
+would move point to a different line than the original, unconstrained
+result.  If N is nil or 1, and a front-sticky field starts at point,
+the point does not move.  To ignore field boundaries bind
+`inhibit-field-text-motion' to t."
+      (interactive "p")
+      (or arg (setq arg 1))
+      (if (/= arg 1)
+          (condition-case nil (line-move (1- arg)) (error nil)))
+
+      (let ((orig (point)))
+        ;; Move to beginning-of-line, ignoring fields and invisibles.
+        (skip-chars-backward "^\n")
+        (while (and (not (bobp)) (line-move-invisible-p (1- (point))))
+          (goto-char (if (featurep 'xemacs)
+                         (previous-property-change (point))
+                       (previous-char-property-change (point))))
+          (skip-chars-backward "^\n"))
+        (vertical-motion 0)
+        (if (/= orig (point))
+            (goto-char (constrain-to-field (point) orig (/= arg 1) t nil)))))
+)
+;;;_  > move-end-of-line if necessary - older emacs, xemacs
+(if (not (fboundp 'move-end-of-line))
+    (defun move-end-of-line (arg)
+      "Move point to end of current line as displayed.
+\(This disregards invisible newlines such as those
+which are part of the text that an image rests on.)
+
+With argument ARG not nil or 1, move forward ARG - 1 lines first.
+If point reaches the beginning or end of buffer, it stops there.
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
+
+This function does not move point across a field boundary unless that
+would move point to a different line than the original, unconstrained
+result.  If N is nil or 1, and a rear-sticky field ends at point,
+the point does not move.  To ignore field boundaries bind
+`inhibit-field-text-motion' to t."
+      (interactive "p")
+      (or arg (setq arg 1))
+      (let ((orig (point))
+            done)
+        (while (not done)
+          (let ((newpos
+                 (save-excursion
+                   (let ((goal-column 0))
+                     (and (condition-case nil
+                              (or (line-move arg) t)
+                            (error nil))
+                          (not (bobp))
+                          (progn
+                            (while (and (not (bobp)) (line-move-invisible-p (1- (point))))
+                              (goto-char (previous-char-property-change (point))))
+                            (backward-char 1)))
+                     (point)))))
+            (goto-char newpos)
+            (if (and (> (point) newpos)
+                     (eq (preceding-char) ?\n))
+                (backward-char 1)
+              (if (and (> (point) newpos) (not (eobp))
+                       (not (eq (following-char) ?\n)))
+                  ;; If we skipped something intangible
+                  ;; and now we're not really at eol,
+                  ;; keep going.
+                  (setq arg 1)
+                (setq done t)))))
+        (if (/= orig (point))
+            (goto-char (constrain-to-field (point) orig (/= arg 1) t
+                                           nil)))))
+  )
+;;;_  > line-move-invisible-p if necessary
+(if (not (fboundp 'line-move-invisible-p))
+    (defun line-move-invisible-p (pos)
+      "Return non-nil if the character after POS is currently invisible."
+      (let ((prop
+             (get-char-property pos 'invisible)))
+        (if (eq buffer-invisibility-spec t)
+            prop
+          (or (memq prop buffer-invisibility-spec)
+              (assq prop buffer-invisibility-spec))))))
+
+
+;;;_ #10 Unfinished
 ;;;_  > allout-bullet-isearch (&optional bullet)
 (defun allout-bullet-isearch (&optional bullet)
   "Isearch \(regexp) for topic with bullet BULLET."
@@ -5769,8 +5806,9 @@ so pass them along when appropriate."
 				bullet)))
     (isearch-repeat 'forward)
     (isearch-mode t)))
-;;;_  ? Re hooking up with isearch - use isearch-op-fun rather than
-;;;	wrapping the isearch functions.
+
+;;;_ #11 Provide
+(provide 'allout)
 
 ;;;_* Local emacs vars.
 ;;; The following `allout-layout' local variable setting:
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 5388ff9863d..3094da3bfe8 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -706,9 +706,9 @@ For more information, see the function `buffer-menu'."
 	 list desired-point)
     (when Buffer-menu-use-header-line
       (let ((pos 0))
-	;; Turn spaces in the header into stretch specs so they work
-	;; regardless of the header-line face.
-	(while (string-match "[ \t]+" header pos)
+	;; Turn whitespace chars in the header into stretch specs so
+	;; they work regardless of the header-line face.
+	(while (string-match "[ \t\n]+" header pos)
 	  (setq pos (match-end 0))
 	  (put-text-property (match-beginning 0) pos 'display
 			     ;; Assume fixed-size chars in the buffer.
@@ -726,6 +726,7 @@ For more information, see the function `buffer-menu'."
       (erase-buffer)
       (setq standard-output (current-buffer))
       (unless Buffer-menu-use-header-line
+        ;; Use U+2014 (EM DASH) to underline if possible, else U+002D (HYPHEN-MINUS)
 	(let ((underline (if (char-displayable-p ?鈥�) ?鈥� ?-)))
 	  (insert header
 		  (apply 'string
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index b900d4c57f3..570fb626747 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -705,7 +705,7 @@ would be \"pm\"."
   "Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
 format.  The result is appended to the file ICAL-FILENAME."
-  (interactive "FExport diary data from file:
+  (interactive "FExport diary data from file: 
 Finto iCalendar file: ")
   (save-current-buffer
     (set-buffer (find-file diary-filename))
@@ -1449,8 +1449,8 @@ Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
 non-marking or not."
-  (interactive "fImport iCalendar data from file:
-Finto diary file:
+  (interactive "fImport iCalendar data from file: 
+Finto diary file: 
 p")
   ;; clean up the diary file
   (save-current-buffer
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 3d06bd0fcae..feacc9adf0d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -932,6 +932,7 @@ If given a prefix (or a COMMENT argument), also prompt for a comment."
 				       "Set customized value for %s to: "
 				       current-prefix-arg))
   (custom-load-symbol variable)
+  (custom-push-theme 'theme-value variable 'user 'set (custom-quote value))
   (funcall (or (get variable 'custom-set) 'set-default) variable value)
   (put variable 'customized-value (list (custom-quote value)))
   (cond ((string= comment "")
@@ -4166,7 +4167,9 @@ This function does not save the buffer."
       (mapatoms
        (lambda (symbol)
 	 (if (and (get symbol 'saved-value)
-		  (eq 'user (car (car-safe (get symbol 'theme-value)))))
+		  ;; ignore theme values
+		  (or (null (get symbol 'theme-value))
+		      (eq 'user (caar (get symbol 'theme-value)))))
 	     (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       (unless (bolp)
diff --git a/lisp/custom.el b/lisp/custom.el
index 0f95e3bab73..bdac459daee 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -690,7 +690,9 @@ Return non-nil iff the `customized-value' property actually changed."
 	    (not (equal value (condition-case nil
 				  (eval (car old))
 				(error nil)))))
-	(put symbol 'customized-value (list (custom-quote value)))
+	(progn (put symbol 'customized-value (list (custom-quote value)))
+	       (custom-push-theme 'theme-value symbol 'user 'set
+				  (custom-quote value)))
       (put symbol 'customized-value nil))
     ;; Changed?
     (not (equal customized (get symbol 'customized-value)))))
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 67da6eae25d..62a6386584e 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-diff)
 
 ;; compiler pacifier
 (defvar ediff-default-variant)
@@ -129,13 +128,33 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP."
 
 (defcustom ediff-diff-options ""
   "*Options to pass to `ediff-diff-program'.
-If Unix diff is used as `ediff-diff-program', then the most useful options are
+If Unix diff is used as `ediff-diff-program', then a useful option is
 `-w', to ignore space, and `-i', to ignore case of letters.
-At present, the option `-c' is not allowed."
+Options `-c' and `-i' are not allowed. Case sensitivity can be toggled
+interactively using [ediff-toggle-ignore-case]"
   :set 'ediff-reset-diff-options
   :type 'string
   :group 'ediff-diff)
 
+(ediff-defvar-local ediff-ignore-case nil
+  "*If t, skip over difference regions that differ only in letter case.
+This variable can be set either in .emacs or toggled interactively.
+Use `setq-default' if setting it in .emacs")
+
+(defcustom ediff-ignore-case-option "-i"
+  "*Option that causes the diff program to ignore case of letters."
+  :type 'string
+  :group 'ediff-diff)
+
+(defcustom ediff-ignore-case-option3 ""
+  "*Option that causes the diff3 program to ignore case of letters.
+GNU diff3 doesn't have such an option."
+  :type 'string
+  :group 'ediff-diff)
+
+;; the actual options used in comparison
+(ediff-defvar-local ediff-actual-diff-options "" "")
+
 (defcustom ediff-custom-diff-program ediff-diff-program
   "*Program to use for generating custom diff output for saving it in a file.
 This output is not used by Ediff internally."
@@ -155,6 +174,10 @@ This output is not used by Ediff internally."
   :set 'ediff-reset-diff-options
   :type 'string
   :group 'ediff-diff)
+
+;; the actual options used in comparison
+(ediff-defvar-local ediff-actual-diff3-options "" "")
+
 (defcustom ediff-diff3-ok-lines-regexp
   "^\\([1-3]:\\|====\\|  \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)"
   "*Regexp that matches normal output lines from `ediff-diff3-program'.
@@ -182,7 +205,7 @@ Use `setq-default' if setting it in .emacs")
 This variable can be set either in .emacs or toggled interactively.
 Use `setq-default' if setting it in .emacs")
 
-(ediff-defvar-local ediff-auto-refine-limit 1400
+(ediff-defvar-local ediff-auto-refine-limit 14000
   "*Auto-refine only the regions of this size \(in bytes\) or less.")
 
 ;;; General
@@ -227,9 +250,9 @@ one optional arguments, diff-number to refine.")
 ;; ediff-setup-diff-regions-function, which can also have the value
 ;; ediff-setup-diff-regions3, which takes 4 arguments.
 (defun ediff-setup-diff-regions (file-A file-B file-C)
-  ;; looking either for '-c' or a 'c' in a set of clustered non-long options
-  (if (string-match "^-c\\| -c\\|-[^- ]+c" ediff-diff-options)
-      (error "Option `-c' is not allowed in `ediff-diff-options'"))
+  ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options
+  (if (string-match "^-[ci]\\| -[ci]\\|-[^- ]+[ci]" ediff-diff-options)
+      (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'"))
 
   ;; create, if it doesn't exist
   (or (ediff-buffer-live-p ediff-diff-buffer)
@@ -266,7 +289,7 @@ one optional arguments, diff-number to refine.")
 	     (ediff-exec-process ediff-diff-program
 				 diff-buffer
 				 'synchronize
-				 ediff-diff-options file1 file2)
+				 ediff-actual-diff-options file1 file2)
 	     (message "")
 	     (ediff-with-current-buffer diff-buffer
 	       (buffer-size))))))
@@ -284,7 +307,9 @@ one optional arguments, diff-number to refine.")
   (let (diff3-job diff-program diff-options ok-regexp diff-list)
     (setq diff3-job ediff-3way-job
 	  diff-program (if diff3-job ediff-diff3-program ediff-diff-program)
-	  diff-options (if diff3-job ediff-diff3-options ediff-diff-options)
+	  diff-options (if diff3-job
+			   ediff-actual-diff3-options
+			 ediff-actual-diff-options)
 	  ok-regexp (if diff3-job
 			ediff-diff3-ok-lines-regexp
 			ediff-diff-ok-lines-regexp))
@@ -366,11 +391,14 @@ one optional arguments, diff-number to refine.")
 	(B-buffer ediff-buffer-B)
 	(C-buffer ediff-buffer-C)
 	(a-prev 1) ; this is needed to set the first diff line correctly
+	(a-prev-pt nil)
 	(b-prev 1)
+	(b-prev-pt nil)
 	(c-prev 1)
+	(c-prev-pt nil)
 	diff-list shift-A shift-B
 	)
-
+    
     ;; diff list contains word numbers, unless changed later
     (setq diff-list (cons (if word-mode 'words 'points)
 			  diff-list))
@@ -382,7 +410,7 @@ one optional arguments, diff-number to refine.")
 	      shift-B
 	      (ediff-overlay-start
 	       (ediff-get-value-according-to-buffer-type 'B bounds))))
-
+    
     ;; reset point in buffers A/B/C
     (ediff-with-current-buffer A-buffer
       (goto-char (if shift-A shift-A (point-min))))
@@ -466,11 +494,13 @@ one optional arguments, diff-number to refine.")
 	       ;; we must disable and then restore longlines-mode
 	       (if (eq longlines-mode-val 1)
 		   (longlines-mode 0))
+	       (goto-char (or a-prev-pt shift-A (point-min)))
 	       (forward-line (- a-begin a-prev))
 	       (setq a-begin-pt (point))
 	       (forward-line (- a-end a-begin))
 	       (setq a-end-pt (point)
-		     a-prev a-end)
+		     a-prev a-end
+		     a-prev-pt a-end-pt)
 	       (if (eq longlines-mode-val 1)
 		   (longlines-mode longlines-mode-val))
 	       ))
@@ -479,11 +509,13 @@ one optional arguments, diff-number to refine.")
 		    (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
 	       (if (eq longlines-mode-val 1)
 		   (longlines-mode 0))
+	       (goto-char (or b-prev-pt shift-B (point-min)))
 	       (forward-line (- b-begin b-prev))
 	       (setq b-begin-pt (point))
 	       (forward-line (- b-end b-begin))
 	       (setq b-end-pt (point)
-		     b-prev b-end)
+		     b-prev b-end
+		     b-prev-pt b-end-pt)
 	       (if (eq longlines-mode-val 1)
 		   (longlines-mode longlines-mode-val))
 	       ))
@@ -493,11 +525,13 @@ one optional arguments, diff-number to refine.")
 			(if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
 		   (if (eq longlines-mode-val 1)
 		       (longlines-mode 0))
+		   (goto-char (or c-prev-pt (point-min)))
 		   (forward-line (- c-begin c-prev))
 		   (setq c-begin-pt (point))
 		   (forward-line (- c-end c-begin))
 		   (setq c-end-pt (point)
-			 c-prev c-end)
+			 c-prev c-end
+			 c-prev-pt c-end-pt)
 		   (if (eq longlines-mode-val 1)
 		       (longlines-mode longlines-mode-val))
 		 )))
@@ -987,8 +1021,11 @@ delimiter regions"))
 	(C-buffer ediff-buffer-C)
 	(anc-buffer ediff-ancestor-buffer)
 	(a-prev 1) ; needed to set the first diff line correctly
+	(a-prev-pt nil)
 	(b-prev 1)
+	(b-prev-pt nil)
 	(c-prev 1)
+	(c-prev-pt nil)
 	(anc-prev 1)
 	diff-list shift-A shift-B shift-C
 	)
@@ -1089,11 +1126,13 @@ delimiter regions"))
 		     ;; we must disable and then restore longlines-mode
 		     (if (eq longlines-mode-val 1)
 			 (longlines-mode 0))
+		     (goto-char (or a-prev-pt shift-A (point-min)))
 		     (forward-line (- a-begin a-prev))
 		     (setq a-begin-pt (point))
 		     (forward-line (- a-end a-begin))
 		     (setq a-end-pt (point)
-			   a-prev a-end)
+			   a-prev a-end
+			   a-prev-pt a-end-pt)
 		     (if (eq longlines-mode-val 1)
 			 (longlines-mode longlines-mode-val))
 		     ))
@@ -1102,11 +1141,13 @@ delimiter regions"))
 			  (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
 		     (if (eq longlines-mode-val 1)
 			 (longlines-mode 0))
+		     (goto-char (or b-prev-pt shift-B (point-min)))
 		     (forward-line (- b-begin b-prev))
 		     (setq b-begin-pt (point))
 		     (forward-line (- b-end b-begin))
 		     (setq b-end-pt (point)
-			   b-prev b-end)
+			   b-prev b-end
+			   b-prev-pt b-end-pt)
 		     (if (eq longlines-mode-val 1)
 			 (longlines-mode longlines-mode-val))
 		     ))
@@ -1115,11 +1156,13 @@ delimiter regions"))
 			  (if (and (boundp 'longlines-mode) longlines-mode) 1 0)))
 		     (if (eq longlines-mode-val 1)
 			 (longlines-mode 0))
+		     (goto-char (or c-prev-pt shift-C (point-min)))
 		     (forward-line (- c-begin c-prev))
 		     (setq c-begin-pt (point))
 		     (forward-line (- c-end c-begin))
 		     (setq c-end-pt (point)
-			   c-prev c-end)
+			   c-prev c-end
+			   c-prev-pt c-end-pt)
 		     (if (eq longlines-mode-val 1)
 			 (longlines-mode longlines-mode-val))
 		     ))
@@ -1171,13 +1214,17 @@ delimiter regions"))
 ;; File-C is either the third file to compare (in case of 3-way comparison)
 ;; or it is the ancestor file.
 (defun ediff-setup-diff-regions3 (file-A file-B file-C)
+  ;; looking for '-i' or a 'i' among clustered non-long options
+  (if (string-match "^-i\\| -i\\|-[^- ]+i" ediff-diff-options)
+      (error "Option `-i' is not allowed in `ediff-diff3-options'"))
+
   (or (ediff-buffer-live-p ediff-diff-buffer)
       (setq ediff-diff-buffer
 	    (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
 
   (message "Computing differences ...")
   (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize
-		      ediff-diff3-options file-A file-B file-C)
+		      ediff-actual-diff3-options file-A file-B file-C)
 
   (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer)
   ;;(message "Computing differences ... done")
@@ -1471,6 +1518,35 @@ affects only files whose names match the expression."
       (setq file-list-list (cdr file-list-list)))
     (reverse result)))
 
+;; Ignore case handling - some ideas from drew.adams@@oracle.com
+(defun ediff-toggle-ignore-case ()
+  (interactive)
+  (ediff-barf-if-not-control-buffer)
+  (setq ediff-ignore-case (not ediff-ignore-case))
+  (cond (ediff-ignore-case
+	 (setq ediff-actual-diff-options 
+	       (concat ediff-diff-options " " ediff-ignore-case-option)
+	       ediff-actual-diff3-options
+	       (concat ediff-diff3-options " " ediff-ignore-case-option3))
+	 (message "Ignoring regions that differ only in case"))
+	(t
+	 (setq ediff-actual-diff-options ediff-diff-options
+	       ediff-actual-diff3-options ediff-diff3-options)
+	 (message "Ignoring case differences turned OFF")))
+  (cond (ediff-merge-job
+	 (message "Ignoring letter case is too dangerous in merge jobs"))
+	((and ediff-diff3-job (string= ediff-ignore-case-option3 ""))
+	 (message "Ignoring letter case is not supported by this diff3 program"))
+	((and (not ediff-3way-job) (string= ediff-ignore-case-option ""))
+	 (message "Ignoring letter case is not supported by this diff program"))
+	(t
+	 (sit-for 1)
+	 (ediff-update-diffs)))
+  )
+
+
+(provide 'ediff-diff)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index cc266e3c8a3..d5f505c7de3 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-help)
 
 ;; Compiler pacifier start
 (defvar ediff-multiframe)
@@ -61,8 +60,8 @@ For help on a specific command:  Click Button 2 over it; or
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
-   gx -goto X's point|                           |  ! -update diff regions
-  C-l -recenter      |    ## -ignore whitespace  |
+   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
+  C-l -recenter      |    #c -ignore case        |
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -rotate buffers|     m -wide display       |
@@ -75,8 +74,8 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
-   gx -goto X's point|                           |  ! -update diff regions
-  C-l -recenter      |    ## -ignore whitespace  |
+   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
+  C-l -recenter      |    #c -ignore case        |
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -swap variants |     m -wide display       |
@@ -89,8 +88,8 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
-   gx -goto X's point|     % -narrow/widen buffs |  ! -update diff regions
-  C-l -recenter      |    ## -ignore whitespace  |
+   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
+  C-l -recenter      |    #c -ignore case        |  % -narrow/widen buffs 
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -swap variants |     m -wide display       |
@@ -103,8 +102,8 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
 n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
     j -jump to diff  |                           |
-   gx -goto X's point|     % -narrow/widen buffs |  ! -recompute diffs
-  C-l -recenter      |                           |
+   gx -goto X's point|    % -narrow/widen buffs  |  ! -recompute diffs
+  C-l -recenter      |    #c -ignore case        |
   v/V -scroll up/dn  | #f/#h -focus/hide regions | wx -save buf X
   </> -scroll lt/rt  |     X -read-only in buf X | wd -save diff output
     ~ -swap variants |     m -wide display       |
@@ -228,6 +227,7 @@ the value of this variable and the variables `ediff-help-message-*' in
 	    ((string= cmd "r") (re-search-forward "^`r'"))
 	    ((string= cmd "rx") (re-search-forward "^`ra'"))
 	    ((string= cmd "##") (re-search-forward "^`##'"))
+	    ((string= cmd "#c") (re-search-forward "^`#c'"))
 	    ((string= cmd "#f/#h") (re-search-forward "^`#f'"))
 	    ((string= cmd "X") (re-search-forward "^`A'"))
 	    ((string= cmd "v/V") (re-search-forward "^`v'"))
@@ -325,5 +325,8 @@ the value of this variable and the variables `ediff-help-message-*' in
   (customize-group "ediff"))
 
 
+(provide 'ediff-help)
+
+
 ;;; arch-tag: 05659813-7fcf-4274-964f-d2f577431a9d
 ;;; ediff-help.el ends here
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 1b86e2f8f62..fcf261efd06 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -371,5 +371,6 @@
 
 (provide 'ediff-hook)
 
+
 ;;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
 ;;; ediff-hook.el ends here
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 4897ffd2e59..2fc0ceefe4d 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1867,6 +1867,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
 	     (set-buffer ,old-buffer)
 	     (set-syntax-table ,old-table)))))))
 
+
 (provide 'ediff-init)
 
 
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 7f0eea2cf09..92f462c0181 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-merg)
 
 ;; compiler pacifier
 (defvar ediff-window-A)
@@ -390,6 +389,9 @@ Combining is done according to the specifications in variable
 	)))
 
 
+(provide 'ediff-merg)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index c24e32a2124..0bbd3298c7a 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -104,7 +104,6 @@
 
 ;;; Code:
 
-(provide 'ediff-mult)
 
 (defgroup ediff-mult nil
   "Multi-file and multi-buffer processing in Ediff."
@@ -123,7 +122,6 @@
 ;; end pacifier
 
 (require 'ediff-init)
-(require 'ediff-util)
 
 ;; meta-buffer
 (ediff-defvar-local ediff-meta-buffer nil "")
@@ -1473,6 +1471,7 @@ Useful commands:
       (ediff-overlay-put overl 'highlight t))
     (ediff-overlay-put overl 'ediff-meta-info prop)
     (ediff-overlay-put overl 'invisible hidden)
+    (ediff-overlay-put overl 'follow-link t)
     (if (numberp session-number)
 	(ediff-overlay-put overl 'ediff-meta-session-number session-number))))
 
@@ -2384,6 +2383,8 @@ for operation, or simply indicate which are equal files.  If it is nil, then
     ))
 
 
+(provide 'ediff-mult)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index 9c5c75d847c..b911c33f0fb 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-ptch)
 
 (defgroup ediff-ptch nil
   "Ediff patch support."
@@ -844,6 +843,8 @@ you can still examine the changes via M-x ediff-files"
 
 
 
+(provide 'ediff-ptch)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index feb7b69d7b6..dff3c6bee61 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-util)
 
 ;; Compiler pacifier
 (defvar ediff-patch-diagnostics)
@@ -49,6 +48,7 @@
 
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
+    (provide 'ediff-util) ; to break recursive load cycle
     (or (featurep 'ediff-init)
 	(load "ediff-init.el" nil nil 'nosuffix))
     (or (featurep 'ediff-help)
@@ -234,6 +234,7 @@ to invocation.")
   (define-key ediff-mode-map "#"  nil)
   (define-key ediff-mode-map "#h"  'ediff-toggle-regexp-match)
   (define-key ediff-mode-map "#f"  'ediff-toggle-regexp-match)
+  (define-key ediff-mode-map "#c"  'ediff-toggle-ignore-case)
   (or ediff-word-mode
       (define-key ediff-mode-map "##"  'ediff-toggle-skip-similar))
   (define-key ediff-mode-map "o"   nil)
@@ -1133,7 +1134,7 @@ of the current buffer."
 ;;       ))
 
 
-(defsubst ediff-file-checked-out-p (file)
+(defun ediff-file-checked-out-p (file)
   (or (not (featurep 'vc-hooks))
       (and (vc-backend file)
 	   (if (fboundp 'vc-state)
@@ -1143,7 +1144,7 @@ of the current buffer."
 	     (vc-locking-user file))
 	   )))
 
-(defsubst ediff-file-checked-in-p (file)
+(defun ediff-file-checked-in-p (file)
   (and (featurep 'vc-hooks)
        ;; CVS files are considered not checked in
        (not (memq (vc-backend file) '(nil CVS)))
@@ -3079,7 +3080,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
 	)))
 
 
-(defsubst ediff-highlight-diff (n)
+(defun ediff-highlight-diff (n)
   "Put face on diff N.  Invoked for X displays only."
   (ediff-highlight-diff-in-one-buffer n 'A)
   (ediff-highlight-diff-in-one-buffer n 'B)
@@ -3088,7 +3089,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
   )
 
 
-(defsubst ediff-unhighlight-diff ()
+(defun ediff-unhighlight-diff ()
   "Remove overlays from buffers A, B, and C."
   (ediff-unhighlight-diff-in-one-buffer 'A)
   (ediff-unhighlight-diff-in-one-buffer 'B)
@@ -3097,7 +3098,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
   )
 
 ;; delete highlighting overlays, restore faces to their original form
-(defsubst ediff-unhighlight-diffs-totally ()
+(defun ediff-unhighlight-diffs-totally ()
   (ediff-unhighlight-diffs-totally-in-one-buffer 'A)
   (ediff-unhighlight-diffs-totally-in-one-buffer 'B)
   (ediff-unhighlight-diffs-totally-in-one-buffer 'C)
@@ -3686,7 +3687,7 @@ Ediff Control Panel to restore highlighting."
 	    (>= (point) end))))))
 
 
-(defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
+(defun ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
   (ediff-with-current-buffer
       (ediff-with-current-buffer ctrl-buf (ediff-get-buffer buf-type))
     (buffer-substring
@@ -3945,6 +3946,7 @@ Ediff Control Panel to restore highlighting."
 	(ediff-device-type (ediff-device-type))
 	varlist salutation buffer-name)
     (setq varlist '(ediff-diff-program ediff-diff-options
+                    ediff-diff3-program ediff-diff3-options
 		    ediff-patch-program ediff-patch-options
 		    ediff-shell
 		    ediff-use-faces
@@ -4300,6 +4302,8 @@ Mail anyway? (y or n) ")
 
 (run-hooks 'ediff-load-hook)
 
+(provide 'ediff-util)
+
 
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 4c9dc4dd9c8..3e8b1c37572 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -311,6 +311,7 @@
 
 (provide 'ediff-vers)
 
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 648a80b6156..28369f9f6bd 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(provide 'ediff-wind)
 
 ;; Compiler pacifier
 (defvar icon-title-format)
@@ -1314,6 +1313,9 @@ It assumes that it is called from within the control buffer."
 			     ediff-wide-display-p)))))))
 
 
+(provide 'ediff-wind)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/ediff.el b/lisp/ediff.el
index abb0f22b047..bb6cfc6b72e 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -7,8 +7,8 @@
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.80.1" "The current version of Ediff")
-(defconst ediff-date "November 25, 2005" "Date of last update")
+(defconst ediff-version "2.81" "The current version of Ediff")
+(defconst ediff-date "February 18, 2006" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.
@@ -107,7 +107,6 @@
 
 ;;; Code:
 
-(provide 'ediff)
 
 ;; Compiler pacifier
 (defvar cvs-cookie-handle)
@@ -121,6 +120,7 @@
 	 (load "pcl-cvs" 'noerror)))
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
+    (provide 'ediff) ; to break recursive load cycle
     (or (featurep 'ediff-init)
 	(load "ediff-init.el" nil nil 'nosuffix))
     (or (featurep 'ediff-mult)
@@ -1374,7 +1374,7 @@ patch. If not given, the user is prompted according to the prefix argument."
    patch-buf
    (read-buffer
     "Which buffer to patch? "
-    (current-buffer))))
+    (ediff-other-buffer patch-buf))))
 
 
 ;;;###autoload
@@ -1533,6 +1533,9 @@ With optional NODE, goes to that node."
 
 (run-hooks 'ediff-load-hook)
 
+(provide 'ediff)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index db82952a6ef..645f4f26eaf 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -196,6 +196,15 @@
 	    (viper-save-cursor-color 'before-insert-mode))
 	;; set insert mode cursor color
 	(viper-change-cursor-color viper-insert-state-cursor-color)))
+  (if (eq viper-current-state 'emacs-state)
+      (let ((has-saved-cursor-color-in-emacs-mode
+	     (stringp (viper-get-saved-cursor-color-in-emacs-mode))))
+	(or has-saved-cursor-color-in-emacs-mode
+	    (string= (viper-get-cursor-color) viper-emacs-state-cursor-color)
+	    ;; save current color, if not already saved
+	    (viper-save-cursor-color 'before-emacs-mode))
+	;; set emacs mode cursor color
+	(viper-change-cursor-color viper-emacs-state-cursor-color)))
 
   (if (and (memq this-command '(dabbrev-expand hippie-expand))
 	   (integerp viper-pre-command-point)
@@ -643,9 +652,12 @@
 	(indent-to-left-margin))
     (viper-add-newline-at-eob-if-necessary)
     (viper-adjust-undo)
-    (viper-change-state 'vi-state)
 
-    (viper-restore-cursor-color 'after-insert-mode)
+    (if (eq viper-current-state 'emacs-state)
+	(viper-restore-cursor-color 'after-emacs-mode)
+      (viper-restore-cursor-color 'after-insert-mode))
+
+    (viper-change-state 'vi-state)
 
     ;; Protect against user errors in hooks
     (condition-case conds
@@ -709,9 +721,17 @@
   (or (viper-overlay-p viper-replace-overlay)
       (viper-set-replace-overlay (point-min) (point-min)))
   (viper-hide-replace-overlay)
+
+  (let ((has-saved-cursor-color-in-emacs-mode
+	 (stringp (viper-get-saved-cursor-color-in-emacs-mode))))
+    (or has-saved-cursor-color-in-emacs-mode
+	(string= (viper-get-cursor-color) viper-emacs-state-cursor-color)
+	(viper-save-cursor-color 'before-emacs-mode))
+    (viper-change-cursor-color viper-emacs-state-cursor-color))
+
   (viper-change-state 'emacs-state)
 
-  ;; Protect agains user errors in hooks
+  ;; Protect against user errors in hooks
   (condition-case conds
       (run-hooks 'viper-emacs-state-hook)
     (error
@@ -820,12 +840,12 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
 		 ;; The next cmd  and viper-set-unread-command-events
 		 ;; are intended to prevent the input method
 		 ;; from swallowing ^M, ^Q and other special characters
-		 (setq ch (read-char))
+		 (setq ch (read-char-exclusive))
 		 ;; replace ^M with the newline
 		 (if (eq ch ?\C-m) (setq ch ?\n))
 		 ;; Make sure ^V and ^Q work as quotation chars
 		 (if (memq ch '(?\C-v ?\C-q))
-		     (setq ch (read-char)))
+		     (setq ch (read-char-exclusive)))
 		 (viper-set-unread-command-events ch)
 		 (quail-input-method nil)
 
@@ -842,12 +862,12 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
 	       ;; same as above but for XEmacs, which doesn't have
 	       ;; quail-input-method
 	       (let (unread-command-events)
-		 (setq ch (read-char))
+		 (setq ch (read-char-exclusive))
 		 ;; replace ^M with the newline
 		 (if (eq ch ?\C-m) (setq ch ?\n))
 		 ;; Make sure ^V and ^Q work as quotation chars
 		 (if (memq ch '(?\C-v ?\C-q))
-		     (setq ch (read-char)))
+		     (setq ch (read-char-exclusive)))
 		 (viper-set-unread-command-events ch)
 		 (quail-start-translation nil)
 
@@ -867,12 +887,12 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
 		   (setq ch (aref (read-key-sequence nil) 0)))
 	       (insert ch))
 	      (t
-	       (setq ch (read-char))
+	       (setq ch (read-char-exclusive))
 	       ;; replace ^M with the newline
 	       (if (eq ch ?\C-m) (setq ch ?\n))
 	       ;; Make sure ^V and ^Q work as quotation chars
 	       (if (memq ch '(?\C-v ?\C-q))
-		   (setq ch (read-char)))
+		   (setq ch (read-char-exclusive)))
 	       (insert ch))
 	      )
 	(setq last-command-event
@@ -2131,7 +2151,7 @@ To turn this feature off, set this variable to nil."
 Remove this function from `viper-minibuffer-exit-hook', if this causes
 problems."
   (if (viper-is-in-minibuffer)
-      (progn
+      (let ((inhibit-field-text-motion t))
 	(goto-char (viper-minibuffer-real-start))
 	(end-of-line)
 	(delete-region (point) (point-max)))))
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 59a78e46dee..661fc6ede7f 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -434,6 +434,13 @@ delete the text being replaced, as in standard Vi."
 (if (fboundp 'make-variable-frame-local)
     (make-variable-frame-local 'viper-insert-state-cursor-color))
 
+(defcustom viper-emacs-state-cursor-color "Magenta"
+  "Cursor color when Viper is in emacs state."
+  :type 'string
+  :group 'viper)
+(if (fboundp 'make-variable-frame-local)
+    (make-variable-frame-local 'viper-emacs-state-cursor-color))
+
 ;; internal var, used to remember the default cursor color of emacs frames
 (defvar viper-vi-state-cursor-color nil)
 (if (fboundp 'make-variable-frame-local)
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 8f79c0dab4a..c7fe792b5f2 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -175,9 +175,12 @@
 	     (selected-frame)
 	     (list
 	      (cons
-	       (if (eq before-which-mode 'before-replace-mode)
-		   'viper-saved-cursor-color-in-replace-mode
-		 'viper-saved-cursor-color-in-insert-mode)
+	       (cond ((eq before-which-mode 'before-replace-mode)
+		      'viper-saved-cursor-color-in-replace-mode)
+		     ((eq before-which-mode 'before-emacs-mode)
+		      'viper-saved-cursor-color-in-emacs-mode)
+		     (t
+		      'viper-saved-cursor-color-in-insert-mode))
 	       color)))
 	  ))))
 
@@ -188,7 +191,9 @@
     (if viper-emacs-p 'frame-parameter 'frame-property)
     (selected-frame)
     'viper-saved-cursor-color-in-replace-mode)
-   viper-vi-state-cursor-color))
+   (if (eq viper-current-state 'emacs-mode)
+       viper-emacs-state-cursor-color
+     viper-vi-state-cursor-color)))
 
 (defsubst viper-get-saved-cursor-color-in-insert-mode ()
   (or
@@ -196,15 +201,27 @@
     (if viper-emacs-p 'frame-parameter 'frame-property)
     (selected-frame)
     'viper-saved-cursor-color-in-insert-mode)
+   (if (eq viper-current-state 'emacs-mode)
+       viper-emacs-state-cursor-color
+     viper-vi-state-cursor-color)))
+
+(defsubst viper-get-saved-cursor-color-in-emacs-mode ()
+  (or
+   (funcall
+    (if viper-emacs-p 'frame-parameter 'frame-property)
+    (selected-frame)
+    'viper-saved-cursor-color-in-emacs-mode)
    viper-vi-state-cursor-color))
 
 ;; restore cursor color from replace overlay
 (defun viper-restore-cursor-color(after-which-mode)
   (if (viper-overlay-p viper-replace-overlay)
       (viper-change-cursor-color
-       (if (eq after-which-mode 'after-replace-mode)
-	   (viper-get-saved-cursor-color-in-replace-mode)
-	 (viper-get-saved-cursor-color-in-insert-mode))
+       (cond ((eq after-which-mode 'after-replace-mode)
+	      (viper-get-saved-cursor-color-in-replace-mode))
+	     ((eq after-which-mode 'after-emacs-mode)
+	      (viper-get-saved-cursor-color-in-emacs-mode))
+	     (t (viper-get-saved-cursor-color-in-insert-mode)))
        )))
 
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 223cff3dd99..fc55d291550 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
 
-(defconst viper-version "3.11.5 of November 25, 2005"
+(defconst viper-version "3.12 of February 18, 2006"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ec2098c7bd3..92f8c401336 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,5 +1,21 @@
+2006-02-19  Michael Olson  <mwolson@gnu.org>
+
+	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
+	parameters are strings before using them.  Thanks to Alejandro
+	Benitez for the report.
+
+	* erc.el (erc-version-string): Release ERC 5.1.2.
+
+2006-02-19  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
+	<C-tab>.
+	(erc-button-previous): New function.
+
 2006-02-15  Michael Olson  <mwolson@gnu.org>
 
+	* NEWS: Add category for ERC 5.2.
+
 	* erc.el (erc): Move to the end of the buffer when a continued
 	session is detected.  Thanks to e1f and indio for the report and
 	testing a potential fix.
@@ -150,7 +166,7 @@
 	* erc-stamp.el: Use new arch tagline, since the other one wasn't
 	being treated properly.
 
-	* erc.el (erc-version-string): Release ERC 5.1.1
+	* erc.el (erc-version-string): Release ERC 5.1.1.
 
 2006-02-03  Zhang Wei  <id.brep@gmail.com>  (tiny change)
 
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 6c6998a3afc..2ec625cc87f 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -216,6 +216,7 @@ PAR is a number of a regexp grouping whose text will be passed to
         (define-key map (kbd "<button2>") 'erc-button-click-button)
       (define-key map (kbd "<mouse-2>") 'erc-button-click-button))
     (define-key map (kbd "TAB") 'erc-button-next)
+    (define-key map (kbd "<C-tab>") 'erc-button-previous)
     (set-keymap-parent map erc-mode-map)
     map)
   "Local keymap for ERC buttons.")
@@ -427,6 +428,22 @@ call it with the value of the `erc-data' text property."
         (error "No next button"))
       t)))
 
+(defun erc-button-previous ()
+  "Go to the previous button in this buffer."
+  (interactive)
+  (let ((here (point)))
+    (when (< here (erc-beg-of-input-line))
+      (while (and (get-text-property here 'erc-callback)
+                  (not (= here (point-min))))
+        (setq here (1- here)))
+      (while (and (not (get-text-property here 'erc-callback))
+                  (not (= here (point-min))))
+        (setq here (1- here)))
+      (if (> here (point-min))
+          (goto-char here)
+        (error "No previous button"))
+      t)))
+
 (defun erc-browse-emacswiki (thing)
   "Browse to thing in the emacs-wiki."
   (browse-url (concat erc-emacswiki-url thing)))
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e1dc240901b..63ff60d762e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.1"
+(defconst erc-version-string "Version 5.1.2"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 1b6665d16d5..5ff63bfdec2 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1255,7 +1255,8 @@ which may actually result in an url rather than a filename."
 		    (abbreviate-file-name (expand-file-name guess))
 		    ))
 	  (setq dir (file-name-directory guess))))
-    (let ((minibuffer-completing-file-name t))
+    (let ((minibuffer-completing-file-name t)
+	  (completion-ignore-case read-file-name-completion-ignore-case))
       (setq guess
 	    (completing-read
 	     prompt
@@ -1321,6 +1322,12 @@ which may actually result in an url rather than a filename."
 (defvar ffap-highlight t
   "If non-nil, ffap highlights the current buffer substring.")
 
+(defface ffap
+  '((t :inherit highlight))
+  "Face used to highlight the current buffer substring."
+  :group 'ffap
+  :version "22.1")
+
 (defvar ffap-highlight-overlay nil
   "Overlay used by `ffap-highlight'.")
 
@@ -1344,8 +1351,7 @@ Uses the face `ffap' if it is defined, or else `highlight'."
    (t
     (setq ffap-highlight-overlay
 	  (apply 'make-overlay ffap-string-at-point-region))
-    (overlay-put ffap-highlight-overlay 'face
-		      (if (facep 'ffap) 'ffap 'highlight)))))
+    (overlay-put ffap-highlight-overlay 'face 'ffap))))
 
 
 ;;; Main Entrance (`find-file-at-point' == `ffap'):
diff --git a/lisp/files.el b/lisp/files.el
index a2e18522051..9cfaf557ec7 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2218,6 +2218,130 @@ Otherwise, return nil; point may be changed."
        (setq end (point))
        (goto-char beg)
        end))))
+
+;;; Handling file local variables
+
+(defvar ignored-local-variables
+  '(ignored-local-variables safe-local-variable-values)
+  "Variables to be ignored in a file's local variable spec.")
+
+(defvar hack-local-variables-hook nil
+  "Normal hook run after processing a file's local variables specs.
+Major modes can use this to examine user-specified local variables
+in order to initialize other data structure based on them.")
+
+(defcustom safe-local-variable-values nil
+  "List variable-value pairs that are considered safe.
+Each element is a cons cell (VAR . VAL), where VAR is a variable
+symbol and VAL is a value that is considered safe."
+  :group 'find-file
+  :type  'alist)
+
+(defcustom safe-local-eval-forms nil
+  "*Expressions that are considered safe in an `eval:' local variable.
+Add expressions to this list if you want Emacs to evaluate them, when
+they appear in an `eval' local variable specification, without first
+asking you for confirmation."
+  :group 'find-file
+  :version "22.1"
+  :type '(repeat sexp))
+
+;; Risky local variables:
+(mapc (lambda (var) (put var 'risky-local-variable t))
+      '(after-load-alist
+	auto-mode-alist
+	buffer-auto-save-file-name
+	buffer-file-name
+	buffer-file-truename
+	buffer-undo-list
+	dabbrev-case-fold-search
+	dabbrev-case-replace
+	debugger
+	default-text-properties
+	display-time-string
+	enable-local-eval
+	eval
+	exec-directory
+	exec-path
+	file-name-handler-alist
+	font-lock-defaults
+	format-alist
+	frame-title-format
+	global-mode-string
+	header-line-format
+	icon-title-format
+	ignored-local-variables
+	imenu--index-alist
+	imenu-generic-expression
+	inhibit-quit
+	input-method-alist
+	load-path
+	max-lisp-eval-depth
+	max-specpdl-size
+	minor-mode-alist
+	minor-mode-map-alist
+	minor-mode-overriding-map-alist
+	mode-line-buffer-identification
+	mode-line-format
+	mode-line-client
+	mode-line-modes
+	mode-line-modified
+	mode-line-mule-info
+	mode-line-position
+	mode-line-process
+	mode-name
+	outline-level
+	overriding-local-map
+	overriding-terminal-local-map
+	parse-time-rules
+	process-environment
+	rmail-output-file-alist
+	save-some-buffers-action-alist
+	special-display-buffer-names
+	standard-input
+	standard-output
+	unread-command-events
+	vc-mode))
+
+;; Safe local variables:
+;;
+;; For variables defined by minor modes, put the safety declarations
+;; here, not in the file defining the minor mode (when Emacs visits a
+;; file specifying that local variable, the minor mode file may not be
+;; loaded yet).  For variables defined by major modes, the safety
+;; declarations can go into the major mode's file, since that will be
+;; loaded before file variables are processed.
+
+(let ((string-or-null (lambda (a) (or (stringp a) (null a)))))
+  (eval
+   `(mapc (lambda (pair)
+	    (put (car pair) 'safe-local-variable (cdr pair)))
+	  '((byte-compile-dynamic . t)
+	    (c-basic-offset     .  integerp)
+	    (c-file-style       .  stringp)
+	    (c-indent-level     .  integerp)
+	    (comment-column     .  integerp)
+	    (compile-command    . ,string-or-null)
+	    (fill-column        .  integerp)
+	    (fill-prefix        . ,string-or-null)
+	    (indent-tabs-mode   .  t)
+	    (ispell-check-comments . (lambda (a)
+				       (memq a '(nil t exclusive))))
+	    (ispell-local-dictionary . ,string-or-null)
+	    (kept-new-versions  .  integerp)
+	    (no-byte-compile    .  t)
+	    (no-update-autoloads . t)
+	    (outline-regexp     . ,string-or-null)
+	    (page-delimiter     . ,string-or-null)
+	    (paragraph-start    . ,string-or-null)
+	    (paragraph-separate . ,string-or-null)
+	    (sentence-end       . ,string-or-null)
+	    (sentence-end-double-space . t)
+	    (tab-width          .  integerp)
+	    (truncate-lines     .  t)
+	    (version-control    .  t)))))
+
+(put 'c-set-style 'safe-local-eval-function t)
 
 (defun hack-local-variables-confirm (vars unsafe-vars risky-vars)
   (if noninteractive
@@ -2346,18 +2470,6 @@ and VAL is the specified value."
 	  mode-specified
 	result))))
 
-(defvar hack-local-variables-hook nil
-  "Normal hook run after processing a file's local variables specs.
-Major modes can use this to examine user-specified local variables
-in order to initialize other data structure based on them.")
-
-(defcustom safe-local-variable-values nil
-  "List variable-value pairs that are considered safe.
-Each element is a cons cell (VAR . VAL), where VAR is a variable
-symbol and VAL is a value that is considered safe."
-  :group 'find-file
-  :type  'alist)
-
 (defun hack-local-variables (&optional mode-only)
   "Parse and put into effect this buffer's local variables spec.
 If MODE-ONLY is non-nil, all we do is check whether the major mode
@@ -2479,93 +2591,6 @@ is specified, returning t if it is specified."
 		  (hack-one-local-variable (car elt) (cdr elt)))))
 	  (run-hooks 'hack-local-variables-hook))))))
 
-(defvar ignored-local-variables
-  '(ignored-local-variables safe-local-variable-values)
-  "Variables to be ignored in a file's local variable spec.")
-
-;; Get confirmation before setting these variables as locals in a file.
-(put 'debugger 'risky-local-variable t)
-(put 'enable-local-eval 'risky-local-variable t)
-(put 'ignored-local-variables 'risky-local-variable t)
-(put 'ignored-local-variables 'safe-local-variable-values t)
-(put 'eval 'risky-local-variable t)
-(put 'file-name-handler-alist 'risky-local-variable t)
-(put 'inhibit-quit 'risky-local-variable t)
-(put 'minor-mode-alist 'risky-local-variable t)
-(put 'minor-mode-map-alist 'risky-local-variable t)
-(put 'minor-mode-overriding-map-alist 'risky-local-variable t)
-(put 'overriding-local-map 'risky-local-variable t)
-(put 'overriding-terminal-local-map 'risky-local-variable t)
-(put 'auto-mode-alist 'risky-local-variable t)
-(put 'after-load-alist 'risky-local-variable t)
-(put 'buffer-file-name 'risky-local-variable t)
-(put 'buffer-undo-list 'risky-local-variable t)
-(put 'buffer-auto-save-file-name 'risky-local-variable t)
-(put 'buffer-file-truename 'risky-local-variable t)
-(put 'default-text-properties 'risky-local-variable t)
-(put 'exec-path 'risky-local-variable t)
-(put 'load-path 'risky-local-variable t)
-(put 'exec-directory 'risky-local-variable t)
-(put 'process-environment 'risky-local-variable t)
-(put 'dabbrev-case-fold-search 'risky-local-variable t)
-(put 'dabbrev-case-replace 'risky-local-variable t)
-;; Don't wait for outline.el to be loaded, for the sake of outline-minor-mode.
-(put 'outline-level 'risky-local-variable t)
-(put 'rmail-output-file-alist 'risky-local-variable t)
-(put 'font-lock-defaults 'risky-local-variable t)
-(put 'special-display-buffer-names 'risky-local-variable t)
-(put 'frame-title-format 'risky-local-variable t)
-(put 'global-mode-string 'risky-local-variable t)
-(put 'header-line-format 'risky-local-variable t)
-(put 'icon-title-format 'risky-local-variable t)
-(put 'input-method-alist 'risky-local-variable t)
-(put 'format-alist 'risky-local-variable t)
-(put 'vc-mode 'risky-local-variable t)
-(put 'imenu-generic-expression 'risky-local-variable t)
-(put 'imenu--index-alist 'risky-local-variable t)
-(put 'standard-input 'risky-local-variable t)
-(put 'standard-output 'risky-local-variable t)
-(put 'unread-command-events 'risky-local-variable t)
-(put 'max-lisp-eval-depth 'risky-local-variable t)
-(put 'max-specpdl-size 'risky-local-variable t)
-(put 'mode-line-format 'risky-local-variable t)
-(put 'mode-line-modified 'risky-local-variable t)
-(put 'mode-line-mule-info 'risky-local-variable t)
-(put 'mode-line-client 'risky-local-variable t)
-(put 'mode-line-buffer-identification 'risky-local-variable t)
-(put 'mode-line-modes 'risky-local-variable t)
-(put 'mode-line-position 'risky-local-variable t)
-(put 'mode-line-process 'risky-local-variable t)
-(put 'mode-name 'risky-local-variable t)
-(put 'display-time-string 'risky-local-variable t)
-(put 'parse-time-rules 'risky-local-variable t)
-
-;; Commonly-encountered local variables that are safe:
-(let ((string-or-null (lambda (a) (or (stringp a) (null a)))))
-  (eval
-   `(mapc (lambda (pair)
-	    (put (car pair) 'safe-local-variable (cdr pair)))
-	  '((byte-compile-dynamic . t)
-	    (c-basic-offset     .  integerp)
-	    (c-file-style       .  stringp)
-	    (c-indent-level     .  integerp)
-	    (comment-column     .  integerp)
-	    (compile-command    . ,string-or-null)
-	    (fill-column        .  integerp)
-	    (fill-prefix        . ,string-or-null)
-	    (indent-tabs-mode   .  t)
-	    (kept-new-versions  .  integerp)
-	    (no-byte-compile    .  t)
-	    (no-update-autoloads . t)
-	    (outline-regexp     . ,string-or-null)
-	    (page-delimiter     . ,string-or-null)
-	    (paragraph-start    . ,string-or-null)
-	    (paragraph-separate . ,string-or-null)
-	    (sentence-end       . ,string-or-null)
-	    (sentence-end-double-space . t)
-	    (tab-width          .  integerp)
-	    (version-control    .  t)))))
-
 (defun safe-local-variable-p (sym val)
   "Non-nil if SYM is safe as a file-local variable with value VAL.
 It is safe if any of these conditions are met:
@@ -2603,17 +2628,6 @@ It is dangerous if either of these conditions are met:
 -[0-9]+$\\|font-lock-syntactic-keywords$\\|-frame-alist$\\|-mode-alist$\\|\
 -map$\\|-map-alist$" (symbol-name sym))))
 
-(defcustom safe-local-eval-forms nil
-  "*Expressions that are considered \"safe\" in an `eval:' local variable.
-Add expressions to this list if you want Emacs to evaluate them, when
-they appear in an `eval' local variable specification, without first
-asking you for confirmation."
-  :group 'find-file
-  :version "22.1"
-  :type '(repeat sexp))
-
-(put 'c-set-style 'safe-local-eval-function t)
-
 (defun hack-one-local-variable-quotep (exp)
   (and (consp exp) (eq (car exp) 'quote) (consp (cdr exp))))
 
@@ -3631,7 +3645,6 @@ This requires the external program `diff' to be in your `exec-path'."
     (?d diff-buffer-with-file
 	"view changes in file"))
   "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
-(put 'save-some-buffers-action-alist 'risky-local-variable t)
 
 (defvar buffer-save-without-query nil
   "Non-nil means `save-some-buffers' should save this buffer without asking.")
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index adca02f5b95..903be005174 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -7,6 +7,44 @@
 
 	* gnus-cus.el: Revert 2005-10-17 change.
 
+2006-02-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (article-strip-banner): Call
+	article-really-strip-banner only when the regexp match is made.
+
+2006-02-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (article-strip-banner): Use
+	gnus-extract-address-components instead of
+	mail-header-parse-addresses to make it work with non-ASCII text.
+
+	* rfc2231.el (rfc2231-parse-string): Attempt to parse parameter
+	values which are surrounded with \"...\"; make it never cause a
+	Lisp error; give up parsing of parameters if it failed in
+	extracting type.
+
+2006-02-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-util.el (mm-make-temp-file): Import the Emacs 22 version of
+	make-temp-file; make it work with Emacs 20 and XEmacs as well.
+
+	* mm-decode.el (mm-display-external): Use the 3rd arg of
+	mm-make-temp-file.
+	(mm-create-image-xemacs): Ditto.
+
+2006-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-draft.el (gnus-draft-send): Replace message-narrow-to-head
+	with message-narrow-to-headers.
+	(gnus-draft-setup): Narrow to header to run message-fetch-field.
+	(gnus-draft-check-draft-articles): New function.
+	(gnus-draft-edit-message, gnus-draft-send-message): Use it.
+
+2006-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nnoo.el (nnoo-declare): Don't generate duplicate entries when
+	re-loading nn* modules.
+
 2006-02-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus.el: Remove bogus comment.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c15151729a0..0c9cb18506a 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2608,18 +2608,22 @@ always hide."
 	  (article-really-strip-banner
 	   (gnus-parameter-banner gnus-newsgroup-name)))
 	(when gnus-article-address-banner-alist
-	  (article-really-strip-banner
-	   (let ((from (save-restriction
-			 (widen)
-			 (article-narrow-to-head)
-			 (mail-fetch-field "from"))))
-	     (when (and from
-			(setq from
-			      (caar (mail-header-parse-addresses from))))
-	       (catch 'found
-		 (dolist (pair gnus-article-address-banner-alist)
-		   (when (string-match (car pair) from)
-		     (throw 'found (cdr pair)))))))))))))
+	  ;; Note that the From header is decoded here, so it is
+	  ;; required that the *-extract-address-components function
+	  ;; supports non-ASCII text.
+	  (let ((from (save-restriction
+			(widen)
+			(article-narrow-to-head)
+			(mail-fetch-field "from"))))
+	    (when (and from
+		       (setq from
+			     (cadr (funcall gnus-extract-address-components
+					    from))))
+	      (catch 'found
+		(dolist (pair gnus-article-address-banner-alist)
+		  (when (string-match (car pair) from)
+		    (throw 'found
+			   (article-really-strip-banner (cdr pair)))))))))))))
 
 (defun article-really-strip-banner (banner)
   "Strip the banner specified by the argument."
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 0d250a3ad0b..f9ff9d7122e 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -98,6 +98,7 @@
   (interactive)
   (let ((article (gnus-summary-article-number))
 	(group gnus-newsgroup-name))
+    (gnus-draft-check-draft-articles (list article))
     (gnus-summary-mark-as-read article gnus-canceled-mark)
     (gnus-draft-setup article group t)
     (set-buffer-modified-p t)
@@ -122,6 +123,7 @@
   (let* ((articles (gnus-summary-work-articles n))
 	 (total (length articles))
 	 article)
+    (gnus-draft-check-draft-articles articles)
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)
@@ -152,7 +154,7 @@
     ;; We read the meta-information that says how and where
     ;; this message is to be sent.
     (save-restriction
-      (message-narrow-to-head)
+      (message-narrow-to-headers)
       (when (re-search-forward
 	     (concat "^" (regexp-quote gnus-agent-target-move-group-header)
 		     ":") nil t)
@@ -258,9 +260,12 @@
 	    (goto-char (point-min))
 	    (search-forward "\n\n")
 	    (forward-char -1)
+	    (save-restriction
+	      (narrow-to-region (point-min) (point))
+	      (setq ga
+		    (message-fetch-field gnus-draft-meta-information-header)))
 	    (insert mail-header-separator)
 	    (forward-line 1)
-	    (setq ga (message-fetch-field gnus-draft-meta-information-header))
 	    (message-set-auto-save-file-name))))
       (gnus-backlog-remove-article group narticle)
       (when (and ga
@@ -285,6 +290,32 @@
   "Say whether ARTICLE is sendable."
   (not (memq article gnus-newsgroup-unsendable)))
 
+(defun gnus-draft-check-draft-articles (articles)
+  "Check whether the draft articles ARTICLES are under edit."
+  (when (equal gnus-newsgroup-name "nndraft:drafts")
+    (let ((buffers (buffer-list))
+	  file buffs buff)
+      (save-current-buffer
+	(while (and articles
+		    (not buff))
+	  (setq file (nndraft-article-filename (pop articles))
+		buffs buffers)
+	  (while buffs
+	    (set-buffer (setq buff (pop buffs)))
+	    (if (and buffer-file-name
+		     (string-equal (file-truename buffer-file-name)
+				   (file-truename file))
+		     (buffer-modified-p))
+		(setq buffs nil)
+	      (setq buff nil)))))
+      (when buff
+	(let* ((window (get-buffer-window buff t))
+	       (frame (and window (window-frame window))))
+	  (if frame
+	      (gnus-select-frame-set-input-focus frame)
+	    (pop-to-buffer buff t)))
+	(error "The draft %s is under edit" file)))))
+
 (provide 'gnus-draft)
 
 ;;; arch-tag: 3d92af58-8c97-4a5c-9db4-a98e85198022
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 996c934191c..fa77b7776f0 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -769,19 +769,18 @@ external if displayed external."
 			  (gnus-map-function mm-file-name-rewrite-functions
 					     (file-name-nondirectory filename))
 			  dir))
-	    (setq file (mm-make-temp-file (expand-file-name "mm." dir)))
-	    (let ((newname
-		   ;; Use nametemplate (defined in RFC1524) if it is
-		   ;; specified in mailcap.
-		   (if (assoc "nametemplate" mime-info)
-		       (format (cdr (assoc "nametemplate" mime-info)) file)
-		     ;; Add a suffix according to `mailcap-mime-extensions'.
-		     (concat file (car (rassoc (mm-handle-media-type handle)
-					       mailcap-mime-extensions))))))
-	      (unless (string-equal file newname)
-		(when (file-exists-p file)
-		  (rename-file file newname))
-		(setq file newname))))
+	    ;; Use nametemplate (defined in RFC1524) if it is specified
+	    ;; in mailcap.
+	    (let ((suffix (cdr (assoc "nametemplate" mime-info))))
+	      (if (and suffix
+		       (string-match "\\`%s\\(\\..+\\)\\'" suffix))
+		  (setq suffix (match-string 1 suffix))
+		;; Otherwise, use a suffix according to
+		;; `mailcap-mime-extensions'.
+		(setq suffix (car (rassoc (mm-handle-media-type handle)
+					  mailcap-mime-extensions))))
+	      (setq file (mm-make-temp-file (expand-file-name "mm." dir)
+					    nil suffix))))
 	  (let ((coding-system-for-write mm-binary-coding-system))
 	    (write-region (point-min) (point-max) file nil 'nomesg))
 	  (message "Viewing with %s" method)
@@ -1312,8 +1311,8 @@ be determined."
     ;; out to a file, and then create a file
     ;; specifier.
     (let ((file (mm-make-temp-file
-		 (expand-file-name "emm.xbm"
-				   mm-tmp-directory))))
+		 (expand-file-name "emm" mm-tmp-directory)
+		 nil ".xbm")))
       (unwind-protect
 	  (progn
 	    (write-region (point-min) (point-max) file)
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index c8f59ec263f..9bdbc3c72b1 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -99,16 +99,6 @@
 	   (lambda (ch) (mm-string-as-multibyte (char-to-string ch)))
 	   string "")))
      (multibyte-string-p . ignore)
-     ;; It is not a MIME function, but some MIME functions use it.
-     (make-temp-file . (lambda (prefix &optional dir-flag)
-			 (let ((file (expand-file-name
-				      (make-temp-name prefix)
-				      (if (fboundp 'temp-directory)
-					  (temp-directory)
-					temporary-file-directory))))
-			   (if dir-flag
-			       (make-directory file))
-			   file)))
      (insert-byte . insert-char)
      (multibyte-char-to-unibyte . identity))))
 
@@ -971,6 +961,77 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'."
 	   inhibit-file-name-handlers)))
     (write-region start end filename append visit lockname)))
 
+;; It is not a MIME function, but some MIME functions use it.
+(if (and (fboundp 'make-temp-file)
+	 (ignore-errors
+	   (let ((def (symbol-function 'make-temp-file)))
+	     (and (byte-code-function-p def)
+		  (setq def (if (fboundp 'compiled-function-arglist)
+				;; XEmacs
+				(eval (list 'compiled-function-arglist def))
+			      (aref def 0)))
+		  (>= (length def) 4)
+		  (eq (nth 3 def) 'suffix)))))
+    (defalias 'mm-make-temp-file 'make-temp-file)
+  ;; Stolen (and modified for Emacs 20 and XEmacs) from Emacs 22.
+  (defun mm-make-temp-file (prefix &optional dir-flag suffix)
+    "Create a temporary file.
+The returned file name (created by appending some random characters at the end
+of PREFIX, and expanding against `temporary-file-directory' if necessary),
+is guaranteed to point to a newly created empty file.
+You can then use `write-region' to write new data into the file.
+
+If DIR-FLAG is non-nil, create a new empty directory instead of a file.
+
+If SUFFIX is non-nil, add that at the end of the file name."
+    (let ((umask (default-file-modes))
+	  file)
+      (unwind-protect
+	  (progn
+	    ;; Create temp files with strict access rights.  It's easy to
+	    ;; loosen them later, whereas it's impossible to close the
+	    ;; time-window of loose permissions otherwise.
+	    (set-default-file-modes 448)
+	    (while (condition-case err
+		       (progn
+			 (setq file
+			       (make-temp-name
+				(expand-file-name
+				 prefix
+				 (if (fboundp 'temp-directory)
+				     ;; XEmacs
+				     (temp-directory)
+				   temporary-file-directory))))
+			 (if suffix
+			     (setq file (concat file suffix)))
+			 (if dir-flag
+			     (make-directory file)
+			   (if (or (featurep 'xemacs)
+				   (= emacs-major-version 20))
+			       ;; NOTE: This is unsafe if Emacs 20
+			       ;; users and XEmacs users don't use
+			       ;; a secure temp directory.
+			       (if (file-exists-p file)
+				   (signal 'file-already-exists
+					   (list "File exists" file))
+				 (write-region "" nil file nil 'silent))
+			     (write-region "" nil file nil 'silent
+					   nil 'excl)))
+			 nil)
+		     (file-already-exists t)
+		     ;; The Emacs 20 and XEmacs versions of
+		     ;; `make-directory' issue `file-error'.
+		     (file-error (or (and (or (featurep 'xemacs)
+					      (= emacs-major-version 20))
+					  (file-exists-p file))
+				     (signal (car err) (cdr err)))))
+	      ;; the file was somehow created by someone else between
+	      ;; `make-temp-name' and `write-region', let's try again.
+	      nil)
+	    file)
+	;; Reset the umask.
+	(set-default-file-modes umask)))))
+
 (defun mm-image-load-path (&optional package)
   (let (dir result)
     (dolist (path load-path (nreverse result))
diff --git a/lisp/gnus/nnoo.el b/lisp/gnus/nnoo.el
index 7a66b4c55aa..122183057b9 100644
--- a/lisp/gnus/nnoo.el
+++ b/lisp/gnus/nnoo.el
@@ -61,12 +61,16 @@
 
 (defmacro nnoo-declare (backend &rest parents)
   `(eval-and-compile
-     (push (list ',backend
-		 (mapcar (lambda (p) (list p)) ',parents)
-		 nil nil)
-	   nnoo-definition-alist)
-     (push (list ',backend "*internal-non-initialized-backend*")
-	   nnoo-state-alist)))
+     (if (assq ',backend nnoo-definition-alist)
+	 (setcar (cdr (assq ',backend nnoo-definition-alist))
+		 (mapcar 'list ',parents))
+       (push (list ',backend
+		   (mapcar 'list ',parents)
+		   nil nil)
+	     nnoo-definition-alist))
+     (unless (assq ',backend nnoo-state-alist)
+       (push (list ',backend "*internal-non-initialized-backend*")
+	     nnoo-state-alist))))
 (put 'nnoo-declare 'lisp-indent-function 1)
 
 (defun nnoo-parents (backend)
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index 7b4cf2447f4..2099b20195d 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -47,15 +47,45 @@ The list will be on the form
  `(name (attribute . value) (attribute . value)...)'.
 
 If the optional SIGNAL-ERROR is non-nil, signal an error when this
-function fails in parsing of parameters."
+function fails in parsing of parameters.  Otherwise, this function
+must never cause a Lisp error."
   (with-temp-buffer
     (let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token))
 	  (stoken (ietf-drums-token-to-list ietf-drums-tspecials))
 	  (ntoken (ietf-drums-token-to-list "0-9"))
 	  c type attribute encoded number prev-attribute vals
 	  prev-encoded parameters value)
-      (ietf-drums-init (mail-header-remove-whitespace
-			(mail-header-remove-comments string)))
+      (ietf-drums-init
+       (condition-case nil
+	   (mail-header-remove-whitespace
+	    (mail-header-remove-comments string))
+	 ;; The most likely cause of an error is unbalanced parentheses
+	 ;; or double-quotes.  If all parentheses and double-quotes are
+	 ;; quoted meaninglessly with backslashes, removing them might
+	 ;; make it parseable.  Let's try...
+	 (error
+	  (let (mod)
+	    (when (and (string-match "\\\\\"" string)
+		       (not (string-match "\\`\"\\|[^\\]\"" string)))
+	      (setq string (mm-replace-in-string string "\\\\\"" "\"")
+		    mod t))
+	    (when (and (string-match "\\\\(" string)
+		       (string-match "\\\\)" string)
+		       (not (string-match "\\`(\\|[^\\][()]" string)))
+	      (setq string (mm-replace-in-string string "\\\\\\([()]\\)" "\\1")
+		    mod t))
+	    (or (and mod
+		     (ignore-errors
+		       (mail-header-remove-whitespace
+			(mail-header-remove-comments string))))
+		;; Finally, attempt to extract only type.
+		(if (string-match
+		     (concat "\\`[\t\n ]*\\([^" ietf-drums-tspecials "\t\n ]+"
+			     "\\(/[^" ietf-drums-tspecials
+			     "\t\n ]+\\)?\\)\\([\t\n ;]\\|\\'\\)")
+		     string)
+		    (match-string 1 string)
+		  ""))))))
       (let ((table (copy-syntax-table ietf-drums-syntax-table)))
 	(modify-syntax-entry ?\' "w" table)
 	(modify-syntax-entry ?* " " table)
@@ -67,9 +97,12 @@ function fails in parsing of parameters."
 	(set-syntax-table table))
       (setq c (char-after))
       (when (and (memq c ttoken)
-		 (not (memq c stoken)))
-	(setq type (downcase (buffer-substring
-			      (point) (progn (forward-sexp 1) (point)))))
+		 (not (memq c stoken))
+		 (setq type (ignore-errors
+			      (downcase
+			       (buffer-substring (point) (progn
+							   (forward-sexp 1)
+							   (point)))))))
 	;; Do the params
 	(condition-case err
 	    (progn
@@ -180,8 +213,7 @@ function fails in parsing of parameters."
 	     ;;(message "%s" (error-message-string err))
 	     )))
 
-	(when type
-	  `(,type ,@(nreverse parameters)))))))
+	(cons type (nreverse parameters))))))
 
 (defun rfc2231-decode-encoded-string (string)
   "Decode an RFC2231-encoded string.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index eec03cc14a5..0a78ed8d68b 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -252,6 +252,7 @@ face (according to `face-differs-from-default-p')."
                          "\\)"
                          "\\(?:es\\|s\\|th\\)?"  ; for ARGth, ARGs
                          "\\(?:-[a-z0-9-]+\\)?"  ; for ARG-xxx, ARG-n
+                         "\\(?:-[{([<`\"].*?\\)?"; for ARG-{x}, (x), <x>, [x], `x'
                          "\\>")                  ; end of word
                  (help-default-arg-highlight arg)
                  doc t t 1)))))
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 191f1d324e6..f53ef7c91d1 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -146,7 +146,7 @@ is minibuffer."
   (if (commandp func-name)
     (save-excursion
       (let* ((sym (intern func-name))
-	     (buf (other-buffer))
+	     (buf (other-buffer nil t))
 	     (map (save-excursion (set-buffer buf) (current-local-map)))
 	     (keys (where-is-internal sym map)))
 	(if keys
diff --git a/lisp/info.el b/lisp/info.el
index e3514fb9729..e9d7f5ca2de 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -622,12 +622,6 @@ just return nil (no error)."
 	(cond
 	 ((string= (downcase filename) "dir")
 	  (setq found t))
-	 ((string= filename "apropos")
-	  (setq found 'apropos))
-	 ((string= filename "history")
-	  (setq found 'history))
-	 ((string= filename "toc")
-	  (setq found 'toc))
 	 (t
 	  (let ((dirs (if (string-match "^\\./" filename)
                           ;; If specified name starts with `./'
@@ -673,7 +667,8 @@ just return nil (no error)."
           (if noerror
               (setq filename nil)
             (error "Info file %s does not exist" filename)))
-        filename)))
+        filename)
+    (and (member filename '(apropos history toc)) filename)))
 
 (defun Info-find-node (filename nodename &optional no-going-back)
   "Go to an Info node specified as separate FILENAME and NODENAME.
@@ -891,9 +886,6 @@ a case-insensitive match is tried."
               (setq Info-current-file
 		    (cond
 		     ((eq filename t) "dir")
-		     ((eq filename 'apropos) "apropos")
-		     ((eq filename 'history) "history")
-		     ((eq filename 'toc) "toc")
 		     (t filename)))
 	      ))
         ;; Use string-equal, not equal, to ignore text props.
@@ -1409,7 +1401,7 @@ any double quotes or backslashes must be escaped (\\\",\\\\)."
 		 (if (stringp Info-current-file)
 		     (replace-regexp-in-string
 		      "%" "%%" (file-name-nondirectory Info-current-file))
-		   "")
+		   (format "*%S*" Info-current-file))
 		 ") "
 		 (if Info-current-node
 		     (propertize (replace-regexp-in-string
@@ -1648,7 +1640,8 @@ If DIRECTION is `backward', search in the reverse direction."
 			    ;; Skip Tag Table node
 			    (save-excursion
 			      (and (search-backward "\^_" nil t)
-				   (looking-at "\^_\nTag Table"))))))
+				   (looking-at
+				    "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
 	    (let ((search-spaces-regexp Info-search-whitespace-regexp))
 	      (if (if backward
 		      (re-search-backward regexp bound t)
@@ -1736,7 +1729,8 @@ If DIRECTION is `backward', search in the reverse direction."
 				  ;; Skip Tag Table node
 				  (save-excursion
 				    (and (search-backward "\^_" nil t)
-					 (looking-at "\^_\nTag Table"))))))
+					 (looking-at
+					  "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
 		  (let ((search-spaces-regexp Info-search-whitespace-regexp))
 		    (if (if backward
 			    (re-search-backward regexp nil t)
@@ -1831,11 +1825,11 @@ If DIRECTION is `backward', search in the reverse direction."
 
 (defun Info-isearch-push-state ()
   `(lambda (cmd)
-     (Info-isearch-pop-state cmd ,Info-current-file ,Info-current-node)))
+     (Info-isearch-pop-state cmd ',Info-current-file ',Info-current-node)))
 
 (defun Info-isearch-pop-state (cmd file node)
-  (or (and (string= Info-current-file file)
-           (string= Info-current-node node))
+  (or (and (equal Info-current-file file)
+           (equal Info-current-node node))
       (progn (Info-find-node file node) (sit-for 0))))
 
 (defun Info-isearch-start ()
@@ -1853,7 +1847,7 @@ if ERRORNAME is nil, just return nil."
 	(forward-line 1)
 	(cond ((re-search-backward
 		(concat name ":" (Info-following-node-name-re)) bound t)
-	       (match-string 1))
+	       (match-string-no-properties 1))
 	      ((not (eq errorname t))
 	       (error "Node has no %s"
 		      (capitalize (or errorname name)))))))))
@@ -1875,7 +1869,7 @@ End of submatch 0, 1, and 3 are the same, so you can safely concat."
 ;;; For compatibility; other files have used this name.
 (defun Info-following-node-name ()
   (and (looking-at (Info-following-node-name-re))
-       (match-string 1)))
+       (match-string-no-properties 1)))
 
 (defun Info-next ()
   "Go to the next node of this node."
@@ -1909,7 +1903,8 @@ If SAME-FILE is non-nil, do not move to a different Info file."
       (Info-goto-node node)
       (setq p (point))
       (goto-char (point-min))
-      (if (and (search-forward "\n* Menu:" nil t)
+      (if (and (stringp old-file)
+	       (search-forward "\n* Menu:" nil t)
 	       (re-search-forward
 		(if (string-equal old-node "Top")
 		    (concat "\n\\*[^:]+: +(" (file-name-nondirectory old-file) ")")
@@ -1977,51 +1972,53 @@ If SAME-FILE is non-nil, do not move to a different Info file."
           (while hl
             (let ((file (nth 0 (car hl)))
                   (node (nth 1 (car hl))))
-              (if (and (string-equal file curr-file)
-                       (string-equal node curr-node))
+              (if (and (equal file curr-file)
+                       (equal node curr-node))
                   (setq p (point)))
-              (insert "* " node ": ("
-		      (propertize (or (file-name-directory file) "") 'invisible t)
-		      (file-name-nondirectory file)
-                      ")" node ".\n"))
+              (if (stringp file)
+		  (insert "* " node ": ("
+			  (propertize (or (file-name-directory file) "") 'invisible t)
+			  (file-name-nondirectory file)
+			  ")" node ".\n")))
             (setq hl (cdr hl))))))
-    (Info-find-node "history" "Top")
+    (Info-find-node 'history "Top")
     (goto-char (or p (point-min)))))
 
 (defun Info-toc ()
   "Go to a node with table of contents of the current Info file.
 Table of contents is created from the tree structure of menus."
   (interactive)
-  (let ((curr-file (substring-no-properties Info-current-file))
-        (curr-node (substring-no-properties Info-current-node))
-        p)
-    (with-current-buffer (get-buffer-create " *info-toc*")
-      (let ((inhibit-read-only t)
-            (node-list (Info-build-toc curr-file)))
-        (erase-buffer)
-        (goto-char (point-min))
-        (insert "\n\^_\nFile: toc,  Node: Top,  Up: (dir)\n\n")
-        (insert "Table of Contents\n*****************\n\n")
-        (insert "*Note Top: (" curr-file ")Top.\n")
-        (Info-insert-toc
-         (nth 2 (assoc "Top" node-list)) ; get Top nodes
-         node-list 0 curr-file))
-      (if (not (bobp))
-          (let ((Info-hide-note-references 'hide)
-                (Info-fontify-visited-nodes nil))
-            (Info-mode)
-            (setq Info-current-file "toc" Info-current-node "Top")
-            (goto-char (point-min))
-            (narrow-to-region (or (re-search-forward "\n[\^_\f]\n" nil t)
-                                  (point-min))
-                              (point-max))
-            (Info-fontify-node)
-            (widen)))
-      (goto-char (point-min))
-      (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
-          (setq p (- p (length curr-node) 2))))
-    (Info-find-node "toc" "Top")
-    (goto-char (or p (point-min)))))
+  (if (stringp Info-current-file)
+      (let ((curr-file (substring-no-properties Info-current-file))
+	    (curr-node (substring-no-properties Info-current-node))
+	    p)
+	(with-current-buffer (get-buffer-create " *info-toc*")
+	  (let ((inhibit-read-only t)
+		(node-list (Info-build-toc curr-file)))
+	    (erase-buffer)
+	    (goto-char (point-min))
+	    (insert "\n\^_\nFile: toc,  Node: Top,  Up: (dir)\n\n")
+	    (insert "Table of Contents\n*****************\n\n")
+	    (insert "*Note Top: (" curr-file ")Top.\n")
+	    (Info-insert-toc
+	     (nth 2 (assoc "Top" node-list)) ; get Top nodes
+	     node-list 0 curr-file))
+	  (if (not (bobp))
+	      (let ((Info-hide-note-references 'hide)
+		    (Info-fontify-visited-nodes nil))
+		(Info-mode)
+		(setq Info-current-file 'toc Info-current-node "Top")
+		(goto-char (point-min))
+		(narrow-to-region (or (re-search-forward "\n[\^_\f]\n" nil t)
+				      (point-min))
+				  (point-max))
+		(Info-fontify-node)
+		(widen)))
+	  (goto-char (point-min))
+	  (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
+	      (setq p (- p (length curr-node) 2))))
+	(Info-find-node 'toc "Top")
+	(goto-char (or p (point-min))))))
 
 (defun Info-insert-toc (nodes node-list level curr-file)
   "Insert table of contents with references to nodes."
@@ -2221,16 +2218,18 @@ Because of ambiguities, this should be concatenated with something like
         (setq Info-point-loc
               (if (match-beginning 5)
                   (string-to-number (match-string 5))
-                (buffer-substring (match-beginning 0) (1- (match-beginning 1)))))
+                (buffer-substring-no-properties
+		 (match-beginning 0) (1- (match-beginning 1)))))
 ;;; Uncomment next line to use names of cross-references in non-index nodes:
 ;;;       (setq Info-point-loc
 ;;;             (buffer-substring (match-beginning 0) (1- (match-beginning 1))))
       )
     (replace-regexp-in-string
      "[ \n]+" " "
-     (or (match-string 2)
+     (or (match-string-no-properties 2)
 	 ;; If the node name is the menu entry name (using `entry::').
-	 (buffer-substring (match-beginning 0) (1- (match-beginning 1)))))))
+	 (buffer-substring-no-properties
+	  (match-beginning 0) (1- (match-beginning 1)))))))
 
 ;; No one calls this.
 ;;(defun Info-menu-item-sequence (list)
@@ -2684,7 +2683,7 @@ following nodes whose names also contain the word \"Index\"."
   (or file (setq file Info-current-file))
   (or (assoc file Info-index-nodes)
       ;; Skip virtual Info files
-      (and (member file '("dir" "history" "toc" "apropos"))
+      (and (member file '("dir" apropos history toc))
            (setq Info-index-nodes (cons (cons file nil) Info-index-nodes)))
       (not (stringp file))
       (if Info-file-supports-index-cookies
@@ -2926,7 +2925,7 @@ Build a menu of the possible matches."
 	     (message "%s" (if (eq (car-safe err) 'error)
 			       (nth 1 err) err))
 	     (sit-for 1 t)))))
-      (Info-goto-node (concat "(" current-file ")" current-node))
+      (Info-find-node current-file current-node)
       (setq Info-history ohist
 	    Info-history-list ohist-list)
       (message "Searching indices...done")
@@ -2945,7 +2944,7 @@ Build a menu of the possible matches."
 		     (if (nth 3 entry)
 			 (concat " (line " (nth 3 entry) ")")
 		       "")))))
-	(Info-find-node "apropos" "Index")
+	(Info-find-node 'apropos "Index")
 	(setq Info-complete-cache nil)))))
 
 (defun Info-undefined ()
@@ -3287,10 +3286,14 @@ With a zero prefix arg, put the name inside a function call to `info'."
   (interactive "P")
   (unless Info-current-node
     (error "No current Info node"))
-  (let ((node (concat "(" (file-name-nondirectory Info-current-file) ")"
-		      Info-current-node)))
+  (let ((node (if (stringp Info-current-file)
+		  (concat "(" (file-name-nondirectory Info-current-file) ")"
+			  Info-current-node))))
     (if (zerop (prefix-numeric-value arg))
         (setq node (concat "(info \"" node "\")")))
+    (unless (stringp Info-current-file)
+      (setq node (format "(Info-find-node '%S '%S)"
+			 Info-current-file Info-current-node)))
     (kill-new node)
     (message "%s" node)))
 
@@ -3817,29 +3820,30 @@ the variable `Info-file-list-for-emacs'."
                                         "^[ \t]+" ""
                                         (replace-regexp-in-string
                                          "[ \t\n]+" " "
-                                         (or (match-string 5)
+                                         (or (match-string-no-properties 5)
                                              (and (not (equal (match-string 4) ""))
-                                                  (match-string 4))
-                                             (match-string 2)))))
+                                                  (match-string-no-properties 4))
+                                             (match-string-no-properties 2)))))
 				 (external-link-p
 				  (string-match "(\\([^)]+\\))\\([^)]*\\)" node))
                                  (file (if external-link-p
 					   (file-name-nondirectory
-					    (match-string 1 node))
+					    (match-string-no-properties 1 node))
 					 Info-current-file))
                                  (hl Info-history-list)
                                  res)
                             (if external-link-p
 				(setq node (if (equal (match-string 2 node) "")
                                                "Top"
-                                             (match-string 2 node))))
+                                             (match-string-no-properties 2 node))))
 			    (while hl
 			      (if (and (string-equal node (nth 1 (car hl)))
-				       (string-equal
-					file (if external-link-p
-						 (file-name-nondirectory
-						  (caar hl))
-					       (caar hl))))
+				       (equal file
+					      (if (and external-link-p
+						       (stringp (caar hl)))
+						  (file-name-nondirectory
+						   (caar hl))
+						(caar hl))))
 				  (setq res (car hl) hl nil)
 				(setq hl (cdr hl))))
                             res))) 'info-xref-visited 'info-xref))
@@ -3932,26 +3936,28 @@ the variable `Info-file-list-for-emacs'."
                  (if (and Info-fontify-visited-nodes
                           (save-match-data
                             (let* ((node (if (equal (match-string 3) "")
-					     (match-string 1)
-					   (match-string 3)))
+					     (match-string-no-properties 1)
+					   (match-string-no-properties 3)))
 				   (external-link-p
 				    (string-match "(\\([^)]+\\))\\([^)]*\\)" node))
 				   (file (if external-link-p
 					     (file-name-nondirectory
-					      (match-string 1 node))
+					      (match-string-no-properties 1 node))
 					   Info-current-file))
 				   (hl Info-history-list)
 				   res)
                               (if external-link-p
                                   (setq node (if (equal (match-string 2 node) "")
                                                  "Top"
-                                               (match-string 2 node))))
+                                               (match-string-no-properties 2 node))))
 			      (while hl
 				(if (and (string-equal node (nth 1 (car hl)))
-					 (string-equal
-					  file (if external-link-p
-						   (file-name-nondirectory (caar hl))
-						 (caar hl))))
+					 (equal file
+						(if (and external-link-p
+							 (stringp (caar hl)))
+						    (file-name-nondirectory
+						     (caar hl))
+						  (caar hl))))
 				    (setq res (car hl) hl nil)
 				  (setq hl (cdr hl))))
                               res))) 'info-xref-visited 'info-xref)))
@@ -4210,8 +4216,8 @@ BUFFER is the buffer speedbar is requesting buttons for."
 
 (defun Info-desktop-buffer-misc-data (desktop-dirname)
   "Auxiliary information to be saved in desktop file."
-  (if (not (member Info-current-file '("apropos" "history" "toc")))
-      (list Info-current-file Info-current-node)))
+  (unless (member Info-current-file '(apropos history toc nil))
+    (list Info-current-file Info-current-node)))
 
 (defun Info-restore-desktop-buffer (desktop-buffer-file-name
                                     desktop-buffer-name
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 3dcf689767a..f484912d490 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,68 @@
+2006-02-19  Bill Wohler  <wohler@newt.com>
+
+	* mh-alias.el (mh-address-mail-regexp)
+	(mh-goto-address-find-address-at-point): Delete copies from
+	goto-addr.el.
+	(mh-alias-suggest-alias): Use goto-address-mail-regexp instead of
+	mh-address-mail-regexp.
+	(mh-alias-add-address-under-point): Use
+	goto-address-find-address-at-point instead of
+	mh-goto-address-find-address-at-point.
+
+	* mh-e.el (mh-show-use-goto-addr-flag): Delete.
+
+	* mh-show.el (mh-show-mode): Mention goto-address-highlight-p in
+	docstring.
+	(mh-show-addr): Call goto-address unconditionally. User should use
+	goto-address-highlight-p instead of mh-show-use-goto-addr-flag.
+
+2006-02-18  Bill Wohler  <wohler@newt.com>
+
+	* mh-e.el (Version, mh-version): Add +cvs to version.
+
+2006-02-18  Bill Wohler  <wohler@newt.com>
+
+	Release MH-E version 7.92.
+
+	* mh-e.el (Version, mh-version): Update for release 7.92.
+
+2006-02-17  Bill Wohler  <wohler@newt.com>
+
+	* mh-e.el (mh-folder-msg-number): Use purple on low-color, light
+	backgrounds per Mark's suggestion.
+
+	* mh-utils.el (mh-image-load-path): Fix problem that images on
+	load-path or image-load-path would win over relative paths (newer
+	MH-E or Emacs distribution).
+
+2006-02-16  Bill Wohler  <wohler@newt.com>
+
+	* mh-e.el (mh-inherit-face-flag): New variable. Non-nil means that
+	the defface :inherit keyword is available.
+	(mh-face-data): New variable (contains all face specs) and
+	function (accessor).
+	(mh-folder-address, mh-folder-body, mh-folder-cur-msg-number)
+	(mh-folder-date, mh-folder-deleted, mh-folder-followup)
+	(mh-folder-msg-number, mh-folder-refiled)
+	(mh-folder-sent-to-me-hint, mh-folder-sent-to-me-sender)
+	(mh-folder-subject, mh-folder-tick, mh-folder-to)
+	(mh-search-folder, mh-letter-header-field, mh-show-cc)
+	(mh-show-date, mh-show-from)
+	(mh-show-header, mh-show-pgg-bad, mh-show-pgg-good)
+	(mh-show-pgg-unknown, mh-show-signature, mh-show-subject)
+	(mh-show-to, mh-show-xface, mh-speedbar-folder)
+	(mh-speedbar-folder-with-unseen-messages)
+	(mh-speedbar-selected-folder)
+	(mh-speedbar-selected-folder-with-unseen-messages): Use
+	mh-face-data.
+
+	* mh-utils.el (mh-image-load-path): The variables image-load-path
+	or load-path would not get updated if user set mh-image-load-path.
+	Moved tests and add-to-list calls outside of cond so they are
+	applied consistently, even if they are redundant in some
+	circumstances. Efficiency isn't a concern here. Made error
+	messages more user-friendly.
+
 2006-02-15  Peter S Galbraith  <psg@debian.org>
 
 	* mh-compat.el (mh-image-search-load-path): Compatibility code.
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 9dc2871241f..6dba65d69df 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -35,6 +35,8 @@
 
 (mh-require-cl)
 
+(require 'goto-addr)
+
 (defvar mh-alias-alist 'not-read
   "Alist of MH aliases.")
 (defvar mh-alias-blind-alist nil
@@ -62,11 +64,6 @@ alias files listed in your \"Aliasfile:\" MH profile component are
 automatically included. You can update the alias list manually using
 \\[mh-alias-reload].")
 
-;; Copy of `goto-address-mail-regexp'.
-(defvar mh-address-mail-regexp
-  "[-a-zA-Z0-9._]+@\\([-a-zA-z0-9_]+\\.\\)+[a-zA-Z0-9]+"
-  "A regular expression probably matching an e-mail address.")
-
 
 
 ;;; Alias Loading
@@ -343,7 +340,7 @@ NO-COMMA-SWAP is non-nil."
    ((string-match "^\\(.*\\) +<.*>$" string)
     ;; Some name <somename@foo.bar>  -> recurse -> Some name
     (mh-alias-suggest-alias (match-string 1 string) no-comma-swap))
-   ((string-match (concat mh-address-mail-regexp " +(\\(.*\\))$") string)
+   ((string-match (concat goto-address-mail-regexp " +(\\(.*\\))$") string)
     ;; somename@foo.bar (Some name)  -> recurse -> Some name
     (mh-alias-suggest-alias (match-string 1 string) no-comma-swap))
    ((string-match "^\\(Dr\\|Prof\\)\\.? +\\(.*\\)" string)
@@ -595,24 +592,11 @@ filing messages."
 (defun mh-alias-add-address-under-point ()
   "Insert an alias for address under point."
   (interactive)
-  (let ((address (mh-goto-address-find-address-at-point)))
+  (let ((address (goto-address-find-address-at-point)))
     (if address
         (mh-alias-add-alias nil address)
       (message "No email address found under point"))))
 
-;; From goto-addr.el, which we don't want to force-load on users.
-(defun mh-goto-address-find-address-at-point ()
-  "Find e-mail address around or before point.
-
-Then search backwards to beginning of line for the start of an
-e-mail address. If no e-mail address found, return nil."
-  (re-search-backward "[^-_A-z0-9.@]" (mh-line-beginning-position) 'lim)
-  (if (or (looking-at mh-address-mail-regexp) ; already at start
-          (and (re-search-forward mh-address-mail-regexp
-                                  (mh-line-end-position) 'lim)
-               (goto-char (match-beginning 0))))
-      (mh-match-string-no-properties 0)))
-
 (defun mh-alias-apropos (regexp)
   "Show all aliases or addresses that match a regular expression REGEXP."
   (interactive "sAlias regexp: ")
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index ab0143c0c85..3dc509c09f0 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -6,7 +6,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 7.91+cvs
+;; Version: 7.92+cvs
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -121,7 +121,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "7.91+cvs" "Version number of MH-E.")
+(defconst mh-version "7.92+cvs" "Version number of MH-E.")
 
 ;; Variants
 
@@ -2615,22 +2615,6 @@ message are shown regardless of size."
   :type 'integer
   :group 'mh-show)
 
-(defcustom mh-show-use-goto-addr-flag (and (boundp 'goto-address-highlight-p)
-                                           goto-address-highlight-p)
-  "*Non-nil means highlight URLs and email addresses\\<goto-address-highlight-keymap>.
-
-To send a message using the highlighted email address or to view
-the web page for the highlighted URL, use the middle mouse button
-or \\[goto-address-at-point].
-
-See Info node `(mh-e)Sending Mail' to see how to configure Emacs
-to send the message using MH-E.
-
-The default value of this option comes from the value of
-`goto-address-highlight-p'."
-  :type 'boolean
-  :group 'mh-show)
-
 (defcustom mh-show-use-xface-flag (>= emacs-major-version 21)
   "*Non-nil means display face images in MH-show buffers.
 
@@ -2968,6 +2952,8 @@ sequence."
 (if (boundp 'facemenu-unlisted-faces)
     (add-to-list 'facemenu-unlisted-faces "^mh-"))
 
+;; Temporary function and data structure used for defining faces.
+;; These will be unbound after the faces are defined.
 (defvar mh-min-colors-defined-flag (and (not mh-xemacs-flag)
                                         (>= emacs-major-version 22))
   "Non-nil means defface supports min-colors display requirement.")
@@ -2999,80 +2985,219 @@ colors."
                 (setq new-spec (cons entry new-spec)))))
       new-spec)))
 
-(defface mh-folder-address '((t (:inherit mh-folder-subject)))
+(defvar mh-inherit-face-flag (assq :inherit custom-face-attributes)
+  "Non-nil means that the `defface' :inherit keyword is available.
+The :inherit keyword is available on all supported versions of
+GNU Emacs and XEmacs from at least 21.5.23 on.")
+
+(defvar mh-face-data
+  '((mh-folder-followup
+     ((((class color) (background light))
+       (:foreground "blue3"))
+      (((class color) (background dark))
+       (:foreground "LightGoldenRod"))
+      (t
+       (:bold t))))
+    (mh-folder-msg-number
+     ((((class color) (min-colors 64) (background light))
+       (:foreground "snow4"))
+      (((class color) (min-colors 64) (background dark))
+       (:foreground "snow3"))
+      (((class color) (background light))
+       (:foreground "purple"))
+      (((class color) (background dark))
+       (:foreground "cyan"))))
+    (mh-folder-refiled
+     ((((class color) (min-colors 64) (background light))
+       (:foreground "DarkGoldenrod"))
+      (((class color) (min-colors 64) (background dark))
+       (:foreground "LightGoldenrod"))
+      (((class color))
+       (:foreground "yellow" :weight light))
+      (((class grayscale) (background light))
+       (:foreground "Gray90" :bold t :italic t))
+      (((class grayscale) (background dark))
+       (:foreground "DimGray" :bold t :italic t))
+      (t
+       (:bold t :italic t))))
+    (mh-folder-subject
+     ((((class color) (background light))
+       (:foreground "blue4"))
+      (((class color) (background dark))
+       (:foreground "yellow"))
+      (t
+       (:bold t))))
+    (mh-folder-tick
+     ((((class color) (background light))
+       (:background "#dddf7e"))
+      (((class color) (background dark))
+       (:background "#dddf7e"))
+      (t
+       (:underline t))))
+    (mh-folder-to
+     ((((class color) (min-colors 64) (background light))
+       (:foreground "RosyBrown"))
+      (((class color) (min-colors 64) (background dark))
+       (:foreground "LightSalmon"))
+      (((class color))
+       (:foreground "green"))
+      (((class grayscale) (background light))
+       (:foreground "DimGray" :italic t))
+      (((class grayscale) (background dark))
+       (:foreground "LightGray" :italic t))
+      (t
+       (:italic t))))
+    (mh-letter-header-field
+     ((((class color) (background light))
+       (:background "gray90"))
+      (((class color) (background dark))
+       (:background "gray10"))
+      (t
+       (:bold t))))
+    (mh-search-folder
+     ((((class color) (background light))
+       (:foreground "dark green" :bold t))
+      (((class color) (background dark))
+       (:foreground "indian red" :bold t))
+      (t
+       (:bold t))))
+    (mh-show-cc
+     ((((class color) (min-colors 64) (background light))
+       (:foreground "DarkGoldenrod"))
+      (((class color) (min-colors 64) (background dark))
+       (:foreground "LightGoldenrod"))
+      (((class color))
+       (:foreground "yellow" :weight light))
+      (((class grayscale) (background light))
+       (:foreground "Gray90" :bold t :italic t))
+      (((class grayscale) (background dark))
+       (:foreground "DimGray" :bold t :italic t))
+      (t
+       (:bold t :italic t))))
+    (mh-show-date
+     ((((class color) (min-colors 64) (background light))
+       (:foreground "ForestGreen"))
+      (((class color) (min-colors 64) (background dark))
+       (:foreground "PaleGreen"))
+      (((class color))
+       (:foreground "green"))
+      (((class grayscale) (background light))
+       (:foreground "Gray90" :bold t))
+      (((class grayscale) (background dark))
+       (:foreground "DimGray" :bold t))
+      (t
+       (:bold t :underline t))))
+    (mh-show-from
+     ((((class color) (background light))
+       (:foreground "red3"))
+      (((class color) (background dark))
+       (:foreground "cyan"))
+      (t
+       (:bold t))))
+    (mh-show-header
+     ((((class color) (min-colors 64) (background light))
+       (:foreground "RosyBrown"))
+      (((class color) (min-colors 64) (background dark))
+       (:foreground "LightSalmon"))
+      (((class color))
+       (:foreground "green"))
+      (((class grayscale) (background light))
+       (:foreground "DimGray" :italic t))
+      (((class grayscale) (background dark))
+       (:foreground "LightGray" :italic t))
+      (t
+       (:italic t))))
+    (mh-show-pgg-bad ((t (:bold t :foreground "DeepPink1"))))
+    (mh-show-pgg-good ((t (:bold t :foreground "LimeGreen"))))
+    (mh-show-pgg-unknown ((t (:bold t :foreground "DarkGoldenrod2"))))
+    (mh-show-signature ((t (:italic t))))
+    (mh-show-to
+     ((((class color) (background light))
+       (:foreground "SaddleBrown"))
+      (((class color) (background dark))
+       (:foreground "burlywood"))
+      (((class grayscale) (background light))
+       (:foreground "DimGray" :underline t))
+      (((class grayscale) (background dark))
+       (:foreground "LightGray" :underline t))
+      (t (:underline t))))
+    (mh-speedbar-folder
+     ((((class color) (background light))
+       (:foreground "blue4"))
+      (((class color) (background dark))
+       (:foreground "light blue"))))
+    (mh-speedbar-selected-folder
+     ((((class color) (background light))
+       (:foreground "red1" :underline t))
+      (((class color) (background dark))
+       (:foreground "red1" :underline t))
+      (t
+       (:underline t))))))
+
+(defun mh-face-data (face &optional inherit)
+  "Return spec for FACE.
+If INHERIT is non-nil and `defface' supports the :inherit
+keyword, return INHERIT literally; otherwise, return spec for FACE.
+
+This isn't a perfect implementation. In the case that
+the :inherit keyword is not supported, any additional attributes
+in the inherit parameter are not added to the returned spec."
+  (if (and inherit mh-inherit-face-flag)
+      inherit
+    (mh-defface-compat (cadr (assoc face mh-face-data)))))
+
+(defface mh-folder-address
+  (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject))))
   "Recipient face."
   :group 'mh-faces
   :group 'mh-folder)
 
 (defface mh-folder-body
-  '((((class color))
-     (:inherit mh-folder-msg-number))
-    (t
-     (:inherit mh-folder-msg-number :italic t)))
+  (mh-face-data 'mh-folder-msg-number
+                '((((class color))
+                   (:inherit mh-folder-msg-number))
+                  (t
+                   (:inherit mh-folder-msg-number :italic t))))
   "Body text face."
   :group 'mh-faces
   :group 'mh-folder)
 
 (defface mh-folder-cur-msg-number
-  '((t
-     (:inherit mh-folder-msg-number :bold t)))
+  (mh-face-data 'mh-folder-msg-number
+                '((t (:inherit mh-folder-msg-number :bold t))))
   "Current message number face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-date '((t (:inherit mh-folder-msg-number)))
+(defface mh-folder-date
+  (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number))))
   "Date face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-deleted '((t (:inherit mh-folder-msg-number)))
+(defface mh-folder-deleted
+  (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number))))
   "Deleted message face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-followup
-  '((((class color) (background light))
-     (:foreground "blue3"))
-    (((class color) (background dark))
-     (:foreground "LightGoldenRod"))
-    (t
-     (:bold t)))
+(defface mh-folder-followup (mh-face-data 'mh-folder-followup)
   "\"Re:\" face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-msg-number
-  (mh-defface-compat
-   '((((class color) (min-colors 64) (background light))
-      (:foreground "snow4"))
-     (((class color) (min-colors 64) (background dark))
-      (:foreground "snow3"))
-     (((class color))
-      (:foreground "cyan"))))
-
+(defface mh-folder-msg-number (mh-face-data 'mh-folder-msg-number)
   "Message number face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-refiled
-  (mh-defface-compat
-   '((((class color) (min-colors 64) (background light))
-      (:foreground "DarkGoldenrod"))
-     (((class color) (min-colors 64) (background dark))
-      (:foreground "LightGoldenrod"))
-     (((class color))
-      (:foreground "yellow" :weight light))
-     (((class grayscale) (background light))
-      (:foreground "Gray90" :bold t :italic t))
-     (((class grayscale) (background dark))
-      (:foreground "DimGray" :bold t :italic t))
-     (t
-      (:bold t :italic t))))
+(defface mh-folder-refiled (mh-face-data 'mh-folder-refiled)
   "Refiled message face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-sent-to-me-hint '((t (:inherit mh-folder-date)))
+(defface mh-folder-sent-to-me-hint
+  (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-date))))
   "Fontification hint face in messages sent directly to us.
 The detection of messages sent to us is governed by the scan
 format `mh-scan-format-nmh' and the regular expression
@@ -3080,7 +3205,8 @@ format `mh-scan-format-nmh' and the regular expression
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-sent-to-me-sender '((t (:inherit mh-folder-followup)))
+(defface mh-folder-sent-to-me-sender
+  (mh-face-data 'mh-folder-followup '((t (:inherit mh-folder-followup))))
   "Sender face in messages sent directly to us.
 The detection of messages sent to us is governed by the scan
 format `mh-scan-format-nmh' and the regular expression
@@ -3088,212 +3214,122 @@ format `mh-scan-format-nmh' and the regular expression
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-subject
-  '((((class color) (background light))
-     (:foreground "blue4"))
-    (((class color) (background dark))
-     (:foreground "yellow"))
-    (t
-     (:bold t)))
+(defface mh-folder-subject (mh-face-data 'mh-folder-subject)
   "Subject face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-tick
-  '((((class color) (background dark))
-     (:background "#dddf7e"))
-    (((class color) (background light))
-     (:background "#dddf7e"))
-    (t
-     (:underline t)))
+(defface mh-folder-tick (mh-face-data 'mh-folder-tick)
   "Ticked message face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-folder-to
-  (mh-defface-compat
-   '((((class color) (min-colors 64) (background light))
-      (:foreground "RosyBrown"))
-     (((class color) (min-colors 64) (background dark))
-      (:foreground "LightSalmon"))
-     (((class color))
-      (:foreground "green"))
-     (((class grayscale) (background light))
-      (:foreground "DimGray" :italic t))
-     (((class grayscale) (background dark))
-      (:foreground "LightGray" :italic t))
-     (t
-      (:italic t))))
+(defface mh-folder-to (mh-face-data 'mh-folder-to)
   "\"To:\" face."
   :group 'mh-faces
   :group 'mh-folder)
 
-(defface mh-search-folder
-  '((((class color) (background light))
-     (:foreground "dark green" :bold t))
-    (((class color) (background dark))
-     (:foreground "indian red" :bold t))
-    (t
-     (:bold t)))
-  "Folder heading face in MH-Folder buffers created by searches."
-  :group 'mh-faces
-  :group 'mh-search)
-
-(defface mh-letter-header-field
-  '((((class color) (background light))
-     (:background "gray90"))
-    (((class color) (background dark))
-     (:background "gray10"))
-    (t
-     (:bold t)))
+(defface mh-letter-header-field (mh-face-data 'mh-letter-header-field)
   "Editable header field value face in draft buffers."
   :group 'mh-faces
   :group 'mh-letter)
 
-(defface mh-show-cc
-  (mh-defface-compat
-   '((((class color) (min-colors 64) (background light))
-      (:foreground "DarkGoldenrod"))
-     (((class color) (min-colors 64) (background dark))
-      (:foreground "LightGoldenrod"))
-     (((class color))
-      (:foreground "yellow" :weight light))
-     (((class grayscale) (background light))
-      (:foreground "Gray90" :bold t :italic t))
-     (((class grayscale) (background dark))
-      (:foreground "DimGray" :bold t :italic t))
-     (t
-      (:bold t :italic t))))
+(defface mh-search-folder (mh-face-data 'mh-search-folder)
+  "Folder heading face in MH-Folder buffers created by searches."
+  :group 'mh-faces
+  :group 'mh-search)
+
+(defface mh-show-cc (mh-face-data 'mh-show-cc)
   "Face used to highlight \"cc:\" header fields."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-date
-  (mh-defface-compat
-   '((((class color) (min-colors 64) (background light))
-      (:foreground "ForestGreen"))
-     (((class color) (min-colors 64) (background dark))
-      (:foreground "PaleGreen"))
-     (((class color))
-      (:foreground "green"))
-     (((class grayscale) (background light))
-      (:foreground "Gray90" :bold t))
-     (((class grayscale) (background dark))
-      (:foreground "DimGray" :bold t))
-     (t
-      (:bold t :underline t))))
+(defface mh-show-date (mh-face-data 'mh-show-date)
   "Face used to highlight \"Date:\" header fields."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-from
-  '((((class color) (background light))
-     (:foreground "red3"))
-    (((class color) (background dark))
-     (:foreground "cyan"))
-    (t
-     (:bold t)))
+(defface mh-show-from (mh-face-data 'mh-show-from)
   "Face used to highlight \"From:\" header fields."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-header
-  (mh-defface-compat
-   '((((class color) (min-colors 64) (background light))
-      (:foreground "RosyBrown"))
-     (((class color) (min-colors 64) (background dark))
-      (:foreground "LightSalmon"))
-     (((class color))
-      (:foreground "green"))
-     (((class grayscale) (background light))
-      (:foreground "DimGray" :italic t))
-     (((class grayscale) (background dark))
-      (:foreground "LightGray" :italic t))
-     (t
-      (:italic t))))
+(defface mh-show-header (mh-face-data 'mh-show-header)
   "Face used to deemphasize less interesting header fields."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-pgg-bad '((t (:bold t :foreground "DeepPink1")))
+(defface mh-show-pgg-bad (mh-face-data 'mh-show-pgg-bad)
   "Bad PGG signature face."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-pgg-good '((t (:bold t :foreground "LimeGreen")))
+(defface mh-show-pgg-good (mh-face-data 'mh-show-pgg-good)
   "Good PGG signature face."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-pgg-unknown '((t (:bold t :foreground "DarkGoldenrod2")))
+(defface mh-show-pgg-unknown (mh-face-data 'mh-show-pgg-unknown)
   "Unknown or untrusted PGG signature face."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-signature '((t (:italic t)))
+(defface mh-show-signature (mh-face-data 'mh-show-signature)
   "Signature face."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-subject '((t (:inherit mh-folder-subject)))
+(defface mh-show-subject
+  (mh-face-data 'mh-folder-subject '((t (:inherit mh-folder-subject))))
   "Face used to highlight \"Subject:\" header fields."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-to
-  '((((class color) (background light))
-     (:foreground "SaddleBrown"))
-    (((class color) (background dark))
-     (:foreground "burlywood"))
-    (((class grayscale) (background light))
-     (:foreground "DimGray" :underline t))
-    (((class grayscale) (background dark))
-     (:foreground "LightGray" :underline t))
-    (t (:underline t)))
+(defface mh-show-to (mh-face-data 'mh-show-to)
   "Face used to highlight \"To:\" header fields."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-show-xface '((t (:inherit (mh-show-from highlight))))
-  "X-Face image face.
+(defface mh-show-xface
+  (mh-face-data 'mh-show-from '((t (:inherit (mh-show-from highlight)))))
+
+"X-Face image face.
 The background and foreground are used in the image."
   :group 'mh-faces
   :group 'mh-show)
 
-(defface mh-speedbar-folder
-  '((((class color) (background light))
-     (:foreground "blue4"))
-    (((class color) (background dark))
-     (:foreground "light blue")))
+(defface mh-speedbar-folder (mh-face-data 'mh-speedbar-folder)
   "Basic folder face."
   :group 'mh-faces
   :group 'mh-speedbar)
 
 (defface mh-speedbar-folder-with-unseen-messages
-  '((t
-     (:inherit mh-speedbar-folder :bold t)))
+  (mh-face-data 'mh-speedbar-folder
+                '((t (:inherit mh-speedbar-folder :bold t))))
   "Folder face when folder contains unread messages."
   :group 'mh-faces
   :group 'mh-speedbar)
 
 (defface mh-speedbar-selected-folder
-  '((((class color) (background light))
-     (:foreground "red1" :underline t))
-    (((class color) (background dark))
-     (:foreground "red1" :underline t))
-    (t
-     (:underline t)))
+  (mh-face-data 'mh-speedbar-selected-folder)
   "Selected folder face."
   :group 'mh-faces
   :group 'mh-speedbar)
 
 (defface mh-speedbar-selected-folder-with-unseen-messages
-  '((t
-     (:inherit mh-speedbar-selected-folder :bold t)))
+  (mh-face-data 'mh-speedbar-selected-folder
+                '((t (:inherit mh-speedbar-selected-folder :bold t))))
   "Selected folder face when folder contains unread messages."
   :group 'mh-faces
   :group 'mh-speedbar)
 
+;; Get rid of temporary functions and data structures.
+(fmakunbound 'mh-defface-compat)
+(fmakunbound 'mh-face-data)
+(makunbound 'mh-face-data)
+(makunbound 'mh-inherit-face-flag)
+(makunbound 'mh-min-colors-defined-flag)
+
 (provide 'mh-e)
 
 ;; Local Variables:
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index b35b1e6aace..4b0ce65cf5d 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1741,9 +1741,9 @@ Returns nil if file command not on system."
     ("application/x-zip" "\.sxw" "application/vnd.sun.xml.writer")
     ("application/x-zip" "\.odg" "application/vnd.oasis.opendocument.graphics")
     ("application/x-zip" "\.odi" "application/vnd.oasis.opendocument.image")
-    ("application/x-zip" "\.odp" 
+    ("application/x-zip" "\.odp"
      "application/vnd.oasis.opendocument.presentation")
-    ("application/x-zip" "\.ods" 
+    ("application/x-zip" "\.ods"
      "application/vnd.oasis.opendocument.spreadsheet")
     ("application/x-zip" "\.odt" "application/vnd.oasis.opendocument.text"))
   "Substitutions to make for Content-Type returned from file command.
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index ab636ae8ab6..3ae609d9204 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -36,13 +36,13 @@
 (require 'mh-e)
 (require 'mh-scan)
 
+(require 'font-lock)
 (require 'gnus-cite)
 (require 'gnus-util)
+(require 'goto-addr)
 
 (autoload 'mh-make-buffer-data "mh-mime") ;can't be automatically generated
 
-(require 'font-lock)
-
 
 
 ;;; MH-Folder Commands
@@ -818,6 +818,13 @@ operation."
 (define-derived-mode mh-show-mode text-mode "MH-Show"
   "Major mode for showing messages in MH-E.\\<mh-show-mode-map>
 
+Email addresses and URLs in the message are highlighted if the
+option `goto-address-highlight-p' is on, which it is by default.
+To view the web page for a highlighted URL or to send a message
+using a highlighted email address, use the middle mouse button or
+\\[goto-address-at-point]. See Info node `(mh-e)Sending Mail' to
+see how to configure Emacs to send the message using MH-E.
+
 The hook `mh-show-mode-hook' is called upon entry to this mode.
 
 See also `mh-folder-mode'.
@@ -877,10 +884,7 @@ See also `mh-folder-mode'.
 ;;;###mh-autoload
 (defun mh-show-addr ()
   "Use `goto-address'."
-  (when mh-show-use-goto-addr-flag
-    (mh-require 'goto-addr nil t)
-    (if (fboundp 'goto-address)
-        (goto-address))))
+  (goto-address))
 
 ;;;###mh-autoload
 (defun mh-gnus-article-highlight-citation ()
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index bf0d29fd2a7..c00558860d1 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -96,10 +96,11 @@ This variable is used by that function to avoid doing the work repeatedly.")
   "Ensure that the MH-E images are accessible by `find-image'.
 
 Images for MH-E are found in \"../../etc/images\" relative to the
-files in \"lisp/mh-e\". This function saves the actual location
-found in the variable `mh-image-load-path'. If the images on your
-system are actually located elsewhere, then set the variable
-`mh-image-load-path' before starting MH-E.
+files in \"lisp/mh-e\", in `image-load-path', or in `load-path'.
+This function saves the actual location found in the variable
+`mh-image-load-path'. If the images on your system are actually
+located elsewhere, then set the variable `mh-image-load-path'
+before starting MH-E.
 
 If `image-load-path' exists (since Emacs 22), then the contents
 of the variable `mh-image-load-path' is added to it if isn't
@@ -110,40 +111,38 @@ already there.
 See also variable `mh-image-load-path-called-flag'."
   (unless mh-image-load-path-called-flag
     (cond
-     ((and mh-image-load-path
-           (file-exists-p (expand-file-name "mh-logo.xpm"
-                                            mh-image-load-path))))
-      ;; User setting exists. We're done.
-     ((and mh-image-load-path
-           (not (file-exists-p (expand-file-name "mh-logo.xpm"
-                                                 mh-image-load-path))))
-      ;; User setting does not exist.
-      (message "Variable mh-image-load-path %s does not contain MH-E images"
-               mh-image-load-path))
-     ((mh-image-search-load-path "mh-logo.xpm")
-      ;; Emacs 22 already knows where the images are.
-      (setq mh-image-load-path
-	    (file-name-directory (mh-image-search-load-path "mh-logo.xpm"))))
-     ((locate-library "mh-logo.xpm")
-      ;; Other Emacs already knows where the images are...
-      (setq mh-image-load-path
-	    (file-name-directory (locate-library "mh-logo.xpm"))))
-     (t      
-      ;; Guess `mh-image-load-path' if it wasn't provided by the user.
-      (let (mh-library-name)
+     (mh-image-load-path)               ; user setting exists
+     ((let (mh-library-name)            ; try relative setting
         ;; First, find mh-e in the load-path.
         (setq mh-library-name (locate-library "mh-e"))
         (if (not mh-library-name)
             (error "Can not find MH-E in load-path"))
+        ;; And then set mh-image-load-path relative to that.
         (setq mh-image-load-path
               (expand-file-name (concat
                                  (file-name-directory mh-library-name)
-                                 "../../etc/images"))))
-      (if (not (file-exists-p mh-image-load-path))
-	  (error "Can not find image directory %s" mh-image-load-path))
-      (if (boundp 'image-load-path)
-	  (add-to-list 'image-load-path mh-image-load-path)
-	(add-to-list 'load-path mh-image-load-path))))
+                                 "../../etc/images")))
+        (file-exists-p (expand-file-name "mh-logo.xpm" mh-image-load-path))))
+     ((mh-image-search-load-path "mh-logo.xpm")
+      ;; Images in image-load-path.
+      (setq mh-image-load-path
+	    (file-name-directory (mh-image-search-load-path "mh-logo.xpm"))))
+     ((locate-library "mh-logo.xpm")
+      ;; Images in load-path.
+      (setq mh-image-load-path
+	    (file-name-directory (locate-library "mh-logo.xpm")))))
+
+    (if (not (file-exists-p mh-image-load-path))
+        (error "Directory %s in mh-image-load-path does not exist"
+               mh-image-load-path))
+    (if (not (file-exists-p
+              (expand-file-name "mh-logo.xpm" mh-image-load-path)))
+      (error "Directory %s in mh-image-load-path does not contain MH-E images"
+             mh-image-load-path))
+    (if (boundp 'image-load-path)
+        (add-to-list 'image-load-path mh-image-load-path)
+      (add-to-list 'load-path mh-image-load-path))
+
     (setq mh-image-load-path-called-flag t)))
 
 ;;;###mh-autoload
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 971b65bf25c..f2eff379d14 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -49,7 +49,7 @@
 (defgroup rcirc nil
   "Simple IRC client."
   :version "22.1"
-  :prefix "rcirc"
+  :prefix "rcirc-"
   :group 'applications)
 
 (defcustom rcirc-server "irc.freenode.net"
@@ -295,16 +295,23 @@ If ARG is non-nil, prompt for a server to connect to."
 (defvar rcirc-topic nil)
 (defvar rcirc-keepalive-timer nil)
 (defvar rcirc-last-server-message-time nil)
-(defun rcirc-connect (server port nick user-name full-name startup-channels)
+(defun rcirc-connect (&optional server port nick user-name full-name startup-channels)
   (add-hook 'window-configuration-change-hook
 	    'rcirc-window-configuration-change)
 
   (save-excursion
     (message "Connecting to %s..." server)
     (let* ((inhibit-eol-conversion)
-           (port-number (if (stringp port)
-                            (string-to-number port)
-                          port))
+           (port-number (if port
+			    (if (stringp port)
+				(string-to-number port)
+			      port)
+			  rcirc-port))
+	   (server (or server rcirc-server))
+	   (nick (or nick rcirc-nick))
+	   (user-name (or user-name rcirc-user-name))
+	   (full-name (or full-name rcirc-user-full-name))
+	   (startup-channels (or startup-channels (rcirc-startup-channels server)))
            (process (open-network-stream server nil server port-number)))
       ;; set up process
       (set-process-coding-system process 'raw-text 'raw-text)
@@ -758,9 +765,9 @@ if there is no existing buffer for TARGET, otherwise return nil."
 Create the buffer if it doesn't exist."
   (let ((buffer (rcirc-get-buffer process target)))
     (if buffer
-	(progn
+	(with-current-buffer buffer
 	  (when (not rcirc-target)
-	    (setq rcirc-target target))
+ 	    (setq rcirc-target target))
 	  buffer)
 	;; create the buffer
 	(with-rcirc-process-buffer process
@@ -896,20 +903,22 @@ Create the buffer if it doesn't exist."
   (kill-buffer (current-buffer))
   (set-window-configuration rcirc-window-configuration))
 
-(defun rcirc-get-any-buffer (process)
+(defun rcirc-any-buffer (process)
   "Return a buffer for PROCESS, either the one selected or the process buffer."
-  (let ((buffer (window-buffer (selected-window))))
-    (if (and buffer
-	     (with-current-buffer buffer
-	       (and (eq major-mode 'rcirc-mode)
-		    (eq rcirc-process process))))
-	buffer
-      (process-buffer process))))
+  (if rcirc-always-use-server-buffer-flag
+      (process-buffer process)
+    (let ((buffer (window-buffer (selected-window))))
+      (if (and buffer
+	       (with-current-buffer buffer
+		 (and (eq major-mode 'rcirc-mode)
+		      (eq rcirc-process process))))
+	  buffer
+	(process-buffer process)))))
 
 (defcustom rcirc-response-formats
-  '(("PRIVMSG" . "%T<%n> %m")
-    ("NOTICE"  . "%T-%n- %m")
-    ("ACTION"  . "%T[%n] %m")
+  '(("PRIVMSG" . "%T<%N> %m")
+    ("NOTICE"  . "%T-%N- %m")
+    ("ACTION"  . "%T[%N %m]")
     ("COMMAND" . "%T%m")
     ("ERROR"   . "%T%fw!!! %m")
     (t         . "%T%fp*** %fs%n %r %m"))
@@ -921,7 +930,8 @@ The entry's value part should be a string, which is inserted with
 the of the following escape sequences replaced by the described values:
 
   %m        The message text
-  %n        The sender's nick (with face `rcirc-my-nick' or `rcirc-other-nick')
+  %n        The sender's nick
+  %N        The sender's nick (with face `rcirc-my-nick' or `rcirc-other-nick')
   %r        The response-type
   %T        The timestamp (with face `rcirc-timestamp')
   %t        The target
@@ -959,13 +969,20 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
 	    (cond ((eq key ?%)
 		   ;; %% -- literal % character
 		   "%")
-		  ((eq key ?n)
-		   ;; %n -- nick
-		   (rcirc-facify (concat (rcirc-abbrev-nick sender)
-					 (and target (concat "," target)))
-				 (if (string= sender (rcirc-nick process))
-				     'rcirc-my-nick
-				   'rcirc-other-nick)))
+		  ((or (eq key ?n) (eq key ?N))
+		   ;; %n/%N -- nick
+		   (let ((nick (concat (if (string= (with-rcirc-process-buffer
+							process rcirc-server)
+						    sender)
+					   ""
+					 (rcirc-abbrev-nick sender))
+				       (and target (concat "," target)))))
+		     (rcirc-facify nick
+				   (if (eq key ?n)
+				       face
+				     (if (string= sender (rcirc-nick process))
+					 'rcirc-my-nick
+				       'rcirc-other-nick)))))
 		  ((eq key ?T)
 		   ;; %T -- timestamp
 		   (rcirc-facify
@@ -1015,9 +1032,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
   (assert (not (bufferp target)))
   (with-rcirc-process-buffer process
     (cond ((not target)
-	   (if rcirc-always-use-server-buffer-flag
-	       (process-buffer process)
-	     (rcirc-get-any-buffer process)))
+	   (rcirc-any-buffer process))
 	  ((not (rcirc-channel-p target))
 	   ;; message from another user
 	   (if (string= response "PRIVMSG")
@@ -1026,7 +1041,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
 						  sender))
 	     (rcirc-get-buffer process target t)))
 	  ((or (rcirc-get-buffer process target)
-	       (rcirc-get-any-buffer process))))))
+	       (rcirc-any-buffer process))))))
 
 (defvar rcirc-activity-type nil)
 (make-variable-buffer-local 'rcirc-activity-type)
@@ -1069,22 +1084,26 @@ record activity."
 	    (set-marker-insertion-type rcirc-prompt-start-marker nil)
 	    (set-marker-insertion-type rcirc-prompt-end-marker nil)
 
-	    ;; fill the text we just inserted, maybe
-	    (when (and rcirc-fill-flag
-		       (not (string= response "372"))) ;/motd
-	      (let ((fill-prefix
-		     (or rcirc-fill-prefix
-			 (make-string
-			  (or (next-single-property-change 0 'rcirc-text
-							   fmted-text)
-			      8)
-			  ?\s)))
-		    (fill-column (cond ((eq rcirc-fill-column 'frame-width)
-					(1- (frame-width)))
-				       (rcirc-fill-column
-					rcirc-fill-column)
-				       (t fill-column))))
-		(fill-region fill-start rcirc-prompt-start-marker 'left t))))
+	    (let ((text-start (make-marker)))
+	      (set-marker text-start
+			  (or (next-single-property-change fill-start 
+							   'rcirc-text)
+			      (point-max)))
+	      ;; squeeze spaces out of text before rcirc-text
+	      (fill-region fill-start (1- text-start))
+
+	      ;; fill the text we just inserted, maybe
+	      (when (and rcirc-fill-flag
+			 (not (string= response "372"))) ;/motd
+		(let ((fill-prefix
+		       (or rcirc-fill-prefix
+			   (make-string (- text-start fill-start) ?\s)))
+		      (fill-column (cond ((eq rcirc-fill-column 'frame-width)
+					  (1- (frame-width)))
+					 (rcirc-fill-column
+					  rcirc-fill-column)
+					 (t fill-column))))
+		  (fill-region fill-start rcirc-prompt-start-marker 'left t)))))
 
 	  ;; set inserted text to be read-only
 	  (when rcirc-read-only-flag
@@ -1175,14 +1194,15 @@ record activity."
 
 (defun rcirc-put-nick-channel (process nick channel)
   "Add CHANNEL to list associated with NICK."
-  (with-rcirc-process-buffer process
-    (let* ((chans (gethash nick rcirc-nick-table))
-	   (record (assoc-string channel chans t)))
-      (if record
-          (setcdr record (current-time))
-        (puthash nick (cons (cons channel (current-time))
-                            chans)
-                 rcirc-nick-table)))))
+  (let ((nick (rcirc-user-nick nick)))
+    (with-rcirc-process-buffer process
+      (let* ((chans (gethash nick rcirc-nick-table))
+	     (record (assoc-string channel chans t)))
+	(if record
+	    (setcdr record (current-time))
+	  (puthash nick (cons (cons channel (current-time))
+			      chans)
+		   rcirc-nick-table))))))
 
 (defun rcirc-nick-remove (process nick)
   "Remove NICK from table."
@@ -1613,15 +1633,21 @@ ones added to the list automatically are marked with an asterisk."
   (propertize (or string "") 'face face 'rear-nonsticky t))
 
 (defvar rcirc-url-regexp
-  (rx word-boundary
-      (or "www."
-	  (and (or "http" "https" "ftp" "file" "gopher" "news" "telnet" "wais"
-		   "mailto")
-	       "://"
-	       (1+ (char "a-zA-Z0-9_."))
-	       (optional ":" (1+ (char "0-9")))))
-      (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]"))
-      (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]"))
+  (rx-to-string
+   `(and word-boundary
+	 (or "www."
+	     (and (or "http" "https" "ftp" "file" "gopher" "news" "telnet" 
+		      "wais" "mailto")
+		  "://"
+		  (1+ (char "-a-zA-Z0-9_."))
+		  (optional ":" (1+ (char "0-9"))))
+	     (and (1+ (char "-a-zA-Z0-9_."))
+		  (or ".com" ".net" ".org")
+		  word-boundary))
+	 (optional 
+	  (and "/"
+	       (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]"))
+	       (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]")))))
   "Regexp matching URLs.  Set to nil to disable URL features in rcirc.")
 
 (defun rcirc-browse-url (&optional arg)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 49f6c64c1a7..12df35182c2 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -72,8 +72,16 @@
 
 ;; 1) Strings that are watched don't update in the speedbar when their
 ;; contents change.
-;; 2) Watch expressions go out of scope when the inferior is re-run.
-;; 3) Cannot handle multiple debug sessions.
+;; 2) Cannot handle multiple debug sessions.
+
+;;; Problems with watch expressions:
+
+;; 1) They go out of scope when the inferior is re-run.
+;; 2) -var-update reports that an out of scope variable has changed:
+;;    changelist=[{name="var1",in_scope="false"}], but the value can't be accessed.
+;;    (-var-list-children, in contrast allows you to create variable objects of
+;;      the children when they are out of scope and get their values).
+;; 3) VARNUM increments even when vaiable object is not created (maybe trivial).
 
 ;;; TODO:
 
@@ -97,8 +105,12 @@
 (defvar gdb-selected-frame nil)
 (defvar gdb-frame-number nil)
 (defvar gdb-current-language nil)
-(defvar gdb-var-list nil "List of variables in watch window.")
-(defvar gdb-var-changed nil "Non-nil means that `gdb-var-list' has changed.")
+(defvar gdb-var-list nil
+ "List of variables in watch window.
+Each element has the form (EXPRESSION VARNUM NUMCHILD TYPE VALUE STATUS) where
+STATUS is nil (unchanged), `changed' or `out-of-scope'.")
+(defvar gdb-force-update t
+ "Non-nil means that view of watch expressions will be updated in the speedbar.")
 (defvar gdb-main-file nil "Source file from which program execution begins.")
 (defvar gdb-overlay-arrow-position nil)
 (defvar gdb-server-prefix nil)
@@ -203,8 +215,8 @@ other with the source file with the main routine of the inferior.
 If `gdb-many-windows' is t, regardless of the value of
 `gdb-show-main', the layout below will appear unless
 `gdb-use-separate-io-buffer' is nil when the source buffer
-occupies the full width of the frame.  Keybindings are given in
-relevant buffer.
+occupies the full width of the frame.  Keybindings are shown in
+some of the buffers.
 
 Watch expressions appear in the speedbar/slowbar.
 
@@ -217,28 +229,28 @@ See Info node `(emacs)GDB Graphical Interface' for a more
 detailed description of this mode.
 
 
-+--------------------------------------------------------------+
-|                           GDB Toolbar                        |
-+-------------------------------+------------------------------+
-| GUD buffer (I/O of GDB)       | Locals buffer                |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-+-------------------------------+------------------------------+
-| Source buffer                 | I/O buffer (of inferior)     |
-|                               | (comint-mode)                |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-|                               |                              |
-+-------------------------------+------------------------------+
-| Stack buffer                  | Breakpoints buffer           |
-| RET      gdb-frames-select    | SPC    gdb-toggle-breakpoint |
-|                               | RET    gdb-goto-breakpoint   |
-|                               | d      gdb-delete-breakpoint |
-+-------------------------------+------------------------------+"
++----------------------------------------------------------------------+
+|                               GDB Toolbar                            |
++-----------------------------------+----------------------------------+
+| GUD buffer (I/O of GDB)           | Locals buffer                    |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
++-----------------------------------+----------------------------------+
+| Source buffer                     | I/O buffer (of debugged program) |
+|                                   | (comint-mode)                    |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
+|                                   |                                  |
++-----------------------------------+----------------------------------+
+| Stack buffer                      | Breakpoints buffer               |
+| RET      gdb-frames-select        | SPC    gdb-toggle-breakpoint     |
+|                                   | RET    gdb-goto-breakpoint       |
+|                                   | D      gdb-delete-breakpoint     |
++-----------------------------------+----------------------------------+"
   ;;
   (interactive (list (gud-query-cmdline 'gdba)))
   ;;
@@ -444,7 +456,7 @@ With arg, use separate IO iff arg is positive."
 	gdb-current-language nil
 	gdb-frame-number nil
 	gdb-var-list nil
-	gdb-var-changed nil
+	gdb-force-update t
 	gdb-first-post-prompt t
 	gdb-prompting nil
 	gdb-input-queue nil
@@ -598,8 +610,7 @@ With arg, automatically raise speedbar iff arg is positive."
 		      (nth 1 var) "\"\n")
 	    (concat "-var-evaluate-expression " (nth 1 var) "\n"))
 	  `(lambda () (gdb-var-evaluate-expression-handler
-		       ,(nth 1 var) nil))))
-	(setq gdb-var-changed t))
+		       ,(nth 1 var) nil)))))
     (if (search-forward "Undefined command" nil t)
 	(message-box "Watching expressions requires gdb 6.0 onwards")
       (message "No symbol \"%s\" in current context." expr))))
@@ -608,16 +619,11 @@ With arg, automatically raise speedbar iff arg is positive."
   (goto-char (point-min))
   (re-search-forward ".*value=\\(\".*\"\\)" nil t)
   (catch 'var-found
-    (let ((num 0))
-      (dolist (var gdb-var-list)
-	(if (string-equal varnum (cadr var))
-	    (progn
-	      (if changed (setcar (nthcdr 5 var) t))
-	      (setcar (nthcdr 4 var) (read (match-string 1)))
-	      (setcar (nthcdr num gdb-var-list) var)
-	      (throw 'var-found nil)))
-	(setq num (+ num 1)))))
-  (setq gdb-var-changed t))
+    (dolist (var gdb-var-list)
+      (when (string-equal varnum (cadr var))
+	(if changed (setcar (nthcdr 5 var) 'changed))
+	(setcar (nthcdr 4 var) (read (match-string 1)))
+	(throw 'var-found nil)))))
 
 (defun gdb-var-list-children (varnum)
   (gdb-enqueue-input
@@ -663,20 +669,25 @@ type=\"\\(.*?\\)\"")
 	   'gdb-var-update-handler))
     (push 'gdb-var-update gdb-pending-triggers)))
 
-(defconst gdb-var-update-regexp "name=\"\\(.*?\\)\"")
+(defconst gdb-var-update-regexp "name=\"\\(.*?\\)\",in_scope=\"\\(.*?\\)\"")
 
 (defun gdb-var-update-handler ()
+  (dolist (var gdb-var-list)
+    (setcar (nthcdr 5 var) nil))
   (goto-char (point-min))
   (while (re-search-forward gdb-var-update-regexp nil t)
-    (catch 'var-found-1
-      (let ((varnum (match-string 1)))
-	(dolist (var gdb-var-list)
-	  (gdb-enqueue-input
-	   (list
-	    (concat "server interpreter mi \"-var-evaluate-expression "
-		    varnum "\"\n")
-	    `(lambda () (gdb-var-evaluate-expression-handler ,varnum t))))
-	  (throw 'var-found-1 nil)))))
+    (let ((varnum (match-string 1)))
+      (if  (string-equal (match-string 2) "false")
+	  (catch 'var-found
+	    (dolist (var gdb-var-list)
+	      (when (string-equal varnum (cadr var))
+		(setcar (nthcdr 5 var) 'out-of-scope)
+		(throw 'var-found nil))))
+	(gdb-enqueue-input
+	 (list
+	  (concat "server interpreter mi \"-var-evaluate-expression "
+		  varnum "\"\n")
+	  `(lambda () (gdb-var-evaluate-expression-handler ,varnum t)))))))
   (setq gdb-pending-triggers
 	(delq 'gdb-var-update gdb-pending-triggers))
   (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
@@ -712,8 +723,7 @@ type=\"\\(.*?\\)\"")
 	    (setq gdb-var-list (delq var gdb-var-list))
 	    (dolist (varchild gdb-var-list)
 	      (if (string-match (concat (nth 1 var) "\\.") (nth 1 varchild))
-		  (setq gdb-var-list (delq varchild gdb-var-list))))
-	    (setq gdb-var-changed t))))))
+		  (setq gdb-var-list (delq varchild gdb-var-list)))))))))
 
 (defun gdb-edit-value (text token indent)
   "Assign a value to a variable displayed in the speedbar."
@@ -729,8 +739,9 @@ type=\"\\(.*?\\)\"")
 	   'ignore))))
 
 (defcustom gdb-show-changed-values t
-  "If non-nil highlight values that have recently changed in the speedbar.
-The highlighting is done with `font-lock-warning-face'."
+  "If non-nil change the face of out of scope variables and changed values.
+Out of scope variables are suppressed with `shadow' face.
+Changed values are highlighted with the face `font-lock-warning-face'."
   :type 'boolean
   :group 'gud
   :version "22.1")
@@ -750,7 +761,7 @@ INDENT is the current indentation depth."
 	 (dolist (var gdb-var-list)
 	   (if (string-match (concat token "\\.") (nth 1 var))
 	       (setq gdb-var-list (delq var gdb-var-list))))
-	 (setq gdb-var-changed t)
+	 (setq gdb-force-update t)
 	 (with-current-buffer gud-comint-buffer
 	   (speedbar-timer-fn)))))
 
@@ -1204,9 +1215,7 @@ happens to be appropriate."
       ;; FIXME: with GDB-6 on Darwin, this might very well work.
       ;; Only needed/used with speedbar/watch expressions.
       (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
-	(setq gdb-var-changed t)    ; force update
-	(dolist (var gdb-var-list)
-	  (setcar (nthcdr 5 var) nil))
+	(setq gdb-force-update t)
 	(if (string-equal gdb-version "pre-6.4")
 	    (gdb-var-update)
 	  (gdb-var-update-1)))))
@@ -2461,17 +2470,17 @@ corresponding to the mode line clicked."
 		:visible (memq gud-minor-mode '(gdbmi gdba))))
   (define-key menu [gdb] '("Gdb" . gdb-display-gdb-buffer))
   (define-key menu [threads] '("Threads" . gdb-display-threads-buffer))
-  (define-key menu [memory] '("Memory" . gdb-display-memory-buffer))
-  (define-key menu [disassembly]
-    '("Disassembly" . gdb-display-assembler-buffer))
-  (define-key menu [registers] '("Registers" . gdb-display-registers-buffer))
   (define-key menu [inferior]
     '(menu-item "Inferior IO" gdb-display-separate-io-buffer
 		:enable gdb-use-separate-io-buffer))
-  (define-key menu [locals] '("Locals" . gdb-display-locals-buffer))
-  (define-key menu [frames] '("Stack" . gdb-display-stack-buffer))
+  (define-key menu [memory] '("Memory" . gdb-display-memory-buffer))
+  (define-key menu [registers] '("Registers" . gdb-display-registers-buffer))
+  (define-key menu [disassembly]
+    '("Disassembly" . gdb-display-assembler-buffer))
   (define-key menu [breakpoints]
-    '("Breakpoints" . gdb-display-breakpoints-buffer)))
+    '("Breakpoints" . gdb-display-breakpoints-buffer))
+  (define-key menu [locals] '("Locals" . gdb-display-locals-buffer))
+  (define-key menu [frames] '("Stack" . gdb-display-stack-buffer)))
 
 (let ((menu (make-sparse-keymap "GDB-Frames")))
   (define-key gud-menu-map [frames]
@@ -2480,15 +2489,15 @@ corresponding to the mode line clicked."
   (define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
   (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
   (define-key menu [memory] '("Memory" . gdb-frame-memory-buffer))
-  (define-key menu [disassembly] '("Disassembiy" . gdb-frame-assembler-buffer))
-  (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
   (define-key menu [inferior]
     '(menu-item "Inferior IO" gdb-frame-separate-io-buffer
 		:enable gdb-use-separate-io-buffer))
-  (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
-  (define-key menu [frames] '("Stack" . gdb-frame-stack-buffer))
+  (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
+  (define-key menu [disassembly] '("Disassembiy" . gdb-frame-assembler-buffer))
   (define-key menu [breakpoints]
-    '("Breakpoints" . gdb-frame-breakpoints-buffer)))
+    '("Breakpoints" . gdb-frame-breakpoints-buffer))
+  (define-key menu [locals] '("Locals" . gdb-frame-locals-buffer))
+  (define-key menu [frames] '("Stack" . gdb-frame-stack-buffer)))
 
 (let ((menu (make-sparse-keymap "GDB-UI/MI")))
   (define-key gud-menu-map [ui]
@@ -2617,6 +2626,8 @@ Kills the gdb buffers and resets the source buffers."
     (setq gdb-overlay-arrow-position nil))
   (setq overlay-arrow-variable-list
 	(delq 'gdb-overlay-arrow-position overlay-arrow-variable-list))
+  (if (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
+      (speedbar-refresh))
   (setq gud-running nil)
   (setq gdb-active-process nil)
   (setq gdb-var-list nil)
@@ -3013,7 +3024,6 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
 			(throw 'child-already-watched nil)))
 		  (push varchild var-list))))
 	  (push var var-list)))
-      (setq gdb-var-changed t)
       (setq gdb-var-list (nreverse var-list)))))
 
 ; Uses "-var-update --all-values".  Needs GDB 6.4 onwards.
@@ -3028,23 +3038,24 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
 	  'gdb-var-update-handler-1))
 	(push 'gdb-var-update gdb-pending-triggers))))
 
-(defconst gdb-var-update-regexp-1 "name=\"\\(.*?\\)\",value=\\(\".*?\"\\),")
+(defconst gdb-var-update-regexp-1
+  "name=\"\\(.*?\\)\",\\(?:value=\\(\".*?\"\\),\\)?in_scope=\"\\(.*?\\)\"")
 
 (defun gdb-var-update-handler-1 ()
+  (dolist (var gdb-var-list)
+    (setcar (nthcdr 5 var) nil))
   (goto-char (point-min))
   (while (re-search-forward gdb-var-update-regexp-1 nil t)
     (let ((varnum (match-string 1)))
-      (catch 'var-found1
-	(let ((num 0))
-	  (dolist (var gdb-var-list)
-	    (if (string-equal varnum (cadr var))
-		(progn
-		  (setcar (nthcdr 5 var) t)
-		  (setcar (nthcdr 4 var) (read (match-string 2)))
-		  (setcar (nthcdr num gdb-var-list) var)
-		  (throw 'var-found1 nil)))
-	    (setq num (+ num 1))))))
-    (setq gdb-var-changed t))
+      (catch 'var-found
+	(dolist (var gdb-var-list)
+	  (when (string-equal varnum (cadr var))
+	    (if (string-equal (match-string 3) "false")
+		(setcar (nthcdr 5 var) 'out-of-scope)
+	      (setcar (nthcdr 5 var) 'changed)
+	      (setcar (nthcdr 4 var)
+		      (read (match-string 2))))
+	    (throw 'var-found nil))))))
   (setq gdb-pending-triggers
    (delq 'gdb-var-update gdb-pending-triggers))
   (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 1d5172a1a52..cc7418d3ff4 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -43,14 +43,13 @@
 (eval-when-compile (require 'cl)) ; for case macro
 
 (require 'comint)
-(require 'font-lock)
 
 (defvar gdb-active-process)
 (defvar gdb-define-alist)
 (defvar gdb-macro-info)
 (defvar gdb-server-prefix)
 (defvar gdb-show-changed-values)
-(defvar gdb-var-changed)
+(defvar gdb-force-update)
 (defvar gdb-var-list)
 (defvar gdb-speedbar-auto-raise)
 (defvar tool-bar-map)
@@ -444,7 +443,7 @@ required by the caller."
 	  (p (window-point window)))
       (cond
        ((memq minor-mode '(gdbmi gdba))
-	(when (or gdb-var-changed
+	(when (or gdb-force-update
 		  (not (save-excursion
 			 (goto-char (point-min))
 			 (let ((case-fold-search t))
@@ -453,51 +452,67 @@ required by the caller."
 	  (insert "Watch Expressions:\n")
 	  (if gdb-speedbar-auto-raise
 	      (raise-frame speedbar-frame))
-	  (let ((var-list gdb-var-list))
+	  (let ((var-list gdb-var-list) parent)
 	    (while var-list
-	      (let* (char (depth 0) (start 0)
-		     (var (car var-list)) (varnum (nth 1 var)))
+	      (let* (char (depth 0) (start 0) (var (car var-list))
+			  (expr (car var)) (varnum (nth 1 var))
+			  (type (nth 3 var)) (status (nth 5 var)))
+		(put-text-property
+		 0 (length expr) 'face font-lock-variable-name-face expr)
+		(put-text-property
+		 0 (length type) 'face font-lock-type-face type)
 		(while (string-match "\\." varnum start)
 		  (setq depth (1+ depth)
 			start (1+ (match-beginning 0))))
+		(if (eq depth 0) (setq parent nil))
 		(if (or (equal (nth 2 var) "0")
 			(and (equal (nth 2 var) "1")
-			     (string-match "char \\*$" (nth 3 var))))
-		    (speedbar-make-tag-line 'bracket ?? nil nil
-					    (concat (car var) "\t" (nth 4 var))
-					    'gdb-edit-value
-					    nil
-					    (if (and (nth 5 var)
-						     gdb-show-changed-values)
-						'font-lock-warning-face
-					      nil) depth)
+			     (string-match "char \\*$" type)))
+		    (speedbar-make-tag-line
+		     'bracket ?? nil nil
+		     (concat expr "\t" (nth 4 var))
+		     (if (or parent (eq status 'out-of-scope))
+			 nil 'gdb-edit-value)
+		     nil
+		     (if gdb-show-changed-values
+			 (or parent (case status
+				      (changed 'font-lock-warning-face)
+				      (out-of-scope 'shadow)
+				      (t t)))
+		       t)
+		     depth)
+		  (if (eq status 'out-of-scope) (setq parent 'shadow))
 		  (if (and (cadr var-list)
 			   (string-match (concat varnum "\\.")
 					 (cadr (cadr var-list))))
 		      (setq char ?-)
 		    (setq char ?+))
-		  (if (string-match "\\*$" (nth 3 var))
-		      (speedbar-make-tag-line 'bracket char
-					      'gdb-speedbar-expand-node varnum
-					      (concat (car var) "\t"
-						      (nth 3 var)"\t"
-						      (nth 4 var))
-					      'gdb-edit-value nil
-					      (if (and (nth 5 var)
-						       gdb-show-changed-values)
-						  'font-lock-warning-face
-						nil) depth)
-		  (speedbar-make-tag-line 'bracket char
-					  'gdb-speedbar-expand-node varnum
-					  (concat (car var) "\t" (nth 3 var))
-					  nil nil nil depth))))
+		  (if (string-match "\\*$" type)
+		      (speedbar-make-tag-line
+		       'bracket char
+		       'gdb-speedbar-expand-node varnum
+		       (concat expr "\t"
+			       type "\t"
+			       (nth 4 var))
+		       (if (or parent status 'out-of-scope)
+			 nil 'gdb-edit-value)
+		       nil
+		       (if (and status gdb-show-changed-values)
+			   'shadow t)
+		       depth)
+		    (speedbar-make-tag-line
+		     'bracket char
+		     'gdb-speedbar-expand-node varnum
+		     (concat expr "\t" type)
+		     nil nil
+		     (if (and status gdb-show-changed-values) 'shadow t)
+		     depth))))
 	      (setq var-list (cdr var-list))))
-	  (setq gdb-var-changed nil)))
-       (t (if (and (save-excursion
-		     (goto-char (point-min))
-		     (looking-at "Current Stack:"))
-		   (equal gud-last-last-frame gud-last-speedbar-stackframe))
-	      nil
+	  (setq gdb-force-update nil)))
+       (t (unless (and (save-excursion
+			 (goto-char (point-min))
+			 (looking-at "Current Stack:"))
+		       (equal gud-last-last-frame gud-last-speedbar-stackframe))
 	    (let ((gud-frame-list
 	    (cond ((eq minor-mode 'gdb)
 		   (gud-gdb-get-stackframe buffer))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index c3f949ead37..4f0e2edf7cb 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1019,10 +1019,10 @@ selected.  If the speedbar frame is active, then select the attached frame."
 		    (lambda () (let ((speedbar-update-flag t))
 				 (speedbar-timer-fn)))))
 
-(defmacro speedbar-frame-width ()
+(defsubst speedbar-frame-width ()
   "Return the width of the speedbar frame in characters.
 nil if it doesn't exist."
-  '(window-width (get-buffer-window speedbar-buffer)))
+  (frame-width speedbar-frame))
 
 (defun speedbar-mode ()
   "Major mode for managing a display of directories and tags.
@@ -1708,9 +1708,13 @@ Separators are not active, have no labels, depth, or actions."
 (defun speedbar-make-button (start end face mouse function &optional token)
   "Create a button from START to END, with FACE as the display face.
 MOUSE is the mouse face.  When this button is clicked on FUNCTION
-will be run with the TOKEN parameter (any Lisp object)"
+will be run with the TOKEN parameter (any Lisp object).  If FACE
+is t use the text properties of the string that is passed as an
+argument."
+  (unless (eq face t)
+    (put-text-property start end 'face face))
   (add-text-properties
-   start end `(face ,face mouse-face ,mouse invisible nil
+   start end `(mouse-face ,mouse invisible nil
                speedbar-text ,(buffer-substring-no-properties start end)))
   (if speedbar-use-tool-tips-flag
       (put-text-property start end 'help-echo #'dframe-help-echo))
@@ -2123,7 +2127,7 @@ Groups may optionally contain a position."
   "A wrapper for `try-completion'.
 Passes STRING and ALIST to `try-completion' if ALIST
 passes some tests."
-  (if (and (listp alist) (not (null alist))
+  (if (and (consp alist)
 	   (listp (car alist)) (stringp (car (car alist))))
       (try-completion string alist)
     nil))
@@ -2423,8 +2427,7 @@ name will have the function FIND-FUN and not token."
 
   ;; Choose the correct method of doodling.
   (if (and speedbar-mode-specific-contents-flag
-	   (listp speedbar-special-mode-expansion-list)
-	   speedbar-special-mode-expansion-list
+	   (consp speedbar-special-mode-expansion-list)
 	   (local-variable-p
 	    'speedbar-special-mode-expansion-list
 	    (current-buffer)))
@@ -2463,12 +2466,14 @@ name will have the function FIND-FUN and not token."
 	    )
 	(set-buffer speedbar-buffer)
 	(speedbar-with-writable
-	  (erase-buffer)
-	  (dolist (func funclst)
-	    (setq default-directory cbd)
-	    (funcall func cbd 0))
-	(speedbar-reconfigure-keymaps)
-	(goto-char (point-min)))
+	  (let* ((window (get-buffer-window speedbar-buffer 0))
+		 (p (window-point window)))
+	    (erase-buffer)
+	    (dolist (func funclst)
+	      (setq default-directory cbd)
+	      (funcall func cbd 0))
+	    (speedbar-reconfigure-keymaps)
+	    (set-window-point window p)))
 	))))
 
 (defun speedbar-update-directory-contents ()
@@ -2572,7 +2577,6 @@ This should only be used by modes classified as special."
 	    ;; We do not erase the buffer because these functions may
 	    ;; decide NOT to update themselves.
 	    (funcall func specialbuff)))
-
       (goto-char (point-min))))
   (speedbar-reconfigure-keymaps))
 
@@ -2614,8 +2618,7 @@ Also resets scanner functions."
 		(speedbar-maybe-add-localized-support (current-buffer))
 		;; Update for special mode all the time!
 		(if (and speedbar-mode-specific-contents-flag
-			 (listp speedbar-special-mode-expansion-list)
-			 speedbar-special-mode-expansion-list
+			 (consp speedbar-special-mode-expansion-list)
 			 (local-variable-p
 			  'speedbar-special-mode-expansion-list
 			  (current-buffer)))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 3bf608c2cc0..b78ec1a8a92 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -508,11 +508,7 @@ re-start emacs."
 			       (const "~nroff") (const "~list")
 			       (const "~latin1") (const "~latin3")
  			       (const :tag "default" nil))
-		       (choice :tag "Coding system"
-			       (const iso-8859-1)
-			       (const iso-8859-2)
-			       (const koi8-r)
-			       (const windows-1251))))
+		       (coding-system :tag "Coding System")))
   :group 'ispell)
 
 
@@ -570,10 +566,10 @@ re-start emacs."
  '(("esperanto"
     "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
     "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
-    "[-']" t ("-C") "~latin3" iso-8859-1)
+    "[-']" t ("-C") "~latin3" iso-8859-3)
    ("esperanto-tex"
     "[A-Za-z^\\]" "[^A-Za-z^\\]"
-    "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-1)
+    "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3)
    ("francais7"
     "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1)
    ("francais"				; Francais.aff
@@ -2604,7 +2600,7 @@ By just answering RET you can find out what the current dictionary is."
 	       (mapcar 'list (ispell-valid-dictionary-list)))
 	  nil t)
 	 current-prefix-arg))
-  (unless arg (ispell-accept-buffer-local-defs))
+  (unless arg (ispell-buffer-local-dict))
   (if (equal dict "default") (setq dict nil))
   ;; This relies on completing-read's bug of returning "" for no match
   (cond ((equal dict "")
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 659c562ea65..fc64dd5f361 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -916,67 +916,79 @@ Recommended as a parent keymap for modes using widgets.")
   "Invoke the button that the mouse is pointing at."
   (interactive "e")
   (if (widget-event-point event)
-      (let* ((pos (widget-event-point event))
+      (let* ((oevent event)
+	     (mouse-1 (memq (event-basic-type event) '(mouse-1 down-mouse-1)))
+	     (pos (widget-event-point event))
 	     (start (event-start event))
 	     (button (get-char-property
 		      pos 'button (and (windowp (posn-window start))
 				       (window-buffer (posn-window start))))))
-	(if button
-	    ;; Mouse click on a widget button.  Do the following
-	    ;; in a save-excursion so that the click on the button
-	    ;; doesn't change point.
-	    (save-selected-window
-	      (select-window (posn-window (event-start event)))
-	      (save-excursion
-		(goto-char (posn-point (event-start event)))
-		(let* ((overlay (widget-get button :button-overlay))
-		       (pressed-face (or (widget-get button :pressed-face)
-					 widget-button-pressed-face))
-		       (face (overlay-get overlay 'face))
-		       (mouse-face (overlay-get overlay 'mouse-face)))
-		  (unwind-protect
-		      ;; Read events, including mouse-movement events
-		      ;; until we receive a release event.  Highlight/
-		      ;; unhighlight the button the mouse was initially
-		      ;; on when we move over it.
-		      (save-excursion
-			(when face	; avoid changing around image
-			  (overlay-put overlay 'face pressed-face)
-			  (overlay-put overlay 'mouse-face pressed-face))
-			(unless (widget-apply button :mouse-down-action event)
-			  (let ((track-mouse t))
-			    (while (not (widget-button-release-event-p event))
-			      (setq event (read-event)
-				    pos (widget-event-point event))
-			      (if (and pos
-				       (eq (get-char-property pos 'button)
-					   button))
-				  (when face
-				    (overlay-put overlay 'face pressed-face)
-				    (overlay-put overlay 'mouse-face pressed-face))
-				(overlay-put overlay 'face face)
-				(overlay-put overlay 'mouse-face mouse-face)))))
+	(when (or (null button)
+		  (catch 'button-press-cancelled
+	      ;; Mouse click on a widget button.  Do the following
+	      ;; in a save-excursion so that the click on the button
+	      ;; doesn't change point.
+	      (save-selected-window
+		(select-window (posn-window (event-start event)))
+		(save-excursion
+		  (goto-char (posn-point (event-start event)))
+		  (let* ((overlay (widget-get button :button-overlay))
+			 (pressed-face (or (widget-get button :pressed-face)
+					   widget-button-pressed-face))
+			 (face (overlay-get overlay 'face))
+			 (mouse-face (overlay-get overlay 'mouse-face)))
+		    (unwind-protect
+			;; Read events, including mouse-movement
+			;; events, waiting for a release event.  If we
+			;; began with a mouse-1 event and receive a
+			;; movement event, that means the user wants
+			;; to perform drag-selection, so cancel the
+			;; button press and do the default mouse-1
+			;; action.  For mouse-2, just highlight/
+			;; unhighlight the button the mouse was
+			;; initially on when we move over it.
+			(save-excursion
+			  (when face	; avoid changing around image
+			    (overlay-put overlay 'face pressed-face)
+			    (overlay-put overlay 'mouse-face pressed-face))
+			  (unless (widget-apply button :mouse-down-action event)
+			    (let ((track-mouse t))
+			      (while (not (widget-button-release-event-p event))
+				(setq event (read-event))
+				(when (and mouse-1 (mouse-movement-p event))
+				  (push event unread-command-events)
+				  (setq event oevent)
+				  (throw 'button-press-cancelled t))
+				(setq pos (widget-event-point event))
+				(if (and pos
+					 (eq (get-char-property pos 'button)
+					     button))
+				    (when face
+				      (overlay-put overlay 'face pressed-face)
+				      (overlay-put overlay 'mouse-face pressed-face))
+				  (overlay-put overlay 'face face)
+				  (overlay-put overlay 'mouse-face mouse-face)))))
 
-			;; When mouse is released over the button, run
-			;; its action function.
-			(when (and pos
-				   (eq (get-char-property pos 'button) button))
-			  (widget-apply-action button event)))
-		    (overlay-put overlay 'face face)
-		    (overlay-put overlay 'mouse-face mouse-face))))
-
-	      (unless (pos-visible-in-window-p (widget-event-point event))
-		(mouse-set-point event)
-		(beginning-of-line)
-		(recenter))
-	      )
+			  ;; When mouse is released over the button, run
+			  ;; its action function.
+			  (when (and pos
+				     (eq (get-char-property pos 'button) button))
+			    (widget-apply-action button event)))
+		      (overlay-put overlay 'face face)
+		      (overlay-put overlay 'mouse-face mouse-face))))
 
+		;; This loses if the widget action switches windows. -- cyd
+		;; (unless (pos-visible-in-window-p (widget-event-point event))
+		;;   (mouse-set-point event)
+		;;   (beginning-of-line)
+		;;   (recenter))
+		)
+	      nil))
 	  (let ((up t) command)
 	    ;; Mouse click not on a widget button.  Find the global
 	    ;; command to run, and check whether it is bound to an
 	    ;; up event.
-	    (mouse-set-point event)
-	    (if (memq (event-basic-type event) '(mouse-1 down-mouse-1))
+	    (if mouse-1
 		(cond ((setq command	;down event
 			     (lookup-key widget-global-map [down-mouse-1]))
 		       (setq up nil))
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 8b523f288d6..e706eb5b9f4 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,26 @@
+2006-02-20  Juanma Barranquero  <lekktu@gmail.com>
+
+	* commands.texi (Using Interactive): Fix reference to node
+	"Minibuffers".
+
+2006-02-19  Richard M. Stallman  <rms@gnu.org>
+
+	* minibuf.texi (High-Level Completion):
+	Add xref to read-input-method-name.
+
+	* files.texi (Relative File Names): Move file-relative-name here.
+	(File Name Expansion): From here.  Minor clarifications.
+
+	* commands.texi (Using Interactive): Add xrefs about reading input.
+	Clarify remarks about that moving point and mark.
+	Put string case before list case.
+
+2006-02-16  Johan Bockg,Ae(Brd  <bojohan@dd.chalmers.se>
+
+	* display.texi (Other Display Specs, Image Descriptors): Revert
+	erroneous changes.  The previous description of image-descriptors
+	as `(image . PROPS)' was correct.
+
 2006-02-14  Richard M. Stallman  <rms@gnu.org>
 
 	* variables.texi (File Local Variables): Clarifications.
diff --git a/lispref/commands.texi b/lispref/commands.texi
index 7a2cdb8edf9..797a5ced8e9 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -150,37 +150,6 @@ It may be omitted or @code{nil}; then the command is called with no
 arguments.  This leads quickly to an error if the command requires one
 or more arguments.
 
-@item
-It may be a Lisp expression that is not a string; then it should be a
-form that is evaluated to get a list of arguments to pass to the
-command.
-@cindex argument evaluation form
-
-If this expression reads keyboard input (this includes using the
-minibuffer), keep in mind that the integer value of point or the mark
-before reading input may be incorrect after reading input.  This is
-because the current buffer may be receiving subprocess output;
-if subprocess output arrives while the command is waiting for input,
-it could relocate point and the mark.
-
-Here's an example of what @emph{not} to do:
-
-@smallexample
-(interactive
- (list (region-beginning) (region-end)
-       (read-string "Foo: " nil 'my-history)))
-@end smallexample
-
-@noindent
-Here's how to avoid the problem, by examining point and the mark only
-after reading the keyboard input:
-
-@smallexample
-(interactive
- (let ((string (read-string "Foo: " nil 'my-history)))
-   (list (region-beginning) (region-end) string)))
-@end smallexample
-
 @item
 @cindex argument prompt
 It may be a string; then its contents should consist of a code character
@@ -231,6 +200,39 @@ You can use @samp{*} and @samp{@@} together; the order does not matter.
 Actual reading of arguments is controlled by the rest of the prompt
 string (starting with the first character that is not @samp{*} or
 @samp{@@}).
+
+@item
+It may be a Lisp expression that is not a string; then it should be a
+form that is evaluated to get a list of arguments to pass to the
+command.  Usually this form will call various functions to read input
+from the user, most often through the minibuffer (@pxref{Minibuffers})
+or directly from the keyboard (@pxref{Reading Input}).
+@cindex argument evaluation form
+
+Providing point or the mark as an argument value is also common, but
+if you do this @emph{and} read input (whether using the minibuffer or
+not), be sure to get the integer values of point or the mark after
+reading.  The current buffer may be receiving subprocess output; if
+subprocess output arrives while the command is waiting for input, it
+could relocate point and the mark.
+
+Here's an example of what @emph{not} to do:
+
+@smallexample
+(interactive
+ (list (region-beginning) (region-end)
+       (read-string "Foo: " nil 'my-history)))
+@end smallexample
+
+@noindent
+Here's how to avoid the problem, by examining point and the mark after
+reading the keyboard input:
+
+@smallexample
+(interactive
+ (let ((string (read-string "Foo: " nil 'my-history)))
+   (list (region-beginning) (region-end) string)))
+@end smallexample
 @end itemize
 
 @cindex examining the @code{interactive} form
diff --git a/lispref/display.texi b/lispref/display.texi
index c6bc63d2ff9..20b8df8d466 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3280,7 +3280,7 @@ Display @var{string} instead of the text that has this property.
 Recursive display specifications are not supported---@var{string}'s
 @code{display} properties, if any, are not used.
 
-@item (image @var{image-props})
+@item (image . @var{image-props})
 This kind of display specification is an image descriptor (@pxref{Images}).
 When used as a display specification, it means to display the image
 instead of the text that has the display specification.
@@ -3507,12 +3507,11 @@ function always returns @code{t}; for other image types, it returns
 @subsection Image Descriptors
 @cindex image descriptor
 
-  An image description is a list of the form @code{(image
-@var{props})}, where @var{props} is a property list containing
-alternating keyword symbols (symbols whose names start with a colon) and
-their values.  You can use any Lisp object as a property, but the only
-properties that have any special meaning are certain symbols, all of
-them keywords.
+  An image description is a list of the form @code{(image . @var{props})},
+where @var{props} is a property list containing alternating keyword
+symbols (symbols whose names start with a colon) and their values.
+You can use any Lisp object as a property, but the only properties
+that have any special meaning are certain symbols, all of them keywords.
 
   Every image descriptor must contain the property @code{:type
 @var{type}} to specify the format of the image.  The value of @var{type}
diff --git a/lispref/files.texi b/lispref/files.texi
index 36cdfa5d2bd..417bab81360 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -1768,6 +1768,32 @@ Unix syntax and VMS syntax.
      @result{} t
 @end group
 @end example
+@end defun
+
+  Given a possibly relative file name, you can convert it to an
+absolute name using @code{expand-file-name} (@pxref{File Name
+Expansion}).  This function converts absolute file names to relative
+names:
+
+@defun file-relative-name filename &optional directory
+This function tries to return a relative name that is equivalent to
+@var{filename}, assuming the result will be interpreted relative to
+@var{directory} (an absolute directory name or directory file name).
+If @var{directory} is omitted or @code{nil}, it defaults to the
+current buffer's default directory.
+
+On some operating systems, an absolute file name begins with a device
+name.  On such systems, @var{filename} has no relative equivalent based
+on @var{directory} if they start with two different device names.  In
+this case, @code{file-relative-name} returns @var{filename} in absolute
+form.
+
+@example
+(file-relative-name "/foo/bar" "/foo/")
+     @result{} "bar"
+(file-relative-name "/foo/bar" "/hack/")
+     @result{} "../foo/bar"
+@end example
 @end defun
 
 @node Directory Names
@@ -1910,16 +1936,13 @@ you must specify the default directory name as well as the file name to
 be expanded.  Expansion also simplifies file names by eliminating
 redundancies such as @file{./} and @file{@var{name}/../}.
 
-In the next two functions, the @var{directory} argument can be either
-a directory name or a directory file name.  @xref{Directory Names}.
-
 @defun expand-file-name filename &optional directory
 This function converts @var{filename} to an absolute file name.  If
 @var{directory} is supplied, it is the default directory to start with
 if @var{filename} is relative.  (The value of @var{directory} should
-itself be an absolute directory name; it may start with @samp{~}.)
-Otherwise, the current buffer's value of @code{default-directory} is
-used.  For example:
+itself be an absolute directory name or directory file name; it may
+start with @samp{~}.)  Otherwise, the current buffer's value of
+@code{default-directory} is used.  For example:
 
 @example
 @group
@@ -1981,27 +2004,6 @@ should make sure to call @code{file-truename} without prior direct or
 indirect calls to @code{expand-file-name}.  @xref{Truenames}.
 @end defun
 
-@c Emacs 19 feature
-@defun file-relative-name filename &optional directory
-This function does the inverse of expansion---it tries to return a
-relative name that is equivalent to @var{filename} when interpreted
-relative to @var{directory}.  If @var{directory} is omitted or
-@code{nil}, it defaults to the current buffer's default directory.
-
-On some operating systems, an absolute file name begins with a device
-name.  On such systems, @var{filename} has no relative equivalent based
-on @var{directory} if they start with two different device names.  In
-this case, @code{file-relative-name} returns @var{filename} in absolute
-form.
-
-@example
-(file-relative-name "/foo/bar" "/foo/")
-     @result{} "bar"
-(file-relative-name "/foo/bar" "/hack/")
-     @result{} "../foo/bar"
-@end example
-@end defun
-
 @defvar default-directory
 The value of this buffer-local variable is the default directory for the
 current buffer.  It should be an absolute directory name; it may start
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index 65887c4c172..4faf8fd374c 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -1194,7 +1194,8 @@ predicate @code{user-variable-p} instead of @code{commandp}:
 @end defun
 
   See also the functions @code{read-coding-system} and
-@code{read-non-nil-coding-system}, in @ref{User-Chosen Coding Systems}.
+@code{read-non-nil-coding-system}, in @ref{User-Chosen Coding Systems},
+and @code{read-input-method-name}, in @ref{Input Methods}.
 
 @node Reading File Names
 @subsection Reading File Names
diff --git a/man/ChangeLog b/man/ChangeLog
index 0d22e6d17bc..88fcb1300ad 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,19 @@
+2006-02-19  Richard M. Stallman  <rms@gnu.org>
+
+	* emacs.texi: Use @smallbook.
+	(Top): Update ref to Emacs paper, delete ref to Cookbook.
+	Update subnode menu.
+	
+	* building.texi (Lisp Interaction): Minor addition.
+
+2006-02-18  Nick Roberts  <nickrob@snap.net.nz>
+
+	* building.texi (Watch Expressions): Update and be more precise.
+
+2006-02-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* faq.texi: Remove the coding cookie, it's not needed anymore.
+
 2006-02-15  Francesco Potort,Al(B  <pot@gnu.org>
 
 	* maintaining.texi (Create Tags Table): Explain why the
diff --git a/man/building.texi b/man/building.texi
index 497c2777a5a..a54b0e8b631 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -936,9 +936,9 @@ in the tool bar (@code{gud-watch}).
   Each watch expression is displayed in the speedbar.  Complex data
 types, such as arrays, structures and unions are represented in a tree
 format.  Leaves and simple data types show the name of the expression
-and its value, and display the type as a tooltip.  Higher levels show
-the name, type and address value for pointers and just the name and
-type otherwise.
+and its value and, when the speedbar frame is selected, display the
+type as a tooltip.  Higher levels show the name, type and address
+value for pointers and just the name and type otherwise.
 
   To expand or contract a complex data type, click @kbd{Mouse-2}
 on the tag to the left of the expression.
@@ -958,7 +958,8 @@ edit it.  Either way, this reads the new value using the minibuffer.
   If you set the variable @code{gdb-show-changed-values} to
 non-@code{nil} (the default value), Emacs uses
 @code{font-lock-warning-face} to highlight values that have recently
-changed.
+changed and @code{shadow} face to make variables which have gone out of
+scope less noticeable.
 
 @vindex gdb-use-colon-colon-notation
   If the variable @code{gdb-use-colon-colon-notation} is
@@ -1277,7 +1278,8 @@ buffer in Lisp Interaction mode.
 is to use Inferior Emacs-Lisp mode, which provides an interface rather
 like Shell mode (@pxref{Shell Mode}) for evaluating Emacs Lisp
 expressions.  Type @kbd{M-x ielm} to create an @samp{*ielm*} buffer
-which uses this mode.
+which uses this mode.  For more information see that command's
+documentation.
 
 @node External Lisp
 @section Running an External Lisp
diff --git a/man/ediff.texi b/man/ediff.texi
index 67e822049cb..01e79c821d0 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -686,6 +686,16 @@ Even though such regions will be skipped over, you can still jump to any
 one of them by typing the region number and then `j'.  Typing @kbd{##}
 again puts Ediff back in the original state.
 
+@item #c
+@kindex #c
+@vindex ediff-ignore-case-option
+@vindex ediff-ignore-case-option3
+@vindex ediff-ignore-case
+Toggle case sensitivity in the diff program. All diffs are recomputed.
+Case sensitivity is controlled by the variables
+@code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3},
+and @code{ediff-ignore-case}, which are explained elsewhere.
+
 @item #h
 @itemx #f
 @kindex #f
@@ -1584,6 +1594,28 @@ Ediff may take a long time to skip over them because it has to compute fine
 differences of all intermediate regions.  This delay does not indicate any
 problem.
 
+@vindex ediff-ignore-case-option
+@vindex ediff-ignore-case-option3
+@vindex ediff-ignore-case
+Finally, Ediff can be told to ignore the case of the letters. This behavior
+can be toggled with @kbd{#c} and it is controlled with three variables:
+Toggle case sensitivity in the diff program. All diffs are recomputed.
+Case sensitivity is controlled by the variables
+@code{ediff-ignore-case-option}, @code{ediff-ignore-case-option3}, and
+@code{ediff-ignore-case}.
+
+The variable @code{ediff-ignore-case-option} specifies the option to pass
+to the diff program for comparing two files or buffers. For GNU
+@code{diff}, this option is @code{"-i"}. The variable
+@code{ediff-ignore-case-option3} specifies the option to pass to the
+@code{diff3} program in order to make it case-insensitive. GNU @code{diff3}
+does not have such an option, so when merging or comparing three files with
+this program, ignoring the letter case is not supported.
+
+The variable @code{ediff-ignore-case} controls whether Ediff starts out by
+ignoring letter case or not. It can be set in @file{.emacs} using
+@code{setq-default}.
+
 @node Highlighting Difference Regions, Narrowing, Selective Browsing, Customization
 @section Highlighting Difference Regions
 
@@ -2388,6 +2420,7 @@ Here is a hopefully full list of contributors:
 
 @example
 Adrian Aichner (aichner@@ecf.teradyne.com),
+Drew Adams (drew.adams@@oracle.com),
 Steve Baur (steve@@xemacs.org),
 Neal Becker (neal@@ctd.comsat.com),
 E.@: Jay Berkenbilt (ejb@@ql.org),
diff --git a/man/emacs.texi b/man/emacs.texi
index 8a5c5842ed6..fc51a6e14dd 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -39,7 +39,7 @@ Software Foundation raise funds for GNU development.''
 @c copy of this manual that will be published.  the manual should go
 @c onto the distribution in the full, 8.5 x 11" size.
 
-@c @smallbook
+@smallbook
 
 @setchapternewpage odd
 @defcodeindex op
@@ -609,7 +609,7 @@ Running Debuggers Under Emacs
                           implement a graphical debugging environment through
                           Emacs.
 
-Maintaining Programs
+Maintaining Large Programs
 
 * Change Log::	        Maintaining a change history for your program.
 * Format of ChangeLog:: What the change log file looks like.
@@ -950,15 +950,12 @@ with GNU Emacs.  The Info file and the printed book contain
 substantially the same text and are generated from the same source
 files, which are also distributed along with GNU Emacs.
 
-  GNU Emacs is a member of the Emacs editor family.  There are many Emacs
-editors, all sharing common principles of organization.  For information on
-the underlying philosophy of Emacs and the lessons learned from its
-development, write for a copy of AI memo 519a, @cite{Emacs, the Extensible,
-Customizable Self-Documenting Display Editor}, is available from
+  GNU Emacs is a member of the Emacs editor family.  There are many
+Emacs editors, all sharing common principles of organization.  For
+information on the underlying philosophy of Emacs and the lessons
+learned from its development, see @cite{Emacs, the Extensible,
+Customizable Self-Documenting Display Editor}, available from
 @url{ftp://publications.ai.mit.edu/ai-publications/pdf/AIM-519A.pdf}.
-Another useful publication is LCS TM-165, @cite{A Cookbook for an
-Emacs}, by Craig Finseth, is available from the MIT libraries in some
-fashion.
 
 This edition of the manual is intended for use with GNU Emacs
 installed on GNU and Unix systems.  GNU Emacs can also be used on VMS,
diff --git a/man/erc.texi b/man/erc.texi
index fb9c60d635d..4713afa2fbc 100644
--- a/man/erc.texi
+++ b/man/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.1.1.
+This manual is for ERC version 5.1.2.
 
 Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
 
diff --git a/man/faq.texi b/man/faq.texi
index fd69ad663b5..01becae0c87 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -1,4 +1,4 @@
-\input texinfo   @c -*- coding: latin-1; mode: texinfo; -*-
+\input texinfo   @c -*- mode: texinfo; -*-
 @c %**start of header
 @setfilename ../info/efaq
 @settitle GNU Emacs FAQ
diff --git a/man/viper.texi b/man/viper.texi
index 4ad437a762d..46d62670345 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -1870,6 +1870,10 @@ application.
 @vindex @code{viper-insert-state-cursor-color}
 If set to a valid color, this will be the cursor color when Viper is in
 insert state.
+@item viper-emacs-state-cursor-color nil
+@vindex @code{viper-emacs-state-cursor-color}
+If set to a valid color, this will be the cursor color when Viper is in
+emacs state.
 @item viper-replace-region-end-delimiter "$"
 A string used to mark the end of replacement regions.  It is used only on
 TTYs or if @code{viper-use-replace-region-delimiters} is non-@code{nil}.
diff --git a/src/ChangeLog b/src/ChangeLog
index 18dcc803efa..f2a6e1e2752 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,66 @@
+2006-02-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* regex.c (extend_range_table_work_area): Fix typo.
+
+2006-02-19  Richard M. Stallman  <rms@gnu.org>
+
+	* xterm.c (x_catch_errors): Use xmalloc.
+
+	* regex.c (extend_range_table_work_area): Call xmalloc and xrealloc.
+	(regex_compile): Likewise.
+	(regcomp): Use xmalloc.
+
+	* gtkutil.c (malloc_widget_value): Use xmalloc.
+
+	* vm-limit.c [HAVE_GETRLIMIT]: Include sys/resource.h.
+	(check_memory_limits) [HAVE_GETRLIMIT]: Use getrlimit.
+
+	* xmenu.c (digest_single_submenu): When pane_string is empty,
+	do initialize save_wv.
+
+2006-02-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* xdisp.c (update_menu_bar) [MAC_OS]: Don't set
+	w->update_mode_line if arg F is not the selected frame.
+
+	* macmenu.c (popup_activated_flag, submenu_id)
+	(next_menubar_widget_id): Remove variables.
+	(initialize_frame_menubar): Remove function.
+	(pop_down_menu, mac_menu_show): Simplify save value.
+	(dispose_menus): New function.
+	(pop_down_menu, fill_menubar): Use it.
+	(fill_submenu): Remove function.  All uses changed to fill_menu.
+	(add_menu_item): Remove args SUBMENU and FORCE_DISABLE.  New arg
+	POS.  Don't call SetMenuItemHierarchicalID here.
+	(fill_menu): Add arg SUBMENU_ID.  Return submenu_id that is to be
+	used next.  Call SetMenuItemHierarchicalID here.
+	(fill_menubar): Add arg DEEP_P.  All uses changed.  Clean up menu
+	objects if needed.  Reuse existing menu bar titles if possible.
+	(set_frame_menubar): Don't clean up menu objects here.
+
+2006-02-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* window.c (window_min_size_1): Ensure room for the scroll bar and
+	fringes.
+
+2006-02-17  Romain Francoise  <romain@orebokech.com>
+
+	* puresize.h (BASE_PURESIZE): Increment to 1200000.
+
+2006-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* alloc.c (Fmake_symbol): Comment-out left-over assert from before the
+	addition of the BLOCK_INPUTs.
+
+2006-02-17  Juanma Barranquero  <lekktu@gmail.com>
+
+	* window.c (Fset_window_scroll_bars): Doc fix.
+
+2006-02-17  Kenichi Handa  <handa@m17n.org>
+
+	* xdisp.c (display_mode_element): Call display_string with correct
+	PREC arg (which must be a number of characters, not column width).
+
 2006-02-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* frame.c (x_get_arg): Clear out PARAM in ALIST also on Mac.
diff --git a/src/alloc.c b/src/alloc.c
index 27fe3f86961..74c3c66173a 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3211,7 +3211,7 @@ Its value and function definition are void, and its property list is nil.  */)
 
   CHECK_STRING (name);
 
-  eassert (!handling_signal);
+  /* eassert (!handling_signal); */
 
 #ifndef SYNC_INPUT
   BLOCK_INPUT;
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 5b7a5166888..203eab257f3 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -199,7 +199,7 @@ malloc_widget_value ()
     }
   else
     {
-      wv = (widget_value *) malloc (sizeof (widget_value));
+      wv = (widget_value *) xmalloc (sizeof (widget_value));
       malloc_cpt++;
     }
   memset (wv, 0, sizeof (widget_value));
diff --git a/src/macmenu.c b/src/macmenu.c
index bd4ad6291cf..fccbbe6402c 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -189,8 +189,9 @@ static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
 static void list_of_panes P_ ((Lisp_Object));
 static void list_of_items P_ ((Lisp_Object));
 
-static void fill_submenu (MenuHandle, widget_value *);
-static void fill_menubar (widget_value *);
+static int fill_menu P_ ((MenuHandle, widget_value *, int));
+static void fill_menubar P_ ((widget_value *, int));
+static void dispose_menus P_ ((int));
 
 
 /* This holds a Lisp vector that holds the results of decoding
@@ -247,15 +248,6 @@ static int menu_items_n_panes;
 /* Current depth within submenus.  */
 static int menu_items_submenu_depth;
 
-/* Flag which when set indicates a dialog or menu has been posted by
-   Xt on behalf of one of the widget sets.  */
-static int popup_activated_flag;
-
-/* Index of the next submenu */
-static int submenu_id;
-
-static int next_menubar_widget_id;
-
 /* This is set nonzero after the user activates the menu bar, and set
    to zero again after the menu bars are redisplayed by prepare_menu_bar.
    While it is nonzero, all calls to set_frame_menubar go deep.
@@ -1440,7 +1432,7 @@ install_menu_quit_handler (MenuHandle menu_handle)
       menu = GetMenuHandle (++i);
     }
 
-  i = menu_handle ? MIN_POPUP_SUBMENU_ID : MIN_SUBMENU_ID;  
+  i = menu_handle ? MIN_POPUP_SUBMENU_ID : MIN_SUBMENU_ID;
   menu = GetMenuHandle (i);
   while (menu != NULL)
     {
@@ -1679,27 +1671,7 @@ set_frame_menubar (f, first_time, deep_p)
   /* Non-null value to indicate menubar has already been "created".  */
   f->output_data.mac->menubar_widget = 1;
 
-  {
-    int i = MIN_MENU_ID;
-    MenuHandle menu = GetMenuHandle (i);
-    while (menu != NULL)
-      {
-	DeleteMenu (i);
-	DisposeMenu (menu);
-	menu = GetMenuHandle (++i);
-      }
-
-    i = MIN_SUBMENU_ID;
-    menu = GetMenuHandle (i);
-    while (menu != NULL)
-      {
-	DeleteMenu (i);
-	DisposeMenu (menu);
-	menu = GetMenuHandle (++i);
-      }
-  }
-
-  fill_menubar (first_wv->contents);
+  fill_menubar (first_wv->contents, deep_p);
 
   /* Add event handler so we can detect C-g. */
   install_menu_quit_handler (NULL);
@@ -1708,22 +1680,6 @@ set_frame_menubar (f, first_time, deep_p)
   UNBLOCK_INPUT;
 }
 
-/* Called from Fx_create_frame to create the initial menubar of a frame
-   before it is mapped, so that the window is mapped with the menubar already
-   there instead of us tacking it on later and thrashing the window after it
-   is visible.  */
-
-void
-initialize_frame_menubar (f)
-     FRAME_PTR f;
-{
-  /* This function is called before the first chance to redisplay
-     the frame.  It has to be, so the frame will have the right size.  */
-  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
-  set_frame_menubar (f, 1, 1);
-}
-
-
 /* Get rid of the menu bar of frame F, and free its storage.
    This is used when deleting a frame, and when turning off the menu bar.  */
 
@@ -1739,11 +1695,9 @@ static Lisp_Object
 pop_down_menu (arg)
      Lisp_Object arg;
 {
-  struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
-  struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
-
-  FRAME_PTR f = p1->pointer;
-  MenuHandle *menu = p2->pointer;
+  struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
+  FRAME_PTR f = p->pointer;
+  MenuHandle menu = GetMenuHandle (POPUP_SUBMENU_ID);
 
   BLOCK_INPUT;
 
@@ -1752,19 +1706,9 @@ pop_down_menu (arg)
   FRAME_MAC_DISPLAY_INFO (f)->grabbed = 0;
 
   /* delete all menus */
-  {
-    int i = MIN_POPUP_SUBMENU_ID;
-    MenuHandle submenu = GetMenuHandle (i);
-    while (submenu != NULL)
-      {
-	DeleteMenu (i);
-	DisposeMenu (submenu);
-	submenu = GetMenuHandle (++i);
-      }
-  }
-
+  dispose_menus (MIN_POPUP_SUBMENU_ID);
   DeleteMenu (POPUP_SUBMENU_ID);
-  DisposeMenu (*menu);
+  DisposeMenu (menu);
 
   UNBLOCK_INPUT;
 
@@ -1998,8 +1942,8 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 
   /* Actually create the menu.  */
   menu = NewMenu (POPUP_SUBMENU_ID, "\p");
-  submenu_id = MIN_POPUP_SUBMENU_ID;
-  fill_submenu (menu, first_wv->contents);
+  InsertMenu (menu, -1);
+  fill_menu (menu, first_wv->contents, MIN_POPUP_SUBMENU_ID);
 
   /* Free the widget_value objects we used to specify the
      contents.  */
@@ -2016,11 +1960,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
   menu_item_choice = 0;
   menu_item_selection = 0;
 
-  InsertMenu (menu, -1);
-
-  record_unwind_protect (pop_down_menu,
-                         Fcons (make_save_value (f, 0),
-                                make_save_value (&menu, 0)));
+  record_unwind_protect (pop_down_menu, make_save_value (f, 0));
 
   /* Add event handler so we can detect C-g. */
   install_menu_quit_handler (menu);
@@ -2421,15 +2361,16 @@ name_is_separator (name)
 }
 
 static void
-add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
-	       int force_disable)
+add_menu_item (menu, pos, wv)
+     MenuHandle menu;
+     int pos;
+     widget_value *wv;
 {
 #if TARGET_API_MAC_CARBON
   CFStringRef item_name;
 #else
   Str255 item_name;
 #endif
-  int pos;
 
   if (name_is_separator (wv->name))
     AppendMenu (menu, "\p-");
@@ -2438,8 +2379,6 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       AppendMenu (menu, "\pX");
 
 #if TARGET_API_MAC_CARBON
-      pos = CountMenuItems (menu);
-
       item_name = cfstring_create_with_utf8_cstring (wv->name);
 
       if (wv->key != NULL)
@@ -2457,13 +2396,11 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       SetMenuItemTextWithCFString (menu, pos, item_name);
       CFRelease (item_name);
 
-      if (wv->enabled && !force_disable)
+      if (wv->enabled)
         EnableMenuItem (menu, pos);
       else
         DisableMenuItem (menu, pos);
 #else  /* ! TARGET_API_MAC_CARBON */
-      pos = CountMItems (menu);
-
       item_name[sizeof (item_name) - 1] = '\0';
       strncpy (item_name, wv->name, sizeof (item_name) - 1);
       if (wv->key != NULL)
@@ -2477,88 +2414,140 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
       c2pstr (item_name);
       SetMenuItemText (menu, pos, item_name);
 
-      if (wv->enabled && !force_disable)
+      if (wv->enabled)
         EnableItem (menu, pos);
       else
         DisableItem (menu, pos);
 #endif  /* ! TARGET_API_MAC_CARBON */
 
       /* Draw radio buttons and tickboxes. */
-      {
       if (wv->selected && (wv->button_type == BUTTON_TYPE_TOGGLE ||
                            wv->button_type == BUTTON_TYPE_RADIO))
 	SetItemMark (menu, pos, checkMark);
       else
 	SetItemMark (menu, pos, noMark);
-      }
 
       SetMenuItemRefCon (menu, pos, (UInt32) wv->call_data);
     }
-
-  if (submenu != 0)
-    SetMenuItemHierarchicalID (menu, pos, submenu);
 }
 
-/* Construct native Mac OS menubar based on widget_value tree.  */
-
-static void
-fill_submenu (MenuHandle menu, widget_value *wv)
-{
-  for ( ; wv != NULL; wv = wv->next)
-    if (wv->contents)
-      {
-	int cur_submenu = submenu_id++;
-        MenuHandle submenu = NewMenu (cur_submenu, "\pX");
-        fill_submenu (submenu, wv->contents);
-        InsertMenu (submenu, -1);
-        add_menu_item (menu, wv, cur_submenu, 0);
-      }
-    else
-      add_menu_item (menu, wv, 0, 0);
-}
-
-
 /* Construct native Mac OS menu based on widget_value tree.  */
 
-static void
-fill_menu (MenuHandle menu, widget_value *wv)
+static int
+fill_menu (menu, wv, submenu_id)
+     MenuHandle menu;
+     widget_value *wv;
+     int submenu_id;
 {
-  for ( ; wv != NULL; wv = wv->next)
-    if (wv->contents)
-      {
-	int cur_submenu = submenu_id++;
-        MenuHandle submenu = NewMenu (cur_submenu, "\pX");
-        fill_submenu (submenu, wv->contents);
-        InsertMenu (submenu, -1);
-        add_menu_item (menu, wv, cur_submenu, 0);
-      }
-    else
-      add_menu_item (menu, wv, 0, 0);
+  int pos;
+
+  for (pos = 1; wv != NULL; wv = wv->next, pos++)
+    {
+      add_menu_item (menu, pos, wv);
+      if (wv->contents)
+	{
+	  MenuHandle submenu = NewMenu (submenu_id, "\pX");
+
+	  InsertMenu (submenu, -1);
+	  SetMenuItemHierarchicalID (menu, pos, submenu_id);
+	  submenu_id = fill_menu (submenu, wv->contents, submenu_id + 1);
+	}
+    }
+
+  return submenu_id;
 }
 
 /* Construct native Mac OS menubar based on widget_value tree.  */
 
 static void
-fill_menubar (widget_value *wv)
+fill_menubar (wv, deep_p)
+     widget_value *wv;
+     int deep_p;
 {
-  int id;
+  int id, submenu_id;
+  MenuHandle menu;
+  Str255 title;
+#if !TARGET_API_MAC_CARBON
+  int title_changed_p = 0;
+#endif
 
-  submenu_id  = MIN_SUBMENU_ID;
+  /* Clean up the menu bar when filled by the entire menu trees.  */
+  if (deep_p)
+    {
+      dispose_menus (MIN_MENU_ID);
+      dispose_menus (MIN_SUBMENU_ID);
+#if !TARGET_API_MAC_CARBON
+      title_changed_p = 1;
+#endif
+    }
 
+  /* Fill menu bar titles and submenus.  Reuse the existing menu bar
+     titles as much as possible to minimize redraw (if !deep_p).  */
+  submenu_id = MIN_SUBMENU_ID;
   for (id = MIN_MENU_ID; wv != NULL; wv = wv->next, id++)
     {
-      MenuHandle menu;
-      Str255 title;
-
       strncpy (title, wv->name, 255);
-      title[255] = 0;
+      title[255] = '\0';
       c2pstr (title);
-      menu = NewMenu (id, title);
+
+      menu = GetMenuHandle (id);
+      if (menu)
+	{
+#if TARGET_API_MAC_CARBON
+	  Str255 old_title;
+
+	  GetMenuTitle (menu, old_title);
+	  if (!EqualString (title, old_title, false, false))
+	    SetMenuTitle (menu, title);
+#else  /* !TARGET_API_MAC_CARBON */
+	  if (!EqualString (title, (*menu)->menuData, false, false))
+	    {
+	      DeleteMenu (id);
+	      DisposeMenu (menu);
+	      menu = NewMenu (id, title);
+	      InsertMenu (menu, GetMenuHandle (id + 1) ? id + 1 : 0);
+	      title_changed_p = 1;
+	    }
+#endif  /* !TARGET_API_MAC_CARBON */
+	}
+      else
+	{
+	  menu = NewMenu (id, title);
+	  InsertMenu (menu, 0);
+#if !TARGET_API_MAC_CARBON
+	  title_changed_p = 1;
+#endif
+	}
 
       if (wv->contents)
-        fill_menu (menu, wv->contents);
+        submenu_id = fill_menu (menu, wv->contents, submenu_id);
+    }
 
-      InsertMenu (menu, 0);
+  if (GetMenuHandle (id))
+    {
+      dispose_menus (id);
+#if !TARGET_API_MAC_CARBON
+      title_changed_p = 1;
+#endif
+    }
+
+#if !TARGET_API_MAC_CARBON
+  if (title_changed_p)
+    InvalMenuBar ();
+#endif
+}
+
+static void
+dispose_menus (id)
+     int id;
+{
+  MenuHandle menu;
+
+  while ((menu = GetMenuHandle (id)) != NULL)
+    {
+      DeleteMenu (id);
+      DisposeMenu (menu);
+      id++;
     }
 }
 
diff --git a/src/regex.c b/src/regex.c
index 60231826380..c08471355fd 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2067,10 +2067,10 @@ extend_range_table_work_area (work_area)
   work_area->allocated += 16 * sizeof (int);
   if (work_area->table)
     work_area->table
-      = (int *) realloc (work_area->table, work_area->allocated);
+      = (int *) xrealloc (work_area->table, work_area->allocated);
   else
     work_area->table
-      = (int *) malloc (work_area->allocated);
+      = (int *) xmalloc (work_area->allocated);
 }
 
 #ifdef emacs
@@ -3608,13 +3608,13 @@ regex_compile (pattern, size, syntax, bufp)
 
 	if (! fail_stack.stack)
 	  fail_stack.stack
-	    = (fail_stack_elt_t *) malloc (fail_stack.size
-					   * sizeof (fail_stack_elt_t));
+	    = (fail_stack_elt_t *) xmalloc (fail_stack.size
+					    * sizeof (fail_stack_elt_t));
 	else
 	  fail_stack.stack
-	    = (fail_stack_elt_t *) realloc (fail_stack.stack,
-					    (fail_stack.size
-					     * sizeof (fail_stack_elt_t)));
+	    = (fail_stack_elt_t *) xrealloc (fail_stack.stack,
+					     (fail_stack.size
+					      * sizeof (fail_stack_elt_t)));
       }
 
     regex_grow_registers (num_regs);
@@ -6292,15 +6292,15 @@ regcomp (preg, pattern, cflags)
   preg->used = 0;
 
   /* Try to allocate space for the fastmap.  */
-  preg->fastmap = (char *) malloc (1 << BYTEWIDTH);
+  preg->fastmap = (char *) xmalloc (1 << BYTEWIDTH);
 
   if (cflags & REG_ICASE)
     {
       unsigned i;
 
       preg->translate
-	= (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE
-				      * sizeof (*(RE_TRANSLATE_TYPE)0));
+	= (RE_TRANSLATE_TYPE) xmalloc (CHAR_SET_SIZE
+				       * sizeof (*(RE_TRANSLATE_TYPE)0));
       if (preg->translate == NULL)
 	return (int) REG_ESPACE;
 
diff --git a/src/vm-limit.c b/src/vm-limit.c
index fb127b27b74..48d13c323ae 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -33,6 +33,10 @@ typedef void *POINTER;
 
 #include "mem-limits.h"
 
+#ifdef HAVE_GETRLIMIT
+#include <sys/resource.h>
+#endif
+
 /*
   Level number of warnings already issued.
   0 -- no warnings issued.
@@ -61,6 +65,19 @@ check_memory_limits ()
   unsigned long five_percent;
   unsigned long data_size;
 
+#ifdef HAVE_GETRLIMIT
+  struct rlimit {
+    rlim_t rlim_cur;
+    rlim_t rlim_max;
+  } rlimit;
+
+  getrlimit (RLIMIT_DATA, &rlimit);
+
+  five_percent = rlimit.rlim_max / 20;
+  data_size = rlimit.rlim_cur;
+
+#else /* not HAVE_GETRLIMIT */
+
   if (lim_data == 0)
     get_lim_data ();
   five_percent = lim_data / 20;
@@ -74,6 +91,8 @@ check_memory_limits ()
   cp = (char *) (*__morecore) (0);
   data_size = (char *) cp - (char *) data_space_start;
 
+#endif /* not HAVE_GETRLIMIT */
+
   if (warn_function)
     switch (warnlevel)
       {
diff --git a/src/window.c b/src/window.c
index 58ab3ee14a0..350b4753491 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2570,7 +2570,10 @@ window_min_size_1 (w, width_p)
   else
     {
       if (width_p)
-	size = window_min_width;
+	size = max (window_min_width,
+		    (MIN_SAFE_WINDOW_WIDTH
+		     + WINDOW_FRINGE_COLS (w)
+		     + WINDOW_SCROLL_BAR_COLS (w)));
       else
 	{
 	  if (MINI_WINDOW_P (w)
@@ -4288,7 +4291,7 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
 	    {
               /* This may happen for the minibuffer.  In that case
                  the window_deletion_count check below does not work.  */
-              if (XINT (CURSIZE (p->next)) - delta <= 0) 
+              if (XINT (CURSIZE (p->next)) - delta <= 0)
                 {
                   Fset_window_configuration (old_config);
                   error ("Cannot adjust window size as specified");
@@ -6602,7 +6605,8 @@ this is automatically adjusted to a multiple of the frame column width.
 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
 bar: left, right, or nil.
 If WIDTH is nil, use the frame's scroll-bar width.
-If TYPE is t, use the frame's scroll-bar type.  */)
+If VERTICAL-TYPE is t, use the frame's scroll-bar type.
+Fourth parameter HORIZONTAL-TYPE is currently unused.  */)
      (window, width, vertical_type, horizontal_type)
      Lisp_Object window, width, vertical_type, horizontal_type;
 {
diff --git a/src/xdisp.c b/src/xdisp.c
index 9efa1c60cbc..1361607010a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9057,14 +9057,15 @@ update_menu_bar (f, save_match_data)
 	  /* Redisplay the menu bar in case we changed it.  */
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \
     || defined (USE_GTK)
-	  if (FRAME_WINDOW_P (f)
-#if defined (MAC_OS)
-              /* All frames on Mac OS share the same menubar.  So only the
-                 selected frame should be allowed to set it.  */
-              && f == SELECTED_FRAME ()
+	  if (FRAME_WINDOW_P (f))
+	    {
+#ifdef MAC_OS
+              /* All frames on Mac OS share the same menubar.  So only
+                 the selected frame should be allowed to set it.  */
+              if (f == SELECTED_FRAME ())
 #endif
-	     )
-	    set_frame_menubar (f, 0, 0);
+		set_frame_menubar (f, 0, 0);
+	    }
 	  else
 	    /* On a terminal screen, the menu bar is an ordinary screen
 	       line, and this makes it get updated.  */
@@ -16492,8 +16493,11 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
 		    {
 		      int bytepos = last_offset;
 		      int charpos = string_byte_to_char (elt, bytepos);
+
+		      if (precision <= 0)
+			nchars = string_byte_to_char (elt, offset) - charpos;
 		      n += display_string (NULL, elt, Qnil, 0, charpos,
-					   it, 0, prec, 0,
+					   it, 0, nchars, 0,
 					   STRING_MULTIBYTE (elt));
 		    }
 		    break;
@@ -17742,7 +17746,7 @@ display_count_lines (start, start_byte, limit_byte, count, byte_pos_ptr)
    display them, and < 0 means obey the current buffer's value of
    enable_multibyte_characters.
 
-   Value is the number of glyphs produced.  */
+   Value is the number of columns displayed.  */
 
 static int
 display_string (string, lisp_string, face_string, face_string_pos,
diff --git a/src/xmenu.c b/src/xmenu.c
index ddb93aa8c77..3c8c6d81a37 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1819,8 +1819,11 @@ digest_single_submenu (start, end, top_level_items)
 	      wv->enabled = 1;
 	      wv->button_type = BUTTON_TYPE_NONE;
 	      wv->help = Qnil;
+	      save_wv = wv;
 	    }
-	  save_wv = wv;
+	  else
+	    save_wv = first_wv;
+
 	  prev_wv = 0;
 	  i += MENU_ITEMS_PANE_LENGTH;
 	}
diff --git a/src/xterm.c b/src/xterm.c
index 86e780cc611..1b1dbdda552 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7527,7 +7527,7 @@ x_catch_errors (dpy)
      Display *dpy;
 {
   int count = SPECPDL_INDEX ();
-  struct x_error_message_stack *data = malloc (sizeof (*data));
+  struct x_error_message_stack *data = xmalloc (sizeof (*data));
   Lisp_Object dummy;
 #ifdef ENABLE_CHECKING
   dummy = make_number ((EMACS_INT)dpy + (EMACS_INT)x_error_message);