Merge from trunk.

106 files changed, 1638 insertions, 1231 deletions

diff --git a/Makefile.in b/Makefile.in
index 400fc73e6da..f178a3aeb16 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -208,11 +208,8 @@ lisppath=@lisppath@
 # building.  This is only used during the process of
 # compiling Emacs, to help Emacs find its lisp files
 # before they've been installed in their final location.
-# It's usually identical to lisppath, except that
-# it does not include locallisppath, and the
-# entry for the directory containing the installed lisp
-# files has been replaced with ../lisp.  This should be a
-# colon-separated list of directories.
+# This should be a colon-separated list of directories.
+# Normally it points to the lisp/ directory in the sources.
 buildlisppath=${srcdir}/lisp
 
 # Where to install the other architecture-independent
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3bfbab881aa..597beb60ce2 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as
+        updated and checked.
+
 2011-11-26  Andreas Schwab  <schwab@linux-m68k.org>
 
         * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index ad056ab0bda..0c75181aa03 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -99,7 +99,7 @@ names of the people who have checked it.
 
 SECTION                  READERS
 ----------------------------------
-TUTORIAL             
+TUTORIAL             cyd
 TUTORIAL.bg          
 TUTORIAL.cn
 TUTORIAL.cs          
@@ -107,7 +107,7 @@ TUTORIAL.de
 TUTORIAL.eo
 TUTORIAL.es          
 TUTORIAL.fr          
-TUTORIAL.he
+TUTORIAL.he          eliz
 TUTORIAL.it          
 TUTORIAL.ja              
 TUTORIAL.ko
@@ -133,7 +133,7 @@ buffers.texi      cyd
 building.texi     cyd
 calendar.texi     
 cal-xtra.texi     
-cmdargs.texi      
+cmdargs.texi      cyd
 commands.texi     cyd
 custom.texi       cyd
 dired.texi        cyd
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index ad46f493a02..4146c8ffa58 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -789,7 +789,7 @@ DIARY OF CHANGES
    frame's kboard from there.)
 
 -- Fix rif issue with X-tty combo sessions.  IMHO the best thing to do
-   is to get rid of that global variable (and use the value value in
+   is to get rid of that global variable (and use the value in
    display_method, which is guaranteed to be correct).
 
    (Done, did exactly that.  Core dumps during combo sessions became
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 657dcdc1766..06cd2d40901 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -49,7 +49,7 @@ COPY='cp -f'
 REMOVE='rm -r'
 MKDIR='mkdir -p'
 
-# Used to execute commands once once we create them
+# Used to execute commands once we create them
 EXEC='sh'
 
 NAWK=/usr/bin/nawk
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ad49224e0d3..ab8c822ffcf 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,26 @@
+2012-01-14  Chong Yidong  <cyd@gnu.org>
+
+        * cmdargs.texi (Action Arguments): No need to mention
+        EMACSLOADPATH.
+        (General Variables): Add xref to Lisp Libraries.
+        (Initial Options): Copyedits.
+        (Resume Arguments): Node deleted; emacs.bash/csh are obsolete.
+        (Environment): Clarify what getenv does.
+        (General Variables): Clarify EMACSPATH etc.  Emacs does not assume
+        light backgrounds on xterms.
+        (Misc Variables): TEMP and TMP are not Windows-specific.
+        (Display X): Copyedits.
+        (Colors X): -bd does nothing for GTK.
+        (Icons X): Gnome 3 doesn't use taskbars.
+
+        * misc.texi (Shell): Document exec-path here.
+
+        * rmail.texi (Movemail): Add xref for exec-path.
+
+2012-01-13  Glenn Morris  <rgm@gnu.org>
+
+        * dired.texi (Dired and Find): Clarify find-ls-options.
+
 2012-01-09  Chong Yidong  <cyd@gnu.org>
 
         * custom.texi (Custom Themes): Switched custom-safe-themes to use
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 11cc4df8ce9..00730cc6510 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -65,7 +65,6 @@ arguments.)
                           and call functions.
 * Initial Options::     Arguments that take effect while starting Emacs.
 * Command Example::     Examples of using command line arguments.
-* Resume Arguments::    Specifying arguments when you resume a running Emacs.
 * Environment::         Environment variables that Emacs uses.
 * Display X::           Changing the default display and using remote login.
 * Font X::              Choosing a font for text, under X.
@@ -124,10 +123,9 @@ Visit @var{file} using @code{find-file}, then go to line number
 @opindex --load
 @cindex loading Lisp libraries, command-line argument
 Load a Lisp library named @var{file} with the function @code{load}.
-@xref{Lisp Libraries}.  If @var{file} is not an absolute file name,
-the library can be found either in the current directory, or in the
-Emacs library search path as specified with @env{EMACSLOADPATH}
-(@pxref{General Variables}).
+If @var{file} is not an absolute file name, Emacs first looks for it
+in the current directory, then in the directories listed in
+@code{load-path} (@pxref{Lisp Libraries}).
 
 @strong{Warning:} If previous command-line arguments have visited
 files, the current directory is the directory of the last file
@@ -186,11 +184,11 @@ specifically related to the X Window System appear in the following
 sections.
 
   Some initial options affect the loading of the initialization file.
-The normal actions of Emacs are to first load @file{site-start.el} if
-it exists, then your own initialization file @file{~/.emacs} if it
-exists, and finally @file{default.el} if it exists.  @xref{Init File}.
-Certain options prevent loading of some of these files or substitute
-other files for them.
+Normally, Emacs first loads @file{site-start.el} if it exists, then
+your own initialization file if it exists, and finally the default
+initialization file @file{default.el} if it exists (@pxref{Init
+File}).  Certain options prevent loading of some of these files or
+substitute other files for them.
 
 @table @samp
 @item -chdir @var{directory}
@@ -207,8 +205,8 @@ stopped.  This makes desktop saving and restoring easier.
 @itemx --terminal=@var{device}
 @opindex --terminal
 @cindex device for Emacs terminal I/O
-Use @var{device} as the device for terminal input and output.
-@samp{--terminal} implies @samp{--no-window-system}.
+Use @var{device} as the device for terminal input and output.  This
+option implies @samp{--no-window-system}.
 
 @item -d @var{display}
 @opindex -d
@@ -252,7 +250,7 @@ terminal's standard input stream (@code{stdin}) instead.
 @samp{--batch} implies @samp{-q} (do not load an initialization file),
 but @file{site-start.el} is loaded nonetheless.  It also causes Emacs
 to exit after processing all the command options.  In addition, it
-disables auto-saving except in buffers for which it has been
+disables auto-saving except in buffers for which auto-saving is
 explicitly requested.
 
 @item --script @var{file}
@@ -270,8 +268,8 @@ Emacs.  They can start with this text on the first line
 
 @noindent
 which will invoke Emacs with @samp{--script} and supply the name of
-the script file as @var{file}.  Emacs Lisp then treats @samp{#!}  as a
-comment delimiter.
+the script file as @var{file}.  Emacs Lisp then treats the @samp{#!}
+on this first line as a comment delimiter.
 
 @item -q
 @opindex -q
@@ -280,11 +278,10 @@ comment delimiter.
 @cindex bypassing init and @file{default.el} file
 @cindex init file, not loading
 @cindex @file{default.el} file, not loading
-Do not load your Emacs initialization file, and do not load the file
-@file{default.el} either (@pxref{Init File}).  Regardless of this
-switch, @file{site-start.el} is still loaded.  When Emacs is invoked
-like this, the Customize facility does not allow options to be saved
-(@pxref{Easy Customization}).
+Do not load any initialization file (@pxref{Init File}).  When Emacs
+is invoked with this option, the Customize facility does not allow
+options to be saved (@pxref{Easy Customization}).  This option does
+not disable loading @file{site-start.el}.
 
 @item --no-site-file
 @opindex --no-site-file
@@ -371,45 +368,6 @@ also guarantees there will be no problem redirecting output to
 @file{log}, because Emacs will not assume that it has a display terminal
 to work with.
 
-@node Resume Arguments
-@appendixsec Resuming Emacs with Arguments
-
-  You can specify action arguments for Emacs when you resume it after
-a suspension.  To prepare for this, put the following code in your
-@file{.emacs} file (@pxref{Hooks}):
-
-@c `resume-suspend-hook' is correct.  It is the name of a function.
-@example
-(add-hook 'suspend-hook 'resume-suspend-hook)
-(add-hook 'suspend-resume-hook 'resume-process-args)
-@end example
-
-  As further preparation, you must execute the shell script
-@file{emacs.csh} (if you use csh as your shell) or @file{emacs.bash}
-(if you use bash as your shell).  These scripts define an alias named
-@code{edit}, which will resume Emacs giving it new command line
-arguments such as files to visit.  The scripts are found in the
-@file{etc} subdirectory of the Emacs distribution.
-
-  Only action arguments work properly when you resume Emacs.  Initial
-arguments are not recognized---it's too late to execute them anyway.
-
-  Note that resuming Emacs (with or without arguments) must be done from
-within the shell that is the parent of the Emacs job.  This is why
-@code{edit} is an alias rather than a program or a shell script.  It is
-not possible to implement a resumption command that could be run from
-other subjobs of the shell; there is no way to define a command that could
-be made the value of @env{EDITOR}, for example.  Therefore, this feature
-does not take the place of the Emacs Server feature (@pxref{Emacs
-Server}).
-
-  The aliases use the Emacs Server feature if you appear to have a
-server Emacs running.  However, they cannot determine this with complete
-accuracy.  They may think that a server is still running when in
-actuality you have killed that Emacs, because the file
-@file{/tmp/esrv@dots{}} still exists.  If this happens, find that
-file and delete it.
-
 @node Environment
 @appendixsec Environment Variables
 @cindex environment variables
@@ -424,19 +382,19 @@ letters only.  The values are all text strings.
 environment automatically from their parent process.  This means you
 can set up an environment variable in your login shell, and all the
 programs you run (including Emacs) will automatically see it.
-Subprocesses of Emacs (such as shells, compilers, and version-control
-software) inherit the environment from Emacs, too.
+Subprocesses of Emacs (such as shells, compilers, and version control
+programs) inherit the environment from Emacs, too.
 
 @findex setenv
 @findex getenv
 @vindex initial-environment
-  Inside Emacs, the command @kbd{M-x getenv} gets the value of an
-environment variable.  @kbd{M-x setenv} sets a variable in the Emacs
-environment, and @kbd{C-u M-x setenv} removes a variable.
-(Environment variable substitutions with @samp{$} work in the value
-just as in file names; see @ref{File Names with $}.)  The variable
-@code{initial-environment} stores the initial environment inherited by
-Emacs.
+  Inside Emacs, the command @kbd{M-x getenv} reads the name of an
+environment variable, and prints its value in the echo area.  @kbd{M-x
+setenv} sets a variable in the Emacs environment, and @kbd{C-u M-x
+setenv} removes a variable.  (Environment variable substitutions with
+@samp{$} work in the value just as in file names; see @ref{File Names
+with $}.)  The variable @code{initial-environment} stores the initial
+environment inherited by Emacs.
 
   The way to set environment variables outside of Emacs depends on the
 operating system, and especially the shell that you are using.  For
@@ -483,22 +441,25 @@ This is used to initialize the Lisp variable @code{data-directory}.
 Directory for the documentation string file, which is used to
 initialize the Lisp variable @code{doc-directory}.
 @item EMACSLOADPATH
-A colon-separated list of directories@footnote{
-Here and below, whenever we say ``colon-separated list of directories,''
-it pertains to Unix and GNU/Linux systems.  On MS-DOS and MS-Windows,
-the directories are separated by semi-colons instead, since DOS/Windows
-file names might include a colon after a drive letter.}
-to search for Emacs Lisp files---used to initialize @code{load-path}.
+A colon-separated list of directories@footnote{ Here and below,
+whenever we say ``colon-separated list of directories,'' it pertains
+to Unix and GNU/Linux systems.  On MS-DOS and MS-Windows, the
+directories are separated by semi-colons instead, since DOS/Windows
+file names might include a colon after a drive letter.}  to search for
+Emacs Lisp files.  If set, it overrides the usual initial value of the
+@code{load-path} variable (@pxref{Lisp Libraries}).
 @item EMACSPATH
-A colon-separated list of directories to search for executable
-files---used to initialize @code{exec-path}.
+A colon-separated list of directories to search for executable files.
+If set, Emacs uses this in addition to @env{PATH} (see below) when
+initializing the variable @code{exec-path} (@pxref{Shell}).
 @item EMAIL
 @vindex user-mail-address@r{, initialization}
 Your email address; used to initialize the Lisp variable
-@code{user-mail-address}, which the Emacs mail interface puts into
-the @samp{From} header of outgoing messages (@pxref{Mail Headers}).
+@code{user-mail-address}, which the Emacs mail interface puts into the
+@samp{From} header of outgoing messages (@pxref{Mail Headers}).
 @item ESHELL
-Used for shell-mode to override the @env{SHELL} environment variable.
+Used for shell-mode to override the @env{SHELL} environment variable
+(@pxref{Interactive Shell}).
 @item HISTFILE
 The name of the file that shell commands are saved in between logins.
 This variable defaults to @file{~/.bash_history} if you use Bash, to
@@ -554,23 +515,28 @@ environment and coding system.  @xref{Language Environments}.
 The user's login name.  See also @env{USER}.
 @item MAIL
 The name of your system mail inbox.
+@ifnottex
 @item MH
-Name of setup file for the mh system.  (The default is @file{~/.mh_profile}.)
+Name of setup file for the mh system.  @xref{Top,,MH-E,mh-e, The Emacs
+Interface to MH}.
+@end ifnottex
 @item NAME
-Your real-world name.
+Your real-world name.  This is used to initialize the variable
+@code{user-full-name} (@pxref{Mail Headers}).
 @item NNTPSERVER
 The name of the news server.  Used by the mh and Gnus packages.
 @item ORGANIZATION
 The name of the organization to which you belong.  Used for setting the
 `Organization:' header in your posts from the Gnus package.
 @item PATH
-A colon-separated list of directories in which executables reside.  This
-is used to initialize the Emacs Lisp variable @code{exec-path}.
+A colon-separated list of directories containing executable files.
+This is used to initialize the variable @code{exec-path}
+(@pxref{Shell}).
 @item PWD
 If set, this should be the default directory when Emacs was started.
 @item REPLYTO
 If set, this specifies an initial value for the variable
-@code{mail-default-reply-to}.  @xref{Mail Headers}.
+@code{mail-default-reply-to} (@pxref{Mail Headers}).
 @item SAVEDIR
 The name of a directory in which news articles are saved by default.
 Used by the Gnus package.
@@ -578,23 +544,29 @@ Used by the Gnus package.
 The name of an interpreter used to parse and execute programs run from
 inside Emacs.
 @item SMTPSERVER
-The name of the outgoing mail server.  Used by the SMTP library
-(@pxref{Top,,,smtpmail,Sending mail via SMTP}).
+The name of the outgoing mail server.  This is used to initialize the
+variable @code{smtpmail-smtp-server} (@pxref{Mail Sending}).
 @cindex background mode, on @command{xterm}
 @item TERM
 The type of the terminal that Emacs is using.  This variable must be
 set unless Emacs is run in batch mode.  On MS-DOS, it defaults to
 @samp{internal}, which specifies a built-in terminal emulation that
-handles the machine's own display.  If the value of @env{TERM} indicates
-that Emacs runs in non-windowed mode from @command{xterm} or a similar
-terminal emulator, the background mode defaults to @samp{light}, and
-Emacs will choose colors that are appropriate for a light background.
+handles the machine's own display.
 @item TERMCAP
 The name of the termcap library file describing how to program the
-terminal specified by the @env{TERM} variable.  This defaults to
+terminal specified by @env{TERM}.  This defaults to
 @file{/etc/termcap}.
 @item TMPDIR
-Used by the Emerge package as a prefix for temporary files.
+@itemx TMP
+@itemx TEMP
+These environment variables are used to initialize the variable
+@code{temporary-file-directory}, which specifies a directory in which
+to put temporary files (@pxref{Backup}).  Emacs tries to use
+@env{TMPDIR} first; if that is unset, it tries @env{TMP}, then
+@env{TEMP}, and finally @file{/tmp}.  But on MS-Windows and MS-DOS,
+Emacs tries @env{TEMP}, then @env{TMPDIR}, then @env{TMP}, and finally
+@file{c:/temp}.
+
 @item TZ
 This specifies the current time zone and possibly also daylight
 saving time information.  On MS-DOS, if @env{TZ} is not set in the
@@ -624,11 +596,6 @@ variable.
 On MS-DOS, this variable defaults to the value of the @env{USER}
 variable.
 
-@item TEMP
-@itemx TMP
-On MS-DOS and MS-Windows, these specify the name of the directory for
-storing temporary files in.
-
 @item EMACSTEST
 On MS-DOS, this specifies a file to use to log the operation of the
 internal terminal emulator.  This feature is useful for submitting bug
@@ -710,27 +677,21 @@ of the settings which on X belong in the @file{.Xdefaults} file
 @cindex display name (X Window System)
 @cindex @env{DISPLAY} environment variable
 
-  The environment variable @env{DISPLAY} tells all X clients, including
-Emacs, where to display their windows.  Its value is set by default
-in ordinary circumstances, when you start an X server and run jobs
-locally.  Occasionally you may need to specify the display yourself; for
-example, if you do a remote login and want to run a client program
-remotely, displaying on your local screen.
-
-  With Emacs, the main reason people change the default display is to
-let them log into another system, run Emacs on that system, but have the
-window displayed at their local terminal.  You might need to log in
-to another system because the files you want to edit are there, or
-because the Emacs executable file you want to run is there.
+  The environment variable @env{DISPLAY} tells all X clients,
+including Emacs, where to display their windows.  Its value is set by
+default in ordinary circumstances, when you start an X server and run
+jobs locally.  You can specify the display yourself; one reason to do
+this is if you want to log into another system and run Emacs there,
+and have the window displayed at your local terminal.
 
   @env{DISPLAY} has the syntax
 @samp{@var{host}:@var{display}.@var{screen}}, where @var{host} is the
 host name of the X Window System server machine, @var{display} is an
 arbitrarily-assigned number that distinguishes your server (X
 terminal) from other servers on the same machine, and @var{screen} is
-a rarely-used field that allows an X server to control multiple
-terminal screens.  The period and the @var{screen} field are optional.
-If included, @var{screen} is usually zero.
+a field that allows an X server to control multiple terminal screens.
+The period and the @var{screen} field are optional.  If included,
+@var{screen} is usually zero.
 
   For example, if your host is named @samp{glasperle} and your server is
 the first (or perhaps the only) server listed in the configuration, your
@@ -744,9 +705,9 @@ by changing the @env{DISPLAY} variable, or with the option @samp{-d
 emacs --display=glasperle:0 &
 @end smallexample
 
-  You can inhibit the direct use of the window system and GUI with the
-@samp{-nw} option.  It tells Emacs to display using ordinary @acronym{ASCII} on
-its controlling terminal.  This is also an initial option.
+  You can inhibit the use of the X window system with the @samp{-nw}
+option.  Then Emacs uses its controlling text terminal for display.
+@xref{Initial Options}.
 
   Sometimes, security arrangements prevent a program on a remote system
 from displaying on your local system.  In this case, trying to run Emacs
@@ -778,17 +739,17 @@ font:
 Use @var{font} as the default font.
 @end table
 
-When passing a font specification to Emacs on the command line, you
-may need to ``quote'' it, by enclosing it in quotation marks, if it
-contains characters that the shell treats specially (e.g.@: spaces).
-For example:
+When passing a font name to Emacs on the command line, you may need to
+``quote'' it, by enclosing it in quotation marks, if it contains
+characters that the shell treats specially (e.g.@: spaces).  For
+example:
 
 @smallexample
 emacs -fn "DejaVu Sans Mono-12"
 @end smallexample
 
-@xref{Fonts}, for other ways to specify the default font and font name
-formats.
+@xref{Fonts}, for details about font names and other ways to specify
+the default font.
 
 @node Colors X
 @appendixsec Window Color Options
@@ -819,7 +780,8 @@ Specify the background color, overriding the color specified by the
 @itemx --border-color=@var{color}
 @opindex --border-color
 @cindex border color, command-line argument
-Specify the color of the border of the X window.
+Specify the color of the border of the X window.  This has no effect
+if Emacs is compiled with GTK+ support.
 @item -cr @var{color}
 @opindex -cr
 @itemx --cursor-color=@var{color}
@@ -844,11 +806,10 @@ Reverse video---swap the foreground and background colors.
 @opindex --color
 @cindex standard colors on a character terminal
 @cindex override character terminal color support
-For a character terminal only, specify the mode of color support.
-This option is intended for overriding the number of supported colors
-that the character terminal advertises in its @code{termcap} or
-@code{terminfo} database.  The parameter @var{mode} can be one of the
-following:
+Set the @dfn{color support mode} when Emacs is run on a text terminal.
+This option overrides the number of supported colors that the
+character terminal advertises in its @code{termcap} or @code{terminfo}
+database.  The parameter @var{mode} can be one of the following:
 @table @samp
 @item never
 @itemx no
@@ -1090,7 +1051,7 @@ Start Emacs in an iconified (``minimized'') state.
 @itemx --no-bitmap-icon
 @opindex --no-bitmap-icon
 @cindex Emacs icon, a gnu
-Do not display the Emacs icon.
+Disable the use of the Emacs icon.
 @end table
 
   Most window managers allow you to ``iconify'' (or ``minimize'') an
@@ -1102,10 +1063,11 @@ The text frame doesn't appear until you deiconify (or ``un-minimize'')
 it.
 
   By default, Emacs uses an icon containing the Emacs logo.  On
-desktop environments such as Gnome, this icon is also displayed on the
-``taskbar''.  The @samp{-nbi} or @samp{--no-bitmap-icon} option tells
-Emacs to let the window manager choose what sort of icon to
-use---usually just a small rectangle containing the frame's title.
+desktop environments such as Gnome, this icon is also displayed in
+other contexts, e.g.@: when switching into an Emacs frame.  The
+@samp{-nbi} or @samp{--no-bitmap-icon} option tells Emacs to let the
+window manager choose what sort of icon to use---usually just a small
+rectangle containing the frame's title.
 
 @node Misc X
 @appendixsec Other Display Options
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 82a63996a64..b2215c19e75 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -141,7 +141,7 @@ previous button or editable field.
   From the top-level customization buffer created by @kbd{M-x
 customize}, you can follow the links to the subgroups of the
 @samp{Emacs} customization group.  These subgroups may contain
-settings for you to customize; they may also contain futher subgroups,
+settings for you to customize; they may also contain further subgroups,
 dealing with yet more specialized subsystems of Emacs.  As you
 navigate the hierarchy of customization groups, you should find some
 settings that you want to customize.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 34ec0d2045c..cce440f2bdb 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1228,9 +1228,9 @@ need to know how to use @command{find}.
 
 @vindex find-ls-option
   The format of listing produced by these commands is controlled by
-the variable @code{find-ls-option}, whose default value specifies
-using options @samp{-ld} for @command{ls}.  If your listings are
-corrupted, you may need to change the value of this variable.
+the variable @code{find-ls-option}.  This is a pair of options; the
+first specifying how to call @command{find} to produce the file listing,
+and the second telling Dired to parse the output.
 
 @findex locate
 @findex locate-with-filter
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index b098f26eea5..e7d58c32290 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1078,7 +1078,7 @@ list):
 @table @code
 @item face
 Enable all visualizations which use special faces.  This element has a
-special meaing: if it is absent from the list, none of the other
+special meaning: if it is absent from the list, none of the other
 visualizations take effect except @code{space-mark}, @code{tab-mark},
 and @code{newline-mark}.
 
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index b8722e9f850..b00625facbf 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1104,7 +1104,6 @@ Command Line Arguments for Emacs Invocation
                           and call functions.
 * Initial Options::     Arguments that take effect while starting Emacs.
 * Command Example::     Examples of using command line arguments.
-* Resume Arguments::    Specifying arguments when you resume a running Emacs.
 * Environment::         Environment variables that Emacs uses.
 * Display X::           Changing the default display and using remote login.
 * Font X::              Choosing a font for text, under X.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index a522e055d2b..77211a3d9ac 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1871,10 +1871,9 @@ Add each file name in @var{directory} and all of its nested
 subdirectories to the file name cache, using @command{locate} to find
 them all.
 @item M-x file-cache-add-directory-list @key{RET} @var{variable} @key{RET}
-Add each file name in each directory listed in @var{variable}
-to the file name cache.  @var{variable} should be a Lisp variable
-such as @code{load-path} or @code{exec-path}, whose value is a list
-of directory names.
+Add each file name in each directory listed in @var{variable} to the
+file name cache.  @var{variable} should be a Lisp variable whose value
+is a list of directory names, like @code{load-path}.
 @item M-x file-cache-clear-cache @key{RET}
 Clear the cache; that is, remove all file names from it.
 @end table
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index c4fbca6574b..16feb939b33 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -356,7 +356,7 @@ Show the list of options.
   In Text mode and related modes, @kbd{M-@key{TAB}}
 (@code{ispell-complete-word}) performs in-buffer completion based on
 spelling correction.  Insert the beginning of a word, and then type
-@kbd{M-@key{TAB}}; this shows shows a list of completions.  (If your
+@kbd{M-@key{TAB}}; this shows a list of completions.  (If your
 window manager intercepts @kbd{M-@key{TAB}}, type @kbd{@key{ESC}
 @key{TAB}} or @kbd{C-M-i}.)  Each completion is listed with a digit or
 character; type that digit or character to choose it.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 69e141efb0f..93dd5e3b8ce 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -465,6 +465,15 @@ then give commands interactively.  Full terminal emulation is
 available.
 @end table
 
+@vindex exec-path
+  Whenever you specify a relative file name for an executable program
+(either in the @var{cmd} argument to one of the above commands, or in
+other contexts), Emacs searches for the program in the directories
+specified by the variable @code{exec-path}.  The value of this
+variable must be a list of directory names; the default value is
+initialized from the environment variable @env{PATH} when Emacs is
+started (@pxref{General Variables}).
+
   @kbd{M-x eshell} invokes a shell implemented entirely in Emacs.  It
 is documented in its own manual.
 @ifnottex
@@ -551,11 +560,8 @@ to @command{gpg}.  This will output the list of keys to the
   The above commands use the shell specified by the variable
 @code{shell-file-name}.  Its default value is determined by the
 @env{SHELL} environment variable when Emacs is started.  If the file
-name is relative, Emacs searches the directories in the list
-@code{exec-path}; this list is initialized based on the environment
-variable @env{PATH} when Emacs is started.  Your init file can
-override either or both of these default initializations (@pxref{Init
-File}).
+name is relative, Emacs searches the directories listed in
+@code{exec-path} (@pxref{Shell}).
 
   To specify a coding system for @kbd{M-!} or @kbd{M-|}, use the command
 @kbd{C-x @key{RET} c} immediately beforehand.  @xref{Communication Coding}.
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 9713b825ee8..be1c1f68c66 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1428,8 +1428,8 @@ This is equivalent to specifying the @samp{file} protocol:
 @code{movemail} to use.  If that is a string, it specifies the
 absolute file name of the @code{movemail} executable.  If it is
 @code{nil}, Rmail searches for @code{movemail} in the directories
-listed in @code{rmail-movemail-search-path} and @code{exec-path}, then
-in @code{exec-directory}.
+listed in @code{rmail-movemail-search-path}, then in @code{exec-path}
+(@pxref{Shell}), then in @code{exec-directory}.
 
 @node Remote Mailboxes
 @section Retrieving Mail from Remote Mailboxes
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index bc6e3281bb7..f7e39b6c65c 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1588,7 +1588,7 @@ Argument @var{PROJ} is the project to save.
 @end deffn
 
 @deffn Method ede-proj-configure-recreate :AFTER this
-Delete project @var{THIS}es configure script and start over.
+Delete project @var{THIS}'s configure script and start over.
 @end deffn
 
 @deffn Method ede-proj-makefile-insert-user-rules :AFTER this
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index bc82e0ba7fe..8da6cd96525 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -36,7 +36,7 @@
 
 @c orgkey{key}                        A key item
 @c orgcmd{key,cmd}                    Key with command name
-@c xorgcmd{key,cmmand}                Key with command name as @itemx
+@c xorgcmd{key,cmd}                   Key with command name as @itemx
 @c orgcmdnki{key,cmd}                 Like orgcmd, but do not index the key
 @c orgcmdtkc{text,key,cmd}            Like orgcmd,special text instead of key
 @c orgcmdkkc{key1,key2,cmd}           Two keys with one command name, use "or"
@@ -1004,8 +1004,8 @@ from within Emacs, please copy and paste the content into your Email program.
 
 Sometimes you might face a problem due to an error in your Emacs or Org mode
 setup.  Before reporting a bug, it is very helpful to start Emacs with minimal
-customisations and reproduce the problem.  Doing so often helps you determine
-if the problem is with your customisation or with Org mode itself.  You can
+customizations and reproduce the problem.  Doing so often helps you determine
+if the problem is with your customization or with Org mode itself.  You can
 start a typical minimal session with a command like the example below.
 
 @example
@@ -1241,7 +1241,7 @@ Reveal context around point, showing the current entry, the following heading
 and the hierarchy above.  Useful for working near a location that has been
 exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command
 (@pxref{Agenda commands}).  With a prefix argument show, on each
-level, all sibling headings.  With a double prefix argument, also show the 
+level, all sibling headings.  With a double prefix argument, also show the
 entire subtree of the parent.
 @orgcmd{C-c C-k,show-branches}
 Expose all the headings of the subtree, CONTENT view for just one subtree.
@@ -3943,7 +3943,7 @@ special faces for some of them.  This can be done using the variable
 @end lisp
 
 While using a list with face properties as shown for CANCELED @emph{should}
-work, this does not aways seem to be the case.  If necessary, define a
+work, this does not always seem to be the case.  If necessary, define a
 special face and use that.  A string is interpreted as a color.  The variable
 @code{org-faces-easy-properties} determines if that color is interpreted as a
 foreground or a background color.
@@ -4427,7 +4427,7 @@ off a box while there are unchecked boxes above it.
 
 @table @kbd
 @orgcmd{C-c C-c,org-toggle-checkbox}
-Toggle checkbox status or (with prefix arg) checkbox presence at point.  
+Toggle checkbox status or (with prefix arg) checkbox presence at point.
 With a single prefix argument, add an empty checkbox or remove the current
 one@footnote{`C-u C-c C-c' on the @emph{first} item of a list with no checkbox
 will add checkboxes to the rest of the list.}.  With a double prefix argument, set it to @samp{[-]}, which is
@@ -6326,7 +6326,7 @@ not started at exactly the right moment.
 @kindex ;
 
 Calling @code{org-timer-set-timer} from an Org mode buffer runs a countdown
-timer.  Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else.
+timer.  Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else.
 
 @code{org-timer-set-timer} prompts the user for a duration and displays a
 countdown timer in the modeline.  @code{org-timer-default-timer} sets the
@@ -7342,7 +7342,7 @@ If you are using the Big Brothers Database to store your contacts, you will
 very likely prefer to store anniversaries in BBDB rather than in a
 separate Org or diary file.  Org supports this and will show BBDB
 anniversaries as part of the agenda.  All you need to do is to add the
-following to one your your agenda files:
+following to one of your agenda files:
 
 @example
 * Anniversaries
@@ -9549,7 +9549,7 @@ broad range of other applications.  @LaTeX{} export lets you use Org mode and
 its structured editing functions to easily create @LaTeX{} files.  DocBook
 export makes it possible to convert Org files to many other formats using
 DocBook tools.  OpenDocument Text(@acronym{ODT}) export allows seamless
-colloboration across organizational boundaries.  For project management you
+collaboration across organizational boundaries.  For project management you
 can create gantt and resource charts by using TaskJuggler export.  To
 incorporate entries with associated times like deadlines or appointments into
 a desktop calendar program like iCal, Org mode can also produce extracts in
@@ -10998,9 +10998,9 @@ You can control the size and scale of the embedded images using the
 
 @vindex org-export-odt-pixels-per-inch
 Note that the exporter specifies the desired size of the image in the final
-document in units of centimetres.  In order to scale the embedded images, the
+document in units of centimeters.  In order to scale the embedded images, the
 exporter needs to compute the size of the image.  This is done by retrieving
-the image size in pixels and converting the pixel units to centimetres using
+the image size in pixels and converting the pixel units to centimeters using
 @code{org-export-odt-pixels-per-inch}.  The default value of this variable is
 set to @code{display-pixels-per-inch}.  You can tweak this variable to
 achieve the best results.
@@ -12629,7 +12629,7 @@ that code is only evaluated after explicit confirmation from the user.  For
 information on these safeguards (and on how to disable them) see @ref{Code
 evaluation security}.} and the results of evaluation optionally placed in the
 Org mode buffer.  By default, the evaluation facility is only enabled for
-Lisp code blocks specified as @code{emacs-lisp}. However, souce code blocks
+Lisp code blocks specified as @code{emacs-lisp}. However, source code blocks
 in many languages can be evaluated within Org mode (see @ref{Languages} for a
 list of supported languages and @ref{Structure of code blocks} for
 information on the syntax used to define a code block).
@@ -16434,7 +16434,7 @@ chapter about publishing.
 @i{Jambunathan K} contributed the @acronym{ODT} exporter.
 @item
 @i{Sebastien Vauban} reported many issues with @LaTeX{} and BEAMER export and
-enabled source code highlighling in Gnus.
+enabled source code highlighting in Gnus.
 @item
 @i{Stefan Vollmar} organized a video-recorded talk at the
 Max-Planck-Institute for Neurology.  He also inspired the creation of a
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 28d0e9cc80c..69092093af8 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -4122,7 +4122,7 @@ Flags governing label insertion.  The value has the form
 (@var{derive} @var{prompt})
 @end example
 
-If @var{derive}is @code{t}, @b{Ref@TeX{}} will try to derive a sensible
+If @var{derive} is @code{t}, @b{Ref@TeX{}} will try to derive a sensible
 label from context.  A section label for example will be derived from
 the section heading.  The conversion of the context to a valid label is
 governed by the specifications given in
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2fa4aee8363..b4e22c506a3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * tutorials/TUTORIAL.he: Update to follow changes to TUTORIAL in
+        2012-01-10T08:27:22Z!cyd@gnu.org.
+
+2012-01-10  Chong Yidong  <cyd@gnu.org>
+
+        * tutorials/TUTORIAL: Don't give instructions for old-style X
+        scrollbars.  Use DEL terminology instead of DelBack.  Improve
+        description of graphical continuation lines and mode-line.
+        Promote use of C-/ and C-SPC.  Remove discussion of flow control.
+
 2012-01-05  Glenn Morris  <rgm@gnu.org>
 
         * refcards/calccard.tex, refcards/cs-dired-ref.tex:
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index 7713aba0140..12b22f83245 100644
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -217,21 +217,10 @@ screenful.  For example, C-u 8 C-v scrolls the screen by 8 lines.
 This should have scrolled the screen up by 8 lines.  If you would like
 to scroll it down again, you can give an argument to M-v.
 
-If you are using a windowed display, such as X or MS-Windows, there
+If you are using a graphical display, such as X or MS-Windows, there
 should be a tall rectangular area called a scroll bar on one side of
-the Emacs window.  (There are other tall rectangles on either side of
-the Emacs display.  These "fringes" are used for displaying
-continuation characters and other symbols.  The scroll bar appears on
-only one side, and is the outermost column on that side.)
-You can scroll the text by clicking the mouse in the scroll bar.
-
->> Try pressing the middle button at the top of the highlighted area
-   within the scroll bar.  This should scroll the text to a position
-   determined by how high or low you click.
-
->> Try moving the mouse up and down, while holding the middle button
-   pressed down.  You'll see that the text scrolls up and down as
-   you move the mouse.
+the Emacs window.  You can scroll the text by clicking the mouse in
+the scroll bar.
 
 If your mouse has a wheel button, you can also use this to scroll.
 
@@ -247,8 +236,8 @@ You can also use C-g to discard a numeric argument or the beginning of
 a command that you do not want to finish.
 
 >> Type C-u 100 to make a numeric argument of 100, then type C-g.
-   Now type C-f.  It should move just one character,
-   because you canceled the argument with C-g.
+   Now type C-f.  It should move just one character, because you
+   canceled the argument with C-g.
 
 If you have typed an <ESC> by mistake, you can get rid of it with a C-g.
 
@@ -274,9 +263,9 @@ disabled command, answer the question with "n".
 * WINDOWS
 ---------
 
-Emacs can have several windows, each displaying its own text.  We will
-explain later on how to use multiple windows.  Right now we want to
-explain how to get rid of extra windows and go back to basic
+Emacs can have several "windows", each displaying its own text.  We
+will explain later on how to use multiple windows.  Right now we want
+to explain how to get rid of extra windows and go back to basic
 one-window editing.  It is simple:
 
         C-x 1   One window (i.e., kill all other windows).
@@ -286,9 +275,9 @@ which contains the cursor, to occupy the full screen.  It deletes all
 other windows.
 
 >> Move the cursor to this line and type C-u 0 C-l.
->> Type CONTROL-h k CONTROL-f.
+>> Type C-h k C-f.
    See how this window shrinks, while a new one appears
-   to display documentation on the CONTROL-f command.
+   to display documentation on the C-f command.
 
 >> Type C-x 1 and see the documentation listing window disappear.
 
@@ -302,39 +291,36 @@ These commands are two, three or four characters long.
 * INSERTING AND DELETING
 ------------------------
 
-If you want to insert text, just type the text.  Characters which you
-can see, such as A, 7, *, etc. are taken by Emacs as text and inserted
-immediately.  Type <Return> (the carriage-return key) to insert a
-Newline character.
-
-You can delete the last character you typed by typing <Delback>.
-<Delback> is a key on the keyboard--the same one you normally use,
-outside Emacs, for deleting the last character you typed.  It is
-normally a large key a couple of lines up from the <Return> key, and
-it is usually labeled "Delete", "Del" or "Backspace".
+If you want to insert text, just type the text.  Ordinary characters,
+like A, 7, *, etc., are inserted as you type them.  To insert a
+Newline character, type <Return> (this is the key on the keyboard
+which is sometimes labeled "Enter").
 
-If the large key there is labeled "Backspace", then that's the one you
-use for <Delback>.  There may also be another key labeled "Delete"
-somewhere else, but that's not <Delback>.
+To delete the character immediately before the current cursor
+position, type <DEL>.  This is the key on the keyboard usually labeled
+"Backspace"--the same one you normally use, outside Emacs, to delete
+the last character typed.
 
-More generally, <Delback> deletes the character immediately before the
-current cursor position.
+There may also be another key on your keyboard labeled <Delete>, but
+that's not the one we refer to as <DEL>.
 
->> Do this now--type a few characters, then delete them
-   by typing <Delback> a few times.  Don't worry about this file
-   being changed; you will not alter the master tutorial.  This is
-   your personal copy of it.
+>> Do this now--type a few characters, then delete them by
+   typing <DEL> a few times.  Don't worry about this file
+   being changed; you will not alter the master tutorial.
+   This is your personal copy of it.
 
 When a line of text gets too big for one line on the screen, the line
-of text is "continued" onto a second screen line.  A backslash ("\")
-(or, if you're using a windowed display, a little curved arrow) at the
-right margin (actually, in the right "fringe") indicates a line which
-has been continued.
+of text is "continued" onto a second screen line.  If you're using a
+graphical display, little curved arrows appear in the narrow spaces on
+each side of the text area (the left and right "fringes"), to indicate
+where a line has been continued.  If you're using a text terminal, the
+continued line is indicated by a backslash ("\") on the rightmost
+screen column.
 
 >> Insert text until you reach the right margin, and keep on inserting.
    You'll see a continuation line appear.
 
->> Use <Delback>s to delete the text until the line fits on one screen
+>> Use <DEL>s to delete the text until the line fits on one screen
    line again.  The continuation line goes away.
 
 You can delete a Newline character just like any other character.
@@ -342,7 +328,7 @@ Deleting the Newline character between two lines merges them into
 one line.  If the resulting combined line is too long to fit in the
 screen width, it will be displayed with a continuation line.
 
->> Move the cursor to the beginning of a line and type <Delback>.  This
+>> Move the cursor to the beginning of a line and type <DEL>.  This
    merges that line with the previous line.
 
 >> Type <Return> to reinsert the Newline you deleted.
@@ -357,24 +343,26 @@ You've now learned the most basic way of typing something in
 Emacs and correcting errors.  You can delete by words or lines
 as well.  Here is a summary of the delete operations:
 
-        <Delback>    Delete the character just before the cursor
+        <DEL>        Delete the character just before the cursor
         C-d          Delete the next character after the cursor
 
-        M-<Delback>  Kill the word immediately before the cursor
+        M-<DEL>      Kill the word immediately before the cursor
         M-d          Kill the next word after the cursor
 
         C-k          Kill from the cursor position to end of line
         M-k          Kill to the end of the current sentence
 
-Notice that <Delback> and C-d vs M-<Delback> and M-d extend the parallel
-started by C-f and M-f (well, <Delback> is not really a control
-character, but let's not worry about that).  C-k and M-k are like C-e
-and M-e, sort of, in that lines are paired with sentences.
+Notice that <DEL> and C-d vs M-<DEL> and M-d extend the parallel
+started by C-f and M-f (well, <DEL> is not really a control character,
+but let's not worry about that).  C-k and M-k are like C-e and M-e,
+sort of, in that lines are paired with sentences.
 
-You can also kill any part of the text with one uniform method.  Move
-to one end of that part, and type C-@ or C-<SPC> (either one).  (<SPC>
-is the Space bar.)  Move to the other end of that part, and type C-w.
-That kills all the text between the two positions.
+You can also kill a segment of text with one uniform method.  Move to
+one end of that part, and type C-<SPC>.  (<SPC> is the Space bar.)
+Next, move the cursor to the other end of the text you intend to kill.
+As you do this, Emacs highlights the text between the cursor and the
+position where you typed C-<SPC>.  Finally, type C-w.  This kills all
+the text between the two positions.
 
 >> Move the cursor to the Y at the start of the previous paragraph.
 >> Type C-<SPC>.  Emacs should display a message "Mark set"
@@ -391,10 +379,10 @@ Reinsertion of killed text is called "yanking".  Generally, the
 commands that can remove a lot of text kill the text (they are set up so
 that you can yank the text), while the commands that remove just one
 character, or only remove blank lines and spaces, do deletion (so you
-cannot yank that text).  <Delback> and C-d  do deletion in the simplest
+cannot yank that text).  <DEL> and C-d  do deletion in the simplest
 case, with no argument.  When given an argument, they kill instead.
 
->> Move the cursor to the  beginning of a line which is not empty.
+>> Move the cursor to the beginning of a line which is not empty.
    Then type C-k to kill the text on that line.
 >> Type C-k a second time.  You'll see that it kills the Newline
    which follows that line.
@@ -405,13 +393,13 @@ treats a numeric argument specially: it kills that many lines AND
 their contents.  This is not mere repetition.  C-u 2 C-k kills two
 lines and their newlines; typing C-k twice would not do that.
 
-Bringing back killed text is called "yanking".  (Think of it as
-yanking back, or pulling back, some text that was taken away.)  You
-can yank the killed text either at the same place where it was killed,
-or at some other place in the text you are editing, or even in a
-different file.  You can yank the same text several times; that makes
-multiple copies of it.  Some other editors call killing and yanking
-"cutting" and "pasting" (see the Glossary in the Emacs manual).
+Reinserting killed text is called "yanking".  (Think of it as yanking
+back, or pulling back, some text that was taken away.)  You can yank
+the killed text either at the same place where it was killed, or at
+some other place in the text you are editing, or even in a different
+file.  You can yank the same text several times; that makes multiple
+copies of it.  Some other editors call killing and yanking "cutting"
+and "pasting" (see the Glossary in the Emacs manual).
 
 The command for yanking is C-y.  It reinserts the last killed text,
 at the current cursor position.
@@ -454,27 +442,25 @@ recent kill).
 ------
 
 If you make a change to the text, and then decide that it was a
-mistake, you can undo the change with the undo command, C-x u.
+mistake, you can undo the change with the undo command, C-/.
 
-Normally, C-x u undoes the changes made by one command; if you repeat
-the C-x u several times in a row, each repetition undoes one
-additional command.
+Normally, C-/ undoes the changes made by one command; if you repeat
+C-/ several times in a row, each repetition undoes one more command.
 
-But there are two exceptions: commands that do not change the text do
-not count (this includes cursor motion commands and scrolling
+But there are two exceptions: commands that do not change the text
+don't count (this includes cursor motion commands and scrolling
 commands), and self-inserting characters are usually handled in groups
-of up to 20.  (This is to reduce the number of C-x u's you have to
-type to undo insertion of text.)
+of up to 20.  (This is to reduce the number of C-/'s you have to type
+to undo insertion of text.)
 
->> Kill this line with C-k, then type C-x u and it should reappear.
+>> Kill this line with C-k, then type C-/ and it should reappear.
 
-C-_ is an alternative undo command; it works just the same as C-x u,
-but it is easier to type several times in a row.  The disadvantage of
-C-_ is that on some keyboards it is not obvious how to type it.  That
-is why we provide C-x u as well.  On some terminals, you can type C-_
-by typing / while holding down CONTROL.
+C-_ is an alternative undo command; it works exactly the same as C-/.
+On some text terminals, typing C-/ actually sends C-_ to Emacs.
+Alternatively, C-x u also works exactly like C-/, but is a little less
+convenient to type.
 
-A numeric argument to C-_ or C-x u acts as a repeat count.
+A numeric argument to C-/, C-_, or C-x u acts as a repeat count.
 
 You can undo deletion of text just as you can undo killing of text.
 The distinction between killing something and deleting it affects
@@ -485,9 +471,9 @@ whether you can yank it with C-y; it makes no difference for undo.
 -------
 
 In order to make the text you edit permanent, you must put it in a
-file.  Otherwise, it will go away when your invocation of Emacs goes
-away.  In order to put your text in a file, you must "find" the file
-before you enter the text.  (This is also called "visiting" the file.)
+file.  Otherwise, it will go away when you exit Emacs.  In order to
+put your text in a file, you must "find" the file before you enter the
+text.  (This is also called "visiting" the file.)
 
 Finding a file means that you see the contents of the file within
 Emacs.  In many ways, it is as if you were editing the file itself.
@@ -498,17 +484,16 @@ you save, Emacs leaves the original file under a changed name in case
 you later decide that your changes were a mistake.
 
 If you look near the bottom of the screen you will see a line that
-begins with dashes, and starts with "--:--- TUTORIAL" or something
+begins with dashes, and starts with " -:---  TUTORIAL" or something
 like that.  This part of the screen normally shows the name of the
-file that you are visiting.  Right now, you are visiting a file called
-"TUTORIAL" which is your personal scratch copy of the Emacs tutorial.
-When you find a file with Emacs, that file's name will appear in that
-precise spot.
+file that you are visiting.  Right now, you are visiting your personal
+copy of the Emacs tutorial, which is called "TUTORIAL".  When you find
+a file with Emacs, that file's name will appear in that precise spot.
 
 One special thing about the command for finding a file is that you
 have to say what file name you want.  We say the command "reads an
-argument from the terminal" (in this case, the argument is the name of
-the file).  After you type the command
+argument" (in this case, the argument is the name of the file).  After
+you type the command
 
         C-x C-f   Find a file
 
@@ -525,13 +510,12 @@ you can cancel the command with C-g.
    minibuffer.  So you do not find any file.
 
 When you have finished entering the file name, type <Return> to
-terminate it.  The C-x C-f command goes to work, and finds the file
-you chose.  The minibuffer disappears when the C-x C-f command is
-finished.
+terminate it.  The minibuffer disappears, and the C-x C-f command goes
+to work to find the file you chose.
 
-In a little while the file contents appear on the screen, and you can
-edit the contents.  When you wish to make your changes permanent,
-type the command
+The file contents now appear on the screen, and you can edit the
+contents.  When you wish to make your changes permanent, type the
+command
 
         C-x C-s   Save the file
 
@@ -544,8 +528,9 @@ When saving is finished, Emacs displays the name of the file written.
 You should save fairly often, so that you will not lose very much
 work if the system should crash (see the section "Auto Save" below).
 
->> Type C-x C-s, saving your copy of the tutorial.
-   This should show "Wrote ...TUTORIAL" at the bottom of the screen.
+>> Type C-x C-s TUTORIAL <Return>.
+   This should save this tutorial to a file named TUTORIAL, and show
+   "Wrote ...TUTORIAL" at the bottom of the screen.
 
 You can find an existing file, to view it or edit it.  You can also
 find a file which does not already exist.  This is the way to create a
@@ -563,14 +548,9 @@ If you find a second file with C-x C-f, the first file remains
 inside Emacs.  You can switch back to it by finding it again with
 C-x C-f.  This way you can get quite a number of files inside Emacs.
 
->> Create a file named "foo" by typing  C-x C-f foo <Return>.
-   Then insert some text, edit it, and save "foo" by typing  C-x C-s.
-   Finally, type C-x C-f TUTORIAL <Return>
-   to come back to the tutorial.
-
 Emacs stores each file's text inside an object called a "buffer".
 Finding a file makes a new buffer inside Emacs.  To see a list of the
-buffers that currently exist in your Emacs job, type
+buffers that currently exist, type
 
         C-x C-b   List buffers
 
@@ -589,22 +569,24 @@ that corresponds to a file, you can do it by visiting the file again
 with C-x C-f.  But there is an easier way: use the C-x b command.
 In that command, you have to type the buffer's name.
 
->> Type C-x b foo <Return> to go back to the buffer "foo" which holds
-   the text of the file "foo".  Then type C-x b TUTORIAL <Return>
-   to come back to this tutorial.
+>> Create a file named "foo" by typing C-x C-f foo <Return>.
+   Then type C-x b TUTORIAL <Return> to come back to this tutorial.
 
 Most of the time, the buffer's name is the same as the file name
 (without the file directory part).  However, this is not always true.
-The buffer list you make with C-x C-b always shows you the name of
-every buffer.
+The buffer list you make with C-x C-b shows you both the buffer name
+and the file name of every buffer.
 
 ANY text you see in an Emacs window is always part of some buffer.
-Some buffers do not correspond to files.  For example, the buffer
-named "*Buffer List*" does not have any file.  It is the buffer which
-contains the buffer list that you made with C-x C-b.  The buffer named
-"*Messages*" also does not correspond to any file; it contains the
-messages that have appeared on the bottom line during your Emacs
-session.
+Some buffers do not correspond to files.  The buffer named
+"*Buffer List*", which contains the buffer list that you made with
+C-x C-b, does not have any file.  This TUTORIAL buffer initially did
+not have a file, but now it does, because in the previous section you
+typed C-x C-s and saved it to a file.
+
+The buffer named "*Messages*" also does not correspond to any file.
+This buffer contains the messages that have appeared on the bottom
+line during your Emacs session.
 
 >> Type C-x b *Messages* <Return> to look at the buffer of messages.
    Then type C-x b TUTORIAL <Return> to come back to this tutorial.
@@ -646,23 +628,21 @@ session--this is the command C-x C-c.  (Do not worry about losing
 changes you have made; C-x C-c offers to save each changed file before
 it kills Emacs.)
 
-If you are using a graphical display that supports multiple
-applications in parallel, you don't need any special command to move
-from Emacs to another application.  You can do this with the mouse or
-with window manager commands.  However, if you're using a text
-terminal which can only show one application at a time, you need to
-"suspend" Emacs to move to any other program.
+If you are using a graphical display, you don't need any special
+command to move from Emacs to another application.  You can do this
+with the mouse or with window manager commands.  However, if you're
+using a text terminal which can only show one application at a time,
+you need to "suspend" Emacs to move to any other program.
 
 C-z is the command to exit Emacs *temporarily*--so that you can go
 back to the same Emacs session afterward.  When Emacs is running on a
 text terminal, C-z "suspends" Emacs; that is, it returns to the shell
-but does not destroy the Emacs.  In the most common shells, you can
-resume Emacs with the `fg' command or with `%emacs'.
+but does not destroy the Emacs job.  In the most common shells, you
+can resume Emacs with the `fg' command or with `%emacs'.
 
 The time to use C-x C-c is when you are about to log out.  It's also
 the right thing to use to exit an Emacs invoked under mail handling
-programs and other miscellaneous utilities, since they may not know
-how to cope with suspension of Emacs.
+programs and other miscellaneous utilities.
 
 There are many C-x commands.  Here is a list of the ones you have learned:
 
@@ -683,7 +663,7 @@ bottom of the screen with M-x and you should type the name of the
 command; in this case, "replace-string".  Just type "repl s<TAB>" and
 Emacs will complete the name.  (<TAB> is the Tab key, usually found
 above the CapsLock or Shift key near the left edge of the keyboard.)
-End the command name with <Return>.
+Submit the command name with <Return>.
 
 The replace-string command requires two arguments--the string to be
 replaced, and the string to replace it with.  You must end each
@@ -729,18 +709,18 @@ shows them to you at the bottom of the screen in an area called the
 The line immediately above the echo area is called the "mode line".
 The mode line says something like this:
 
---:**-  TUTORIAL       63% L749    (Fundamental)-----------------------
+ -:**-  TUTORIAL       63% L749    (Fundamental)
 
 This line gives useful information about the status of Emacs and
 the text you are editing.
 
 You already know what the filename means--it is the file you have
-found.  NN% indicates your current position in the text; it means that
-NN percent of the text is above the top of the screen.  If the top of
-the file is on the screen, it will say "Top" instead of " 0%".  If the
-bottom of the text is on the screen, it will say "Bot".  If you are
-looking at text so small that all of it fits on the screen, the mode
-line says "All".
+found.  NN% indicates your current position in the buffer text; it
+means that NN percent of the buffer is above the top of the screen.
+If the top of the buffer is on the screen, it will say "Top" instead
+of " 0%".  If the bottom of the buffer is on the screen, it will say
+"Bot".  If you are looking at a buffer so small that all of it fits on
+the screen, the mode line says "All".
 
 The L and digits indicate position in another way: they give the
 current line number of point.
@@ -783,7 +763,7 @@ differently.
 
 To view documentation on your current major mode, type C-h m.
 
->> Use C-u C-v once or more to bring this line near the top of screen.
+>> Type C-l C-l to bring this line to the top of screen.
 >> Type C-h m, to see how Text mode differs from Fundamental mode.
 >> Type C-x 1 to remove the documentation from the screen.
 
@@ -829,10 +809,10 @@ that paragraph.
 * SEARCHING
 -----------
 
-Emacs can do searches for strings (these are groups of contiguous
-characters or words) either forward through the text or backward
-through it.  Searching for a string is a cursor motion command;
-it moves the cursor to the next place where that string appears.
+Emacs can do searches for strings (a "string" is a group of contiguous
+characters) either forward through the text or backward through it.
+Searching for a string is a cursor motion command; it moves the cursor
+to the next place where that string appears.
 
 The Emacs search command is "incremental".  This means that the
 search happens while you type in the string to search for.
@@ -850,7 +830,7 @@ you want to search for.  <Return> terminates a search.
    character to notice what happens to the cursor.
    Now you have searched for "cursor", once.
 >> Type C-s again, to search for the next occurrence of "cursor".
->> Now type <Delback> four times and see how the cursor moves.
+>> Now type <DEL> four times and see how the cursor moves.
 >> Type <Return> to terminate the search.
 
 Did you see what happened?  Emacs, in an incremental search, tries to
@@ -859,27 +839,23 @@ go to the next occurrence of 'cursor' just type C-s again.  If no such
 occurrence exists, Emacs beeps and tells you the search is currently
 "failing".  C-g would also terminate the search.
 
-(Note that on some systems, typing C-s will freeze the screen and you
-will see no further output from Emacs.  This indicates that an
-operating system "feature" called "flow control" is intercepting the
-C-s and not letting it get through to Emacs.  To unfreeze the screen,
-type C-q.)
-
-If you are in the middle of an incremental search and type <Delback>,
-you'll notice that the last character in the search string is erased
-and the search backs up to the last place of the search.  For
-instance, suppose you have typed "c", to search for the first
-occurrence of "c".  Now if you type "u", the cursor will move
-to the first occurrence of "cu".  Now type <Delback>.  This erases
-the "u" from the search string, and the cursor moves back to
-the first occurrence of "c".
+If you are in the middle of an incremental search and type <DEL>, the
+search "retreats" to an earlier location.  If you type <DEL> just
+after you had typed C-s to advance to the next occurrence of a search
+string, the <DEL> moves the cursor back to an earlier occurrence.  If
+there are no earlier occurrences, the <DEL> erases the last character
+in the search string.  For instance, suppose you have typed "c", to
+search for the first occurrence of "c".  Now if you type "u", the
+cursor will move to the first occurrence of "cu".  Now type <DEL>.
+This erases the "u" from the search string, and the cursor moves back
+to the first occurrence of "c".
 
 If you are in the middle of a search and type a control or meta
-character (with a few exceptions--characters that are special in
-a search, such as C-s and C-r), the search is terminated.
+character (with a few exceptions--characters that are special in a
+search, such as C-s and C-r), the search is terminated.
 
-The C-s starts a search that looks for any occurrence of the search
-string AFTER the current cursor position.  If you want to search for
+C-s starts a search that looks for any occurrence of the search string
+AFTER the current cursor position.  If you want to search for
 something earlier in the text, type C-r instead.  Everything that we
 have said about C-s also applies to C-r, except that the direction of
 the search is reversed.
@@ -888,17 +864,17 @@ the search is reversed.
 * MULTIPLE WINDOWS
 ------------------
 
-One of the nice features of Emacs is that you can display more than one
-window on the screen at the same time.  (Note that Emacs uses the term
-"frames"--described in the next section--for what some other
+One of the nice features of Emacs is that you can display more than
+one window on the screen at the same time.  (Note that Emacs uses the
+term "frames"--described in the next section--for what some other
 applications call "windows".  The Emacs manual contains a Glossary of
 Emacs terms.)
 
->> Move the cursor to this line and type C-u 0 C-l (that's CONTROL-L, not
-   CONTROL-1).
+>> Move the cursor to this line and type C-l C-l.
 
 >> Now type C-x 2 which splits the screen into two windows.
-   Both windows display this tutorial.  The cursor stays in the top window.
+   Both windows display this tutorial.  The editing cursor stays in
+   the top window.
 
 >> Type C-M-v to scroll the bottom window.
    (If you do not have a real META key, type <ESC> C-v.)
@@ -910,23 +886,24 @@ Emacs terms.)
 >> Type C-x o again to move the cursor back to the top window.
    The cursor in the top window is just where it was before.
 
-You can keep using C-x o to switch between the windows.  Each
-window has its own cursor position, but only one window actually
-shows the cursor.  All the ordinary editing commands apply to the
-window that the cursor is in.  We call this the "selected window".
+You can keep using C-x o to switch between the windows.  The "selected
+window", where most editing takes place, is the one with a prominent
+cursor which blinks when you are not typing.  The other windows have
+their own cursor positions; if you are running Emacs in a graphical
+display, those cursors are drawn as unblinking hollow boxes.
 
 The command C-M-v is very useful when you are editing text in one
-window and using the other window just for reference.  You can keep
-the cursor always in the window where you are editing, and advance
-through the other window sequentially with C-M-v.
+window and using the other window just for reference.  Without leaving
+the selected window, you can scroll the other window with C-M-v.
 
-C-M-v is an example of a CONTROL-META character.  If you have a real
-META key, you can type C-M-v by holding down both CONTROL and META while
-typing v.  It does not matter whether CONTROL or META "comes first,"
-because both of these keys act by modifying the characters you type.
+C-M-v is an example of a CONTROL-META character.  If you have a META
+(or Alt) key, you can type C-M-v by holding down both CONTROL and META
+while typing v.  It does not matter whether CONTROL or META "comes
+first," as both of these keys act by modifying the characters you
+type.
 
-If you do not have a real META key, and you use <ESC> instead, the
-order does matter: you must type <ESC> followed by CONTROL-v, because
+If you do not have a META key, and you use <ESC> instead, the order
+does matter: you must type <ESC> followed by CONTROL-v, because
 CONTROL-<ESC> v will not work.  This is because <ESC> is a character
 in its own right, not a modifier key.
 
@@ -953,10 +930,12 @@ Here is another way to use two windows to display two different things:
 * MULTIPLE FRAMES
 ------------------
 
-Emacs can also create multiple "frames" (unless you are using a
-text-only terminal).  A frame is what we call one collection of
-windows, together with its menus, scroll bars, echo area, etc.
-(Some other applications call a frame a "window".)
+Emacs can also create multiple "frames".  A frame is what we call one
+collection of windows, together with its menus, scroll bars, echo
+area, etc.  On graphical displays, what Emacs calls a "frame" is what
+most other applications call a "window".  Multiple graphical frames
+can be shown on the screen at the same time.  On a text terminal, only
+one frame can be shown at a time.
 
 >> Type M-x make-frame <Return>.
    See a new frame appear on your screen.
@@ -967,10 +946,10 @@ There is nothing special about the first frame.
 >> Type M-x delete-frame <Return>.
    This removes the selected frame.
 
-You can also remove a frame by using the normal method provided by
-your window manager (often clicking a button with an "X" at a top
-corner of the frame).  No information is lost when you close a frame
-(or window), it is simply removed from sight and can be restored later.
+You can also remove a frame by using the normal method provided by the
+graphical system (often clicking a button with an "X" at a top corner
+of the frame).  If you remove the Emacs job's last frame this way,
+that exits Emacs.
 
 
 * RECURSIVE EDITING LEVELS
@@ -1035,11 +1014,11 @@ To get more information about a command, use C-h k instead of C-h c.
 
 >> Type C-h k C-p.
 
-This displays the documentation of the function, as well as its
-name, in an Emacs window.  When you are finished reading the
-output, type C-x 1 to get rid of the help text.  You do not have
-to do this right away.  You can do some editing while referring
-to the help text, and then type C-x 1.
+This displays the documentation of the function, as well as its name,
+in an Emacs window.  When you are finished reading the output, type
+C-x 1 to get rid of that window.  You do not have to do this right
+away.  You can do some editing while referring to the help text, and
+then type C-x 1.
 
 Here are some other useful C-h options:
 
diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index 95670ff1efe..140f58ac06e 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -12,9 +12,10 @@ ou ALT). Pour ces touches, nous utiliserons les abréviations suivantes :
          touches n'existe, pressez puis relâchez la touche ESC et
          tapez <car>. Nous écrirons <ESC> pour désigner la touche ESC.
 
-Tapez C-x C-c (deux caractères) pour terminer une session Emacs.
-Dans ce didacticiel, les caractères ">>" en marge gauche indiquent les
-directions à suivre pour essayer une commande. Ainsi :
+Note importante : tapez C-x C-c (deux caractères) pour terminer une
+session Emacs. Pour interrompre une commande partiellement entrée,
+tapez C-g. Dans ce didacticiel, les caractères ">>" en marge gauche
+indiquent les directions à suivre pour essayer une commande. Ainsi :
 <<Lignes blanches insérées après cette ligne par help-with-tutorial>>
 [Centre de page delibérément vide. Le texte continue ci-dessous.]
 >>  Tapez C-v (Voir l'écran suivant) pour passer à l'écran suivant
@@ -34,9 +35,6 @@ touche META, EDIT ou ALT).
 
 >>  Faites M-v, puis C-v plusieurs fois.
 
-Si votre terminal en dispose, vous pouvez également utiliser les
-touches PgUp et PgDn pour monter ou descendre d'un écran, bien que les
-combinaisons C-v et M-v soient plus efficaces.
 
 * RÉSUMÉ
 --------
@@ -52,7 +50,14 @@ Les commandes suivantes servent à manipuler des écrans :
 
 >> Notez le texte situé à côté du curseur, puis faites C-l.
    Recherchez l'emplacement du curseur et vous remarquerez que
-   c'est le même texte qui est à côté de lui.
+   c'est le même texte qui est à côté de lui, mais il est désormais
+   au centre de l'écran.
+   Si vous appuyez de nouveau sur C-l, ce bout de texte se déplacera
+   en haut de l'écran. Faite encore C-l, et il se déplace en bas.
+
+Si votre terminal en dispose, vous pouvez également utiliser les
+touches PgUp et PgDn pour monter ou descendre d'un écran, bien que les
+combinaisons C-v et M-v soient plus efficaces.
 
 
 * GESTION DU CURSEUR
@@ -240,15 +245,8 @@ ou « scrollbar » sur le bord gauche de la fenêtre d'Emacs. Vous pouvez
 faire défiler le texte en cliquant avec la souris dans cette barre de
 défilement.
 
->> Cliquez avec le bouton du milieu en haut de la zone mise en
-   évidence dans la barre de défilement. Cela devrait déplacer le
-   texte jusqu'à une position dépendant de la hauteur où vous avez
-   cliqué.
-
->> Déplacez la souris de bas en haut tout en maintenant son bouton du
-   milieu pressé. Vous constaterez que le texte défile vers le haut et
-   vers le bas en fonction du déplacement de la souris.
-
+Si votre souris a une molette, vous pouvez aussi l'utiliser pour faire
+défiler le texte.
 
 * QUAND EMACS EST MUET
 ----------------------
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index 98690501f5f..cb82f87f765 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -198,19 +198,9 @@ argument) משו×� מקישי×� ×�ותו לפני הפקודה ×�ליה הו×� ×
 כתוצ�ה, התצוגה היתה צריכה לזוז ב־8 שורות. �� ברצונכ� לגלול בחזרה,
 �פשר להשיג ז�ת ע"י מתן �רגומנט ל־M-v.
 
-�� הפעלת� �ת Emacs על־גבי מערכת חלונ�ית כגון X �ו MS-Windows, �ת�
+�� הפעלת� �ת Emacs על־גבי תצוגה גרפית כגון X �ו MS-Windows, �ת�
 צריכי� לר�ות פס צר וגבוה, ששמו פס גלילה (scroll bar) בצידו של החלון
-של Emacs. (שימו לב שבשני צידי החלון קיימי� פסי� נוספי�. �לה נקר�י�
-"השוליי�" -- "fringes" -- ומשמשי� להצגת סימני המשך שורה וסימוני�
-�חרי�. פס הגלילה, לעומת�, מופיע רק בצד �חד והו� הכי קרוב לקצה החלון
-בצד ההו�.)
-
->> נסו עתה להקליק בכפתור ה�מצעי של העכבר בחלק העליון של ה�זור המודגש
-   של פס הגלילה. פעולה זו �מורה לגלול �ת הטקסט בשיעור שתלוי במקו� בו
-   הקלקת�.
-
->> נסו לגרור �ת העכבר מעלה ומטה, תוך כדי לחיצה על הכפתור ה�מצעי.
-   כתוצ�ה, Emacs יגלול �ת הטקסט מעלה ומטה בהת�� לתנועת העכבר.
+של Emacs. ניתן לגלול �ת הטקסט ע"י הקלקת עכבר בתוך פס הגלילה.
 
 �� העכבר שלכ� מצויד בגלגל, תוכלו להשתמש ג� בו לגלילת הטקסט.
 
@@ -255,9 +245,9 @@ argument) משו×� מקישי×� ×�ותו לפני הפקודה ×�ליה הו×� ×
 מבטלת �ת ש�ר החלונות.
 
 >> הניעו �ת הסמן לתוך שורה זו והקישו C-u 0 C-l.
->> עתה הקישו CONTROL-h k CONTROL-f.
+>> עתה הקישו C-h k C-f.
    שימו לב כיצד החלון הנוכחי מצטמצ� ומופיע חלון חדש שבו מוצג
-   התיעוד של הפקודה CONTROL-f.
+   התיעוד של הפקודה C-f.
 
 >> הקישו C-x 1 ושימו לב שהחלון ע� ההסבר על C-f נעל�.
 
@@ -271,40 +261,37 @@ argument) משו×� מקישי×� ×�ותו לפני הפקודה ×�ליה הו×� ×
 --------------
 
 �� ברצונכ� להכניס טקסט, פשוט הקישו על המקשי� המת�ימי�. תוי� רגילי�,
-כגון A, �, 7, * וכד' מתפרשי� ע"י Emacs כטקסט ומיד מתווספי� לטקסט
-הקיי�. הקישו <Return> (מקש חזרת גרר) כדי להכניס �ת תו השורה החדשה
+כגון A, �, 7, * וכד' מיד מתווספי� לטקסט הקיי�. הקישו <Return> (מקש
+חזרת גרר שלעתי� נהוג לקרו� לו "Enter") כדי להכניס �ת תו השורה החדשה
 (Newline).
 
-למחיקת התו ה�חרון שהקשת� הקישו <DelBack>. המקש ש�נו קור�י� לו <DelBack>
-יכול להתקר� בשמות שוני� -- "Delete", "DEL" �ו "Backspace". בדרך כלל
-זהו מקש גדול ובולט שנמצ� ל� הרחק ממקש <Return>, והו� משמש �תכ� למחיקת
-התו �חרון ג� בתוכניות �חרות, ל� רק ב־Emacs.
-
-�� קיי� במקלדת שלכ� מקש גדול שעליו רשו� <Backspace>, �ז זהון המקש �שר
-ישמש כ־<DelBack>. ג� �� יהיה מקש �חר המסומן ב־"Delete" במקו� �חרת זה
-�ינו ה־<DelBack> שלכ�.
+למחיקת התו ה�חרון שהקשת� הקישו <DEL>. בדרך כלל זהו מקש שמסומן
+ב־"Backspace", והו� משמש �תכ� למחיקת התו �חרון ג� בתוכניות �חרות, ל�
+רק ב־Emacs.
 
-ב�ופן כללי יותר, <DelBack> מוחק �ת התו שקוד� למיקו� הסמן.
+יתכן שבמקלדת שלכ� קיי� מקש שעליו רשו� <Delete>, �ך זה �ינו המקש ש�נו
+קור�י� לו <DEL>.
 
 >> הקישו עתה מספר תוי�, ו�חר־כך מחקו �ות� ע"י הקשות �חדות
-   על <DelBack>. �ל תחששו לשנות �ת הקובץ הזה -- העותק המקורי
+   על <DEL>. �ל תחששו לשנות �ת הקובץ הזה -- העותק המקורי
    של השיעור ייש�ר לל� שינוי. �ת� עובדי� על העותק ה�ישי שלכ�.
 
 כ�שר שורה של טקסט נעשית �רוכה משורה �חת של תצוגה, חלק מהטקסט ממשיך
-בשורת תצוגה נוספת, הי� "שורת ההמשך". תו לוכסן ("/") בסוף השורה (�ו
-חץ עקלקל קטן ב�זור השוליי� -- "fringe") מסמל שלשורה יש שורת המשך.
+בשורת תצוגה נוספת, הי� "שורת ההמשך". על תצוגה גרפית יופיע חץ עקלקל קטן
+ב�זור השוליי� -- "fringe" שמסמל כי לשורה יש שורת המשך, ו�ילו על תצוגה
+טקסטו�לית יופיע תו לוכסן ("/") ל�ותה תכלית בסוף השורה.
 
 >> הקישו טקסט עד שתגיעו לקצה השורה, ו�ז תמשיכו להקיש עוד טקסט.
    כתוצ�ה, תר�ו שמופיעה שורת המשך.
 
->> עתה הקישו <DelBack> על־מנת למחוק טקסט עד שהשורה תיעשה קצרה מספיק
+>> עתה הקישו <DEL> על־מנת למחוק טקסט עד שהשורה תיעשה קצרה מספיק
    ותת�י� לשורה בודדת על־גבי התצוגה. שורת ההמשך תיעל�.
 
 ניתן למחוק �ת תו ה־Newline כמו כל תו �חר. מחיקת ה־Newline בין שתי
 שורות תמזג �ת השורות לשורה �חת. �� השורה המשולבת תהיה �רוכה מרוחב
 התצוגה, הי� תוצג ע� שורת המשך.
 
->> הניעו �ת הסמן לתחילת השורה והקישו <DelBack>. כתוצ�ה, השורה תתמזג
+>> הניעו �ת הסמן לתחילת השורה והקישו <DEL>. כתוצ�ה, השורה תתמזג
    �� קודמתה.
 
 >> עתה הקישו <Return> כדי להחזיר �ת ה־Newline שמחקת�.
@@ -317,24 +304,24 @@ argument) משו×� מקישי×� ×�ותו לפני הפקודה ×�ליה הו×� ×
 ובכן, למדת� �ת ה�ופן הבסיסי ביותר להדפיס משהו ב־Emacs ולתקן שגי�ות.
 �פשר למחוק ג� מלי� ו�ף שורות שלמות. להלן סיכו� פקודות המחיקה:
 
-        �<Delback>    מחק תו שלפני הסמן
+        �<DEL>                מחק תו שלפני הסמן
         �C-d          מחק תו מתחת �ו �חרי הסמן
 
-        �‪M-<Delback>‬     גזור מילה שלפני הסמן
+        �‪M-<DEL>‬        גזור מילה שלפני הסמן
         �M-d          גזור מילה ש�חרי הסמן
 
         �C-k          גזור טקסט מהסמן ועד סוף השורה
         �M-k          גזור טקסט עד סוף המשפט הנוכחי.
 
-שימו לב שהיחס בין <Delback> ו־C-d לעומת M-<Delback>‎ ו־M-d ממשיכי� �ת
-ההקבלה שבין C-f ו־M-f (�מנ� <Delback> �יננו תו בקרה, בו� נזניח �ת
-הנקודה הזו לעת־עתה). C-k ו־M-k דומי� ל־C-e ו־M-e, �� נקביל שורות
-למשפטי�.
+שימו לב שהיחס בין <DEL> ו־C-d לעומת M-<DEL>‎ ו־M-d ממשיכי� �ת ההקבלה
+שבין C-f ו־M-f (�מנ� <DEL> �יננו תו בקרה, �בל בו� נזניח �ת הנקודה הזו
+לעת־עתה). C-k ו־M-k דומי� ל־C-e ו־M-e, �� נקביל שורות למשפטי�.
 
 בנוסף, קיימת שיטה �חידה שמ�פשרת לגזור קטע כלשהו של טקסט. לש� כך, תגיעו
-לקצה ה�חד של חלק הטקסט והקישו C-@‎ �ו C-<SPC>‎ (�חד מבין שני �לו).
-(<SPC> הו� מקש הרווח.) עתה הניעו �ת הסמן לקצה השני של חלק הטקסט והקישו
-C-w. כתוצ�ה, כל הטקסט בין שני המקומות הללו ייגזר.
+לקצה ה�חד של חלק הטקסט והקישו C-<SPC>‎. (<SPC> הו� מקש הרווח.) עתה
+הניעו �ת הסמן לקצה השני של חלק הטקסט �שר ברצונכ� לגזור. תוך כדי תנועת
+הסמן Emacs צובע �ת הטקסט בין הסמן לבין המקו� בו הקשת� C-<SPC>‎. לבסוף,
+הקישו C-w. כתוצ�ה, כל הטקסט בין שני המקומות הללו ייגזר.
 
 >> הניעו �ת הסמן �ל ה�ות ב בתחילת הפיסקה הקודמת.
 >> הקישו C-<SPC>‎. �Emacs צריך להציג הודעה ה�ומרת "Mark set" בתחתית
@@ -348,7 +335,7 @@ C-w. כתוצ×�×”, כל הטקסט בין שני המקומות הללו ×™×™×’×
 הטקסט הגזור נקר� "הדבקה" ("yanking"). ב�ופן כללי, פקודות �שר עלולות
 להעלי� כמויות גדולות של טקסט תמיד גוזרות �ת הטקסט (כך שניתן יהיה בקלות
 לשחזרו) בעוד הפקודות שמורידות תו בודד �ו שורות ריקות ותוי רווח --
-מוחקות (כך של� ניתן להדביק �ת הטקסט שנמחק). כך, <Delback> ו־C-d מוחקי�
+מוחקות (כך של� ניתן להדביק �ת הטקסט שנמחק). כך, <DEL> ו־C-d מוחקי�
 כ�שר מפעילי� �ות� לל� �רגומנט, �בל גוזרי� כ�שר מפעילי� �ות� ע� �רגומנט.
 
 >> הניעו �ת הסמן לתחילת שורה ש�ינה ריקה. �חר־כך הקישו C-k כדי לגזור
@@ -406,23 +393,22 @@ C-w. כתוצ×�×”, כל הטקסט בין שני המקומות הללו ×™×™×’×
 --------------
 
 �� שינית� �ת הטקסט ו�ז החלטת� שהשינוי היה טעות, תוכלו לבטל �ת השינוי
-בעזרת פקודת הביטול, C-x u.
+בעזרת פקודת הביטול, ‪C-/‬.
 
-בדרך כלל, C-x u מבטל �ת השינויי� שבוצעו ע"י פקודה �חת. הפעלה חוזרת של
-C-x u ברצף מבטלת שינויי� של פקודות קודמות, �חת �חרי השניה.
+בדרך כלל,‪C-/‬ מבטל �ת השינויי� שבוצעו ע"י פקודה �חת. הפעלה חוזרת של
+‪C-/‬ ברצף מבטלת שינויי� של פקודות קודמות, �חת �חרי השניה.
 
 שני יוצ�י� מהכלל הזה: פקודות ש�ינן משנות טקסט (למשל פקודות הנעת הסמן
 ופקודות גלילה) �ינן נספרות ותוי� שמכניסי� �ת עצמ� מקובצי� בקבוצות של
-עד 20, כדי להקטין �ת מספר הפעמי� שיש להקיש C-x u כדי לבטל הכנסת טקסט.
+עד 20, כדי להקטין �ת מספר הפעמי� שיש להקיש ‪C-/‬ כדי לבטל הכנסת טקסט.
 
->> גזרו שורה זו ע� C-k, �חר־כך הקישו C-x u והי� תופיע שוב.
+>> גזרו שורה זו ע� C-k, �חר־כך הקישו ‪C-/‬ והי� תופיע שוב.
 
-�C-_‎ הינה דרך חלופית להפעיל �ת פקודת הביטול. הי� פועלת בדיוק כמו C-x u,
-�בל קלה יותר להקשה מספר פעמי� בזו �חר זו. החסרון של C-_‎ הו� שבכמה
-מקלדות ל� ברור מ�ליו כיצד להקיש ז�ת. זו הסיבה לקיומו של C-x u. במקלדות
-�חדות ניתן להקיש C-_‎ ע"י החזקת CONTROL והקשת לוכסן /.
+�C-_‎ הינה דרך חלופית להפעיל �ת פקודת הביטול. הי� פועלת בדיוק כמו ‪C-/‬.
+במקלדות �חדות הקשה על ‪C-/‬ שולחת ל־Emacs �ת התו C-_‎. חלופה נוספת הי�
+C-x u, ��־כי הי� פחות נוחה להקשה מספר פעמי� בזו �חר זו.
 
-�רגומנט נומרי ל־C-_‎ �ו ל־C-x u משמש כמספר החזרות על הפקודה.
+�רגומנט נומרי ל־‪C-/‬ �ו ל־C-_‎ �ו ל־C-x u משמש כמספר החזרות על הפקודה.
 
 ניתן לבטל מחיקה של טקסט בדיוק כמו שניתן לבטל גזירה. ההבדלי� בין מחיקה
 וגזירה משפיעי� על יכולתכ� להדביק �ת הטקסט הגזור ע� C-y; ה� �ינ� חשובי�
@@ -442,15 +428,15 @@ C-x u ברצף מבטלת שינויי� של פקודות קודמות, �חת
 של� במערכת של� כרצונכ�. �פילו �� �ת� שומרי� �ת הקובץ, Emacs מש�יר �ת
 התוכן המקורי בש� שונה למקרה שמ�וחר יותר תחליטו שהשינויי� נעשו בטעות.
 
-�� תביטו בחלק התחתון של התצוגה, תר�ו ש� שורה בולטת שמתחילה ומסתיימת
-במקפי� וליד הקצה השמ�לי שלה כתוב "TUTORIAL.he". חלק זה של התצוגה בדרך
-כלל מציג �ת ש� הקובץ �ותו �ת� פוקדי�. כרגע �ת� פוקדי� קובץ בש�
-"TUTORIAL.he" שהו� עותק הטיוטה ה�ישי שלכ� של שיעור השימוש ב־Emacs.
-פתיחת קובץ כלשהו ב־Emacs תציג �ת שמו של הקובץ במקו� זה.
+�� תביטו בחלק התחתון של התצוגה, תר�ו ש� שורה בולטת שמתחילה במקפי� וליד
+הקצה השמ�לי שלה כתוב "TUTORIAL.he". חלק זה של התצוגה בדרך כלל מציג �ת
+ש� הקובץ �ותו �ת� פוקדי�. כרגע �ת� פוקדי� קובץ בש� "TUTORIAL.he" שהו�
+עותק הטיוטה ה�ישי שלכ� של שיעור השימוש ב־Emacs. פתיחת קובץ כלשהו
+ב־Emacs תציג �ת שמו של הקובץ במקו� זה.
 
 היבט �חד מיוחד של פתיחת קובץ הו� שיש לציין �ת ש� הקובץ �שר ברצונכ�
-לפתוח. �נו �ומרי� שהפקודה "קור�ת �רגומנט מהמסוף" (במקרה זה ה�רגומנט
-הו� ש� הקובץ). �חרי שתקישו �ת הפקודה
+לפתוח. �נו �ומרי� שהפקודה "קור�ת �רגומנט" (במקרה זה ה�רגומנט הו� ש�
+הקובץ). �חרי שתקישו �ת הפקודה
 
         �C-x C-f    פתח קובץ
 
@@ -465,12 +451,11 @@ C-x u ברצף מבטלת שינויי� של פקודות קודמות, �חת
 >> הקישו 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    שמור �ת הקובץ
 
@@ -482,8 +467,9 @@ C-x C-f לעבודה ותמצ×� ותפתח ×�ת הקובץ שבחרת×�. המי×
 לשמור לעתי� מזומנות על־מנת להימנע מל�בד יותר מדי מהעבודה שלכ� �� המחשב
 ייפול (ר�ה להלן פיסקה על שמירה �וטומטית).
 
->> הקישו C-x C-s כדי לשמור �ת העותק שלכ� של השיעור.
-   כתוצ�ה, תופיע ההודעה "Wrote ... TUTORIAL.he" בתחתית התצוגה.
+>> הקישו C-x C-s TUTORIAL.he ותסיימו בהקשת <Return>. כתוצ�ה, שיעור זה
+   יישמר בקובץ בש� TUTORIAL.he ובתחתית התצוגה תופיע ההודעה
+   "Wrote ...TUTORIAL.he".
 
 ניתן לפתוח קובץ קיי� על־מנת לצפות בו �ו לערוך �ותו. ניתן ג� לפתוח קובץ
 ש�ינו קיי�. זו הדרך ליצור קבצי� חדשי� בעזרת Emacs: פתחו �ת הקובץ
@@ -498,10 +484,6 @@ Emacs ייצור �ת הקובץ ע� הטקסט שהקשת�. מ�ותו רגע
 �� תפתחו קובץ נוסף ע� C-x C-f, הקובץ הר�שון עדיין נש�ר פתוח ב־Emacs.
 תוכלו לחזור �ליו ע"י C-x C-f. כך תוכלו לפתוח מספר רב של קבצי�.
 
->> ניצור עתה קובץ בש� "foo" ע"י הקשת C-x C-f foo <Return>‎.
-   �חר־כך הכניסו קצת טקסט, ערכו �ותו ולבסוף שמרו בקובץ "foo"
-   ע"י C-x C-s. עתה חזרו לשיעור בעזרת C-x C-f TUTORIAL.he <Return>‎.
-
 �Emacs מחזיק כל קובץ בתוך יישות בש� "חוצץ" ("buffer"). פתיחת קובץ יוצרת
 חוצץ חדש בתוך Emacs. כדי לר�ות �ת רשימת החוצצי� הקיימי� בתוך Emacs,
 הקישו
@@ -522,17 +504,19 @@ Emacs ייצור �ת הקובץ ע� הטקסט שהקשת�. מ�ותו רגע
 ע"י C-x C-f שיפקוד �ת הקובץ בשנית. �בל קיימת דרך פשוטה יותר: שימוש
 בפקודה C-x b. פקודה זו תחייב �ותכ� להקיש �ת ש� החוצץ.
 
->> הקישו C-x b foo <Return>‎ כדי לחזור לחוצץ "foo" �שר מחזיק טקסט של
-   הקובץ "foo". �חר־כך הקישו C-x b TUTORIAL.he <Return>‎ כדי לשוב
-   לשיעור זה.
+>> ניצור עתה קובץ בש� "foo" ע"י הקשת C-x C-f foo <Return>‎.
+   עתה חזרו לשיעור זה בעזרת C-x b TUTORIAL.he <Return>‎.
 
 ברוב המקרי� ש� החוצץ זהה לש� הקובץ (לל� ש� התיקיה שלו). �בל �ין זה
-תמיד כך. רשימת החוצצי� שנוצרת ע"י C-x C-b תמיד תציג �ת שמות כל החוצצי�
-הקיימי� ב־Emacs.
+תמיד כך. רשימת החוצצי� שנוצרת ע"י C-x C-b תציג הן �ת ש� החוצץ והן �ת
+ש� הקובץ עבור כל החוצצי� הקיימי� ב־Emacs.
 
 כל טקסט שמוצג בחלון של Emacs הינו תמיד חלק של חוצץ כלשהו. קיימי�
-חוצצי� ש�ינ� קשורי� לשו� קובץ. לדוגמ�, החוצץ בש� "*Buffer List*" �ינו
-מציג שו� קובץ. זהו חוצץ המחזיק �ת רשימת החוצצי� שנוצר ע"י C-x C-b.
+חוצצי� ש�ינ� קשורי� לשו� קובץ. לדוגמ�, החוצץ בש� "*Buffer List*"
+המחזיק �ת רשימת החוצצי� שנוצרה ע"י C-x C-b �ינו מציג שו� קובץ. ג�
+לחוצץ הנוכחי ששמו TUTORIAL.he ל� היה קובץ עד שהקשת� על C-x C-s כדי
+לשמור �ותו בקובץ.
+
 חוצץ בש� "*Messages*" �ף הו� �ינו קשור לשו� קובץ; הו� מחזיק �ת ההודעות
 שהופיעו בשורה התחתונה במהלך עבודתכ� בתוך Emacs.
 
@@ -573,11 +557,11 @@ C-x C-s. לכן קיימת פקודה
 מ־Emacs -- �C-x C-c. (כש�ת� מפעילי� C-x C-c, �ל תד�גו לשינויי� שטר�
 נשמרו; C-x C-c מציע לשמור כל קובץ ששינית� לפני שהו� מסיי� �ת Emacs.)
 
-�� �ת� משתמשי� בצג גרפי �שר תומך במספר תוכניות במקביל, �ינכ� זקוקי�
-לפקודה מיוחדת כדי לעבור מ־Emacs לתוכנית �חרת. �פשר לעשות ז�ת בעזרת
-העכבר �ו פקודות של מנהל החלונות. �ול�, כ�שר �ת� משתמשי� בתצוגה
-טקסטו�לית שמסוגלת להציג רק תוכנית �חת בו־זמנית, תצטרכו "להשעות"
-("suspend") �ת Emacs על־מנת לעבור לתוכנית �חרת.
+�� �ת� משתמשי� בצג גרפי, �ינכ� זקוקי� לפקודה מיוחדת כדי לעבור מ־Emacs
+לתוכנית �חרת. �פשר לעשות ז�ת בעזרת העכבר �ו פקודות של מנהל החלונות.
+�ול�, כ�שר �ת� משתמשי� בתצוגה טקסטו�לית שמסוגלת להציג רק תוכנית �חת
+בו־זמנית, תצטרכו "להשעות" ("suspend") �ת Emacs על־מנת לעבור לתוכנית
+�חרת.
 
 הפקודה C-z יוצ�ת מ־Emacs *ב�ופן זמני* -- כך שתוכלו לשוב �ליו מ�וחר
 יותר ולהמשיך מ�ותה נקודה. כ�שר Emacs רץ על תצוגת טקסט, C-z "משעה" �ת
@@ -587,8 +571,7 @@ Emacs: הו� מחזיר �תכ� לשורת הפקודות הבסיסית של
 
 הרגע הנכון להשתמש ב־C-x C-c הו� כ�שר �ת� עומדי� להתנתק (log out).
 כמו־כן, תצטרכו להשתמש בו כדי לצ�ת מ־Emacs שהופעל ע"י תוכניות �חרות
-כגון קרי�ת דו�ר �לקטרוני -- תוכניות �לו ל� תמיד יודעות להסתדר ע�
-השעיית Emacs.
+כגון קרי�ת דו�ר �לקטרוני.
 
 קיימות פקודות C-x רבות מ�ד. להלן רשימת �לו שכבר למדת�:
 
@@ -607,7 +590,7 @@ replace-string (החלף מחרוזת) ×�שר מחליפה מחרוזת ×�חת ×
 �חרי שתקישו M-x, �Emacs מציג M-x בתחתית התצוגה ומחכה שתקישו �ת ש�
 הפקודה, במקרה זה "replace-string". מספיק שתקישו "repl s<TAB>‎" ו־Emacs
 ישלי� �ת הש� המל�. (<TAB> הו� מקש Tab, בדרך כלל תמצ�ו �ותו מעל מקש
-ה־CapsLock �ו Shift, ליד הקצה השמ�לי של המקלדת.) סיימו �ת ש� הפקודה
+ה־CapsLock �ו Shift, ליד הקצה השמ�לי של המקלדת.) סיימו �ת הזנת הפקודה
 ע"י הקשת <Return>.
 
 הפקודה להחלפת מחרוזת זקוקה לשני �רגומנטי� -- המחרוזת שתוחלף וזו שתחליף
@@ -651,15 +634,15 @@ replace-string (החלף מחרוזת) ×�שר מחליפה מחרוזת ×�חת ×
 השורה שמעל �זור תצוגת הד נקר�ת "שורת הסטטוס" (mode line). שורה זו
 מציגה משהו כמו:
 
-    -U:**-  TUTORIAL.he    63% L651    (Fundamental)-----------------------
+     U:**-  TUTORIAL.he    63% L651    (Fundamental)
 
 שורה זו מציגה מידע חשוב לגבי מצבו של Emacs ולגבי הטקסט שנמצ� בעריכה.
 
 �ת� כבר יודעי� מהי משמעותו של ש� הקובץ -- זהו הקובץ שפתחת�. NN%‎ מציין
-�ת מיקומכ� הנוכחי בתוך הטקסט, ל�מור כי NN �חוזי� מהטקסט קודמי� לטקסט
-המוצג כרגע בחלון. �� המוצג בחלון כולל �ת תחילת הטקסט, תר�ו ש� "Top"
-במקו� "0% ". �� המוצג בחלון כולל �ת סוף הטקסט, תר�ו ש� "Bot" �(bottom).
-�� הטקסט כל־כך קצר שכולו מוצג בחלון, שורת הסטטוס תציג "All".
+�ת מיקומכ� הנוכחי בתוך הטקסט, ל�מור כי NN �חוזי� מתכולת החוצץ קודמי�
+לטקסט המוצג כרגע בחלון. �� המוצג בחלון כולל �ת תחילת הטקסט, תר�ו ש�
+"Top" במקו� "0% ". �� המוצג בחלון כולל �ת סוף הטקסט, תר�ו ש� "Bot"
+�(bottom). �� הטקסט כל־כך קצר שכולו מוצג בחלון, שורת הסטטוס תציג "All".
 
 ה�ות L והמספר ש�חריה מצייני� �ת המיקו� הנוכחי בדרך �חרת: ה� מר�י� �ת
 מספר השורה שבה נמצ� הסמן.
@@ -698,7 +681,7 @@ replace-string (החלף מחרוזת) ×�שר מחליפה מחרוזת ×�חת ×
 
 לצפיה בתיעוד של ה�ופן הר�שי הנוכחי יש להקיש C-h m.
 
->> השתמשו ב־C-u C-v פע� �חת �ו יותר כדי להבי� שורה זו לר�שית התצוגה.
+>> הקישו C-l C-l כדי להבי� שורה זו לר�שית התצוגה.
 >> עתה הקישו C-h m כדי לר�ות במה Text mode שונה מה־Fundamental mode.
 >> לבסוף, הקישו C-x 1 כדי לסלק �ת התיעוד מהתצוגה.
 
@@ -740,9 +723,9 @@ Auto Fill mode. כ�שר �ופן זה מופעל, Emacs �וטומטית פות
 * חיפוש
 -------
 
-�Emacs יכול לחפש מחרוזות (רצף של תווי� �ו מילי�) קדימה �ו �חורה בתוך
-הטקסט. חיפוש של מחרוזת הו� סוג של פקודה להנעת הסמן: הו� ממק� �ת הסמן
-היכן שנמצ�ה המחרוזת הב�ה.
+�Emacs יכול לחפש מחרוזות (רצף של תווי�) קדימה �ו �חורה בתוך הטקסט.
+חיפוש של מחרוזת הו� סוג של פקודה להנעת הסמן: הו� ממק� �ת הסמן היכן
+שנמצ�ה המחרוזת הב�ה.
 
 החיפוש של Emacs הינו "מצטבר" ("incremental"). פירוש הדבר הו� שהחיפוש
 מתבצע במקביל להקשתכ� �ת המחרוזת �ותה ברצונכ� למצו�.
@@ -759,7 +742,7 @@ Auto Fill mode. כ�שר �ופן זה מופעל, Emacs �וטומטית פות
    "סמן", ע� הפסקה �חרי כל �ות, ושימו לב להתנהגות הסמן.
    זה עתה מצ�ת� �ת המילה "סמן" פע� �חת.
 >> הקישו C-s שוב, כדי למצו� �ת "סמן" במקומות נוספי� בטקסט.
->> הקישו <Delback> שלוש פעמי� ושימו לב לתנועת הסמן בכל הקשה.
+>> הקישו <DEL> שלוש פעמי� ושימו לב לתנועת הסמן בכל הקשה.
 >> הקישו <Return> לסיו� החיפוש.
 
 ה�� שמת� לב למה שקרה? במהלך "חיפוש מצטבר" Emacs מנסה למצו� �ת המקו�
@@ -768,16 +751,13 @@ Auto Fill mode. כ�שר �ופן זה מופעל, Emacs �וטומטית פות
 ומודיע שהחיפוש נכנס למצב של "כשלון" ("failing"). הקשה על C-g ג� הי�
 מסיימת �ת החיפוש.
 
-(הערה: במערכות �חדות הקשה על C-s מקפיעה �ת תצוגת המסך, כך של� תר�ו
-יותר שו� פלט של Emacs. משמעות הדבר שתכונת מערכת ההפעלה ששמה "flow
-control" מופעלת ע"י C-s ו�ינה מעבירה �ת C-s ל־Emacs. לביטול הקפ�ת
-התצוגה במערכות �לו יש להקיש C-q.)
-
-�� במהלך החיפוש תקישו על <Delback>, תר�ו שהתו ה�חרון של המחרוזת
-המבוקשת נמחק והחיפוש חוזר למקו� הקוד� בו נמצ�ה המחרוזת לל� התו ה�חרון.
-למשל, נניח שהקשת� "ס" על־מנת למצו� �ת המקו� הב� בו מופיעה ה�ות "ס". ��
-עכשיו תקישו "מ", הסמן יזוז למקו� בו נמצ� "סמ". עתה הקישו <Delback>.
-ה־"מ" נמחק מהמחרוזת והסמן חוזר למקו� בו הו� מצ� �ת "ס" לר�שונה.
+�� במהלך החיפוש תקישו על <DEL>, החיפוש "נסוג" למצב קוד�. �� הקשת�
+<DEL> מיד �חרי C-s, הקשת <DEL> מחזירה �ת הסמן למקו� הקוד� בו נמצ�ה
+המחרוזת. �� �ין מקומות קודמי� בה� מופיעה המחרוזת, הקשת <DEL> מוחקת �ת
+התו ה�חרון של המחרוזת המבוקשת. למשל, נניח שהקשת� "ס" על־מנת למצו� �ת
+המקו� הב� בו מופיעה ה�ות "ס". �� עכשיו תקישו "מ", הסמן יזוז למקו� בו
+נמצ� "סמ". עתה הקישו <DEL>. ה־"מ" נמחק מהמחרוזת והסמן חוזר למקו� בו
+הו� מצ� �ת "ס" לר�שונה.
 
 �� במהלך החיפוש תפעילו פקודה כלשהי ע"י הקשה על מקש תוך לחיצה על
 CONTROL �ו META, החיפוש יסתיי�. (כמה תווי� יוצ�י� מכלל זה -- �לו תווי�
@@ -796,10 +776,10 @@ CONTROL �ו META, החיפוש יסתיי�. (כמה תווי� יוצ�י� מ
 שתוכניות �חרות מכנות "חלון". תבניות מתו�רות בפסקה הב�ה. תוכלו למצו� �ת
 רשימת המונחי� של Emacs בפרק "Glossary" של מדריך משתמש.)
 
->> הבי�ו סמן לשורה זו והקישו C-u 0 C-l �(CONTROL-L ול� CONTROL-1).
+>> הבי�ו סמן לשורה זו והקישו C-l C-l �(CONTROL-L ול� CONTROL-1).
 
 >> עתה הקישו C-x 2 וכתוצ�ה מכך החלון יתחלק לשניי�. כל �חד משני החלונות
-   מציג �ת השיעור הזה. הסמן נש�ר בחלון העליוןץ
+   מציג �ת השיעור הזה. הסמן נש�ר בחלון העליון.
 
 >> הקישו C-M-v כדי לגלול �ת החלון התחתון.
    (�� במקלדת שלכ� �ין מקש META �מיתי, הקישו ‎<ESC> C-v כתחליף.)
@@ -812,19 +792,19 @@ CONTROL �ו META, החיפוש יסתיי�. (כמה תווי� יוצ�י� מ
 >> הקישו C-x o שוב לחזור לחלון העליון.
    הסמן בחלון העליון ייש�ר במקו� בו הו� היה לפני־כן.
 
-תוכלו להמשיך להשתמש ב־C-x o כדי לדלג בין שני החלונות. לכל חלון מיקו�
-סמן משלו, �בל רק חלון �חד מציג �ת הסמן בכל רגע. כל פקודות העריכה
-הרגילות פועלות על החלון שבו מוצג הסמן. �נו קור�י� לחלון זה "החלון
-הנבחר".
+תוכלו להמשיך להשתמש ב־C-x o כדי לדלג בין החלונות. "החלון הנבחר", �ותו
+חלון בו הנכ� עורכי� טקסט, מזוהה ע"י סמן בולט שמהבהב בזמן ש�ינכ�
+מקלידי�. לכל החלונות ה�חרי� מיקו� סמן משלה�; �� הפעלת� �ת Emacs על צג
+גרפי, מיקו� הסמן בחלונות ה�חרי� מוצג כתיבה ריקה ש�ינה מהבהבת.
 
 הפקודה C-M-v נוחה מ�ד כ�שר הינכ� עורכי� טקסט בחלון �חד ומשתמשי� בחלון
-�חר לייחוס. תוכלו בכל עת לשמור על הסמן בחלון בו �ת� עורכי� טקסט
-ולהתקד� בחלון השני בעזרת C-M-v.
+�חר לייחוס. תוכלו להתקד� בחלון השני בעזרת C-M-v מבלי לעזוב �ת החלון
+הנבחר.
 
 �C-M-v הי� דוגמ� �חת של פקודת CONTROL-META. �� במקלדת שלכ� קיי� מקש
-META �מיתי, תוכלו להקיש �ת הפקודה ע"י לחיצה והחזקה של מקשי CONTROL
-ו־META ג� יחד ו�ז להקיש v. הסדר שבו תלחצו על CONTROL ו־META �ינו משנה
-כי שני המקשי� הללו פועלי� ע"י שינוי התו המוקש יחד �ית�.
+META (�ו Alt) �מיתי, תוכלו להקיש �ת הפקודה ע"י לחיצה והחזקה של מקשי
+CONTROL ו־META ג� יחד ו�ז להקיש v. הסדר שבו תלחצו על CONTROL ו־META
+�ינו משנה כי שני המקשי� הללו פועלי� ע"י שינוי התו המוקש יחד �ית�.
 
 �� �ין במקלדת מקש META �מיתי ו�ת� משתמשי� ב־<ESC> כתחליף, הסדר כן
 משנה: חייבי� להקיש <ESC> ורק ל�חר מכן CONTROL-v, וז�ת משו�
@@ -853,9 +833,10 @@ META �מיתי, תוכלו להקיש �ת הפקודה ע"י לחיצה והח
 * תבניות מרובות
 ---------------
 
-�Emacs מסוגל לפתוח מספר "תבניות" ("frames") בתנ�י ש�ינכ� משתמשי� בצג
-שמסוגל להציג רק טקסט. תבנית כוללת קבוצת חלונות, תפריט, פסי גלילה, �זור
-תצוגת הד וכו'. (תוכניות �חרות נוהגות לקרו� לזה "חלון".)
+�Emacs מסוגל לפתוח מספר "תבניות" ("frames"). תבנית כוללת קבוצת חלונות,
+תפריט, פסי גלילה, �זור תצוגת הד וכו'. על צג גרפי מה ש�נו קור�י�
+"תבנית" נקר� בדרך־כלל "חלון". ניתן להציג תבניות �חדות על �ותו צג גרפי
+בו־זמנית על צג טקסטו�לי �פשר להציג רק תבנית �חת בכל עת.
 
 >> הקישו M-x make-frame <Return>‎.
    כתוצ�ה, תבנית חדשה תופיע על המסך.
@@ -866,10 +847,10 @@ META �מיתי, תוכלו להקיש �ת הפקודה ע"י לחיצה והח
 >> הקישו M-x delete-frame <Return>‎.
    התבנית שבה הקשת� �ת הפקודה תיסגר ותיעל� מהמסך.
 
-כמו־כן, ניתן לסגור תבנית בדרך הרגילה הנתמכת ע"י מנהל החלונות של המערכת
-שלכ� (בדרך־כלל, ע"י הקלקה על הכפתור המסומן ב־"X" בפינה עליונה של
-התבנית.) שו� מידע �ינו הולך לעיבוד כ�שר סוגרי� תבנית (�ו חלון). המידע
-הזה פשוט יורד מהתצוגה, �בל ניתן ל�חזרו מ�וחר יותר.
+כמו־כן, ניתן לסגור תבנית בדרך הרגילה הנתמכת ע"י התצוגה הגרפית של
+המערכת שלכ� (בדרך־כלל, ע"י הקלקה על הכפתור המסומן ב־"X" בפינה עליונה
+של התבנית.) שו� מידע �ינו הולך לעיבוד כ�שר סוגרי� תבנית (�ו חלון).
+המידע הזה פשוט יורד מהתצוגה, �בל ניתן ל�חזרו מ�וחר יותר.
 
 
 * רמות עריכה רקורסיביות
@@ -983,7 +964,7 @@ find-file.
 ושמות קבצי�. תכונת ההשלמה מתו�רת במלו�ה במדריך למשתמש Emacs בצומת
 (node) בש� "Completion".
 
-�Dired מ�פשר להציג רשימת קבצי� בתיקיה (וכ�פציה ג� בתת-תיקיות שלה), לנוע
+�Dired מ�פשר להציג רשימת קבצי� בתיקיה (וכ�פציה ג� בתת־תיקיות שלה), לנוע
 בתוך הרשימה הזו, לפתוח קבצי�, לשנות �ת שמותיה�, למחוק �ות� ולבצע עליה�
 עוד פעולות רבות. Dired מתו�ר במלו�ו במדריך למשתמש בצומת בש� "Dired".
 
diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators
index a69d23c471d..64780687bb1 100644
--- a/etc/tutorials/TUTORIAL.translators
+++ b/etc/tutorials/TUTORIAL.translators
@@ -12,8 +12,7 @@ Maintainer: Sun Yijiang <sunyijiang@gmail.com>
 * TUTORIAL.cs:
 Author:     Milan Zamazal <pdm@zamazal.org>
             Pavel Janík <Pavel@Janik.cz>
-Maintainer: Milan Zamazal <pdm@zamazal.org>
-            Pavel Janík <Pavel@Janik.cz>
+Maintainer: Maintainer needed.
 
 * TUTORIAL.de:
 Author:     Werner Lemberg <wl@gnu.org>
@@ -73,7 +72,7 @@ Maintainer: Alex Ott <ottalex@narod.ru>
 * TUTORIAL.sk:
 Author:     Miroslav Vaško <vasko@debian.cz>
             Pavel Janík <Pavel@Janik.cz>
-Maintainer: Pavel Janík <Pavel@Janik.cz>
+Maintainer: Maintainer needed.
 
 * TUTORIAL.sl:
 Author:     Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfc21373806..76728fdbc5b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,58 @@
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * info.el (Info-toc-build): If the Info file has no "Up" pointer,
+        don't pass the (nil) value of `upnode' to string-match.
+
+2012-01-14  Chong Yidong  <cyd@gnu.org>
+
+        * startup.el (command-line): Fix X resource class for cursorColor.
+        Fix values recognized by the cursorBlink resource.
+
+2012-01-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * epg.el (epg--make-temp-file): Avoid permission race condition
+        when running on old Emacs versions (bug#10403).
+
+2012-01-14  Glenn Morris  <rgm@gnu.org>
+
+        * dired.el (dired-get-filename): Fix 'verbatim case of previous change.
+
+2012-01-13  Glenn Morris  <rgm@gnu.org>
+
+        * dired.el (dired-switches-escape-p): New function.
+        (dired-insert-directory): Use dired-switches-escape-p.
+        (dired-get-filename): Undo "\ " quoting if needed.  (Bug#10469)
+
+        * find-dired.el (find-ls-option): Doc fix.  (Bug#10262)
+
+2012-01-12  Glenn Morris  <rgm@gnu.org>
+
+        * mail/sendmail.el (mail-mode): Update paragraph-separate for
+        changes in adaptive-fill-regexp.  (Bug#10276)
+
+2012-01-11  Alan Mackenzie  <acm@muc.de>
+
+        Fix Emacs bug #10463 - put `widen's around the critical spots.
+
+        * progmodes/cc-engine.el (c-in-literal, c-literal-limits): put a
+        widen around each invocation of c-state-pp-to-literal.  Remove an
+        unused let variable.
+
+2012-01-11  Glenn Morris  <rgm@gnu.org>
+
+        * dired-aux.el (dired-do-shell-command): Fix */? logic.  (Bug#6561)
+        Doc fix.
+
+2012-01-10  Chong Yidong  <cyd@gnu.org>
+
+        * net/network-stream.el (network-stream-open-starttls): Avoid
+        emitting a confusing error message when the server gives a bad
+        response to the capability command.
+
+2012-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * mail/unrmail.el (unrmail): Tweak previous change.
+
 2012-01-09  Chong Yidong  <cyd@gnu.org>
 
         * custom.el (custom-safe-themes): Use SHA-256 for hashing.
@@ -27,7 +82,7 @@
         * ibuffer.el (ibuffer-mode): List the bindings in the corrent map
         (bug#9759).
 
-        * mail/smtpmail.el (password-cache-add): Removed unused declaration.
+        * mail/smtpmail.el (password-cache-add): Remove unused declaration.
         (password-read): Don't autoload unused function.
 
 2012-01-07  Juanma Barranquero  <lekktu@gmail.com>
@@ -1382,7 +1437,7 @@
         (window-list-no-nils): Remove.
         (window-state-get-1, window-state-get): Use backquote instead.
 
-2011-11-08  thierry  <thierry.volpiatto@gmail.com>
+2011-11-08  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
         * emacs-lisp/find-func.el (find-function-read):
         Fix incorrect use of default argument in `completing-read'.
@@ -4532,7 +4587,7 @@
 
         * printing.el: Add documentation to all the `pr-toggle-' commands.
 
-2011-07-11  Leo  <sdl.web@gmail.com>  (tiny change)
+2011-07-11  Leo Liu  <sdl.web@gmail.com>
 
         * files.el (toggle-read-only): Only do the `C-x C-q' warning on VC
         backends where it makes sense (bug#2623).
@@ -7116,7 +7171,7 @@
 2011-05-23  Kevin Ryde  <user42@zip.com.au>
 
         * emacs-lisp/advice.el (ad-read-advised-function):
-        Use `function-called-at-point' as the default default, if it has
+        Use `function-called-at-point' as the default, if it has
         advice and passes PREDICATE.
 
 2011-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -7942,7 +7997,7 @@
         * net/gnutls.el (gnutls-negotiate): Add hostname, verify-flags,
         verify-error, and verify-hostname-error parameters.  Check whether
         default trustfile exists before going to use it.  Add missing
-        argument to gnutls-message-maybe call.  Return return value.
+        argument to gnutls-message-maybe call.  Return value.
         Reported by Claudio Bley <claudio.bley@gmail.com>.
         (open-gnutls-stream): Add usage example.
 
@@ -9566,7 +9621,7 @@
         * calc/calc-menu.el (calc-units-menu): Add entries for logarithmic
         units and musical notes.
 
-2011-03-20  Leo  <sdl.web@gmail.com>
+2011-03-20  Leo Liu  <sdl.web@gmail.com>
 
         * ido.el (ido-read-internal): Use completing-read-default.
         (ido-completing-read): Fix compatibility with completing-read.
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index 5389bd27125..9958c6ccdb3 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -100,7 +100,7 @@
 
 1986-03-31  Richard M. Stallman  (rms@prep)
 
-        * man.el: fix stupid error in arg to file-name-all-completions.
+        * man.el: Fix stupid error in arg to file-name-all-completions.
 
 1986-03-28  Richard M. Stallman  (rms@prep)
 
@@ -117,7 +117,7 @@
 1986-03-26  Richard Mlynarik  (mly@prep)
 
         * indent.el (edit-tab-stops):
-        Go to character 0 so editing happens in right place
+        Go to character 0 so editing happens in right place.
 
 1986-03-24  Richard M. Stallman  (rms@prep)
 
@@ -196,8 +196,8 @@
 
 1986-03-12  Richard Mlynarik  (mly@prep)
 
-        * shell.el (shell)
-        If no environment variable SHELL, default to /bin/sh
+        * shell.el (shell):
+        If no environment variable SHELL, default to /bin/sh.
 
 1986-03-12  Leonard H. Tower Jr.  (tower@prep)
 
@@ -226,16 +226,16 @@
 
 1986-03-07  Sundar Narasimhan  (sundar@prep)
 
-        * rnews.el: fix bug in news-get-new-news. (news-current-news-group
+        * rnews.el: Fix bug in news-get-new-news. (news-current-news-group
         should be nil on startup).
 
 1986-03-07  Bill Rozas  (jinx@prep)
 
-        * scheme.el: autoloads from xscheme.el
+        * scheme.el: Autoloads from xscheme.el.
 
         * xscheme.el: New file.  Implements inferior-scheme-mode and
         related commands.  Similar (almost a query replace of)
-        inferior-lisp-mode in shell.el
+        inferior-lisp-mode in shell.el.
 
 1986-03-07  Richard M. Stallman  (rms@prep)
 
@@ -267,8 +267,8 @@
 
 1986-03-03  Leonard H. Tower Jr.  (tower@prep)
 
-        * rnews.el (news-add-news-group)
-        Fixed bug that was putting "/"'s in newsgroups names in .newsrc
+        * rnews.el (news-add-news-group):
+        Fix bug that was putting "/"'s in newsgroups names in .newsrc
         instead of "."'s.
 
 1986-03-03  Richard M. Stallman  (rms@prep)
@@ -320,8 +320,8 @@
 1986-02-20  Richard Mlynarik  (mly@prep)
 
         * info.el (Info-validate):
-        Node-names are case-insensitive, but assoc is case-sensitive
-        Separate out function Info-validate-tags-table
+        Node-names are case-insensitive, but assoc is case-sensitive.
+        Separate out function Info-validate-tags-table.
 
 1986-02-19  Richard M. Stallman  (rms@prep)
 
@@ -404,7 +404,7 @@
 
         * info.el:
         Completely rewrite Info-find-node so that it doesn't
-        blow out on nonexistent nodes/files
+        blow out on nonexistent nodes/files.
 
         Rewrite Info-goto-node through the Magic of Regular Expressions.
 
@@ -426,7 +426,7 @@
 
 1986-02-03  Richard Mlynarik  (mly@prep)
 
-        * info.el (Info-validate) Insert a missing space.
+        * info.el (Info-validate): Insert a missing space.
 
 1986-02-03  Richard M. Stallman  (rms@prep)
 
@@ -522,7 +522,7 @@
         Set mode correctly for .~i~ backup files.
 
         * shell.el (inferior-lisp-mode):
-        Use \\{...} in doc.  Fix up initialization of inferior-lisp-mode-map
+        Use \\{...} in doc.  Fix up initialization of inferior-lisp-mode-map.
 
 1986-01-21  Richard Mlynarik  (mly@prep)
 
@@ -585,7 +585,7 @@
 1986-01-09  Richard Mlynarik  (mly@prep)
 
         * mail-utils.el (mail-strip-quoted-names):
-        Handle multi-line address lists
+        Handle multi-line address lists.
 
 1986-01-08  Richard Mlynarik  (mly@prep)
 
@@ -610,12 +610,12 @@
 1986-01-07  Richard Mlynarik  (mly@prep)
 
         * tags.el (visit-tags-table):
-        Barf if given a directory
+        Barf if given a directory.
 
 1986-01-06  Richard Mlynarik  (mly@prep)
 
         * nroff-mode.el (electric-nroff-mode):
-        set-minor-mode correctly
+        set-minor-mode correctly.
 
 1986-01-02  Richard Mlynarik  (mly@prep)
 
@@ -626,7 +626,7 @@
 
         * info.el (Info-tagify, Info-validate):
         (let ((case-fold-search t)) ...)
-        for when these functions are used outside info mode
+        for when these functions are used outside info mode.
 
 1985-12-30  Richard M. Stallman  (rms@prep)
 
@@ -646,7 +646,7 @@
 1985-12-30  Richard Mlynarik  (mly@prep)
 
         * files.el (backup-buffer):
-        Don't backup `weird' (non-character or link) files
+        Don't backup `weird' (non-character or link) files.
 
 1985-12-28  Richard M. Stallman  (rms@prep)
 
@@ -749,7 +749,7 @@
 1985-12-17  Richard Mlynarik  (mly@prep)
 
         * simple.el (goto-line):
-        Accept either prefix arg or prompt in minibuffer
+        Accept either prefix arg or prompt in minibuffer.
 
 1985-12-17  Richard M. Stallman  (rms@prep)
 
@@ -772,7 +772,7 @@
         * files.el (set-visited-file-name):
         Work properly in case of arg = nil or = "".
 
-        * debug.el (debugger-frame{,-clear})
+        * debug.el (debugger-frame{,-clear}):
         Bind off read-only flag to change buffer.
 
 1985-12-14  Richard M. Stallman  (rms@prep)
@@ -812,8 +812,7 @@
         modified in Rmail doesn't always correlate with
         what the user is thinking about.
 
-        * abbrev.el (prepare-abbrev-list-buffer, list-abbrevs,
-        edit-abbrevs):
+        * abbrev.el (prepare-abbrev-list-buffer, list-abbrevs, edit-abbrevs):
         Some cleanups.  prepare-... now does all the work and
         returns the buffer for the caller to select or display.
 
@@ -894,8 +893,8 @@
         * files.el (switch-to-buffer-other-window):
         Pass t as new second arg to pop-to-buffer.
 
-        * indent.el (insert-tab):
-        If indent-tabs-mode = nil, insert spaces instead.
+        * indent.el (insert-tab):
+        If indent-tabs-mode = nil, insert spaces instead.
 
         * debug.el (debug):
         Combine two unwind-protect's into one.
@@ -907,7 +906,7 @@
 1985-12-09  Richard Mlynarik  (mly@prep)
 
         * rmail.el (rmail-save):
-        Don't do possibly lengthy expunge if buffer not modified
+        Don't do possibly lengthy expunge if buffer not modified.
 
         * loaddefs.el:
         (fset 'TeX-mode 'tex-mode)
@@ -942,10 +941,10 @@
 
         * info.el (Info-find-node):
         Must search for "Node: Foo" not " Foo" or else would
-        lose when there was a "Node: Bar Foo"
+        lose when there was a "Node: Bar Foo".
 
         * dired.el (dired-copy-file):
-        interactive "F" not "s"
+        interactive "F" not "s".
 
         * man.el (manual-entry):
         Allow user to specify "chdir(3)" to get entry from section
@@ -965,10 +964,10 @@
 
         * info.el:
         (Info-validate-node-name): Don't complain about nodes in other files.
-        (Info-menu-sequence): fix typo in function name.
+        (Info-menu-sequence): Fix typo in function name.
 
         * rmail.el:
-        (rmail-save): new function; `s' and `q' commands now expunge.
+        (rmail-save): New function; `s' and `q' commands now expunge.
         (rmail-set-attribute): Don't lose if buffer wasn't narrowed.
         (rmail-undelete-previous-message):
           Try current message first, then back up till deleted msg
@@ -1032,11 +1031,12 @@
 
 1985-12-05  Richard Mlynarik  (mly@prep)
 
-        * abbrev.el, chistory.el, debug.el, doctor.el, indent.el, info.el, sendmail.el:
-        Fix initialization of mode-maps
+        * abbrev.el, chistory.el, debug.el, doctor.el, indent.el:
+        * info.el, sendmail.el:
+        Fix initialization of mode-maps.
 
         * sendmail.el (mail-position-on-field):
-        Make this work
+        Make this work.
 
 1985-12-05  Richard M. Stallman  (rms@prep)
 
@@ -1091,18 +1091,18 @@
 1985-12-03  Richard Mlynarik  (mly@prep)
 
         * bytecomp.el (byte-compile-file-form):
-        Reduce noninteractive message verbosity
+        Reduce noninteractive message verbosity.
 
         * ebuff-menu.el:
-        Standardize initialization of Electric-buffer-menu-mode-map
-          make digits, meta-digits and "-" be numeric args
+        Standardize initialization of Electric-buffer-menu-mode-map.
+        Make digits, meta-digits and "-" be numeric args.
         (put 'Electric-buffer-menu-undefined 'suppress-keymap t)
 
         * electric.el (Electric-command-loop):
-        Set up this-command and last-command-char in command loop
+        Set up this-command and last-command-char in command loop.
 
         * simple.el (prefix-arg-internal, negative-argument):
-        Fix problem with negative-arguments and unreading
+        Fix problem with negative-arguments and unreading.
 
 1985-12-03  Richard M. Stallman  (rms@prep)
 
@@ -1114,9 +1114,8 @@
 
         * rnews.el:
         Remove stray "<" character introduced by mly.
-        (news-move-to-group): give error message if no new group to move
-        to.
-        (news-next-message): with arg of 1 or -1, keep doing
+        (news-move-to-group): Give error message if no new group to move to.
+        (news-next-message): With arg of 1 or -1, keep doing
         news-next-group or news-previous-group till reach nonempty group.
 
         * x-mouse.el:
@@ -1146,14 +1145,14 @@
 1985-11-26  Richard Mlynarik  (mly@prep)
 
         * view.el:
-        Define c-x o
+        Define c-x o.
         Rename interactive functions from view-* to View-* to improve m-x
         completion.
-        defvar, rather than defconst, view-mode-map
-        Take old-emacs-version-compatibility out of view-file
+        defvar, rather than defconst, view-mode-map.
+        Take old-emacs-version-compatibility out of view-file.
 
-        * helper.el (Helper-describe-mode, Helper-describe-bindings)
-        Fix bit-rot
+        * helper.el (Helper-describe-mode, Helper-describe-bindings):
+        Fix bit-rot.
         Hack C-l in Helper-help-scroller.
 
 1985-11-25  Richard M. Stallman  (rms@prep)
@@ -1207,26 +1206,26 @@
         Make edit-options-1 inline.
 
         * term-xterm.el:
-        Fix documentation for x-switches
+        Fix documentation for x-switches.
 
 1985-11-20  Richard Mlynarik  (mly@prep)
 
         * files.el, sendmail.el:
-        New function delete-auto-save-file-if-necessary
-        Make basic-save-file, mail-send call it
+        New function delete-auto-save-file-if-necessary.
+        Make basic-save-file, mail-send call it.
 
         * startup.el (command-line-1):
-        Reformat to make all extraneous bs fit in 80 columns
+        Reformat to make all extraneous bs fit in 80 columns.
 
         * lisp-mode.el (calculate-lisp-indent):
         Check for boundp lisp-indent-hook, not fboundp.
 
-        * lisp.el, lisp-mode.el
+        * lisp.el, lisp-mode.el:
         Move eval-last-sexp, eval-defun from lisp.el to lisp-mode.el since
         all their usages occur in the latter file.
 
-        * rnews.el
-        Use `mail-header-separator'
+        * rnews.el:
+        Use `mail-header-separator'.
 
         * term-xterm.el:
         Define x-handle-switch-1 to modularize discarding of
@@ -1236,8 +1235,8 @@
         Check for command-switch-alist before checking for builtin
         switches.
 
-        * bytecomp.el, term-xterm.el, tex-start.el
-        Switches look for `command-line-args' rather than `args'
+        * bytecomp.el, term-xterm.el, tex-start.el:
+        Switches look for `command-line-args' rather than `args'.
 
 1985-11-20  Richard M. Stallman  (rms@prep)
 
@@ -1275,14 +1274,14 @@
 
 1985-11-18  Richard Mlynarik  (mly@prep)
 
-        * bytecomp.el (batch-byte-compile):
+        * bytecomp.el (batch-byte-compile):
         Print a message for the log before terminating self.
 
         * simple.el (set-variable):
         Fix thinko in help-form, and include current value.
 
         * info.el (Info-find-node):
-        If can't find node, say which node in error message
+        If can't find node, say which node in error message.
 
         * rmailedit.el (rmail-edit-mode):
         Improve documentation greatly, fix typo.
@@ -1303,8 +1302,8 @@
 
 1985-11-14  Richard Mlynarik  (mly@prep)
 
-        * info.el
-        Make "." be beginning-of-buffer
+        * info.el:
+        Make "." be beginning-of-buffer.
 
 1985-11-13  Richard M. Stallman  (rms@prep)
 
@@ -1332,19 +1331,19 @@
 1985-11-08  Richard Mlynarik  (mly@prep)
 
         * startup.el (command-line):
-        If noninteractive, don't load "term-*"
+        If noninteractive, don't load "term-*".
         noninteractive => -q [Change this if you think it is a bad
          idea rms -- every use of -batch I make is followed by -q...]
 
 1985-11-07  Richard Mlynarik  (mly@prep)
 
         * files.el (after-find-file):
-        If get error hacking mode or local-vars, say what sort of error
+        If get error hacking mode or local-vars, say what sort of error.
 
 1985-11-06  Richard Mlynarik  (mly@prep)
 
         * bytecomp.el (byte-compile-lambda):
-        Compile non-string `interactive' frobs
+        Compile non-string `interactive' frobs.
 
 1985-11-05  Richard M. Stallman  (rms@prep)
 
@@ -1359,18 +1358,18 @@
         Don't use create-file-buffer for summary buffer!
 
         * rmailsum.el (rmail-make-summary-line-1):
-        Fix bug computing new summary line
+        Fix bug computing new summary line.
 
         * debug.el (debug):
         Make recursive calls to the debugger work.
-        Make debugger buffer read-only
+        Make debugger buffer read-only.
 
         * sendmail.el (mail-send, sendmail-send-it):
         Move some stuff from sendmail-send-it to mail-send
-        Delete auto-save #%*mail* file if `delete-auto-save-files'
+        Delete auto-save #%*mail* file if `delete-auto-save-files'.
 
         * electric.el (Electric-command-loop):
-        condition-case for `beginning-of-buffer'
+        condition-case for `beginning-of-buffer'.
 
 1985-11-05  Richard M. Stallman  (rms@prep)
 
@@ -1381,7 +1380,7 @@
 1985-11-04  Richard Mlynarik  (mly@prep)
 
         * yow.el, loaddefs.el:
-        Function yow.  Depends on file emacs/etc/yow.lines
+        Function yow.  Depends on file emacs/etc/yow.lines.
 
 1985-11-04  Richard M. Stallman  (rms@prep)
 
@@ -1423,7 +1422,7 @@
         Some more bugs seem to remain in this code...
 
         * dired.el:
-        Both "e" and "f" are `dired-find-file'
+        Both "e" and "f" are `dired-find-file'.
 
 1985-10-30  Richard Mlynarik  (mly@prep)
 
@@ -1449,7 +1448,7 @@
 1985-10-29  Richard Mlynarik  (mly@prep)
 
         * startup.el (command-line-1):
-        "-l" switch loads wrt load-path, rather than wrt default-directory
+        "-l" switch loads wrt load-path, rather than wrt default-directory.
 
 1985-10-29  Richard M. Stallman  (rms@prep)
 
@@ -1491,7 +1490,7 @@
 
 1985-10-23  Richard Mlynarik  (mly@prep)
 
-        * mouseinit.el
+        * mouseinit.el:
         Delete this file.  Put its contents in files
         term-bg.el, term-bgnv.el, term-bgrv.el, term-bbn.el.
         (Perhaps there should be a subdirectory emacs/lisp/term/ ??)
@@ -1504,10 +1503,10 @@
 1985-10-22  Richard Mlynarik  (mly@prep)
 
         * debugger.el (debug):
-        Bind variable `debugger-value' instead of `value'
+        Bind variable `debugger-value' instead of `value'.
 
         * userlock.el:
-        Give `file-locked' error-conditions and error-message props
+        Give `file-locked' error-conditions and error-message props.
 
 1985-10-21  Richard M. Stallman  (rms@mit-prep)
 
@@ -1522,10 +1521,10 @@
 
         * sendmail.el (mail-do-fcc):
         Do cretinous unix ">" `quoting' of "\nFrom " strings
-        (this isn't transparent, but it's what other stupid programs expect)
+        (this isn't transparent, but it's what other stupid programs expect).
 
         * mailalias.el (expand-mail-aliases):
-        Hack case-fold-search as appropriate
+        Hack case-fold-search as appropriate.
 
 1985-10-21  Richard M. Stallman  (rms@mit-prep)
 
@@ -1570,7 +1569,7 @@
 
         * sendmail.el:
         Use new var mail-header-separator in place of constant --text...
-        (mail-setup): fill the To and Cc text inserted.
+        (mail-setup): Fill the To and Cc text inserted.
             Assume <...> constructs were handled by mail-strip-quoted-names.
         (mail-fill-yanked-message): Add this and put on C-c q.
         (mail-mode): Set up mail-mode-map when file is loaded.
@@ -1617,9 +1616,9 @@
         * rnews.el (news-save-item-in-file):
         Append to file, rather than overwriting.
 
-        * isearch.el
+        * isearch.el:
         Eliminate confused attempts at indicating that long isearch was
-        `in progress'
+        `in progress'.
 
 1985-10-15  Richard M. Stallman  (rms@mit-prep)
 
@@ -1651,7 +1650,7 @@
 
 1985-10-15  Richard Mlynarik  (mly@mit-prep)
 
-        * bytecomp.el (byte-compile-find-vars-1)
+        * bytecomp.el (byte-compile-find-vars-1):
         Fix paren error.
 
 1985-10-15  Richard M. Stallman  (rms@mit-prep)
@@ -1786,7 +1785,6 @@
         Initialize the local map when the file is loaded,
         not when mode is invoked.
 
-
 1985-10-04  Richard M. Stallman  (rms@mit-prep)
 
         * indent.el (indent-relative-maybe):
@@ -1810,12 +1808,12 @@
 
 1985-10-03  Richard Mlynarik  (mly@mit-prep)
 
-        * simple.el
-        Functions quit, keyboard-quit
+        * simple.el:
+        Functions quit, keyboard-quit.
 
         * isearch.el:
         "I-searching: foo..." in the middle of possibly lengthy
-        search
+        search.
 
         * files.el (set-auto-mode):
         Don't hack auto-mode-alist at all if -*- mode -*- is specified.
@@ -2019,7 +2017,7 @@
 
 1985-09-03  Richard Mlynarik  (mly@mit-prep)
 
-        * macros.el (kbd-macro-query)
+        * macros.el (kbd-macro-query):
         Barf if not defining or executing keyboard macro.
 
 1985-09-02  Richard M. Stallman  (rms@mit-prep)
@@ -2052,7 +2050,7 @@
 
 1985-08-31  Richard Mlynarik  (mly@mit-prep)
 
-        * simple.el (delete-indentation)
+        * simple.el (delete-indentation):
         Don't err if on first line of buffer.
 
 1985-08-30  Richard M. Stallman  (rms@mit-prep)
@@ -2062,7 +2060,7 @@
 
 1985-08-26  Richard Mlynarik  (mly@mit-prep)
 
-        * shell.el
+        * shell.el:
         Sending empty line of input at the end of a buffer that is an
         interaction with a promptless shell program copied previous input
         rather than sending an empty line.
@@ -2070,46 +2068,46 @@
 
 1985-08-20  Richard Mlynarik  (mly@mit-prep)
 
-        * dired.el, files.el, sendmail.el, compile.el
+        * dired.el, files.el, sendmail.el, compile.el:
         Make *-other-window really do other window even if pop-up-windows
         is set to nil.
 
 1985-08-17  Richard Mlynarik  (mly@mit-prep)
 
-        * c-mode.el (c-indent-line)
+        * c-mode.el (c-indent-line):
         Make "^[ \t]*#" indent to 0 (if not in string or comment)
 
-        * startup.el (command-line)
+        * startup.el (command-line):
         (or (getenv "USER") (getenv "LOGNAME")) for USG compatibility
          (consider it a standard)
 
-        * lpr.el
+        * lpr.el:
         Typo (``format1'' for ``format'')
 
 1985-08-12  Richard Mlynarik  (mly@mit-prep)
 
-        * buff-menu.el (Buffer-menu-buffer)
+        * buff-menu.el (Buffer-menu-buffer):
         Win more often on `too-long' buffer names.
 
 1985-08-11  Richard Mlynarik  (mly@mit-prep)
 
-        * make narrow-to-page be disabled by default.
+        * Make narrow-to-page be disabled by default.
 
-        * rmail.el (rmail-insert-inbox-text)
-        Hack case that /usr/spool/mail/user is a directory
+        * rmail.el (rmail-insert-inbox-text):
+        Hack case that /usr/spool/mail/user is a directory.
 
 1985-08-10  Richard Mlynarik  (mly@mit-prep)
 
-        * isearch.el (isearch)
-        Make isearch work in regexp case
+        * isearch.el (isearch):
+        Make isearch work in regexp case.
 
 1985-08-09  Richard Mlynarik  (mly@mit-prep)
 
-        * c-mode.el (c-comment-indent)
-        Return a valid value when used within a comment.
-        (such as when indenting when comment-multi-line is non-nil)
+        * c-mode.el (c-comment-indent):
+        Return a valid value when used within a comment
+        (such as when indenting when comment-multi-line is non-nil).
         Associated changes to
-         c-indent-line, c-calculate-indent-within-comment
+         c-indent-line, c-calculate-indent-within-comment.
 
         * debug.el (debug):
         Use buffer "*Backtrace*", not " *Backtrace*" so that users can
@@ -2117,89 +2115,88 @@
         Kill the buffer on exit so that users aren't tempted to lose
         weirdly.
         Rename "args" "debugger-args" so that common var isn't lambda-bound.
-
-        Make "-" be negative-argument in debugger-mode-map
+        Make "-" be negative-argument in debugger-mode-map.
 
         * rnews.el (news-convert-format):
         Don't lose on empty messages.
 
-        * term-vt100.el, term-vt200.el
+        * term-vt100.el, term-vt200.el:
         Make "application mode" arrow keys ("\eOA"... "\eOD") do the right
         thing.
 
 1985-08-06  Richard Mlynarik  (mly@mit-prep)
 
-        * c-mode.el
-        calculate-c-indent was ignoring parse-start arg
+        * c-mode.el:
+        calculate-c-indent was ignoring parse-start arg.
 
         Inserted jdf@prep.mit.edu's `else' indentation code
         Make C-j be reindent-then-newline-and-indent to take advantage
         of this.
 
-        * simple.el
-        Added function reindent-then-newline-and-indent
+        * simple.el:
+        Add function reindent-then-newline-and-indent.
 
-        * rnews.el
-        Fix typo and supply function news-show-all-headers
+        * rnews.el:
+        Fix typo and supply function news-show-all-headers.
 
-        * startup.el
+        * startup.el:
         Make the value of  args  be the remaining command-line
         arguments after the "-e" function name when the "-e" function
         is called.
         Make "-f" be the same as "-e" --- it's in the manual.
 
-        * bytecomp.el
-        Added batch-byte-compile written by crl@newton.purdue.edu
+        * bytecomp.el:
+        Add batch-byte-compile written by crl@newton.purdue.edu.
 
-        * isearch.el
+        * isearch.el:
         Typing C-s/C-r at start of isearch wasn't displaying search
         string until it had completed the search.
 
-        * indent.el (indent-relative)
-        Losing when indentation point was beneath non-whitespace
+        * indent.el (indent-relative):
+        Losing when indentation point was beneath non-whitespace.
 
         * c-mode.el (indent-c-exp):
         Replace "2" with "c-continued-statement-offset"
         Add (message "...")
 
-        * mlsupport.el
-        Fix typo in ml-current-indent
-        Make kill-to-end-of-line work
+        * mlsupport.el:
+        Fix typo in ml-current-indent.
+        Make kill-to-end-of-line work.
 
-        * mlconvert.el
-        Hack "(forward-word)" => "(forward-word 1)"
+        * mlconvert.el:
+        Hack "(forward-word)" => "(forward-word 1)".
 
 1985-08-05  Richard Mlynarik  (mly@mit-prep)
 
-        * c-mode.el
+        * c-mode.el:
         Variable "c-continued-statement-indent" should have been
-        "c-continued-statement-offset" as in the documentation and manual
+        "c-continued-statement-offset" as in the documentation and manual.
 
         * rmail.el (rmail-find):
         Hack default of last search string, hack reverse search.
         (-ve prefix arg):
-        Make "-" be negative-argument
+        Make "-" be negative-argument.
 
 1985-07-23  Richard Mlynarik  (mly@mit-prep)
 
         * shell.el (shell-send-input):
         cd/pushd hackery wasn't substitute-in/expand-file-name'ing
-        (ie "cd $es" was losing)
+        (ie "cd $es" was losing).
 
 1985-07-16  Richard Mlynarik  (mly@mit-prep)
 
         * view.el:
         Add "c-x ]" and "c-x [" page-movement commands
-        "c-x /" "c-x j" register save/jump
+        "c-x /" "c-x j" register save/jump.
 
         Speed up more losingly slow calls to substitute-command-keys by
         conditional substitution of constant string.
         (view-helpful-message, view-undefined, view-mode-command-loop)
 
-        * mail-utils.el
+        * mail-utils.el:
         rmail-dont-reply-to was losing on multi-line fields.
 
-        * simple.el
+        * simple.el:
         delete-blank-lines was deleting too much if on an isolated blank line.
 
 1985-07-12  Richard M. Stallman  (rms@mit-prep)
@@ -2222,7 +2219,7 @@
 
 1985-07-10  Richard Mlynarik  (mly@mit-prep)
 
-        * ebuff-menu.el (Electric-buffer-menu-undefined)
+        * ebuff-menu.el (Electric-buffer-menu-undefined):
         Don't call substitute-command-keys if keybindings are default,
         with resultant couple-of-orders-of-magnitude speedup.
         RMS: this is what my changes to Fsubstitute_command_keys in doc.c
@@ -2385,8 +2382,8 @@
         * compile.el (compile1.el):
         If *compilation* is current buffer, put point at end.
 
-        * simple.el (indent-for-comment, kill-comment, set-comment-column,
-        indent-new-comment-line): use comment-start-skip to find comments.
+        * simple.el (indent-for-comment, kill-comment, set-comment-column)
+        (indent-new-comment-line): Use comment-start-skip to find comments.
         Don't use find-comment-line any more.
 
         * lisp-mode.el, c-mode.el, scheme.el, mim-mode.el:
@@ -2554,8 +2551,8 @@
 
 1985-06-12  Richard Mlynarik  (mly@mit-prep)
 
-        * rmail (rmail-insert-inbox-text)
-        file-name-directory includes a trailing "/"
+        * rmail (rmail-insert-inbox-text):
+        file-name-directory includes a trailing "/".
 
 1985-06-12  K. Shane Hartman  (shane@mit-prep)
 
@@ -2686,7 +2683,7 @@
         describing help options.  Add `v' command for viewing buffer and
         returning to the Electric Buffer List.
 
-        * loaddefs.el: autoload edit-picture.
+        * loaddefs.el: Autoload edit-picture.
 
         * picture.el: New "Major" mode for editing pictures and tables.
 
@@ -2731,7 +2728,7 @@
 
         * sendmail.el (sendmail-send-it):
         Somewhat gratuitously deleting empty subject lines.
-        /usr/lib/sendmail seems smart enough (!) to hack this itself
+        /usr/lib/sendmail seems smart enough (!) to hack this itself.
 
 1985-06-04  K. Shane Hartman  (shane@mit-prep)
 
@@ -2798,7 +2795,7 @@
         Process exec-directory using expand-file-name
         so as not to depend on whether it ends in /.
 
-        * simple.el: define turn-on-auto-fill.
+        * simple.el: Define turn-on-auto-fill.
 
 1985-06-01  K. Shane Hartman  (shane@mit-prep)
 
@@ -2823,7 +2820,7 @@
 
 1985-06-01  Richard M. Stallman  (rms@mit-prep)
 
-        * Many files: put in \\[...] where appropriate.
+        * Many files: Put in \\[...] where appropriate.
 
 1985-06-01  K. Shane Hartman  (shane@mit-prep)
 
@@ -2862,16 +2859,16 @@
 
 1985-05-30  Richard Mlynarik  (mly@mit-prep)
 
-        * sendmail.el
-        Typo made sendmail-send-it lose when mail-interactive
+        * sendmail.el:
+        Typo made sendmail-send-it lose when mail-interactive.
 
-        * simple.el
+        * simple.el:
         Aborting out of octal read in read-quoted-char restarts
         "from the top."
 
-        * startup.el
+        * startup.el:
         Catch another place where \\[..] was needed
-        Don't insert copyright info if noninteractive
+        Don't insert copyright info if noninteractive.
 
 1985-05-30  K. Shane Hartman  (shane@mit-prep)
 
@@ -2913,22 +2910,22 @@
         * Rename some files so all .el & .elc file names are <= 14 chars.
         syntax-check-mim.el => mim-syntax.el (change in mim-mode.el too).
         new-version-level.el => grow-vers.el.
-        scheme-mode.el => scheme.el
-        compare-windows.el => compare-w.el
-        electric-buffer-list.el => ebuff-menu.el
+        scheme-mode.el => scheme.el.
+        compare-windows.el => compare-w.el.
+        electric-buffer-list.el => ebuff-menu.el.
 
 1985-05-28  Richard Mlynarik  (mly@mit-prep)
 
-        * simple.el (describe-function)
-        bind enable-recursive-minibuffers to read fn name
-        (useful when typing c-h f after m-esc)
+        * simple.el (describe-function):
+        Bind enable-recursive-minibuffers to read fn name
+        (useful when typing c-h f after m-esc).
 
-        * files.el
-        made create-file-buffer a lisp function (was in src/buffer.c)
+        * files.el:
+        Make create-file-buffer a lisp function (was in src/buffer.c).
 
-        * electric-buffer-menu-mode.el
+        * electric-buffer-menu-mode.el:
         If the first character typed is a space then quit, ie return to
-        previous window/buffer configuration
+        previous window/buffer configuration.
 
 1985-05-27  Richard M. Stallman  (rms@mit-prep)
 
@@ -2967,30 +2964,30 @@
         * lisp-mode.el:
         Provide default definition of lisp-send-defun, to just get an error.
 
-        * shell.el: rename lisp to run-lisp.
-        * loaddefs.el: make run-lisp autoloading.
+        * shell.el: Rename lisp to run-lisp.
+        * loaddefs.el: Make run-lisp autoloading.
 
 1985-05-23  Richard Mlynarik  (mly@mit-prep)
 
-        * files.el
+        * files.el:
         FOO! Local-variables weren't working since hack-local-variables
-        was searching for "\n^L" not "\n\^L"
+        was searching for "\n^L" not "\n\^L".
 
-        * lisp-mode.el, loadup.el, startup.el
-        renamed lisp-interaction-mode to elisp-interaction-mode
-        Made elisp-mode call elisp-mode-hook, elisp-interaction-mode call
+        * lisp-mode.el, loadup.el, startup.el:
+        Rename lisp-interaction-mode to elisp-interaction-mode
+        Make elisp-mode call elisp-mode-hook, elisp-interaction-mode call
         elisp-interaction-mode-hook.  This will break people's init files!
 
-        * loaddefs.el
-        made ".lisp" suffixes get lisp mode.  Toto, I don't think we're
+        * loaddefs.el:
+        Make ".lisp" suffixes get lisp mode.  Toto, I don't think we're
         using fourteen-character filenames anymore.
-        Autoload scheme-mode
+        Autoload scheme-mode.
 
-        * scheme-mode.el
-        installed scheme-mode, courtesy MIT scheme people.
+        * scheme-mode.el:
+        Install scheme-mode, courtesy MIT scheme people.
 
-        * lisp-mode.el
-        made mode doc strings use \[...] substitute-command-keys technology
+        * lisp-mode.el:
+        Make mode doc strings use \[...] substitute-command-keys technology.
 
 1985-05-23  Richard M. Stallman  (rms@mit-prep)
 
@@ -3008,19 +3005,19 @@
 
 1985-05-22  Richard Mlynarik  (mly@mit-prep)
 
-        * nrnews.el
+        * nrnews.el:
         Foo.  A distinct lack of communication here.
         Fairly radical surgery --- many bug fixes and clarifications,
         quite different from rnews.el  Sigh
 
 1985-05-22  K. Shane Hartman  (shane@mit-prep)
 
-        * view.el
+        * view.el:
         Add new flavor of help.  ?, h still give list of
         commands.  C-h understands m, c, k options.  Make
         help commands use pop up window with scroll on space.
 
-        * loaddefs.el
+        * loaddefs.el:
         Minor change for documentation of view-file and
         view-buffer because C-h does not describe mode now.
 
@@ -3045,15 +3042,15 @@
 1985-05-21  Richard Mlynarik  (mly@mit-prep)
 
         * mlsupport.el:
-        Fix assorted typos where variable "bufname" was changed to "name"
+        Fix assorted typos where variable "bufname" was changed to "name".
 
-        * view.el
+        * view.el:
         Make M-<, M-> work.  Fix documentation strings to work with the
         combination of lisp quoting and substitute-command-keys quoting.
 
-        * electric-buffer-list.el
+        * electric-buffer-list.el:
         Call Buffer-menu-execute before selecting. (Why doesn't standard
-        buffer-menu-mode do this?)  Flush "x", "1" and "2" commands
+        buffer-menu-mode do this?)  Flush "x", "1" and "2" commands.
 
         * buff-menu.el:
         Call bury-buffer after selecting new buffer.
@@ -3086,23 +3083,23 @@
 
 1985-05-19  Richard Mlynarik  (mly@mit-prep)
 
-        * view.el, dired.el
-        typos in viewing stuff
+        * view.el, dired.el:
+        Typos in viewing stuff.
 
-        * simple.el, isearch.el
-        Added prompt argument to read-quoted-char; improved isearch
+        * simple.el, isearch.el:
+        Add prompt argument to read-quoted-char; improve isearch
         input echoing when reading quoted char.
 
-        * sendmail.el, loaddefs.el
-        added send-mail-function; initially sendmail-send-it
+        * sendmail.el, loaddefs.el:
+        Add send-mail-function; initially sendmail-send-it
         (also, mail-yank-ignored-headers had a typo).
 
-        * rmail.el (rmail-get-new-mail, convert-to-babyl-format, ...)
+        * rmail.el (rmail-get-new-mail, convert-to-babyl-format, ...):
         * loaddefs.el:
         Remodularize inbox parsing.  Add support(?) for mmdf inboxes.
         Note that I can't seem to define definitive documentation of
         what this format is; however the code installed seems to work
-        for all cases encountered
+        for all cases encountered.
 
 1985-05-19  Richard M. Stallman  (rms@mit-prep)
 
@@ -3130,15 +3127,15 @@
 1985-05-17  Richard M. Stallman  (rms@mit-prep)
 
         * isearch.el:
-        Preserve window-start on exit from save-window-excursion
+        Preserve window-start on exit from save-window-excursion.
 
 1985-05-16  Richard M. Stallman  (rms@mit-prep)
 
-        * rmail.el: correct read-only suppression in rmail-new-summary.
+        * rmail.el: Correct read-only suppression in rmail-new-summary.
 
 1985-05-16  K. Shane Hartman  (shane@mit-prep)
 
-        * loaddefs.el: Autoload more-mode, more-file, more-buffer.
+        * loaddefs.el: Autoload more-mode, more-file, more-buffer.
 
         * more-mode.el: New tourist mode for files.
 
@@ -3149,7 +3146,7 @@
 
         * simple.el: Make <help> i run info.
 
-        * sundry changes to go with changes in src/fileio.c making
+        * Sundry changes to go with changes in src/fileio.c making
         copy-file, rename-file, add-name take an optional third argument.
         The only autoloaded system code this breaks is rmail ---
         a condition-case for wrong-number-of-arguments kludge was installed
@@ -3158,7 +3155,7 @@
         to remove the kludge at that time!
         Mods to files.el, loadup.el, rmail.el.
 
-        * added autoloading function electric-buffer-list.
+        * Add autoloading function electric-buffer-list.
 
         * buff-menu.el: Make splitting screen between > 2 buffers work.
 
@@ -3184,7 +3181,7 @@
 
         * inc-version.el: Kill Emacs at the end.
 
-        * simple.el: fixed overflow problem in what-cursor-position.
+        * simple.el: Fix overflow problem in what-cursor-position.
 
         * startup.el: Don't print a help message if noninteractive.
 
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index f2e88a899db..6db8f66f0ca 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -569,7 +569,7 @@
         * emacs-lisp/lisp-mode.el: Give `deftype' a doc-string-elt
         property (Bug#2984).
 
-2009-04-16  Leo  <sdl.web@gmail.com>  (tiny change)
+2009-04-16  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * ediff-wind.el (ediff-make-wide-display): Fix typo in frame
         parameter alist.
@@ -1041,7 +1041,7 @@
 
         * mail/supercite.el (sc-version): Doc fix.
 
-2009-03-19  Leo  <sdl.web@gmail.com>  (tiny change)
+2009-03-19  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * mail/supercite.el (sc-version): Fix typo in interactive spec.
 
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 6dbfff03573..f354050389e 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -288,7 +288,7 @@
         * emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error
         if there is no node.  (Bug#3261)
 
-2011-03-04  Leo  <sdl.web@gmail.com>
+2011-03-04  Leo Liu  <sdl.web@gmail.com>
 
         * vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)
 
@@ -866,7 +866,7 @@
         * net/soap-client.el:
         * net/soap-inspect.el: New files.
 
-2011-02-16  Leo  <sdl.web@gmail.com>
+2011-02-16  Leo Liu  <sdl.web@gmail.com>
 
         * dired-x.el (dired-mode-map, dired-extra-startup):
         Remove dired-copy-filename-as-kill since it's already in dired.el.
@@ -1586,7 +1586,7 @@
         * vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch):
         Callers changed.
 
-2011-01-28  Leo  <sdl.web@gmail.com>
+2011-01-28  Leo Liu  <sdl.web@gmail.com>
 
         * emacs-lisp/advice.el (ad-make-advised-docstring): Don't apply
         highlighting to the "this function is advised" message.
@@ -2668,7 +2668,7 @@
         * mail/rmail.el (rmail-show-message-1): If rmail-enable-mime is
         non-nil, handle the header in rmail-show-mime-function.
 
-2011-01-02  Leo  <sdl.web@gmail.com>
+2011-01-02  Leo Liu  <sdl.web@gmail.com>
 
         * help-fns.el (describe-variable): Fix previous change.
 
@@ -2699,7 +2699,7 @@
         * mail/smtpmail.el (smtpmail-send-it): Write queued mail body with
         Unix EOLs.  (Bug#7589)
 
-2011-01-02  Leo  <sdl.web@gmail.com>
+2011-01-02  Leo Liu  <sdl.web@gmail.com>
 
         * eshell/em-hist.el (eshell-previous-matching-input): Signal error
         if point is not behind eshell-last-output-end (Bug#7585).
@@ -2867,7 +2867,7 @@
         * obsolete/pgg-gpg.el, obsolete/pgg-def.el, obsolete/pgg.el:
         Move from lisp/.
 
-2010-12-20  Leo  <sdl.web@gmail.com>
+2010-12-20  Leo Liu  <sdl.web@gmail.com>
 
         * dnd.el (dnd-get-local-file-name): Unhex of file name shall
         always be performed (Bug#7680).
@@ -2953,7 +2953,7 @@
         * epa-file.el (epa-file-select-keys): Accept 'silent to inhibit
         key selection prompt; make 'silent as default (Bug#7487).
 
-2010-12-16  Leo  <sdl.web@gmail.com>
+2010-12-16  Leo Liu  <sdl.web@gmail.com>
 
         * eshell/eshell.el (eshell-directory-name):
         Use locate-user-emacs-file (Bug#7578).
@@ -3081,7 +3081,7 @@
         * diff-mode.el (diff-refine-hunk): Make it work when the hunk contains
         empty lines without a leading space.
 
-2010-12-13  Leo  <sdl.web@gmail.com>
+2010-12-13  Leo Liu  <sdl.web@gmail.com>
 
         * dired-aux.el (dired-do-redisplay): Postpone dired-after-readin-hook
         while mapping over marks (Bug#6810).
@@ -3155,7 +3155,7 @@
         (rmail-search-mime-message-function): Set to
         rmail-search-mime-message.
 
-2010-12-13  Leo  <sdl.web@gmail.com>
+2010-12-13  Leo Liu  <sdl.web@gmail.com>
 
         * ido.el (ido-common-initialization): New function.  (bug#3274)
         (ido-mode): Use it.
@@ -4990,7 +4990,7 @@
         (minibuffer-force-complete): Set completion-cycling.
         (completion-all-sorted-completions): Move declaration before first use.
 
-2010-10-28  Leo  <sdl.web@gmail.com>
+2010-10-28  Leo Liu  <sdl.web@gmail.com>
 
         * iswitchb.el (iswitchb-kill-buffer): Avoid `iswitchb-make-buflist'
         which changes the order of matches seen by users (bug#7231).
@@ -5279,7 +5279,7 @@
         (set-cursor-color, set-mouse-color, set-border-color):
         Use read-color.
 
-2010-10-24  Leo  <sdl.web@gmail.com>
+2010-10-24  Leo Liu  <sdl.web@gmail.com>
 
         * eshell/em-unix.el (eshell-remove-entries): Use the TRASH
         argument of delete-file and delete-directory (Bug#7011).
@@ -5876,7 +5876,7 @@
 
         * vc-svn.el (vc-svn-merge-news): Use --non-interactive.  (Bug#7152)
 
-2010-10-08  Leo  <sdl.web@gmail.com>
+2010-10-08  Leo Liu  <sdl.web@gmail.com>
 
         * dnd.el (dnd-get-local-file-name): If MUST-EXIST is non-nil, only
         return non-nil if the file exists (Bug#7090).
@@ -7038,7 +7038,7 @@
 
         * subr.el (y-or-n-p): New function, moved from src/fns.c; use read-key.
 
-2010-09-12  Leo  <sdl.web@gmail.com>
+2010-09-12  Leo Liu  <sdl.web@gmail.com>
 
         * net/rcirc.el (rcirc-server-commands, rcirc-client-commands)
         (rcirc-completion-start): New variables.
@@ -7961,7 +7961,7 @@
         * startup.el (command-line-1): Issue warning for ignored arguments
         --unibyte, etc (Bug#6886).
 
-2010-08-22  Leo  <sdl.web@gmail.com>
+2010-08-22  Leo Liu  <sdl.web@gmail.com>
 
         * net/rcirc.el (rcirc-add-or-remove): Accept a list of elements.
         (ignore, bright, dim, keyword): Split list of nicknames before
@@ -7971,7 +7971,7 @@
 
         * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880).
 
-2010-08-22  Leo  <sdl.web@gmail.com>
+2010-08-22  Leo Liu  <sdl.web@gmail.com>
 
         Fix buffer-list rename&refresh after killing a buffer in ido.
         * ido.el: Revert Óscar's.
@@ -8429,7 +8429,7 @@
         * emacs-lisp/syntax.el (syntax-ppss-toplevel-pos):
         Fix typo in docstring (bug#6747).
 
-2010-08-08  Leo  <sdl.web@gmail.com>
+2010-08-08  Leo Liu  <sdl.web@gmail.com>
 
         * eshell/esh-io.el (eshell-get-target): Better detection of
         read-only file (Bug#6762).
@@ -8535,7 +8535,7 @@
         (tramp-handle-start-file-process): Use it, in order to invalidate
         file caches.
 
-2010-08-03  Leo  <sdl.web@gmail.com>
+2010-08-03  Leo Liu  <sdl.web@gmail.com>
 
         * server.el (server-start): Simplify loop.
 
@@ -9336,7 +9336,7 @@
 
         * xml.el (xml-parse-region): Avoid infloop (Bug#5281).
 
-2010-06-29  Leo  <sdl.web@gmail.com>
+2010-06-29  Leo Liu  <sdl.web@gmail.com>
 
         * emacs-lisp/rx.el (rx): Doc fix.  (Bug#6537)
 
@@ -19360,7 +19360,7 @@
         * eshell/em-dirs.el (eshell-complete-user-reference):
         Declare pcomplete functions and variables to avoid compiler warnings.
 
-2009-09-13  Leo  <sdl.web@gmail.com>  (tiny change)
+2009-09-13  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * eshell/em-script.el (eshell-login-script, eshell-rc-script):
         * eshell/em-dirs.el (eshell-last-dir-ring-file-name):
@@ -19823,7 +19823,7 @@
         * files.el (locate-file-completion-table): Make it provide boundary
         information, so partial-completion works better.
 
-2009-09-04  Leo  <sdl.web@gmail.com>  (tiny change)
+2009-09-04  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * mail/footnote.el (Footnote-text-under-cursor):
         Check footnote-text-marker-alist before using it (bug#4324).
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index a02480fb3be..3c3979f22cf 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -56,7 +56,7 @@
         buffer or file has changed.
 
         * abbrev.el: Doc fix.
-        * files.el:
+        * files.el: ???
 
 1988-08-03  Robert J. Chassell  (bob@frosted-flakes.ai.mit.edu)
 
@@ -454,7 +454,7 @@
 
 1988-04-09  Leonard H. Tower Jr.  (tower@frosted-flakes.ai.mit.edu)
 
-        * rnewspost.el (news-post-news, news-reply) No longer re-inits
+        * rnewspost.el (news-post-news, news-reply): No longer re-inits
         *post-news* buffer, if buffer-modified-p.
 
 1988-04-09  Richard Stallman  (rms@frosted-flakes.ai.mit.edu)
@@ -852,7 +852,7 @@
         * lisp-mode.el (eval-print-last-sexp):
         * debug.el (debugger-mode):
         * chistory.el (Command-history-setup):
-        * options.el (Edit-options-mode):
+        * options.el (Edit-options-mode): ???
 
 1987-12-01  Richard Stallman  (rms@frosted-flakes)
 
@@ -1116,7 +1116,7 @@
 
 1987-06-08  Richard M. Stallman  (rms@prep)
 
-        * version 18.46 released.
+        * Version 18.46 released.
 
         * isearch.el (isearch): Typo (3 should be 2) in getting old
         start-point in reverse regexp search made more liberal.
@@ -1131,7 +1131,7 @@
 
 1987-05-31  Richard M. Stallman  (rms@prep)
 
-        * version 18.45.
+        * Version 18.45.
 
         * informat.el (Info-split): Bind case-fold-search to t.
 
@@ -1319,7 +1319,7 @@
 
 1987-04-15  Paul Rubin  (phr@prep)
 
-        * version 18.44 released.
+        * Version 18.44 released.
 
 1987-04-14  Richard Mlynarik  (mly@prep)
 
@@ -1910,7 +1910,7 @@
 
 1987-01-16  Richard Mlynarik  (mly@prep)
 
-        * rmail.el (rmail-count-new-messages),
+        * rmail.el (rmail-count-new-messages):
         * rmailout.el (rmail-output-to-rmail-file):
         Add optional arg `nomsg' to former, which latter supplies,
         so that rmail doesn't report counting one appended message.
@@ -2397,7 +2397,7 @@
 
 1986-11-23  Richard M. Stallman  (rms@prep)
 
-        * version 18.31 released.
+        * Version 18.31 released.
 
         * x-mouse.el: New mouse-command keys are C-x C-@.
 
@@ -2482,7 +2482,7 @@
 
 1986-11-14  Richard M. Stallman  (rms@prep)
 
-        * Emacs version 18.30 *
+        * Emacs version 18.30.
 
         * rmail.el (rmail-forward):
         Use mail-other-window unless there is only one window visible.
@@ -2624,8 +2624,8 @@
 
 1986-11-04  Richard M. Stallman  (rms@prep)
 
-        * various files (dired-mode, Edit-options-mode, rmail-mode,
-        rmail-summary-mode, rmail-edit-mode, Buffer-menu-mode):
+        * various files (dired-mode, Edit-options-mode, rmail-mode)
+        (rmail-summary-mode, rmail-edit-mode, Buffer-menu-mode):
         Give these symbols `special' as a `mode-class' property.
 
         * dired.el (dired-mode): Take out local value for
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index fef57d0c68d..f23b1199a4e 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -533,7 +533,7 @@
 
 1993-05-16  Richard Stallman  (rms@geech.gnu.ai.mit.edu)
 
-        * gnus.el, gnuspost.el, gnusmail.el, gnusmisc.el
+        * gnus.el, gnuspost.el, gnusmail.el, gnusmisc.el,
         * nntp.el, nnspool.el, mhspool.el: Version 3.15 from Umeda.
 
         * frame.el (toggle-scroll-bar): Renamed from toggle-vertical-scroll...
@@ -762,8 +762,8 @@
 
         Fail more gracefully if we can't build bold, italic, etc,
         versions of the default font.
-        * faces.el (make-face-bold, make-face-italic,
-        make-face-bold-italic, make-face-unbold, make-face-unitalic):
+        * faces.el (make-face-bold, make-face-italic)
+        (make-face-bold-italic, make-face-unbold, make-face-unitalic):
         Implement NOERROR argument.
         (x-initialize-frame-faces): Use the NOERROR argument to the
         font manipulation functions to avoid errors while starting up.
@@ -1772,8 +1772,8 @@
 
 1993-03-24  Jim Blandy  (jimb@geech.gnu.ai.mit.edu)
 
-        * calendar.el (calendar-standard-time-zone-name,
-        calendar-daylight-time-zone-name): Initialize these at load-time,
+        * calendar.el (calendar-standard-time-zone-name)
+        (calendar-daylight-time-zone-name): Initialize these at load-time,
         as well as calendar-time-zone.
 
         * calendar.el (calendar-time-zone): Fix code which initializes
@@ -1827,7 +1827,7 @@
         * help.el, register.el, replace.el, reposition.el, rfc822.el,
         * rlogin.el, rot13.el, scribe.el, scroll-bar.el, sendmail.el,
         * setenv.el, sgml-mode.el, simple.el, simula.el, sort.el, spell.el,
-        * spook.el, studly.el, tabify.el, text-mode.el: Added or corrected
+        * spook.el, studly.el, tabify.el, text-mode.el: Add or correct
         Commentary headers.
 
 1993-03-22  Edward M. Reingold  (reingold@emr.cs.uiuc.edu)
@@ -1840,7 +1840,7 @@
         * man.el, mlconvert.el, mlsupport.el, modula2.el, mouse.el,
         * mpuz.el, netunam.el, novice.el, nroff-mode.el, options.el,
         * outline.el, page.el, paragraphs.el, picture.el, prolog.el,
-        * rect.el: Added or corrected Commentary sections.
+        * rect.el: Add or correct Commentary sections.
 
 1993-03-22  Eric S. Raymond  (eric@geech.gnu.ai.mit.edu)
 
@@ -1857,7 +1857,7 @@
         * mail-utils.el, mailalias.el, makefile.el, makesum.el, mim-mode.el,
         * modula2.el, nroff-mode.el, perl-mode.el, prolog.el, scheme.el,
         * sgml-mode.el, tex-mode.el:
-        Added or corrected Commentary sections.  There's more of this
+        Add or correct Commentary sections.  There's more of this
         coming; soon, the package finder will be able to browse Commentary
         sections, and I want almost all packages to have useful ones.
 
@@ -1972,7 +1972,7 @@
         * cust-print.el, find-dired.el, etags.el, electric.el, dired.el,
         * dired-aux.el, cust-print.el, cmuscheme.el, cmulisp.el, cl.el,
         * case-table.el, byte-run.el, ange-ftp.el, backquote.el:
-        Added or corrected library header comments.
+        Add or correct library header comments.
 
 1993-03-17  Eric S. Raymond  (eric@mole.gnu.ai.mit.edu)
 
@@ -2186,8 +2186,8 @@
 
 1993-03-10  Edward M. Reingold  (reingold@emr.cs.uiuc.edu)
 
-        * diary-insert.el (insert-anniversary-diary-entry,
-        insert-block-diary-entry): Fix calendar-date-display-form used.
+        * diary-insert.el (insert-anniversary-diary-entry)
+        (insert-block-diary-entry): Fix calendar-date-display-form used.
 
 1993-03-10  Jim Blandy  (jimb@totoro.cs.oberlin.edu)
 
@@ -2383,8 +2383,8 @@
         nonexistent function last-month-of-hebrew-year to the correct
         function hebrew-calendar-last-month-of-year.
 
-        * cal-mayan.el (calendar-mayan-haab-on-or-before,
-        calendar-mayan-tzolkin-on-or-before): Change `mod' to `%'.
+        * cal-mayan.el (calendar-mayan-haab-on-or-before)
+        (calendar-mayan-tzolkin-on-or-before): Change `mod' to `%'.
 
         * cal-mayan.el (calendar-next-tzolkin-date): Delete bogus second
         defun.
@@ -2857,8 +2857,8 @@
         * ehelp.el (electric-help-command-loop): Same.
         * electric.el (Electric-command-loop): Same.
         * emerge.el (emerge-show-file-name): Same.
-        * fortran.el (fortran-abbrev-start,
-        fortran-window-create-momentarily): Same.
+        * fortran.el (fortran-abbrev-start)
+        (fortran-window-create-momentarily): Same.
         * gnus.el (gnus-Subject-next-article): Same.
         * info.el (Info-summary): Same.
         * isearch-mode.el (isearch-update, isearch-unread): Same.
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index 13a3b6364ca..64564626c46 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -124,7 +124,7 @@
 
         * server.el (server-kill-emacs-query-function): Ignore killed buffers.
 
-1994-05-24  Kenneth Manheimer  (ken.manheimer@nist.gov)
+1994-05-24  Ken Manheimer  (ken.manheimer@nist.gov)
 
         * allout.el (outline-chart-subtree): Include outline-next-
         heading in loop conditions to detect end-of-buffer (and avoid
@@ -342,7 +342,7 @@
         * startup.el (precompute-menubar-bindings): Don't precompute menus
         if not using x.
 
-1994-05-12  Kenneth Manheimer  (klm@coil.nist.gov)
+1994-05-12  Ken Manheimer  (klm@coil.nist.gov)
 
         * allout.el (outline-mode): Use outline-this-or-next-heading.
         * allout.el (outline-this-or-next-heading): New function.
@@ -421,7 +421,7 @@
 
 1994-05-10  Karl Heuer  (kwzh@hal.gnu.ai.mit.edu)
 
-        * ediff.el (ediff-no-help-in-control-buffer): Renamed from
+        * ediff.el (ediff-no-help-in-control-buffer): Rename from
         ediff-nix-help-in-control-buffer, to match doc and usage.
 
         * autoload.el (update-file-autoloads): Delete leftover variable.
@@ -517,7 +517,7 @@
         * cal-menu.el (calendar-mouse-set-mark): New function.
         (calendar-mouse-date-menu): Bind it to key.
 
-1994-05-08  Kenneth Manheimer  (klm@coil.nist.gov)
+1994-05-08  Ken Manheimer  (klm@coil.nist.gov)
 
         * allout.el (outline-init): New user interface for control of
         outline-mode session setup, sets up `outline-find-file-hook',
@@ -958,9 +958,9 @@
 
         * files.el (revert-buffer): Widen before replacing text.
 
-1994-04-29  Kenneth Manheimer  (ken.manheimer@nist.gov)
+1994-04-29  Ken Manheimer  (ken.manheimer@nist.gov)
 
-        * allout.el: major code speedups, bug fixes, behavior
+        * allout.el: Major code speedups, bug fixes, behavior
            refinements, doc-string clarification and elaboration, etc.
            Prominent new features include:
          - Exposure changes and navigation are greatly accelerated.
@@ -1689,7 +1689,7 @@
 
         * saveplace.el (save-place-find-file-hook)
         (save-place-kill-emacs-hook): New functions.
-        (hooks for find-file-hooks,kill-emacs-hook): Use those new functions.
+        (hooks for find-file-hooks, kill-emacs-hook): Use those new functions.
 
         * menu-bar.el (clipboard-yank, clipboard-kill-ring-save)
         (clipboard-kill-region): New functions.  Give them
@@ -3114,32 +3114,32 @@
         (calendar-cursor-to-date): Add optional parameter to cause error
         signal when cursor is not on a date---this allows lots of
         simplifications throughout the code.
-        (calendar-forward-month,calendar-set-mark)
-        (calendar-exchange-point-and-mark,calendar-count-days-region)
-        (calendar-print-day-of-year,calendar-print-iso-date)
-        (calendar-print-julian-date,calendar-print-islamic-date)
-        (calendar-print-hebrew-date,calendar-print-astro-day-number):
+        (calendar-forward-month, calendar-set-mark)
+        (calendar-exchange-point-and-mark, calendar-count-days-region)
+        (calendar-print-day-of-year, calendar-print-iso-date)
+        (calendar-print-julian-date, calendar-print-islamic-date)
+        (calendar-print-hebrew-date, calendar-print-astro-day-number):
         Use simplification.
 
         * holidays.el (calendar-cursor-holidays): Use new error arg
         to calendar-cursor-to-date.
 
-        * diary.el (view-diary-entries,diary-islamic-date): Use new error arg
+        * diary.el (view-diary-entries, diary-islamic-date): Use new error arg
         to calendar-cursor-to-date.
 
-        * diary-ins.el (insert-diary-entry,insert-weekly-diary-entry)
-        (insert-monthly-diary-entry,insert-yearly-diary-entry)
-        (insert-anniversary-diary-entry,insert-block-diary-entry)
-        (insert-cyclic-diary-entry,insert-hebrew-diary-entry)
-        (insert-monthly-hebrew-diary-entry,insert-yearly-hebrew-diary-entry)
-        (insert-islamic-diary-entry,insert-monthly-islamic-diary-entry)
+        * diary-ins.el (insert-diary-entry, insert-weekly-diary-entry)
+        (insert-monthly-diary-entry, insert-yearly-diary-entry)
+        (insert-anniversary-diary-entry, insert-block-diary-entry)
+        (insert-cyclic-diary-entry, insert-hebrew-diary-entry)
+        (insert-monthly-hebrew-diary-entry, insert-yearly-hebrew-diary-entry)
+        (insert-islamic-diary-entry, insert-monthly-islamic-diary-entry)
         (insert-yearly-islamic-diary-entry): Use new error arg
         to calendar-cursor-to-date.
 
         * solar.el (calendar-sunrise-sunset): Use new error arg
         to calendar-cursor-to-date.
 
-        * cal-french.el (calendar-print-french-date,diary-french-date):
+        * cal-french.el (calendar-print-french-date, diary-french-date):
         Use new error arg to calendar-cursor-to-date.
 
         * cal-mayan.el (calendar-print-mayan-date): Use new error arg
@@ -3516,16 +3516,18 @@
         (diary-entry-marker, calendar-today-marker)
         (calendar-holiday-marker): Don't autoload them; change definitions
         to support monochrome and color workstations.
-        (calendar-french-date-string,calendar-mayan-date-string): Autoload them.
+        (calendar-french-date-string, calendar-mayan-date-string):
+        Autoload them.
         (calendar-day-of-year-string, calendar-iso-date-string)
-        (calendar-julian-date-string,calendar-islamic-date-string)
-        (calendar-hebrew-date-string,calendar-astro-date-string): New functions.
+        (calendar-julian-date-string, calendar-islamic-date-string)
+        (calendar-hebrew-date-string, calendar-astro-date-string):
+        New functions.
         (calendar-print-day-of-year, calendar-print-iso-date)
-        (calendar-print-iso-date,calendar-print-julian-date)
-        (calendar-print-islamic-date,calendar-print-hebrew-date)
+        (calendar-print-iso-date, calendar-print-julian-date)
+        (calendar-print-islamic-date, calendar-print-hebrew-date)
         (calendar-print-astro-day-number): Use them.
         (calendar-mode-map): Add mouse support.
-        (calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
+        (calendar-unmark, mark-visible-calendar-date, calendar-mark-today):
         Rewritten.
 
         * diary.el (diary-day-of-year, diary-iso-date, diary-islamic-date)
@@ -5896,8 +5898,8 @@
 
         * loaddefs.el (ctl-x-map): `C-x r c' now runs `clear-rectangle'.
 
-        * texinfmt.el (texinfo-format-region texinfo-format-buffer): Add
-        ###autoload cookies.
+        * texinfmt.el (texinfo-format-region texinfo-format-buffer):
+        Add ###autoload cookies.
         (batch-texinfo-format): Use `buffer-disable-undo' instead of
         obsolete function `buffer-flush-undo'.
 
@@ -5916,8 +5918,8 @@
 
 1993-08-26  Jim Blandy  (blandy@comano.cscs.ch)
 
-        * add-log.el (add-log-full-name, add-log-mailing-address): New
-        variables.
+        * add-log.el (add-log-full-name, add-log-mailing-address):
+        New variables.
         (add-change-log-entry): Don't ask for the login name and site name
         separately; instead, prompt for a mailing address; that's more
         useful.  Set add-log-full-name and add-log-mailing-address, so
@@ -8760,8 +8762,8 @@
         calendar-time-display-form): Change Universal Time (UT) to
         Coordinated Universal Time (UTC).
 
-        *solar.el (solar-setup, solar-ephemeris-time, sunrise-sunset): Change
-        Universal Time (UT) to Coordinated Universal Time (UTC).
+        * solar.el (solar-setup, solar-ephemeris-time, sunrise-sunset):
+        Change Universal Time (UT) to Coordinated Universal Time (UTC).
         (solar-time-string): Use calendar-daylight-time-offset instead of
         1 hr, and use calendar-daylight-savings-switchover-time instead of
         midnight.  Add an optional parameter to allow forcing the use of
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 84dfb1031fd..5bc0474c58b 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -4501,7 +4501,7 @@
         (reporter-status-message, reporter-status-count): New variables.
 
         * reporter.el (reporter-update-status, reporter-beautify-list)
-        reporter-dump-variable): Now smarter about formatting variables
+        (reporter-dump-variable): Now smarter about formatting variables
         with list values.  Checks the value of reporter-dont-compact-list.
 
 1994-12-23  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -4732,8 +4732,8 @@
 
 1994-12-18  Lawrence R. Dodd  (dodd@roebling.poly.edu)
 
-        * fortran.el (fortran-end-if, fortran-end-do,
-        fortran-beginning-if, fortran-beginning-do): New subroutines.
+        * fortran.el (fortran-end-if, fortran-end-do)
+        (fortran-beginning-if, fortran-beginning-do): New subroutines.
         (fortran-blink-matching-if, fortran-blink-matching-do): Use them.
         (fortran-mark-do, fortran-mark-if): New user functions.
         (fortran-blink-matching-if, fortran-mode): Doc mod.
@@ -5249,8 +5249,8 @@
 
 1994-11-09  Francesco Potortì  (pot@cnuce.cnr.it)
 
-        * man.el (Man-berkeley-sed-script, Man-sysv-sed-script,
-        Man-cleanup-manpage, Man-fontify-manpage): Handle the "+\bo" form
+        * man.el (Man-berkeley-sed-script, Man-sysv-sed-script)
+        (Man-cleanup-manpage, Man-fontify-manpage): Handle the "+\bo" form
         (used by aix) in addition to the "o\b+" one (used by sun).
 
 1994-11-09  Karl Heuer  <kwzh@hal.gnu.ai.mit.edu>
@@ -5285,8 +5285,8 @@
 
 1994-11-08  Ed Reingold  <reingold@albert.gnu.ai.mit.edu>
 
-        * calendar.el (diary-entry-marker, calendar-today-marker,
-        calendar-holiday-marker): Don't supersede attributes for faces
+        * calendar.el (diary-entry-marker, calendar-today-marker)
+        (calendar-holiday-marker): Don't supersede attributes for faces
         `diary-face', `calendar-display-face', or `holiday-face' if they
         are already defined.
 
@@ -5341,7 +5341,7 @@
         * bytecomp.el (byte-compile-insert-header): Escape backslashes
         in FILENAME when putting it inside a string constant.
 
-1994-10-31  voelker  <voelker@cs.washington.edu>
+1994-10-31  Geoff Voelker  <voelker@cs.washington.edu>
 
         * makefile.nt: New file.
 
@@ -5634,8 +5634,8 @@
 
 1994-10-22  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
-        * dired-aux.el (dired-do-tags-search,
-        dired-do-tags-query-replace): New functions.
+        * dired-aux.el (dired-do-tags-search, dired-do-tags-query-replace):
+        New functions.
         * dired.el (dired-mode-map): Bind A to dired-do-tags-search, Q to
         dired-do-tags-query-replace.
 
@@ -5665,8 +5665,8 @@
 
 1994-10-20  Noah Friedman  <friedman@splode.com>
 
-        * timer.el (timer-error, timer-abnormal-termination,
-        timer-filter-error): New error conditions.
+        * timer.el (timer-error, timer-abnormal-termination)
+        (timer-filter-error): New error conditions.
         (timer-process-filter, timer-process-sentinel): Signal an error,
         don't just print a message.
 
@@ -5707,8 +5707,8 @@
 
 1994-10-19  Boris Goldowsky  <boris@cs.rochester.edu>
 
-        * facemenu.el (facemenu-face-menu, facemenu-foreground-menu,
-        facemenu-background-menu, facemenu-special-menu): New or renamed
+        * facemenu.el (facemenu-face-menu, facemenu-foreground-menu)
+        (facemenu-background-menu, facemenu-special-menu): New or renamed
         variables for submenus.
         * facemenu.el (facemenu-color-alist): Renamed from facemenu-colors.
         * facemenu.el (facemenu-add-new-face): New function.
@@ -5901,8 +5901,8 @@
         (facemenu-add-face, facemenu-discard-redundant-faces): New functions.
 
         * facemenu.el (facemenu-set-foreground, facemenu-set-background)
-        (facemenu-get-face, facemenu-foreground, facemenu-background): New
-        functions and variables.  Faces with names of the form fg:color
+        (facemenu-get-face, facemenu-foreground, facemenu-background):
+        New functions and variables.  Faces with names of the form fg:color
         and bg:color are now treated specially.
         (facemenu-update): Updated for above.
 
@@ -6168,10 +6168,10 @@
         * comint.el (comint-check-proc): Recognize `open'.
         (comint-exec): Use open-network-stream if command is a cons pair.
 
-        * font-lock.el (compilation-mode-font-lock-keywords,
-        rmail-summary-font-lock-keywords, dired-font-lock-keywords,
-        shell-font-lock-keywords, texi-font-lock-keywords,
-        perl-font-lock-keywords): Deleted.
+        * font-lock.el (compilation-mode-font-lock-keywords)
+        (rmail-summary-font-lock-keywords, dired-font-lock-keywords)
+        (shell-font-lock-keywords, texi-font-lock-keywords)
+        (perl-font-lock-keywords): Delete.
 
         * sh-script.el (sh-font-lock-keywords): Default to nil.
 
@@ -6232,7 +6232,7 @@
         (Man-filter-list, Man-original-frame, Man-arguments)
         (Man-fontify-manpage-flag, Man-sections-alist, Man-refpages-alist)
         (Man-uses-untabify-flag, Man-page-mode-string, Man-sed-script):
-        Added defvar's to keep the compiler quiet.
+        Add defvar's to keep the compiler quiet.
         (Man-getpage-in-background): Start buffer name with "*Man ".
         instead of "*man " to avoid conflict with "*mail*".
         (Man-match-substring): Defsubst moved before first call.
@@ -7016,7 +7016,7 @@
 
         * vc-hooks.el (vc-file-not-found-hook): Use save-excursion.
 
-1994-09-18  Kenneth Manheimer  (klm@coil.nist.gov)
+1994-09-18  Ken Manheimer  (klm@coil.nist.gov)
 
         * icomplete.el: Major rewrite to behave more like a minor mode.
         Doc fixes.
@@ -7233,14 +7233,14 @@
 
 1994-09-14  Boris Goldowsky  <boris@cs.rochester.edu>
 
-        * simple.el (repeat-complex-command, next-history-element,
-        previous-matching-history-element): Override print-level when
+        * simple.el (repeat-complex-command, next-history-element)
+        (previous-matching-history-element): Override print-level when
         offering command lines to edit.
 
 1994-09-13  Karl Heuer  <kwzh@hal.gnu.ai.mit.edu>
 
-        * faces.el (make-face-unbold, make-face-unitalic, make-face-bold,
-        make-face-italic, make-face-bold-italic): Don't try to frob font
+        * faces.el (make-face-unbold, make-face-unitalic, make-face-bold)
+        (make-face-italic, make-face-bold-italic): Don't try to frob font
         if it's nil.
 
 1994-09-11  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -7967,8 +7967,8 @@
         Now accommodates buffer identifications generated by
         mode-line.el and uniquify.el.
 
-        * ediff.el (ediff-current-diff-face-A/B,
-        ediff-fine-diff-face-A/B,ediff-odd/even-diff-face-A/B):
+        * ediff.el (ediff-current-diff-face-A/B)
+        (ediff-fine-diff-face-A/B, ediff-odd/even-diff-face-A/B):
         Variables changed to contain face names
         instead of face internal representation.
 
@@ -8714,9 +8714,9 @@
 
 1994-06-22  Noah Friedman  (friedman@splode.com)
 
-        * rsz-mini.el (resize-minibuffer-window-exactly,
-        resize-minibuffer-frame, resize-minibuffer-frame-exactly): Doc
-        fixes.
+        * rsz-mini.el (resize-minibuffer-window-exactly)
+        (resize-minibuffer-frame, resize-minibuffer-frame-exactly):
+        Doc fixes.
         (resize-minibuffer-frame-exactly): Make default t.
         (resize-minibuffer-frame-original-height): New variable.
         (resize-minibuffer-setup): Set it locally in the minibuffer.
@@ -8912,8 +8912,8 @@
 
 1994-06-17  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
 
-        * etags.el (tags-table-computed-list,
-        tags-table-computed-list-for): New variables.
+        * etags.el (tags-table-computed-list)
+        (tags-table-computed-list-for): New variables.
         (tags-table-list-pointer, tags-table-list-started-at): Doc fixes.
         (tags-table-parent-pointer-list): Variable removed.
         (tags-table-check-computed-list, tags-table-extend-computed-list): New
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index c3d748a7baa..85301ef78e1 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -686,7 +686,7 @@
 
 1996-06-23  Noah Friedman  <friedman@splode.com>
 
-        * rlogin.el (rlogin): make comint-output-filter-functions local
+        * rlogin.el (rlogin): Make comint-output-filter-functions local
         before adding hooks.
 
 1996-06-22  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>
@@ -719,7 +719,7 @@
         (ediff-make-diff2-buffer): Refuses to diff remote files.
         (ediff-make-diff2-buffer, ediff-setup-diff-regions): Changed functions.
         (ediff-make-diff2-buffer): New function.
-        Added ^\C-m$ to ok-lines regexps
+        Add ^\C-m$ to ok-lines regexps.
 
         * ediff-ptch.el: New file.
 
@@ -1478,8 +1478,8 @@
 
 1996-04-18  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
-        * gnus.el (gnus-summary-pipe-output, gnus-buffer-configuration,
-        gnus-window-to-buffer): Pop up the shell buffer after piping
+        * gnus.el (gnus-summary-pipe-output, gnus-buffer-configuration)
+        (gnus-window-to-buffer): Pop up the shell buffer after piping
         articles through a filter.
 
         * gnus-ems.el: Make invisible text intangible as well.
@@ -2684,7 +2684,7 @@
         determined in c-emacs-features.
 
         * cc-mode.el:
-        imenu is required in Emacs 19, but doesn't exist in XEmacs
+        imenu is required in Emacs 19, but doesn't exist in XEmacs.
 
         * cc-mode.el (c-site-default-style): New variable.
 
@@ -2874,15 +2874,15 @@
 
 1996-01-29  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
-        * ada-mode.el (ada-indent-region, ada-check-matching-start,
-        ada-check-defun-name): Fix error format string.
+        * ada-mode.el (ada-indent-region, ada-check-matching-start)
+        (ada-check-defun-name): Fix error format string.
         * allout.el (outline-process-exposed): Likewise.
         * bookmark.el (bookmark-load): Likewise.
         * cpp.el (cpp-parse-error): Likewise.
         * ediff-init.el (ediff-event-point, ediff-event-buffer):
         Likewise.
-        * etags.el (visit-tags-table-buffer, tags-loop-scan,
-        complete-tag): Likewise.
+        * etags.el (visit-tags-table-buffer, tags-loop-scan)
+        (complete-tag): Likewise.
         * forms.el (forms--process-format-list): Likewise.
         * gnus-ems.el (gnus-summary-insert-pseudos-xemacs): Likewise.
         * hexl.el (hexl-hex-char-to-integer, hexl-oct-char-to-integer):
@@ -3106,8 +3106,8 @@
         * facemenu.el (list-text-properties-at): Likewise.
         * finder.el (finder-summary): Likewise.
         * flow-ctrl.el (enable-flow-control): Likewise.
-        * forms.el (forms--help, forms-search-forward,
-        forms-search-backward): Likewise.
+        * forms.el (forms--help, forms-search-forward)
+        (forms-search-backward): Likewise.
         * help-macro.el (make-help-screen): Likewise.
         * hippie-exp.el (hippie-expand): Likewise.
         * holidays.el (calendar-cursor-holidays): Likewise.
@@ -3133,8 +3133,8 @@
         * type-break.el (type-break-demo-life): Likewise.
         * view.el (view-mode-enter, View-scroll-lines-forward): Likewise.
         * viper-ex.el (ex-pwd, vip-info-on-file): Likewise.
-        * viper-macs.el (ex-map-read-args, ex-unmap-read-args,
-        vip-record-kbd-macro): Likewise.
+        * viper-macs.el (ex-map-read-args, ex-unmap-read-args)
+        (vip-record-kbd-macro): Likewise.
         * viper-util.el (vip-save-setting): Likewise.
 
         * ada-mode.el (ada-adjust-case-region, ada-indent-region): Delete
@@ -3146,14 +3146,14 @@
         * enriched.el (enriched-next-annotation): Likewise.
         * ispell4.el (ispell-point): Likewise.
         * mh-e.el (mh-get-new-mail): Likewise.
-        * saveplace.el (toggle-save-place, save-place-alist-to-file,
-        load-save-place-alist-from-file): Likewise.
+        * saveplace.el (toggle-save-place, save-place-alist-to-file)
+        (load-save-place-alist-from-file): Likewise.
         * shadow.el (list-load-path-shadows): Likewise.
         * shadowfile.el (shadow-cancel, shadow-copy-file): Likewise.
         * subr.el (read-quoted-char): Likewise.
         * tpu-edt.el (tpu-y-or-n-p): Likewise.
-        * vip.el (vip-replace-string, vip-search-forward,
-        vip-search-backward): Likewise.
+        * vip.el (vip-replace-string, vip-search-forward)
+        (vip-search-backward): Likewise.
         * viper-ex.el (ex-set): Likewise.
 
 1996-01-24  Karl Heuer  <kwzh@gnu.ai.mit.edu>
@@ -3176,9 +3176,9 @@
 
         * solitaire.el (solitaire): Doc fix.
 
-        * solar.el (solar-moment, solar-ephemeris-time,
-        solar-equatorial-coordinates, solar-horizontal-coordinates): Doc
-        fixes.
+        * solar.el (solar-moment, solar-ephemeris-time)
+        (solar-equatorial-coordinates, solar-horizontal-coordinates):
+        Doc fixes.
 
         * lunar.el (lunar-new-moon-on-or-after): Doc fix.
 
@@ -3221,11 +3221,11 @@
         * cal-tex.el (cal-tex-preamble): Add \hfuzz=1000pt to get rid of
         overfull box messages.
 
-        * solar.el (calendar-latitude, calendar-longitude,
-        calendar-location-name, solar-sunrise-and-sunset): Fix doc strings.
+        * solar.el (calendar-latitude, calendar-longitude)
+        (calendar-location-name, solar-sunrise-and-sunset): Fix doc strings.
         (solar-exact-local-noon, solar-sunrise-sunset): Refer to
         (calendar-longitude) and (calendar-latitude) instead of
-        calendar-longitude and
+        calendar-longitude and calendar-latitude.
 
 1996-01-24  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -3743,67 +3743,67 @@
 
         * custom.el (custom-default-validate): Fix message spelling.
         * debug.el (debug): Likewise.
-        * doctor.el (make-doctor-variables, doctor-othermodifierp,
-        doctor-strangelove): Likewise.
+        * doctor.el (make-doctor-variables, doctor-othermodifierp)
+        (doctor-strangelove): Likewise.
         * dunnet.el (dun-sauna-heat, dun-login): Likewise.
         * gnus.el (gnus-summary-save-article): Likewise.
         * hideshow.el (hs-hide-block): Likewise.
         * hilit19.el (hilit-submit-feedback): Likewise.
-        * mail-extr.el (mail-extr-nuke-outside-range,
-        mail-extr-all-top-level-domains): Likewise.
+        * mail-extr.el (mail-extr-nuke-outside-range)
+        (mail-extr-all-top-level-domains): Likewise.
         * simple.el (shell-command): Likewise.
         * term.el (term-process-pager): Likewise.
         * term/sun-mouse.el (describe-mouse-briefly): Likewise.
 
-        * ada-mode.el (ada-case-keyword, ada-auto-case, ada-krunch-args,
-        ada-call-pretty-printer): Doc fix.
-        * allout.el (outline-primary-bullet, outline-numbered-bullet,
-        outline-override-protect, outline-explicitly-deactivated,
-        outline-init, outline-chart-subtree, outline-chart-spec,
-        outline-make-topic-prefix, outline-open-topic,
-        outline-reindent-body, outline-yank-processing, outline-yank,
-        outlineify-sticky): Doc fix.
+        * ada-mode.el (ada-case-keyword, ada-auto-case, ada-krunch-args)
+        (ada-call-pretty-printer): Doc fix.
+        * allout.el (outline-primary-bullet, outline-numbered-bullet)
+        (outline-override-protect, outline-explicitly-deactivated)
+        (outline-init, outline-chart-subtree, outline-chart-spec)
+        (outline-make-topic-prefix, outline-open-topic)
+        (outline-reindent-body, outline-yank-processing, outline-yank)
+        (outlineify-sticky): Doc fix.
         * apropos.el (apropos-files-scanned): Doc fix.
         * arc-mode.el (archive-summarize-files): Doc fix.
         * bib-mode.el (capitalize-title-stop-words): Doc fix.
         * bibtex.el (bibtex-generate-autokey, bibtex-find-entry-location):
         Doc fix.
-        * bookmark.el (bookmark-save-flag, bookmark-read-annotation-text-func,
-        bookmark-rename, bookmark-bmenu-mode, bookmark-menu-rename): Doc fix.
-        * cc-mode.el (c-file-offsets, c++-mode, c-mode, objc-mode,
-        c-postprocess-file-styles): Doc fix.
+        * bookmark.el (bookmark-save-flag, bookmark-read-annotation-text-func)
+        (bookmark-rename, bookmark-bmenu-mode, bookmark-menu-rename): Doc fix.
+        * cc-mode.el (c-file-offsets, c++-mode, c-mode, objc-mode)
+        (c-postprocess-file-styles): Doc fix.
         * cl-extra.el (cl-copy-tree): Doc fix.
         * comint.el (comint-ptyp, comint-completion-autolist): Doc fix.
         * compile.el (compilation-error-list): Doc fix.
         * cplus-md.el (c++-mode): Doc fix.
         * cpp.el (cpp-unknown-face, cpp-face-mono-list, cpp-face-all-list):
         Doc fix.
-        * custom.el (rear-nonsticky, custom-property-set, custom-field-accept,
-        custom-repeat-extract, custom-pair-extract, custom-list-extract,
-        custom-choice-extract, custom-choice-validate, custom-mode-map):
+        * custom.el (rear-nonsticky, custom-property-set, custom-field-accept)
+        (custom-repeat-extract, custom-pair-extract, custom-list-extract)
+        (custom-choice-extract, custom-choice-validate, custom-mode-map):
         Doc fix.
         * dired-x.el (dired-mark-sexp): Doc fix.
         * docref.el (docref-subst): Doc fix.
         * edebug.el (edebug-read): Doc fix.
         * ediff-init.el (ediff-keep-variants): Doc fix.
         * ediff-wind.el (ediff-prefer-iconified-control-frame): Doc fix.
-        * edt.el (edt-find-forward, edt-find-backward, edt-find,
-        edt-find-next-forward, edt-find-next-backward, edt-find-next): Doc fix.
+        * edt.el (edt-find-forward, edt-find-backward, edt-find)
+        (edt-find-next-forward, edt-find-next-backward, edt-find-next): Doc fix.
         * ffap.el (ffap-list-env): Doc fix.
         * files.el (make-directory): Doc fix.
-        * fill.el (fill-context-prefix, unjustify-current-line,
-        unjustify-region): Doc fix.
+        * fill.el (fill-context-prefix, unjustify-current-line)
+        (unjustify-region): Doc fix.
         * font-lock.el (font-lock-keywords): Doc fix.
         * format.el (format-annotate-atomic-property-change): Doc fix.
         * forms.el (forms-toggle-read-only, forms-enumerate): Doc fix.
         gnus-cus.el: Doc fix.
         * gnus-edit.el (gnus-score-custom-data): Doc fix.
         * gnus-uu.el (gnus-uu-do-not-unpack-archives): Doc fix.
-        * gnus.el (gnus-buffer-configuration,
-        gnus-article-hide-headers-if-wanted): Doc fix.
-        * hexl.el (hexl-program, hexl-beginning-of-1k-page,
-        hexl-end-of-1k-page, hexl-beginning-of-512b-page,
-        hexl-end-of-512b-page): Doc fix.
+        * gnus.el (gnus-buffer-configuration)
+        (gnus-article-hide-headers-if-wanted): Doc fix.
+        * hexl.el (hexl-program, hexl-beginning-of-1k-page)
+        (hexl-end-of-1k-page, hexl-beginning-of-512b-page)
+        (hexl-end-of-512b-page): Doc fix.
         * hideshow.el (hs-unbalance-handler-method, hs-show-block): Doc fix.
         * hilit19.el (hilit-lookup-face-create): Doc fix.
         * icomplete.el (icomplete-simple-completing-p, icomplete-completions):
@@ -3814,8 +3814,8 @@
         * iso-cvt.el (iso-fix-tex2iso): Doc fix.
         * ispell4.el (ispell-gnu-look-still-broken-p, ispell-message-text-end):
         Doc fix.
-        * make-mode.el (makefile-insert-special-target,
-        makefile-backslash-region): Doc fix.
+        * make-mode.el (makefile-insert-special-target)
+        (makefile-backslash-region): Doc fix.
         * mh-e.el (mh-good-msg-regexp): Doc fix.
         * modula2.el (m2-case, m2-for, m2-if): Doc fix.
         * msb.el (msb-max-file-menu-items, msb-menu-cond): Doc fix.
@@ -3830,12 +3830,12 @@
         * sh-script.el (sh-mode-syntax-table): Doc fix.
         * simple.el (next-completion): Doc fix.
         * skeleton.el (skeleton-insert): Doc fix.
-        * supercite.el (sc-citation-nonnested-root-regexp,
-        sc-add-citation-level, sc-no-blank-line-or-header): Doc fix.
+        * supercite.el (sc-citation-nonnested-root-regexp)
+        (sc-add-citation-level, sc-no-blank-line-or-header): Doc fix.
         * tempo.el (tempo-local-tags, tempo-user-elements, tempo-use-tag-list):
         Doc fix.
-        * term.el (term-ptyp, term-termcap-format, term-scroll-region,
-        term-completion-autolist): Doc fix.
+        * term.el (term-ptyp, term-termcap-format, term-scroll-region)
+        (term-completion-autolist): Doc fix.
         * texinfo.el (texinfo-master-menu): Doc fix.
         * texnfo-upd.el (texinfo-master-menu): Doc fix.
         * thingatpt.el (read-from-whole-string): Doc fix.
@@ -3845,8 +3845,8 @@
         * type-break.el (type-break-keystroke-threshold, type-break-mode):
         Doc fix.
         * vip.el (vip-shift-width): Doc fix.
-        * viper.el (vip-insert-diehard-minor-mode, vip-toggle-search-style,
-        vip-del-backward-char-in-replace, vip-query-replace): Doc fix.
+        * viper.el (vip-insert-diehard-minor-mode, vip-toggle-search-style)
+        (vip-del-backward-char-in-replace, vip-query-replace): Doc fix.
         * vmsproc.el (display-subprocess-window): Doc fix.
         * xscheme.el (xscheme-control-g-synchronization-p): Doc fix.
 
@@ -4389,9 +4389,9 @@
 
 1995-12-19  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        * time.el (display-time): make it work under ms-dos by setting the
+        * time.el (display-time): Make it work under MS-DOS by setting the
         `dos-display-time' variable instead of invoking `wakeup' as
-        asynchronous process (which doesn't work under ms-dos).
+        asynchronous process (which doesn't work under MS-DOS).
 
 1995-12-19  Karl Heuer  <kwzh@gnu.ai.mit.edu>
 
@@ -4419,8 +4419,8 @@
 
 1995-12-14  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
 
-        * gnus.el (gnus-summary-mode-line-format,
-        gnus-article-mode-line-format, gnus-group-mode-line-format):
+        * gnus.el (gnus-summary-mode-line-format)
+        (gnus-article-mode-line-format, gnus-group-mode-line-format):
         Include the buffer name in the default mode strings.
         (gnus-mode-non-string-length): Changed the default to not
         limit/pad mode line lengths.
@@ -4502,8 +4502,8 @@
         (bibtex-font-lock-keywords): New variable with font-lock keywords
         for BibTeX mode.
 
-        * bibtex.el (bibtex-make-optional-field): Not longer interactive
-        (suggested by Karl Eichwalder <karl@pertron.central.de>).
+        * bibtex.el (bibtex-make-optional-field): Not longer interactive.
+        Suggested by Karl Eichwalder <karl@pertron.central.de>.
 
         * bibtex.el (bibtex-maintain-sorted-entries): Set to nil, since it
         requires more user attention and more restricted files to have
@@ -4561,8 +4561,8 @@
         to bibtex-completion-candidates).
         (bibtex-complete-string): Made it use bibtex-string.
 
-        * bibtex.el (bibtex-keys,
-        bibtex-buffer-last-parsed-for-keys-tick): New buffer-local
+        * bibtex.el (bibtex-keys)
+        (bibtex-buffer-last-parsed-for-keys-tick): New buffer-local
         variables to make parsing of BibTeX buffer for reference keys
         (needed by TAB completion in minibuffer when entering key) more
         occasional.
@@ -4708,17 +4708,17 @@
 
 1995-11-29  Paul Eggert  <eggert@twinsun.com>
 
-        * cal-chinese.el (calendar-chinese-sexagesimal-name): Renamed from
+        * cal-chinese.el (calendar-chinese-sexagesimal-name): Rename from
         calendar-chinese-sexagisimal-name to fix misspelling.
         * cal-hebrew.el (holiday-rosh-hashanah-etc): Fix misspelled var.
         * holidays.el (holiday-easter-etc): Fix misspelling of "Whitmonday".
         * calendar.el (calendar-setup, calendar-basic-setup)
         (calendar-next-calendar-round-date)
-        (calendar-previous-calendar-round-date, cal-tex-cursor-year)
-        * cal-julian.el (calendar-absolute-from-astro)
+        (calendar-previous-calendar-round-date, cal-tex-cursor-year):
+        * cal-julian.el (calendar-absolute-from-astro):
         * cal-mayan.el (calendar-next-calendar-round-date)
-        (calendar-previous-calendar-round-date)
-        * diary-lib.el (list-sexp-diary-entries)
+        (calendar-previous-calendar-round-date):
+        * diary-lib.el (list-sexp-diary-entries):
         * solar.el (solar-longitude): Doc fixes to fix misspellings.
 
 1995-11-29  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -5010,8 +5010,8 @@
 1995-11-14  Eric Ding  <ericding@mit.edu>
 
         * goto-addr.el (goto-address-highlight-p): New variable.
-        (goto-address-fontify): Removed check for invisible text,
-        set inhibit-point-motion-hooks instead
+        (goto-address-fontify): Remove check for invisible text,
+        set inhibit-point-motion-hooks instead.
 
 1995-11-13  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -5980,7 +5980,7 @@
 
         * help.el (print-help-return-message): Handle lists in
         special-display-regexps and same-window-regexps.  Also in
-        special-display-buffer-names and same-window-buffer-names
+        special-display-buffer-names and same-window-buffer-names.
 
         * files.el (interpreter-mode-alist): Handle nawk.
 
@@ -6157,8 +6157,8 @@
         dates; fix astro date message.
         (calendar-mouse-2-date-menu): Add dayname to menu.
 
-        * cal-french.el (french-calendar-special-days-array,
-        calendar-french-date-string): Fix accents.
+        * cal-french.el (french-calendar-special-days-array)
+        (calendar-french-date-string): Fix accents.
         (calendar-goto-french-date): Use reverse instead of nreverse; fix
         accents.
         (french-calendar-epoch): New variable.
@@ -6168,8 +6168,8 @@
         (dst-adjust-time): Moved and renamed from solar.el.
         (dst-in-effect): New function.
 
-        * solar.el (solar-equinoxes-solstices, solar-ephemeris-correction,
-        solar-equinoxes/solstices): Rewritten.
+        * solar.el (solar-equinoxes-solstices, solar-ephemeris-correction)
+        (solar-equinoxes/solstices): Rewritten.
         (solar-apparent-longitude-of-sun): Deleted.
         (solar-longitude, solar-date-next-longitude): New functions.
         (solar-adj-time-for-dst): Renamed dst-adjust-time and moved to
@@ -6178,31 +6178,30 @@
         Take angle mod 360.0.
         (solar-tangent-degrees): Change to macro.
 
-        * calendar.el (calendar-mod, calendar-absolute-from-astro,
-        calendar-astro-from-absolute): New functions.
-        (calendar-astro-date-string, calendar-goto-astro-day-number): Use
-        them.  Autoload holiday-chinese-new-year,
+        * calendar.el (calendar-mod, calendar-absolute-from-astro)
+        (calendar-astro-from-absolute): New functions.
+        (calendar-astro-date-string, calendar-goto-astro-day-number):
+        Use them.  Autoload holiday-chinese-new-year,
         calendar-goto-chinese-date, calendar-print-chinese-date,
         calendar-chinese-date-string, calendar-goto-coptic-date,
         calendar-print-coptic-date, calendar-coptic-date-string,
         calendar-goto-ethiopic-date, calendar-print-ethiopic-date,
         calendar-ethiopic-date-string, calendar-one-frame-setup, and
-        calendar-two-frame-setup.  (oriental-holidays): New variable for
-        Chinese New Year.  (calendar-mode-map): Put Chinese and Coptic
-        calendar functions on keys.  (calendar-setup): Moved here from
-        cal-x.el.  (diary-file): Mention Chinese, Coptic, and Ethiopic
-        dates.  (calendar-goto-today, calendar-forward-month,
-        calendar-forward-year, calendar-backward-month,
-        calendar-backward-year, scroll-calendar-left,
-        scroll-calendar-right, scroll-calendar-left-three-months,
-        scroll-calendar-right-three-months,
-        calendar-cursor-to-nearest-date, calendar-forward-day,
-        calendar-backward-day, calendar-forward-week,
-        calendar-backward-week, calendar-beginning-of-week,
-        calendar-end-of-week, calendar-beginning-of-month,
-        calendar-end-of-month, calendar-beginning-of-year,
-        calendar-end-of-year, calendar-cursor-to-visible-date,
-        calendar-goto-date, calendar-goto-iso-date): Moved to cal-move.el.
+        calendar-two-frame-setup.
+        (oriental-holidays): New variable for Chinese New Year.
+        (calendar-mode-map): Put Chinese and Coptic calendar functions on keys.
+        (calendar-setup): Moved here from cal-x.el.
+        (diary-file): Mention Chinese, Coptic, and Ethiopic dates.
+        (calendar-goto-today, calendar-forward-month, calendar-forward-year)
+        (calendar-backward-month, calendar-backward-year, scroll-calendar-left)
+        (scroll-calendar-right, scroll-calendar-left-three-months)
+        (scroll-calendar-right-three-months, calendar-cursor-to-nearest-date)
+        (calendar-forward-day, calendar-backward-day, calendar-forward-week)
+        (calendar-backward-week, calendar-beginning-of-week)
+        (calendar-end-of-week, calendar-beginning-of-month)
+        (calendar-end-of-month, calendar-beginning-of-year)
+        (calendar-end-of-year, calendar-cursor-to-visible-date)
+        (calendar-goto-date, calendar-goto-iso-date): Moved to cal-move.el.
         (calendar-goto-julian-date): Moved to cal-julian.
         (calendar-cursor-to-date, generate-calendar-month): Consider the
         space next to a one-digit date as being on that date.
@@ -6210,8 +6209,8 @@
         * cal-mayan.el (calendar-mayan-tzolkin-from-absolute): Use them.
         (mayan-adjusted-mod): Moved to calendar.el and renamed calendar-mod.
 
-        * lunar.el (lunar-new-moon-time, lunar-new-moon-on-or-after) New
-        functions.
+        * lunar.el (lunar-new-moon-time, lunar-new-moon-on-or-after):
+        New functions.
 
 1995-09-18  Richard Stallman  <rms@whiz-bang.gnu.ai.mit.edu>
 
@@ -6863,7 +6862,7 @@
         (skeleton-read): Don't quit and remove partial skeleton when empty
         string entered for outer iterator.  Added implicit argument `input'.
         (define-skeleton, skeleton-insert, skeleton-internal-list): Use `x
-        rather than backquote's (` x) or own (list 'x)
+        rather than backquote's (` x) or own (list 'x).
 
         * sh-script.el (sh-test): New variable.
         (sh-if, sh-until, sh-while): Use it.
@@ -7011,8 +7010,8 @@
 
 1995-08-04  Stephen A. Wood  <saw@hallc1.cebaf.gov>
 
-        * fortran.el (fortran-auto-fill-mode, fortran-do-auto-fill,
-        fortran-fill): Invoke auto filling only when past fill-column.
+        * fortran.el (fortran-auto-fill-mode, fortran-do-auto-fill)
+        (fortran-fill): Invoke auto filling only when past fill-column.
 
 1995-08-04  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
@@ -7287,7 +7286,7 @@
 
 1995-07-25  Ake Stenhoff  <etxaksf@aom.ericsson.se>
 
-        * perl-mode.el (perl-imenu-generic-expression) New variable.
+        * perl-mode.el (perl-imenu-generic-expression): New variable.
         (perl-mode): Set imenu-generic-expression.
 
         * imenu.el (imenu-generic-expression): Call make-variable-buffer-local.
@@ -7640,7 +7639,7 @@
         apropos-command in apropos.el.
 
         * autoload.el (make-autoload): Generate `(autoload ...)' form for
-        `(define-skeleton ...)'
+        `(define-skeleton ...)'.
 
         * skeleton.el: Partly rewritten and extended.
         (skeleton-filter, skeleton-untabify, skeleton-further-elements)
@@ -7702,7 +7701,7 @@
         * two-column.el: Symbols renamed to be like mode-line indicator.
         Supposed to now also work for Lucid.
         (2C-mode-map): New name for `tc-mode-map'.  Additionally bound to [f2].
-        (2C-minor-mode-map) New variable.
+        (2C-minor-mode-map): New variable.
         (2C-mode): New name for `tc-other'.
         (2C-mode-line-format): New name for `tc-mode-line-format'.
         (2C-other-buffer-hook): New variable.
@@ -7799,7 +7798,7 @@
 1995-06-29  David M. Smith  <D.M.Smith@lancaster.ac.uk>
 
         * ielm.el (ielm-font-lock-keywords): New variable.
-        (inferior-emacs-lisp-mode): Use it for font-lock support
+        (inferior-emacs-lisp-mode): Use it for font-lock support.
 
 1995-06-29  Bryan O'Sullivan  <bos@Eng.Sun.COM>
 
@@ -7944,7 +7943,7 @@
 
 1995-06-24  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
-        * rmail.el (rmail-revert): Use the default revert-buffer-function
+        * rmail.el (rmail-revert): Use the default revert-buffer-function.
 
         * simple.el (newline): Put point at right place if insert gets error.
 
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 10c8a024df0..5bc9c8a8d25 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1902,7 +1902,7 @@
         (japanese-hankaku-region): Likewise.
         (japanese-zenkaku-region): Likewise.
 
-1998-06-22  WJCarpenter  <bill@carpenter.ORG>
+1998-06-22  WJ Carpenter  <bill@carpenter.ORG>
 
         * mail/feedmail.el: New file.
 
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 7d6f9f570ec..f9a546ec894 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,20 @@
+2012-01-09  Eric Ludlam  <zappo@gnu.org>
+
+        * ede.el (ede-project-directories): New option.
+        (ede-directory-safe-p): Check it.
+        (ede-initialize-state-current-buffer, ede, ede-new)
+        (ede-check-project-directory, ede-rescan-toplevel)
+        (ede-load-project-file, ede-parent-project, ede-current-project):
+        (ede-target-parent): Avoid loading in a project unless it is safe,
+        since it may involve malicious code.  This security flaw was
+        pointed out by Hiroshi Oota.
+
+        * ede/auto.el (ede-project-autoload): Add safe-p slot.
+        (ede-project-class-files): Projects using Project.ede are unsafe.
+        (ede-auto-load-project): New method.
+
+        * ede/simple.el (ede-project-class-files): Mark as unsafe.
+
 2011-12-19  Sam Steingold  <sds@gnu.org>
 
         * semantic/edit.el (semantic-edits-incremental-parser): Add the
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 5f336df5514..cc8b6f53242 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -94,6 +94,42 @@ target willing to take the file.  'never means never perform the check."
   :group 'ede
   :type 'sexp) ; make this be a list of options some day
 
+(defcustom ede-project-directories nil
+  "Directories in which EDE may search for project files.
+If the value is t, EDE may search in any directory.
+
+If the value is a function, EDE calls that function with one
+argument, the directory name; the function should return t iff
+EDE should look for project files in the directory.
+
+Otherwise, the value should be a list of fully-expanded directory
+names.  EDE searches for project files only in those directories.
+If you invoke the commands \\[ede] or \\[ede-new] on a directory
+that is not listed, Emacs will offer to add it to the list.
+
+Any other value disables searching for EDE project files."
+  :group 'ede
+  :type '(choice (const :tag "Any directory" t)
+                 (repeat :tag "List of directories"
+                         (directory))
+                 (function :tag "Predicate"))
+  :version "23.4"
+  :risky t)
+
+(defun ede-directory-safe-p (dir)
+  "Return non-nil if DIR is a safe directory to load projects from.
+Projects that do not load a project definition as Emacs Lisp code
+are safe, and can be loaded automatically.  Other project types,
+such as those created with Project.ede files, are safe only if
+specified by `ede-project-directories'."
+  (setq dir (directory-file-name (expand-file-name dir)))
+  ;; Load only if allowed by `ede-project-directories'.
+  (or (eq ede-project-directories t)
+      (and (functionp ede-project-directories)
+           (funcall ede-project-directories dir))
+      (and (listp ede-project-directories)
+           (member dir ede-project-directories))))
+
 
 ;;; Management variables
 
@@ -420,24 +456,42 @@ provided `global-ede-mode' is enabled."
 Sets buffer local variables for EDE."
   (let* ((ROOT nil)
          (proj (ede-directory-get-open-project default-directory
-                                               'ROOT)))
+                                               'ROOT))
+         (projauto nil))
+
     (when (or proj ROOT
-              (ede-directory-project-p default-directory t))
+              ;; If there is no open project, look up the project
+              ;; autoloader to see if we should initialize.
+              (setq projauto (ede-directory-project-p default-directory t)))
+
+      (when (and (not proj) projauto)
+
+        ;; No project was loaded, but we have a project description
+        ;; object.  This means that we can check if it is a safe
+        ;; project to load before requesting it to be loaded.
 
-      (when (not proj)
-        ;; @todo - this could be wasteful.
-        (setq proj (ede-load-project-file default-directory 'ROOT)))
+        (when (or (oref projauto safe-p)
+                  ;; The project style is not safe, so check if it is
+                  ;; in `ede-project-directories'.
+                  (let ((top (ede-toplevel-project default-directory)))
+                    (ede-directory-safe-p top)))
 
-      (setq ede-object (ede-buffer-object (current-buffer)
+          ;; The project is safe, so load it in.
+          (setq proj (ede-load-project-file default-directory 'ROOT))))
+
+      ;; Only initialize EDE state in this buffer if we found a project.
+      (when proj
+
+        (setq ede-object (ede-buffer-object (current-buffer)
                                           'ede-object-project))
 
-      (setq ede-object-root-project
-            (or ROOT (ede-project-root ede-object-project)))
+        (setq ede-object-root-project
+              (or ROOT (ede-project-root ede-object-project)))
 
-      (if (and (not ede-object) ede-object-project)
-          (ede-auto-add-to-target))
+        (if (and (not ede-object) ede-object-project)
+            (ede-auto-add-to-target))
 
-      (ede-apply-target-options))))
+        (ede-apply-target-options)))))
 
 (defun ede-reset-all-buffers (onoff)
   "Reset all the buffers due to change in EDE.
@@ -557,13 +611,73 @@ of objects with the `ede-want-file-p' method."
 
 ;;; Interactive method invocations
 ;;
-(defun ede (file)
-  "Start up EDE on something.
-Argument FILE is the file or directory to load a project from."
-  (interactive "fProject File: ")
-  (if (not (file-exists-p file))
-      (ede-new file)
-    (ede-load-project-file (file-name-directory file))))
+(defun ede (dir)
+  "Start up EDE for directory DIR.
+If DIR has an existing project file, load it.
+Otherwise, create a new project for DIR."
+  (interactive
+   ;; When choosing a directory to turn on, and we see some directory here,
+   ;; provide that as the default.
+   (let* ((top (ede-toplevel-project default-directory))
+          (promptdflt (or top default-directory)))
+     (list (read-directory-name "Project directory: "
+                                promptdflt promptdflt t))))
+  (unless (file-directory-p dir)
+    (error "%s is not a directory" dir))
+  (when (ede-directory-get-open-project dir)
+    (error "%s already has an open project associated with it" dir))
+
+  ;; Check if the directory has been added to the list of safe
+  ;; directories.  It can also add the directory to the safe list if
+  ;; the user chooses.
+  (if (ede-check-project-directory dir)
+      (progn
+        ;; If there is a project in DIR, load it, otherwise do
+        ;; nothing.
+        (ede-load-project-file dir)
+
+        ;; Check if we loaded anything on the previous line.
+        (if (ede-current-project dir)
+
+            ;; We successfully opened an existing project.  Some open
+            ;; buffers may also be referring to this project.
+            ;; Resetting all the buffers will get them to also point
+            ;; at this new open project.
+            (ede-reset-all-buffers 1)
+
+          ;; ELSE
+          ;; There was no project, so switch to `ede-new' which is how
+          ;; a user can select a new kind of project to create.
+          (let ((default-directory (expand-file-name dir)))
+            (call-interactively 'ede-new))))
+
+    ;; If the proposed directory isn't safe, then say so.
+    (error "%s is not an allowed project directory in `ede-project-directories'"
+           dir)))
+
+(defun ede-check-project-directory (dir)
+  "Check if DIR should be in `ede-project-directories'.
+If it is not, try asking the user if it should be added; if so,
+add it and save `ede-project-directories' via Customize.
+Return nil iff DIR should not be in `ede-project-directories'."
+  (setq dir (directory-file-name (expand-file-name dir))) ; strip trailing /
+  (or (eq ede-project-directories t)
+      (and (functionp ede-project-directories)
+           (funcall ede-project-directories dir))
+      ;; If `ede-project-directories' is a list, maybe add it.
+      (when (listp ede-project-directories)
+        (or (member dir ede-project-directories)
+            (when (y-or-n-p (format "`%s' is not listed in `ede-project-directories'.
+Add it to the list of allowed project directories? "
+                                    dir))
+              (push dir ede-project-directories)
+              ;; If possible, save `ede-project-directories'.
+              (if (or custom-file user-init-file)
+                  (let ((coding-system-for-read nil))
+                    (customize-save-variable
+                     'ede-project-directories
+                     ede-project-directories)))
+              t)))))
 
 (defun ede-new (type &optional name)
   "Create a new project starting from project type TYPE.
@@ -598,6 +712,11 @@ Optional argument NAME is the name to give this project."
     (error "Cannot create project in non-existent directory %s" default-directory))
   (when (not (file-writable-p default-directory))
     (error "No write permissions for %s" default-directory))
+  (unless (ede-check-project-directory default-directory)
+    (error "%s is not an allowed project directory in `ede-project-directories'"
+           default-directory))
+  ;; Make sure the project directory is loadable in the future.
+  (ede-check-project-directory default-directory)
   ;; Create the project
   (let* ((obj (object-assoc type 'name ede-project-class-files))
          (nobj (let ((f (oref obj file))
@@ -631,6 +750,10 @@ Optional argument NAME is the name to give this project."
         (ede-add-subproject pp nobj)
         (ede-commit-project pp)))
     (ede-commit-project nobj))
+  ;; Once the project is created, load it again.  This used to happen
+  ;; lazily, but with project loading occurring less often and with
+  ;; security in mind, this is now the safe time to reload.
+  (ede-load-project-file default-directory)
   ;; Have the menu appear
   (setq ede-minor-mode t)
   ;; Allert the user
@@ -653,11 +776,16 @@ ARGS are additional arguments to pass to method SYM."
 (defun ede-rescan-toplevel ()
   "Rescan all project files."
   (interactive)
-  (let ((toppath (ede-toplevel-project default-directory))
-        (ede-deep-rescan t))
-    (project-rescan (ede-load-project-file toppath))
-    (ede-reset-all-buffers 1)
-    ))
+  (if (not (ede-directory-get-open-project default-directory))
+      ;; This directory isn't open.  Can't rescan.
+      (error "Attempt to rescan a project that isn't open")
+
+    ;; Continue
+    (let ((toppath (ede-toplevel-project default-directory))
+          (ede-deep-rescan t))
+
+      (project-rescan (ede-load-project-file toppath))
+      (ede-reset-all-buffers 1))))
 
 (defun ede-new-target (&rest args)
   "Create a new target specific to this type of project file.
@@ -893,7 +1021,7 @@ Optional ROOTRETURN will return the root project for DIR."
   ;; Do the load
   ;;(message "EDE LOAD : %S" file)
   (let* ((file dir)
-         (path (expand-file-name (file-name-directory file)))
+         (path (file-name-as-directory (expand-file-name dir)))
          (pfc (ede-directory-project-p path))
          (toppath nil)
          (o nil))
@@ -922,13 +1050,11 @@ Optional ROOTRETURN will return the root project for DIR."
       ;; See if it's been loaded before
       (setq o (object-assoc (ede-dir-to-projectfile pfc toppath) 'file
                             ede-projects))
-      (if (not o)
-          ;; If not, get it now.
-          (let ((ede-constructing pfc))
-            (setq o (funcall (oref pfc load-type) toppath))
-            (when (not o)
-              (error "Project type error: :load-type failed to create a project"))
-            (ede-add-project-to-global-list o)))
+
+      ;; If not open yet, load it.
+      (unless o
+        (let ((ede-constructing pfc))
+          (setq o (ede-auto-load-project pfc toppath))))
 
       ;; Return the found root project.
       (when rootreturn (set rootreturn o))
@@ -982,13 +1108,7 @@ Optional argument OBJ is an object to find the parent of."
              (and root
                   (ede-find-subproject-for-directory root updir))
              ;; Try the all structure based search.
-             (ede-directory-get-open-project updir)
-             ;; Load up the project file as a last resort.
-             ;; Last resort since it uses file-truename, and other
-             ;; slow features.
-             (and (ede-directory-project-p updir)
-                  (ede-load-project-file
-                   (file-name-as-directory updir))))))))))
+             (ede-directory-get-open-project updir))))))))
 
 (defun ede-current-project (&optional dir)
   "Return the current project file.
@@ -1002,11 +1122,7 @@ If optional DIR is provided, get the project for DIR instead."
     ;; No current project.
     (when (not ans)
       (let* ((ldir (or dir default-directory)))
-        (setq ans (ede-directory-get-open-project ldir))
-        (or ans
-            ;; No open project, if this dir pass project-p, then load.
-            (when (ede-directory-project-p ldir)
-              (setq ans (ede-load-project-file ldir))))))
+        (setq ans (ede-directory-get-open-project ldir))))
     ;; Return what we found.
     ans))
 
@@ -1061,12 +1177,13 @@ If TARGET belongs to a subproject, return that project file."
   "Return the project which is the parent of TARGET.
 It is recommended you track the project a different way as this function
 could become slow in time."
-  ;; @todo - use ede-object-project as a starting point.
-  (let ((ans nil) (projs ede-projects))
-    (while (and (not ans) projs)
-      (setq ans (ede-target-in-project-p (car projs) target)
-            projs (cdr projs)))
-    ans))
+  (or ede-object-project
+      ;; If not cached, derive it from the current directory of the target.
+      (let ((ans nil) (projs ede-projects))
+        (while (and (not ans) projs)
+          (setq ans (ede-target-in-project-p (car projs) target)
+                projs (cdr projs)))
+        ans)))
 
 (defmethod ede-find-target ((proj ede-project) buffer)
   "Fetch the target in PROJ belonging to BUFFER or nil."
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 7ff291d3675..b458cc246f0 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -58,6 +58,13 @@ associated with a single object class, based on the initializers used.")
           :initform t
           :documentation
           "Non-nil if this is an option when a user creates a project.")
+   (safe-p :initarg :safe-p
+           :initform t
+           :documentation
+           "Non-nil if the project load files are \"safe\".
+An unsafe project is one that loads project variables via Emacs
+Lisp code.  A safe project is one that loads project variables by
+scanning files without loading Lisp code from them.")
    )
   "Class representing minimal knowledge set to run preliminary EDE functions.
 When more advanced functionality is needed from a project type, that projects
@@ -69,13 +76,15 @@ type is required and the load function used.")
                          :name "Make" :file 'ede/proj
                          :proj-file "Project.ede"
                          :load-type 'ede-proj-load
-                         :class-sym 'ede-proj-project)
+                         :class-sym 'ede-proj-project
+                         :safe-p nil)
    (ede-project-autoload "edeproject-automake"
                          :name "Automake" :file 'ede/proj
                          :proj-file "Project.ede"
                          :initializers '(:makefile-type Makefile.am)
                          :load-type 'ede-proj-load
-                         :class-sym 'ede-proj-project)
+                         :class-sym 'ede-proj-project
+                         :safe-p nil)
    (ede-project-autoload "automake"
                          :name "automake" :file 'ede/project-am
                          :proj-file "Makefile.am"
@@ -84,6 +93,8 @@ type is required and the load function used.")
                          :new-p nil))
   "List of vectors defining how to determine what type of projects exist.")
 
+(put 'ede-project-class-files 'risky-local-variable t)
+
 ;;; EDE project-autoload methods
 ;;
 (defmethod ede-project-root ((this ede-project-autoload))
@@ -122,6 +133,19 @@ Return nil if the project file does not exist."
     (when (and f (file-exists-p f))
       f)))
 
+(defmethod ede-auto-load-project ((this ede-project-autoload) dir)
+  "Load in the project associated with THIS project autoload description.
+THIS project description should be valid for DIR, where the project will
+be loaded."
+  ;; Last line of defense: don't load unsafe projects.
+  (when (not (or (oref this :safe-p)
+                 (ede-directory-safe-p dir)))
+    (error "Attempt to load an unsafe project (bug elsewhere in EDE)"))
+  ;; Things are good - so load the project.
+  (let ((o (funcall (oref this load-type) dir)))
+    (when (not o)
+      (error "Project type error: :load-type failed to create a project"))
+    (ede-add-project-to-global-list o)))
 
 (provide 'ede/auto)
 
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index 028c126e9e4..5cfa750c63f 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -50,7 +50,8 @@
               :name "Simple" :file 'ede/simple
               :proj-file 'ede-simple-projectfile-for-dir
               :load-type 'ede-simple-load
-              :class-sym 'ede-simple-project)
+              :class-sym 'ede-simple-project
+              :safe-p nil)
              t)
 
 (defcustom ede-simple-save-directory "~/.ede"
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 7fd4214016d..50b50398e16 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -45,7 +45,7 @@
 (defvar semantic-decoratiton-mouse-3 (if (featurep 'xemacs) [ button3 ] [ mouse-3 ])
   "The keybinding lisp object to use for binding the right mouse button.")
 
-;;; Includes that that are in a happy state!
+;;; Includes that are in a happy state!
 ;;
 (defface semantic-decoration-on-includes
   nil
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 6d7865a29df..ac28702787d 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -451,7 +451,7 @@ Also load the specified macro libraries."
       ',(semantic-grammar-keyword-properties keywords))))
 
 (define-overloadable-function semantic-grammar-keywordtable-builder ()
-  "Return the keyword table table value.")
+  "Return the keyword table value.")
 
 ;;; Token table builder
 ;;
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index b864316deb5..45f0d2b3afb 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -41,7 +41,7 @@
 (define-overload srecode-calculate-context ()
   "Calculate the context at the current point.
 The returned context is a list, with the top-most context first.
-Each returned context is a string that that would show up in a `context'
+Each returned context is a string that would show up in a `context'
 statement in an `.srt' file.
 
 Some useful context values used by the provided srecode templates are:
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 31d8afc4fca..2d05be312eb 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -576,8 +576,11 @@ file name added at the end of COMMAND (separated by a space).
 
 `*' and `?' when not surrounded by whitespace have no special
 significance for `dired-do-shell-command', and are passed through
-normally to the shell, but you must confirm first.  To pass `*' by
-itself to the shell as a wildcard, type `*\"\"'.
+normally to the shell, but you must confirm first.
+
+If you want to use `*' as a shell wildcard with whitespace around
+it, write `*\"\"' in place of just `*'.  This is equivalent to just
+`*' in the shell, but avoids Dired's special handling.
 
 If COMMAND produces output, it goes to a separate buffer.
 
@@ -605,16 +608,16 @@ can be produced by `dired-get-marked-files', for example."
       current-prefix-arg
       files)))
   (let* ((on-each (not (string-match dired-star-subst-regexp command)))
-         (subst (not (string-match dired-quark-subst-regexp command)))
-         (star (not (string-match "\\*" command)))
-         (qmark (not (string-match "\\?" command))))
+         (no-subst (not (string-match dired-quark-subst-regexp command)))
+         (star (string-match "\\*" command))
+         (qmark (string-match "\\?" command)))
     ;; Get confirmation for wildcards that may have been meant
     ;; to control substitution of a file name or the file name list.
-    (if (cond ((not (or on-each subst))
+    (if (cond ((not (or on-each no-subst))
                (error "You can not combine `*' and `?' substitution marks"))
-              ((and star (not on-each))
+              ((and star on-each)
                (y-or-n-p "Confirm--do you mean to use `*' as a wildcard? "))
-              ((and qmark (not subst))
+              ((and qmark no-subst)
                (y-or-n-p "Confirm--do you mean to use `?' as a wildcard? "))
               (t))
         (if on-each
diff --git a/lisp/dired.el b/lisp/dired.el
index da105bc2a5f..f1a778ad05a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1111,6 +1111,11 @@ BEG..END is the line where the file info is located."
 
 (defvar ls-lisp-use-insert-directory-program)
 
+(defun dired-switches-escape-p (switches)
+  "Return non-nil if the string SWITCHES contains -b or --escape."
+  ;; Do not match things like "--block-size" that happen to contain "b".
+  (string-match "\\(\\`\\| \\)-[[:alnum:]]*b\\|--escape\\>" switches))
+
 (defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
   "Insert a directory listing of DIR, Dired style.
 Use SWITCHES to make the listings.
@@ -1152,7 +1157,7 @@ see `dired-use-ls-dired' for more details.")
             (dired-align-file beg (point))))
       (insert-directory dir switches wildcard (not wildcard)))
     ;; Quote certain characters, unless ls quoted them for us.
-    (if (not (string-match "b" dired-actual-switches))
+    (if (not (dired-switches-escape-p dired-actual-switches))
         (save-excursion
           (setq end (point-marker))
           (goto-char opoint)
@@ -2099,7 +2104,18 @@ Otherwise, an error occurs in these cases."
           ;; with quotation marks in their names.
           (while (string-match "\\(?:[^\\]\\|\\`\\)\\(\"\\)" file)
             (setq file (replace-match "\\\"" nil t file 1)))
-
+          ;; Unescape any spaces escaped by ls -b (bug#10469).
+          ;; Other -b quotes, eg \t, \n, work transparently.
+          (if (dired-switches-escape-p dired-actual-switches)
+              (let ((start 0)
+                    (rep "")
+                    (shift -1))
+                (if (eq localp 'verbatim)
+                    (setq rep "\\\\"
+                          shift +1))
+                (while (string-match "\\(\\\\\\) " file start)
+                  (setq file (replace-match rep nil t file 1)
+                        start (+ shift (match-end 0))))))
           (when (eq system-type 'windows-nt)
             (save-match-data
               (let ((start 0))
@@ -2107,6 +2123,7 @@ Otherwise, an error occurs in these cases."
                   (aset file (match-beginning 0) ?/)
                   (setq start (match-end 0))))))
 
+          ;; Hence we don't need to worry about converting `\\' back to `\'.
           (setq file (read (concat "\"" file "\"")))
           ;; The above `read' will return a unibyte string if FILE
           ;; contains eight-bit-control/graphic characters.
@@ -3667,7 +3684,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "cdcae8f5f4ea69fa7b0231f640c13163")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "e77c506a0dd793230c5856a67e408fc6")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
@@ -3784,8 +3801,11 @@ file name added at the end of COMMAND (separated by a space).
 
 `*' and `?' when not surrounded by whitespace have no special
 significance for `dired-do-shell-command', and are passed through
-normally to the shell, but you must confirm first.  To pass `*' by
-itself to the shell as a wildcard, type `*\"\"'.
+normally to the shell, but you must confirm first.
+
+If you want to use `*' as a shell wildcard with whitespace around
+it, write `*\"\"' in place of just `*'.  This is equivalent to just
+`*' in the shell, but avoids Dired's special handling.
 
 If COMMAND produces output, it goes to a separate buffer.
 
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 0a845265a37..78ac29d89df 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1574,7 +1574,7 @@ If FOR-EFFECT is non-nil, the return value is assumed to be of no importance."
               ;;   stack-set-X+1 stack-ref-X  -->  dup stack-set-X+2
               ;; but this is a very minor gain, since dup is stack-ref-0,
               ;; i.e. it's only better if X>5, and even then it comes
-              ;; at the cost cost of an extra stack slot.  Let's not bother.
+              ;; at the cost of an extra stack slot.  Let's not bother.
               ((and (eq 'byte-varref (car lap2))
                     (eq (cdr lap1) (cdr lap2))
                     (memq (car lap1) '(byte-varset byte-varbind)))
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index fb14382bfd2..7a9a33fc2cc 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1943,7 +1943,7 @@ from the comment."
 A code fragment is identified by an open parenthesis followed by a
 symbol which is a valid function or a word in all CAPS, or a parenthesis
 that is quoted with the ' character.  Only the region from START to LIMIT
-is is allowed while searching for the bounding parenthesis."
+is allowed while searching for the bounding parenthesis."
   (save-match-data
     (save-restriction
       (narrow-to-region start limit)
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 252b167c446..743b828326c 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -1,6 +1,6 @@
 ;;; emacs-lock.el --- protect buffers against killing or exiting -*- lexical-binding: t -*-
 
-;; Copyright (C) 2011-2012 Free Software Foundation, Inc
+;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
 ;; Author: Juanma Barranquero <lekktu@gmail.com>
 ;; Inspired by emacs-lock.el by Tom Wurgler <twurgler@goodyear.com>
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index a49ba33f158..4e2c3b1e886 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -27,7 +27,7 @@
 ;;
 ;; With the following setup, the keypad can be used for numeric data
 ;; entry when NumLock is off, and to give numeric prefix arguments to
-;; emacs commands, when NumLock on on.
+;; emacs commands, when NumLock is on.
 ;;
 ;;  keypad-setup         => Plain Numeric Keypad
 ;;  keypad-numlock-setup => Prefix numeric args
diff --git a/lisp/epg.el b/lisp/epg.el
index 3505e183c1f..6529afb2d3c 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1951,7 +1951,8 @@ 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."
-      (let (tempdir tempfile)
+      (let ((orig-modes (default-file-modes))
+            tempdir tempfile)
         (setq prefix (expand-file-name prefix
                                        (if (featurep 'xemacs)
                                            (temp-directory)
@@ -1959,6 +1960,7 @@ You can then use `write-region' to write new data into the file."
         (unwind-protect
             (let (file)
               ;; First, create a temporary directory.
+              (set-default-file-modes #o700)
               (while (condition-case ()
                          (progn
                            (setq tempdir (make-temp-name
@@ -1969,14 +1971,12 @@ You can then use `write-region' to write new data into the file."
                            (make-directory tempdir))
                        ;; let's try again.
                        (file-already-exists t)))
-              (set-file-modes tempdir 448)
               ;; Second, create a temporary file in the tempdir.
               ;; There *is* a race condition between `make-temp-name'
               ;; and `write-region', but we don't care it since we are
               ;; in a private directory now.
               (setq tempfile (make-temp-name (concat tempdir "/EMU")))
               (write-region "" nil tempfile nil 'silent)
-              (set-file-modes tempfile 384)
               ;; Finally, make a hard-link from the tempfile.
               (while (condition-case ()
                          (progn
@@ -1986,6 +1986,7 @@ You can then use `write-region' to write new data into the file."
                        ;; let's try again.
                        (file-already-exists t)))
               file)
+          (set-default-file-modes orig-modes)
           ;; Cleanup the tempfile.
           (and tempfile
                (file-exists-p tempfile)
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 87f30c8965a..f9b4506b784 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -200,7 +200,7 @@
 
         * erc-autoaway.el(erc-mode):
         Reset idletime on connect. Fixes an annoying bug which
-        flooded the server with aways on reconnect.
+        flooded the server with always on reconnect.
         (erc-autoway-reset-idletime): Accept optional args so we can hook it
         onto erc-server-001-hook.
 
diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index 5465a624bb0..5dd77d5dfd8 100644
--- a/lisp/erc/ChangeLog.06
+++ b/lisp/erc/ChangeLog.06
@@ -18,7 +18,7 @@
         (erc-nickserv-identify-on-connect)
         (erc-nickserv-identify-on-nick-change): Handle 'both method.
 
-2006-12-28  Leo  <sdl.web@gmail.com>  (tiny change)
+2006-12-28  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * erc.el (erc-iswitchb): Wrap body in unwind-protect so that
         hitting C-g does not leave iswitchb-mode on.
@@ -51,7 +51,7 @@
         * erc.el (erc-open): Restore old point correctly, or at least get
         closer to doing so than before.
 
-2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
+2006-12-13  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
         isn't active already, instead of leaving it on.
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index 14c46d08aec..e6b670c91ba 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -1,6 +1,6 @@
 ;; erc-page.el - CTCP PAGE support for ERC
 
-;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation
+;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 3fda2153e09..9c1c8eedffd 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -63,10 +63,20 @@ than the latter."
     (cons
      (format "-exec ls -ld {} %s" find-exec-terminator)
      "-ld"))
-  "Description of the option to `find' to produce an `ls -l'-type listing.
-This is a cons of two strings (FIND-OPTION . LS-SWITCHES).  FIND-OPTION
-gives the option (or options) to `find' that produce the desired output.
-LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output."
+  "A pair of options to produce and parse an `ls -l'-type list from `find'.
+This is a cons of two strings (FIND-OPTION . LS-SWITCHES).
+FIND-OPTION is the option (or options) passed to `find' to produce
+a file listing in the desired format.  LS-SWITCHES is a set of
+`ls' switches that tell dired how to parse the output of `find'.
+
+The two options must be set to compatible values.
+For example, to use human-readable file sizes with GNU ls:
+   \(\"-exec ls -ldh {} +\" . \"-ldh\")
+
+To use GNU find's inbuilt \"-ls\" option to list files:
+   \(\"-ls\" . \"-dilsb\")
+since GNU find's output has the same format as using GNU ls with
+the options \"-dilsb\"."
   :version "24.1"              ; add tests for -ls and -exec + support
   :type '(cons (string :tag "Find Option")
                (string :tag "Ls Switches"))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 630184a60c5..c7358779818 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-10  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * nntp.el (nntp-send-authinfo): Query `auth-source-search' with the
+        logical server name in addition to the actual machine address.
+
+        * auth-source.el (auth-source-user-and-password): Add convenience
+        wrapper to search by just host and optionally user.
+
 2012-01-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * shr.el (shr-visit-file): Move point to the beginning of the buffer
@@ -93,7 +101,7 @@
 
         * gnus.el (gnus-parameters): Note precedence.
 
-2012-01-04  Leo  <sdl.web@gmail.com>
+2012-01-04  Leo Liu  <sdl.web@gmail.com>
 
         * nndraft.el (nndraft-update-unread-articles): Don't move point around
         in the group buffer.
@@ -125,7 +133,7 @@
         * nnimap.el (nnimap-finish-retrieve-group-infos): Check the connection
         status in the correct buffer.
 
-2012-01-03  Leo  <sdl.web@gmail.com>
+2012-01-03  Leo Liu  <sdl.web@gmail.com>
 
         * gnus-topic.el (gnus-topic-goto-next-group): Don't move point around
         when opening topics (bug#10407).
@@ -11234,7 +11242,7 @@
         * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): Add "alpine".
         (gnus-treat-body-boundary): Don't test window-system.
 
-2007-10-28  Leo  <sdl.web@gmail.com>  (tiny change)
+2007-10-28  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * gnus-art.el (gnus-treat-emphasize): Don't test window-system.
 
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index acbc541512f..5e946372d04 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -1781,6 +1781,26 @@ MODE can be \"login\" or \"password\"."
 
     found))
 
+(defun auth-source-user-and-password (host &optional user)
+  (let* ((auth-info (car
+                     (if user
+                         (auth-source-search
+                          :host host
+                          :user "yourusername"
+                          :max 1
+                          :require '(:user :secret)
+                          :create nil)
+                       (auth-source-search
+                        :host host
+                        :max 1
+                        :require '(:user :secret)
+                        :create nil))))
+         (user (plist-get auth-info :user))
+         (password (plist-get auth-info :secret)))
+    (when (functionp password)
+      (setq password (funcall password)))
+    (list user password auth-info)))
+
 (provide 'auth-source)
 
 ;;; auth-source.el ends here
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index db9d9e252be..c740f614356 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1249,8 +1249,8 @@ If SEND-IF-FORCE, only send authinfo to the server if the
          (alist (netrc-machine list nntp-address "nntp"))
          (auth-info
           (nth 0 (auth-source-search :max 1
-                                     ;; TODO: allow the virtual server name too
-                                     :host nntp-address
+                                     :host (list nntp-address
+                                                 (nnoo-current-server 'nntp))
                                      :port '("119" "nntp"))))
          (auth-user (plist-get auth-info :user))
          (auth-force (plist-get auth-info :force))
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index ac9d2c5ba04..4c811d885d7 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -861,7 +861,7 @@ which *doesn't* clash with CLASS is returned.\n
 \(A specification with a class of t is considered to match any class you
 specify - this matches Emacs' behavior when deciding on which face attributes
 to use, to the best of my understanding).\n
-If CLASS is nil, then you just get get whatever `face-attr-construct' returns,
+If CLASS is nil, then you just get whatever `face-attr-construct' returns,
 ie the current specification in effect for FACE.\n
 *NOTE*: This function forces any face that is not 'default and which has
 no :inherit property to inherit from 'default (this is because 'default
diff --git a/lisp/info.el b/lisp/info.el
index 94d29518995..a8cb141114c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2251,7 +2251,7 @@ Table of contents is created from the tree structure of menus."
                               (match-string-no-properties 1)))
                  (section "Top")
                  menu-items)
-            (when (string-match "(" upnode) (setq upnode nil))
+            (when (and upnode (string-match "(" upnode)) (setq upnode nil))
             (when (and (not (Info-index-node nodename file))
                        (re-search-forward "^\\* Menu:" bound t))
               (forward-line 1)
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 5012d8af650..6af9c2478fc 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -394,7 +394,7 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
 ;; Matches ham radio call signs.
 ;; Help from: Mat Maessen N2NJZ <maessm@rpi.edu>, Mark Feit
 ;; <mark@era.com>, Michael Covington <mcovingt@ai.uga.edu>.
-;; Examples: DX504 DX515 K5MRU K8DHK KA9WGN KA9WGN KD3FU KD6EUI KD6HBW
+;; Examples: DX504 DX515 K5MRU K8DHK KA9WGN KD3FU KD6EUI KD6HBW
 ;; KE9TV KF0NV N1API N3FU N3GZE N3IGS N4KCC N7IKQ N9HHU W4YHF W6ANK WA2SUH
 ;; WB7VZI N2NJZ NR3G KJ4KK AB4UM AL7NI KH6OH WN3KBT N4TMI W1A N0NZO
 (defconst mail-extr-ham-call-sign-pattern
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 2e18c7ce23a..056bfebb1e5 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -1,6 +1,6 @@
 ;;; mailclient.el --- mail sending via system's mail client.
 
-;; Copyright (C) 2005-2012 Free Software Foundation
+;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
 ;; Author: David Reitter <david.reitter@gmail.com>
 ;; Keywords: mail
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f0068e81811..18d928e4b90 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1,4 +1,4 @@
-;;; sendmail.el --- mail sending commands for Emacs.  -*- byte-compile-dynamic: t -*-
+;;; sendmail.el --- mail sending commands for Emacs
 
 ;; Copyright (C) 1985-1986, 1992-1996, 1998, 2000-2012
 ;;   Free Software Foundation, Inc.
@@ -730,6 +730,7 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and
       (set (make-local-variable 'comment-start-skip)
            (concat "^" (regexp-quote mail-yank-prefix) "[ \t]*")))
   (make-local-variable 'adaptive-fill-regexp)
+  ;; Also update the paragraph-separate entry if you change this.
   (setq adaptive-fill-regexp
         (concat "[ \t]*[-[:alnum:]]+>+[ \t]*\\|"
                 adaptive-fill-regexp))
@@ -743,11 +744,14 @@ Turning on Mail mode runs the normal hooks `text-mode-hook' and
   ;; lines that delimit forwarded messages.
   ;; Lines containing just >= 3 dashes, perhaps after whitespace,
   ;; are also sometimes used and should be separators.
-  (setq paragraph-separate (concat (regexp-quote mail-header-separator)
-                                "$\\|\t*\\([-|#;>* ]\\|(?[0-9]+[.)]\\)+$"
-                                "\\|[ \t]*[[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|"
-                                "--\\( \\|-+\\)$\\|"
-                                page-delimiter)))
+  (setq paragraph-separate
+        (concat (regexp-quote mail-header-separator)
+                ;; This is based on adaptive-fill-regexp (presumably
+                ;; the idea is to allow navigation etc of cited paragraphs).
+                "$\\|\t*[-–!|#%;>*·•‣�◦ ]+$"
+                "\\|[ \t]*[-[:alnum:]]*>+[ \t]*$\\|[ \t]*$\\|"
+                "--\\( \\|-+\\)$\\|"
+                page-delimiter)))
 
 
 (defun mail-header-end ()
@@ -1986,4 +1990,9 @@ you can move to one of them and type C-c C-c to recover that one."
 
 (provide 'sendmail)
 
+;; Local Variables:
+;; byte-compile-dynamic: t
+;; coding: utf-8
+;; End:
+
 ;;; sendmail.el ends here
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 929f97746b0..af16bbf8c73 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -66,11 +66,11 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
           from to)
       (goto-char (point-min))
       (search-forward "\n\^_" nil t)    ; Skip BABYL header.
-      (if (= (setq from (point)) (point-max))
-          (error "The input file contains no messages"))
+      (setq from (point))
       (goto-char (point-max))
       (search-backward "\n\^_" from 'mv)
-      (setq to (point))
+      (if (= from (setq to (point)))
+          (error "The input file contains no messages"))
       (unless (and coding-system
                    (coding-system-p coding-system))
         (setq coding-system
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 8b4981940ae..94ac7a2f3b7 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -2898,7 +2898,7 @@
 
 2003-06-01  Peter S Galbraith  <psg@debian.org>
 
-        * mh-comp.el (mh-modify-header-field): Bug fix.  Calling with with
+        * mh-comp.el (mh-modify-header-field): Bug fix.  Calling with
         a value that was already inserted causes it to get inserted a
         second time.  I have wrapped the value around \b word delimiters.
         Hope there are no side effects for other code.
@@ -9952,7 +9952,7 @@
         * mh-mime.el (compilation): Code rearrangement to remove compiler
         warnings.
         (mh-defun-compat): New macro to define to useful functions that
-        aren't present present in old Gnus.
+        aren't present in old Gnus.
         (mh-destroy-postponed-handles): New function to cleanup handles
         that are associated with external viewers.
         (mh-handle-set-external-undisplayer): New function to replace
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 7860eb96846..8730e875ea0 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -299,7 +299,8 @@ functionality.
                ;; support, or no gnutls-cli installed.
                (eq resulting-type 'plain))
       (setq error
-            (if starttls-available
+            (if (or (null starttls-command)
+                    starttls-available)
                 "Server does not support TLS"
               (concat "Emacs does not support TLS, and no external `"
                       (if starttls-use-gnutls
diff --git a/lisp/obsolete/old-emacs-lock.el b/lisp/obsolete/old-emacs-lock.el
index e586d34b499..9bb084d7db4 100644
--- a/lisp/obsolete/old-emacs-lock.el
+++ b/lisp/obsolete/old-emacs-lock.el
@@ -1,6 +1,6 @@
 ;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked
 
-;; Copyright (C) 1994, 1997, 2001-2012 Free Software Foundation, Inc
+;; Copyright (C) 1994, 1997, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Tom Wurgler <twurgler@goodyear.com>
 ;; Created: 12/8/94
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 983df8a6bfc..7bee98d8110 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1177,7 +1177,7 @@
         * org.el: Remap `outline-promote' and `outline-demote' keys to
         `org-promote-subtree' and `org-demote-subtree'.
 
-2012-01-03  Leo  <sdl.web@gmail.com>
+2012-01-03  Leo Liu  <sdl.web@gmail.com>
 
         * org-agenda.el (org-agenda-do-context-action): Check if marker is
         valid before use.
@@ -1749,7 +1749,7 @@
 
 2012-01-03  Suvayu Ali  <fatkasuvayu+linux@gmail.com>  (tiny change)
 
-        * org-inlinetask.el (org-inlinetask): New customisable face
+        * org-inlinetask.el (org-inlinetask): New customizable face
         for inlinetasks
 
 2012-01-03  Bastien Guerry  <bzg@gnu.org>
@@ -2964,7 +2964,7 @@
 
         * org-latex.el (org-export-latex-header-defs-re): Delete.
 
-2011-07-28  Bastien  <bzg@gnu.org>
+2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org.el (org-last-set-property): New variable.
         (org-read-property-name): Use the new variable: the prompt
@@ -6786,7 +6786,7 @@
         * ob.el (org-babel-params-from-properties): Test for
         "header-arg-name" and ":header-arg-name", in that order.
 
-2011-07-28  Bastien  <bastien.guerry@wikimedia.fr>
+2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-capture.el (org-capture-templates): Document "currentfile"
         for capture template.
@@ -19573,7 +19573,7 @@
         against all agenda files.
 
 2008-10-12  Carsten Dominik  <dominik@science.uva.nl>
-        Bastien Guerry  <bzg@altern.org>
+            Bastien Guerry  <bzg@altern.org>
 
         * org-list.el: New file, aggregating list functions from org.el
         and org-export-latex.el.
diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el
index b6305c42769..46d2269a1d7 100644
--- a/lisp/org/ob-fortran.el
+++ b/lisp/org/ob-fortran.el
@@ -110,7 +110,7 @@ it's header arguments."
   "Wrap body in a \"program ... end program\" block if none exists."
   (if (string-match "^[ \t]*program[ \t]*.*" (capitalize body))
        (let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
-         (if vars (error "cannot use :vars if 'program' statment is present"))
+         (if vars (error "cannot use :vars if 'program' statement is present"))
          body)
     (format "program main\n%s\nend program main\n" body)))
 
@@ -127,7 +127,7 @@ support for sessions"
 ;; helper functions
 
 (defun org-babel-fortran-var-to-fortran (pair)
-  "fortranonvert an elisp val into a string of fortran code specifying a var
+  "Convert an elisp val into a string of fortran code specifying a var
 of the same value."
   ;; TODO list support
   (let ((var (car pair))
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 0db71992826..23e8d91fecd 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -132,7 +132,7 @@ This function is called by `org-babel-execute-src-block'."
               (when (file-exists-p transient-pdf-file)
                 (delete-file transient-pdf-file))))))
          ((string-match "\\.\\([^\\.]+\\)$" out-file)
-          (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header arguement"
+          (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header argument"
                  (match-string 1 out-file))))
         nil) ;; signal that output has already been written to file
     body))
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index e9c142712eb..a454d51e391 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -29,7 +29,7 @@
 ;;
 ;; 1) there is no such thing as a "session" in ledger
 ;;
-;; 2) we are generally only going to return output from the leger program
+;; 2) we are generally only going to return output from the ledger program
 ;;
 ;; 3) we are adding the "cmdline" header argument
 ;;
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index d444aff4f2b..bdf68819089 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -28,7 +28,7 @@
 ;;
 ;; The functions `org-batch-agenda', `org-batch-agenda-csv', and
 ;; `org-batch-store-agenda-views' are implemented as macros to provide
-;; a conveniant way for extracting agenda information from the command
+;; a convenient way for extracting agenda information from the command
 ;; line. The Lisp does not evaluate parameters of a macro call; thus
 ;; it is not necessary to quote the parameters passed to one of those
 ;; functions. E.g. you can write:
@@ -1088,7 +1088,7 @@ and timeline buffers."
               (const :tag "Sunday" 0)))
 
 (defcustom org-agenda-move-date-from-past-immediately-to-today t
-  "Non-nil means jumpt to today when moving a past date forward in time.
+  "Non-nil means jump to today when moving a past date forward in time.
 When using S-right in the agenda to move a a date forward, and the date
 stamp currently points to the past, the first key press will move it
 to today.  WHen nil, just move one day forward even if the date stays
@@ -1660,7 +1660,7 @@ Where CATEGORY-REGEXP is a regexp matching the categories where
 the icon should be displayed.
 FILE-OR-DATA either a file path or a string containing image data.
 
-The other fields can be omited safely if not needed:
+The other fields can be omitted safely if not needed:
 TYPE indicates the image type.
 DATA-P is a boolean indicating whether the FILE-OR-DATA string is
 image data.
@@ -3064,7 +3064,7 @@ define a filter for one of the individual blocks.  You need to set it in
 the global options and expect it to be applied to the entire view.")
 
 (defvar org-agenda-category-filter-preset nil
-  "A preset of the categeory filter used for secondary agenda filtering.
+  "A preset of the category filter used for secondary agenda filtering.
 This must be a list of strings, each string must be a single category
 preceded by \"+\" or \"-\".
 This variable should not be set directly, but agenda custom commands can
@@ -4922,7 +4922,7 @@ DAYNAME is a number between 0 (Sunday) and 6 (Saturday).
 SKIP-WEEKS is any number of ISO weeks in the block period for which the
 item should be skipped.  If any of the SKIP-WEEKS arguments is the symbol
 `holidays', then any date that is known by the Emacs calendar to be a
-holidy will also be skipped."
+holiday will also be skipped."
   (let* ((date1 (calendar-absolute-from-gregorian (list m1 d1 y1)))
          (date2 (calendar-absolute-from-gregorian (list m2 d2 y2)))
          (d (calendar-absolute-from-gregorian date)))
@@ -8507,7 +8507,7 @@ tag and (if present) the flagging note."
           (org-agenda-remove-flag hdmarker)
           (let ((win (get-buffer-window "*Flagging Note*")))
             (and win (delete-window win)))
-          (message "Entry unflaged"))
+          (message "Entry unflagged"))
       (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE"))
       (unless note
         (error "No flagging note"))
@@ -8530,7 +8530,7 @@ tag and (if present) the flagging note."
       (org-entry-delete nil "THEFLAGGINGNOTE")
       (setq newhead (org-get-heading)))
     (org-agenda-change-all-lines newhead marker)
-    (message "Entry unflaged")))
+    (message "Entry unflagged")))
 
 (defun org-agenda-get-any-marker (&optional pos)
   (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker)
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 0a402ed4038..28b79a03dfe 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -410,7 +410,7 @@ the value will be inserted right after the documentclass statement."
 
 
 ;; Functions to initialize and post-process
-;; These fuctions will be hooked into various places in the export process
+;; These functions will be hooked into various places in the export process
 
 (defun org-beamer-initialize-open-trackers ()
   "Reset variables that track if certain environments are open during export."
@@ -450,7 +450,7 @@ The effect is that these values will be accessible during export."
      ((stringp org-beamer-frame-level-now)
       (setq org-beamer-frame-level-now
             (string-to-number org-beamer-frame-level-now))))
-    ;; Find the header additons, most likely theme commands
+    ;; Find the header additions, most likely theme commands
     (setq org-beamer-header-extra
           (or (and (org-region-active-p)
                    (save-excursion
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 46202f8adea..31694d47bc0 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -374,7 +374,7 @@ to avoid conflicts with other active capture processes."
   (plist-get (if local org-capture-current-plist org-capture-plist) prop))
 
 (defun org-capture-member (prop &optional local)
-  "Is PROP a preperty in `org-capture-plist'.
+  "Is PROP a property in `org-capture-plist'.
 When LOCAL is set, use the local variable `org-capture-current-plist',
 this is necessary after initialization of the capture process,
 to avoid conflicts with other active capture processes."
@@ -1455,7 +1455,7 @@ The template may still contain \"%?\" for cursor positioning."
       (goto-char (point-min))
       (while (looking-at "[ \t]*\n") (replace-match ""))
       (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n"))
-      ;; Return the expanded tempate and kill the temporary buffer
+      ;; Return the expanded template and kill the temporary buffer
       (untabify (point-min) (point-max))
       (set-buffer-modified-p nil)
       (prog1 (buffer-string) (kill-buffer (current-buffer))))))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 2784707e452..6211ae45b1b 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2128,7 +2128,7 @@ the currently selected interval size."
   "Write out a clock table at position IPOS in the current buffer.
 TABLES is a list of tables with clocking data as produced by
 `org-clock-get-table-data'.  PARAMS is the parameter property list obtained
-from the dynamic block defintion."
+from the dynamic block definition."
   ;; This function looks quite complicated, mainly because there are a
   ;; lot of options which can add or remove columns.  I have massively
   ;; commented this function, the I hope it is understandable.  If
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 425e8d816c7..7c969375a7f 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -275,7 +275,7 @@ Works on both Emacs and XEmacs."
     nil))
 
 (defmacro org-xemacs-without-invisibility (&rest body)
-  "Turn off exents with invisibility while executing BODY."
+  "Turn off extents with invisibility while executing BODY."
   `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol)
                                'all-extents-closed-open 'invisible))
          ext-inv-specs)
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 7cbd299782f..ea94d419957 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -35,7 +35,7 @@
 ;; links to these 'tagged' destinations, allowing seamless navigation between
 ;; multiple org-mode files. Topics can be created in any org mode file and
 ;; will always be found by plain links from other files. Other file types
-;; recognised by ctags (source code files, latex files, etc) will also be
+;; recognized by ctags (source code files, latex files, etc) will also be
 ;; available as destinations for plain links, and similarly, org-mode links
 ;; will be available as tags from source files. Finally, the function
 ;; `org-ctags-find-tag-interactive' lets you choose any known tag, using
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index 49da40f5f4f..c7e1a94216e 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2800,7 +2800,7 @@ continue numbering from the last numbered block.
 REPLACE-LABELS is dual-purpose.
 1. It controls the retention of labels in the exported block.
 2. It specifies in what manner the links (or references) to a
-   labelled line be formatted.
+   labeled line be formatted.
 
 REPLACE-LABELS is the symbol `keep' if the literal example
 specifies \"-k\" option, is numeric if the literal example
@@ -2808,12 +2808,12 @@ specifies \"-r\" option and is nil otherwise.
 
 Handle REPLACE-LABELS as below:
 - If nil, retain labels in the exported block and use
-  user-provided labels for referencing the labelled lines.
+  user-provided labels for referencing the labeled lines.
 - If it is a number, remove labels in the exported block and use
-  one of line numbers or labels for referencing labelled lines based
+  one of line numbers or labels for referencing labeled lines based
   on NUMBER option.
 - If it is a keep, retain labels in the exported block and use
-  one of line numbers or labels for referencing labelled lines
+  one of line numbers or labels for referencing labeled lines
   based on NUMBER option.
 
 LABEL-FORMAT is the value of \"-l\" switch associated with
@@ -2823,8 +2823,8 @@ PREPROCESS is intended for backend-agnostic handling of source
 block numbering.  When non-nil do the following:
 - do not number the lines
 - always strip the labels from exported block
-- do not make the labelled line a target of an incoming link.
-  Instead mark the labelled line with `org-coderef' property and
+- do not make the labeled line a target of an incoming link.
+  Instead mark the labeled line with `org-coderef' property and
   store the label in it."
   (setq skip1 (or skip1 0) skip2 (or skip2 0))
   (if (and number (not cont)) (setq org-export-last-code-line-counter-value 0))
@@ -3021,7 +3021,7 @@ to the value of `temporary-file-directory'."
           (org-load-modules-maybe)
           (unless org-local-vars
             (setq org-local-vars (org-get-local-variables)))
-          (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode'
+          (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
            (list 'let org-local-vars
                  (list (intern (format "org-export-as-%s" fmt))
                        nil nil nil ''string t))))
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index b36167701b4..da8a810895c 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -71,7 +71,7 @@
 ;; few thousand lines long).  Thus, code should follow the rule:
 ;; "collect once, use many".  As a corollary, it is usually a bad idea
 ;; to use directly an interactive function inside the code, as those,
-;; being independant entities, read the whole list structure another
+;; being independent entities, read the whole list structure another
 ;; time.
 
 ;;; Code:
@@ -685,7 +685,7 @@ Assume point is at an item."
               (cond
                ((<= (point) lim-up)
                 ;; At upward limit: if we ended at an item, store it,
-                ;; else dimiss useless data recorded above BEG-CELL.
+                ;; else dismiss useless data recorded above BEG-CELL.
                 ;; Jump to part 2.
                 (throw 'exit
                        (setq itm-lst
@@ -2674,7 +2674,7 @@ If a region is active, all items inside will be moved."
 (defvar org-tab-ind-state)
 (defun org-cycle-item-indentation ()
   "Cycle levels of indentation of an empty item.
-The first run indents the item, if applicable.  Subsequents runs
+The first run indents the item, if applicable.  Subsequent runs
 outdent it at meaningful levels in the list.  When done, item is
 put back at its original position with its original bullet.
 
@@ -3047,7 +3047,7 @@ Valid parameters PARAMS are:
 
 Alternatively, each parameter can also be a form returning
 a string.  These sexp can use keywords `counter' and `depth',
-reprensenting respectively counter associated to the current
+representing respectively counter associated to the current
 item, and depth of the current sub-list, starting at 0.
 Obviously, `counter' is only available for parameters applying to
 items."
diff --git a/lisp/org/org-lparse.el b/lisp/org/org-lparse.el
index b13dc86e5a6..229135e9b50 100644
--- a/lisp/org/org-lparse.el
+++ b/lisp/org/org-lparse.el
@@ -854,7 +854,7 @@ version."
             (throw 'nextline nil))
 
           ;; Notes: The baseline version of org-html.el (git commit
-          ;; 3d802e), while encoutering a *line-long* protected text,
+          ;; 3d802e), while encountering a *line-long* protected text,
           ;; does one of the following two things based on the state
           ;; of the export buffer.
 
@@ -869,10 +869,10 @@ version."
           ;; I think --->
 
           ;; Scenario 1 mentioned above kicks in when a block of
-          ;; protected text has to be inserted enbloc. For example,
+          ;; protected text has to be inserted en bloc. For example,
           ;; this happens, when inserting an source or example block
           ;; or preformatted content enclosed in #+backend,
-          ;; #+begin_bakend ... #+end_backend)
+          ;; #+begin_backend ... #+end_backend)
 
           ;; Scenario 2 mentioned above kicks in when the protected
           ;; text is part of a running sentence. For example this
@@ -1189,7 +1189,7 @@ version."
        (t (current-buffer))))))
 
 (defun org-lparse-format-table (lines olines)
-  "Retuns backend-specific code for org-type and table-type tables."
+  "Returns backend-specific code for org-type and table-type tables."
   (if (stringp lines)
       (setq lines (org-split-string lines "\n")))
   (if (string-match "^[ \t]*|" (car lines))
diff --git a/lisp/org/org-odt.el b/lisp/org/org-odt.el
index 886efa014f3..c8fa7ea363b 100644
--- a/lisp/org/org-odt.el
+++ b/lisp/org/org-odt.el
@@ -284,7 +284,7 @@ FILE-MEMBERS.
 Use options 1, 2 or 3 only if styles.xml alone suffices for
 achieving the desired formatting.  Use option 4, if the styles.xml
 references additional files like header and footer images for
-achieving the desired formattting.
+achieving the desired formatting.
 
 Use \"#+ODT_STYLES_FILE: ...\" directive to set this variable on
 a per-file basis.  For example,
@@ -1878,7 +1878,7 @@ ATTR is a string of other attributes of the a element."
     (cons width height)))
 
 (defvar org-odt-entity-labels-alist nil
-  "Associate Labels with the Labelled entities.
+  "Associate Labels with the Labeled entities.
 Each element of the alist is of the form (LABEL-NAME
 CATEGORY-NAME SEQNO LABEL-STYLE-NAME).  LABEL-NAME is same as
 that specified by \"#+LABEL: ...\" line.  CATEGORY-NAME is the
@@ -2213,7 +2213,7 @@ visually."
   (with-current-buffer
       (find-file-noselect (expand-file-name "styles.xml") t)
     ;; Don't make automatic backup of styles.xml file. This setting
-    ;; prevents the backedup styles.xml file from being zipped in to
+    ;; prevents the backed-up styles.xml file from being zipped in to
     ;; odt file. This is more of a hackish fix. Better alternative
     ;; would be to fix the zip command so that the output odt file
     ;; includes only the needed files and excludes any auto-generated
@@ -2228,7 +2228,7 @@ visually."
     (org-odt-configure-outline-numbering
      (if org-export-with-section-numbers org-export-headline-levels 0)))
 
-  ;; Write custom stlyes for source blocks
+  ;; Write custom styles for source blocks
   (org-odt-insert-custom-styles-for-srcblocks
    (mapconcat
     (lambda (style)
@@ -2479,7 +2479,7 @@ Do this when translation to MathML fails."
 ;; `org-export-preprocess-after-blockquote-hook'. Note that this hook
 ;; is the one that is closest and well before the call to
 ;; `org-export-attach-captions-and-attributes' in
-;; `org-export-preprocess-stirng'.  The above arrangement permits
+;; `org-export-preprocess-string'.  The above arrangement permits
 ;; captions, labels and attributes to be attached to png images
 ;; generated out of latex equations.
 (add-hook 'org-export-preprocess-after-blockquote-hook
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index ccdbc314a53..6ffa86a1204 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -145,8 +145,8 @@
 (defgroup org-protocol nil
   "Intercept calls from emacsclient to trigger custom actions.
 
-This is done by advising `server-visit-files' to scann the list of filenames
-for `org-protocol-the-protocol' and sub-procols defined in
+This is done by advising `server-visit-files' to scan the list of filenames
+for `org-protocol-the-protocol' and sub-protocols defined in
 `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'."
   :version "22.1"
   :group 'convenience
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index dc794dd92c5..67540a67688 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -277,12 +277,12 @@ in the sitemap."
   :type 'string)
 
 (defcustom org-publish-sitemap-file-entry-format "%t"
-  "How a sitemap file entry is formated.
+  "How a sitemap file entry is formatted.
 You could use brackets to delimit on what part the link will be.
 
 %t is the title.
 %a is the author.
-%d is the date formated using `org-publish-sitemap-date-format'."
+%d is the date formatted using `org-publish-sitemap-date-format'."
   :group 'org-publish
   :type 'string)
 
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index df93a9a7271..0d2a2e6a973 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -50,7 +50,7 @@
 (defvar orgtbl-after-send-table-hook nil
   "Hook for functions attaching to `C-c C-c', if the table is sent.
 This can be used to add additional functionality after the table is sent
-to the receiver position, othewise, if table is not sent, the functions
+to the receiver position, otherwise, if table is not sent, the functions
 are not run.")
 
 (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized)
@@ -1299,7 +1299,7 @@ However, when FORCE is non-nil, create new columns if necessary."
 (defun org-table-line-to-dline (line &optional above)
   "Turn a buffer line number into a data line number.
 If there is no data line in this line, return nil.
-If there is no matchin dline (most likely te refrence was a hline), the
+If there is no matching dline (most likely the reference was a hline), the
 first dline below it is used.  When ABOVE is non-nil, the one above is used."
   (catch 'exit
     (let ((ll (length org-table-dlines))
@@ -2671,7 +2671,7 @@ in the buffer and column1 and column2 are table column numbers."
             (prog1 (org-trim (org-table-get-field c1))
               (if highlight (org-table-highlight-rectangle (point) (point)))))
         ;; A range, return a vector
-        ;; First sort the numbers to get a regular ractangle
+        ;; First sort the numbers to get a regular rectangle
         (if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
         (if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
         (if corners-only
@@ -2931,7 +2931,7 @@ known that the table will be realigned a little later anyway."
 
 (defun org-table-iterate (&optional arg)
   "Recalculate the table until it does not change anymore.
-The maximun number of iterations is 10, but you can chose a different value
+The maximum number of iterations is 10, but you can choose a different value
 with the prefix ARG."
   (interactive "P")
   (let ((imax (if arg (prefix-numeric-value arg) 10))
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 68f64974ff3..c1a59ee70cb 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -69,7 +69,7 @@
 ;; "taskjuggler_project" (or whatever you customized
 ;; `org-export-taskjuggler-project-tag' to). You are now ready to
 ;; export the project plan with `org-export-as-taskjuggler-and-open'
-;; which will export the project plan and open a gant chart in
+;; which will export the project plan and open a Gantt chart in
 ;; TaskJugglerUI.
 ;;
 ;; * Resources
@@ -572,7 +572,7 @@ with separator \"\n\"."
     (and filtered-items (mapconcat 'identity filtered-items "\n"))))
 
 (defun org-taskjuggler-get-attributes (item attributes)
-  "Return all attribute as a single formated string. ITEM is an
+  "Return all attribute as a single formatted string. ITEM is an
 alist representing either a resource or a task. ATTRIBUTES is a
 list of symbols. Only entries from ITEM are considered that are
 listed in ATTRIBUTES."
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c5d5e545b9f..57d2c96514e 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4717,7 +4717,7 @@ but the stars and the body are.")
                     "\\(?: +" org-todo-regexp "\\)?"
                     "\\(?: +\\(\\[#.\\]\\)\\)?"
                     "\\(?: +"
-                    ;; Stats cookies can be sticked to body.
+                    ;; Stats cookies can be stuck to body.
                     "\\(?:\\[[0-9%%/]+\\] *\\)?"
                     "\\(%s\\)"
                     "\\(?: *\\[[0-9%%/]+\\]\\)?"
@@ -5241,7 +5241,7 @@ The time stamps may be either active or inactive.")
 (defvar org-emph-face nil)
 
 (defun org-do-emphasis-faces (limit)
-  "Run through the buffer and add overlays to emphasised strings."
+  "Run through the buffer and add overlays to emphasized strings."
   (let (rtn a)
     (while (and (not rtn) (re-search-forward org-emph-re limit t))
       (if (not (= (char-after (match-beginning 3))
@@ -5737,7 +5737,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'."
 
 (defvar org-font-lock-set-keywords-hook nil
   "Functions that can manipulate `org-font-lock-extra-keywords'.
-This is calles after `org-font-lock-extra-keywords' is defined, but before
+This is called after `org-font-lock-extra-keywords' is defined, but before
 it is installed to be used by font lock.  This can be useful if something
 needs to be inserted at a specific position in the font-lock sequence.")
 
@@ -5854,7 +5854,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
   (org-set-local 'org-pretty-entities (not org-pretty-entities))
   (org-restart-font-lock)
   (if org-pretty-entities
-      (message "Entities are displayed as UTF8 characers")
+      (message "Entities are displayed as UTF8 characters")
     (save-restriction
       (widen)
       (org-decompose-region (point-min) (point-max))
@@ -11441,7 +11441,7 @@ changes.  Such blocking occurs when:
                      (forward-line 1)
                      (re-search-forward org-not-done-heading-regexp pos t))
             (throw 'dont-block nil))  ; block, there is an older sibling not done.
-          ;; Search further up the hierarchy, to see if an anchestor is blocked
+          ;; Search further up the hierarchy, to see if an ancestor is blocked
           (while t
             (goto-char parent-pos)
             (if (not (looking-at org-not-done-heading-regexp))
@@ -15123,7 +15123,7 @@ user."
       (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day)
                                t nil ans)))
 
-    ;; Help matching dottet european dates
+    ;; Help matching dotted european dates
     (when (string-match
            "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans)
       (setq year (if (match-end 3)
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index d72eef27a58..1e07ac4cf09 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1533,7 +1533,7 @@ the project file."
   ;;      .ali file for a spec file.  If we are, go to step 3.
   ;;   3- If the file is not found or step 2 failed:
   ;;      find the name of the "other file", ie the body, and look
-  ;;      for its associated .ali file by subtituting the extension
+  ;;      for its associated .ali file by substituting the extension
   ;;
   ;; We must also handle the case of separate packages and subprograms:
   ;;   4- If no ali file was found, we try to modify the file name by removing
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 392e5d1c37c..2e0294341da 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -4211,12 +4211,14 @@ The last point calculated is cached if the cache is enabled, i.e. if
 
 Note that this function might do hidden buffer changes.  See the
 comment at the start of cc-engine.el for more info."
-  (let* ((safe-place (c-state-safe-place (point)))
-         (lit (c-state-pp-to-literal safe-place (point))))
-    (or (cadr lit)
-        (and detect-cpp
-             (save-excursion (c-beginning-of-macro))
-             'pound))))
+  (save-restriction
+    (widen)
+    (let* ((safe-place (c-state-safe-place (point)))
+           (lit (c-state-pp-to-literal safe-place (point))))
+      (or (cadr lit)
+          (and detect-cpp
+               (save-excursion (c-beginning-of-macro))
+               'pound)))))
 
 (defun c-literal-limits (&optional lim near not-in-delimiter)
   "Return a cons of the beginning and end positions of the comment or
@@ -4236,9 +4238,10 @@ comment at the start of cc-engine.el for more info."
   (save-excursion
     (let* ((pos (point))
            (lim (or lim (c-state-safe-place pos)))
-           (pp-to-lit (c-state-pp-to-literal lim pos))
+           (pp-to-lit (save-restriction
+                        (widen)
+                        (c-state-pp-to-literal lim pos)))
            (state (car pp-to-lit))
-           (lit-type (cadr pp-to-lit))
            (lit-limits (car (cddr pp-to-lit))))
 
       (cond
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index f52864df809..e7d00815708 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1429,7 +1429,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
               nil)
 
              ((and (not c-enums-contain-decls)
-                   ;; An optimisation quickly to eliminate scans of long enum
+                   ;; An optimization quickly to eliminate scans of long enum
                    ;; declarations in the next cond arm.
                    (let ((paren-state (c-parse-state)))
                      (and
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 56f04751bda..cc5f0fef934 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -463,7 +463,7 @@ Returns non-nil if it is a valid table."
 
 ;; Subroutine of visit-tags-table-buffer.  Search the current tags tables
 ;; for one that has tags for THIS-FILE (or that includes a table that
-;; does).  Return the name of the first table table listing THIS-FILE; if
+;; does).  Return the name of the first table listing THIS-FILE; if
 ;; the table is one included by another table, it is the master table that
 ;; we return.  If CORE-ONLY is non-nil, check only tags tables that are
 ;; already in buffers--don't visit any new files.
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index c9ba5ef2818..0884d28ad5a 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -604,7 +604,7 @@ we return a list having a nil as its car and the end of comment position
 as cdr."
   (save-excursion
     ;; the idea is to look backwards for a comment start regexp, do a
-    ;; forward comment, and see if we are inside, then extend extend
+    ;; forward comment, and see if we are inside, then extend
     ;; forward and backward as long as we have comments
     (let ((q (point)))
       (when (or (looking-at hs-c-start-regexp)
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 619b903e902..55a085fbde0 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -227,7 +227,7 @@ window, but is useful for stepping, etc."
   "Obsolete variable.  See `idlwave-shell-debug-modifiers'.")
 
 (defcustom idlwave-shell-use-truename nil
-  "*Non-nil means, use use `file-truename' when looking for buffers.
+  "*Non-nil means, use `file-truename' when looking for buffers.
 If this variable is non-nil, Emacs will use the function `file-truename' to
 resolve symbolic links in the file paths printed by e.g., STOP commands.
 This means, unvisited files will be loaded under their truename.
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index b152f7367eb..54d857dd4b1 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -145,43 +145,43 @@ zeros to make a word."
     (LD1 loading "load I1" 9 field
          "Put in rI1 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
          2)
 
     (LD2 loading "load I2" 10 field
          "Put in rI2 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
          2)
 
     (LD3 loading "load I3" 11 field
          "Put in rI3 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
          2)
 
     (LD4 loading "load I4" 12 field
          "Put in rI4 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
          2)
 
     (LD5 loading "load I5" 13 field
          "Put in rI5 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
          2)
 
     (LD6 loading "load I6" 14 field
          "Put in rI6 the contents of cell no. M.
 Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
          2)
 
     (LDAN loading "load A negative" 16 field
@@ -200,7 +200,7 @@ Subfield is left padded with zeros to make a word."
           "Put in rI1 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
           2)
 
@@ -208,7 +208,7 @@ in undefined behavior."
           "Put in rI2 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
           2)
 
@@ -216,7 +216,7 @@ in undefined behavior."
           "Put in rI3 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
           2)
 
@@ -224,7 +224,7 @@ in undefined behavior."
           "Put in rI4 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
           2)
 
@@ -232,7 +232,7 @@ in undefined behavior."
           "Put in rI5 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
           2)
 
@@ -240,7 +240,7 @@ in undefined behavior."
           "Put in rI6 the contents of cell no. M, with opposite sign.
 Uses a + when there is no sign in subfield, otherwise use the opposite sign.
 Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
 in undefined behavior."
           2)
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 1cbf2f74c14..41056f3907e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -910,7 +910,7 @@ opening the first frame (e.g. open a connection to an X server).")
             (setq no-blinking-cursor t)))
       ;; If the cursorColor X resource exists, alter the `cursor' face
       ;; spec, but mark it as changed outside of Customize.
-      (let ((color (x-get-resource "cursorColor" "CursorColor")))
+      (let ((color (x-get-resource "cursorColor" "Foreground")))
         (when color
           (put 'cursor 'theme-face
                `((changed ((t :background ,color)))))
@@ -929,7 +929,7 @@ opening the first frame (e.g. open a connection to an X server).")
               emacs-basic-display
               (and (memq window-system '(x w32 ns))
                    (not (member (x-get-resource "cursorBlink" "CursorBlink")
-                                '("off" "false")))))
+                                '("no" "off" "false" "0")))))
     (setq no-blinking-cursor t))
 
   ;; Re-evaluate predefined variables whose initial value depends on
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index d3fa49491d4..08254c6f5f7 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -93,6 +93,7 @@ reinserts the fill prefix in each resulting line."
   ;; Added `!' for doxygen comments starting with `//!' or `/*!'.
   ;; Added `%' for TeX comments.
   ;; RMS: deleted the code to match `1.' and `(1)'.
+  ;; Update mail-mode's paragraph-separate if you change this.
   (purecopy "[ \t]*\\([-–!|#%;>*·•‣�◦]+[ \t]*\\)*")
   "Regexp to match text at start of line that constitutes indentation.
 If Adaptive Fill mode is enabled, a prefix matching this pattern
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 4c28ae3f1a9..f011a8d1dc0 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-12  Glenn Morris  <rgm@gnu.org>
+
+        * url-auth.el (url-basic-auth, url-digest-auth):
+        Allow reading usernames etc when the minibuffer is already in use,
+        eg in url-handler-mode.  (Bug#10298)
+
 2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
 
         * url-dav.el (url-dav-delete-file): Fix typo.
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index be307698575..f7e53eafb44 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -69,6 +69,7 @@ instead of the filename inheritance method."
          (file (url-filename href))
          (user (url-user href))
          (pass (url-password href))
+         (enable-recursive-minibuffers t) ; for url-handler-mode (bug#10298)
          byserv retval data)
     (setq server (format "%s:%d" server port)
           file (cond
@@ -163,6 +164,7 @@ instead of hostname:portnum."
              (type (url-type href))
              (port (url-port href))
              (file (url-filename href))
+             (enable-recursive-minibuffers t)
              user pass byserv retval data)
         (setq file (cond
                     (realm realm)
diff --git a/lisp/winner.el b/lisp/winner.el
index 55f82647089..ef7b0c2a3ce 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -1,6 +1,6 @@
 ;;; winner.el --- Restore old window configurations
 
-;; Copyright (C) 1997-1998, 2001-2012 Free Software Foundation. Inc.
+;; Copyright (C) 1997-1998, 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
 ;; Created: 27 Feb 1997
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 482934f2029..060970151ef 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * sed4.inp (PATH_DUMPLOADSEARCH): Edit to "../lisp", for when the
+        default in src/epaths.in will change, maybe.
+
 2011-10-31  Eli Zaretskii  <eliz@gnu.org>
 
         * sed3v2.inp (insrcdir): Comment out definition.
diff --git a/msdos/sed4.inp b/msdos/sed4.inp
index efbed4d3f1d..73d025463d8 100644
--- a/msdos/sed4.inp
+++ b/msdos/sed4.inp
@@ -16,6 +16,7 @@
 #
 # ----------------------------------------------------------------------
 /^#define *PATH_LOADSEARCH/s/".*"/rootrelativepath ("lisp")/
+/^#define *PATH_DUMPLOADSEARCH/s/".*"/"..\/lisp"/
 /^#define *PATH_DATA/s/".*"/rootrelativepath ("etc")/
 /^#define *PATH_DOC/s/".*"/rootrelativepath ("etc")/
 /^#define *PATH_INFO/s/".*"/rootrelativepath ("info")/
diff --git a/src/ChangeLog b/src/ChangeLog
index 00202258d02..a989246335d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2012-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+2012-01-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix integer width and related bugs (Bug#9874).
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -788,6 +788,42 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (signal_user_input): Don't do a QUIT, to avoid
+        thrashing the stack of the thread.  (Bug#9087)
+
+2012-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
+
+2012-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Handle the case where the
+        highlight ends on a newline.  (Bug#10464)
+        (mouse_face_from_buffer_pos): Fix off-by-one error in calculating
+        he end column for display of highlight that ends on a newline
+        before a R2L line.
+
+2012-01-11  Glenn Morris  <rgm@gnu.org>
+
+        * lread.c (init_lread): If no-site-lisp, remove site-lisp dirs
+        from load-path also when installation-directory is nil.  (Bug#10208)
+
+2012-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.c (syms_of_emacs) <installation-directory>: Doc fix.
+
+        * epaths.in (PATH_LOADSEARCH, PATH_EXEC, PATH_DATA, PATH_DOC):
+        Update template values to be closer to their typical values these days.
+
+2012-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (rows_from_pos_range): Accept additional argument
+        DISP_STRING, and accept any glyph in a row whose object is that
+        string as eligible for mouse highlight.  Fixes mouse highlight of
+        display strings from overlays.  (Bug#10464)
+
 2012-01-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         emacs: fix an auto-save permissions race condition (Bug#10400)
@@ -896,7 +932,7 @@
         (trackingNotification): Surround with ifdef NS_IMPL_COCOA.
         (syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA.
 
-2011-12-18 David Reitter <reitter@cmu.edu>
+2011-12-18  David Reitter  <reitter@cmu.edu>
 
         * nsterm.m (ns_term_init): Subscribe for notifications
         NSMenuDidBeginTrackingNotification and NSMenuDidEndTrackingNotification
@@ -6545,7 +6581,7 @@
         where the include path doesn't have X11/X.h by default.  See
         <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
 
-2011-05-20 Kenichi Handa  <handa@m17n.org>
+2011-05-20  Kenichi Handa  <handa@m17n.org>
 
         * composite.c (find_automatic_composition): Fix previous change.
 
@@ -6887,7 +6923,7 @@
         * lread.c (lisp_file_lexically_bound_p): Stop scanning at end
         marker.  (Bug#8610)
 
-2011-05-05 Eli Zaretskii  <eliz@gnu.org>
+2011-05-05  Eli Zaretskii  <eliz@gnu.org>
 
         * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
         New version that can reserve upto 2GB of heap space.
@@ -9091,7 +9127,7 @@
         are now in src/globals.h.
         (syms_of_minibuf): Remove spurious & from previous change.
 
-2011-03-20  Leo  <sdl.web@gmail.com>
+2011-03-20  Leo Liu  <sdl.web@gmail.com>
 
         * minibuf.c (completing-read-function): New variable.
         (completing-read-default): Rename from completing-read.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 6c361399535..e8bfd964312 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -3538,7 +3538,6 @@
         * nsmenu.m (syms_of_nsmenu):
         * nsfns.m (syms_of_nsfns):
         * msdos.c (syms_of_msdos):
-
         * image.c (syms_of_image):
         * charset.c (syms_of_charset): Use intern_c_string instead of intern.
 
@@ -4388,7 +4387,7 @@
         * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last change.
         Don't make first argument optional.  Doc fix.
 
-2010-09-14  Leo  <sdl.web@gmail.com>  (tiny change)
+2010-09-14  Leo Liu  <sdl.web@gmail.com>  (tiny change)
 
         * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
         parameters for the doc string.
@@ -29523,7 +29522,7 @@
         (Fdisplay_buffer): Use it.
         (syms_of_window): Export, and initialize it.
 
-2007-09-06  Pixel  <pixel@mandriva.com>  (tiny change)
+2007-09-06  Pascal Rigaux  <pixel@mandriva.com>  (tiny change)
 
         * image.c (gif_load): Fix bug: Handle nonexistent colormap.
 
diff --git a/src/bidi.c b/src/bidi.c
index a2d857469cc..99936d93e4f 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -572,7 +572,7 @@ bidi_cache_find (ptrdiff_t charpos, int level, struct bidi_it *bidi_it)
 
       bidi_copy_it (bidi_it, &bidi_cache[i]);
       bidi_cache_last_idx = i;
-      /* Don't let scan direction from from the cached state override
+      /* Don't let scan direction from the cached state override
          the current scan direction.  */
       bidi_it->scan_dir = current_scan_dir;
       return bidi_it->type;
diff --git a/src/dispnew.c b/src/dispnew.c
index 5290b60972a..749523158cb 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -62,7 +62,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <errno.h>
 
 /* Get number of chars of output now in the buffer of a stdio stream.
-   This ought to be built in in stdio, but it isn't.  Some s- files
+   This ought to be built in stdio, but it isn't.  Some s- files
    override this because their stdio internals differ.  */
 
 #ifdef __GNU_LIBRARY__
diff --git a/src/emacs.c b/src/emacs.c
index b8abcef6cbd..29bc44191ab 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2485,9 +2485,11 @@ The value is nil if that directory's name is not known.  */);
 
   DEFVAR_LISP ("installation-directory", Vinstallation_directory,
                doc: /* A directory within which to look for the `lib-src' and `etc' directories.
-This is non-nil when we can't find those directories in their standard
-installed locations, but we can find them near where the Emacs executable
-was found.  */);
+In an installed Emacs, this is normally nil.  It is non-nil if
+both `lib-src' (on MS-DOS, `info') and `etc' directories are found
+within the variable `invocation-directory' or its parent.  For example,
+this is the case when running an uninstalled Emacs executable from its
+build directory.  */);
   Vinstallation_directory = Qnil;
 
   DEFVAR_LISP ("system-messages-locale", Vsystem_messages_locale,
diff --git a/src/epaths.in b/src/epaths.in
index 9ce1cefd211..17cb65a3234 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -19,14 +19,21 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* The default search path for Lisp function "load".
-   This sets load-path.  */
-#define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp"
-
-/* Like PATH_LOADSEARCH, but used only when Emacs is dumping.  This
-   path is usually identical to PATH_LOADSEARCH except that the entry
-   for the directory containing the installed lisp files has been
-   replaced with ../lisp.  */
+/* The default value of load-path, which is the search path for
+   the Lisp function "load".  Configure (using "make epaths-force")
+   sets this to $lisppath, which typically has a value like:
+   <datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp:
+   <datadir>/emacs/VERSION/lisp:<datadir>/emacs/VERSION/leim
+   where datadir is eg /usr/local/share.
+   Configure prepends any $locallisppath, as set by the
+   --enable-locallisppath argument.
+*/
+#define PATH_LOADSEARCH "/usr/local/share/emacs/lisp"
+
+/* Like PATH_LOADSEARCH, but used only during the build process
+   when Emacs is dumping.  Configure (using "make epaths-force") sets
+   this to $buildlisppath, which normally has the value: <srcdir>/lisp.
+*/
 #define PATH_DUMPLOADSEARCH "../lisp"
 
 /* The extra search path for programs to invoke.  This is appended to
@@ -34,12 +41,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    variable exec-path and the first file name in it sets the Lisp
    variable exec-directory.  exec-directory is used for finding
    executables and other architecture-dependent files.  */
-#define PATH_EXEC "/usr/local/lib/emacs/etc"
+#define PATH_EXEC "/usr/local/libexec/emacs"
 
 /* Where Emacs should look for its architecture-independent data
    files, like the NEWS file.  The lisp variable data-directory
    is set to this value.  */
-#define PATH_DATA "/usr/local/lib/emacs/data"
+#define PATH_DATA "/usr/local/share/emacs/etc"
 
 /* Where Emacs should look for X bitmap files.
    The lisp variable x-bitmap-file-path is set based on this value.  */
@@ -47,7 +54,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Where Emacs should look for its docstring file.  The lisp variable
    doc-directory is set to this value.  */
-#define PATH_DOC "/usr/local/lib/emacs/data"
+#define PATH_DOC "/usr/local/share/emacs/etc"
 
 /* Where the configuration process believes the info tree lives.  The
    lisp variable configure-info-directory gets its value from this
diff --git a/src/keyboard.c b/src/keyboard.c
index 177034f91ca..da15f663a0d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2237,8 +2237,8 @@ do { if (polling_stopped_here) start_polling ();	\
        polling_stopped_here = 0; } while (0)
 
 /* read a character from the keyboard; call the redisplay if needed */
-/* commandflag 0 means do not do auto-saving, but do do redisplay.
-   -1 means do not do redisplay, but do do autosaving.
+/* commandflag 0 means do not autosave, but do redisplay.
+   -1 means do not redisplay, but do autosave.
    1 means do both.  */
 
 /* The arguments MAPS and NMAPS are for menu prompting.
@@ -5133,7 +5133,7 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
 
   if (WINDOWP (window))
     {
-      /* It's a click in window window at frame coordinates (x,y)  */
+      /* It's a click in window WINDOW at frame coordinates (X,Y)  */
       struct window *w = XWINDOW (window);
       Lisp_Object string_info = Qnil;
       ptrdiff_t textpos = -1;
diff --git a/src/lread.c b/src/lread.c
index 2a7b7a8585d..256624da046 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4115,7 +4115,46 @@ init_lread (void)
   const char *normal;
   int turn_off_warning = 0;
 
-  /* Compute the default load-path.  */
+  /* Compute the default Vload-path, with the following logic:
+     If CANNOT_DUMP just use PATH_LOADSEARCH.
+     Else if purify-flag (ie dumping) start from PATH_DUMPLOADSEARCH;
+     otherwise start from PATH_LOADSEARCH.
+     If !initialized, then just set both Vload_path and dump_path.
+     If initialized, then if Vload_path != dump_path, do nothing.
+     (Presumably the load-path has already been changed by something.)
+     Also do nothing if Vinstallation_directory is nil.
+     Otherwise:
+       Remove site-lisp directories from the front of load-path.
+       Add installation-dir/lisp (if exists and not already a member),
+         at the front, and turn off warnings about missing directories
+         (because we are presumably running uninstalled).
+         If it does not exist, add dump_path at the end instead.
+       Add installation-dir/leim (if exists and not already a member)
+         at the front.
+       Add installation-dir/site-lisp (if !no_site_lisp, and exists
+         and not already a member) at the front.
+       If installation-dir != source-dir (ie running an uninstalled,
+         out-of-tree build) AND install-dir/src/Makefile exists BUT
+         install-dir/src/Makefile.in does NOT exist (this is a sanity
+         check), then repeat the above steps for source-dir/lisp,
+         leim and site-lisp.
+       Finally, add the previously removed site-lisp directories back
+       at the front (if !no_site_lisp).
+
+     We then warn about any of the load-path elements that do not
+     exist.  The only ones that might not exist are those from
+     PATH_LOADSEARCH, and perhaps dump_path.
+
+     Having done all this, we then throw it all away if purify-flag is
+     nil (ie, not dumping) and EMACSLOADPATH is set, and just
+     unconditionally use the latter value instead.
+     So AFAICS the only net results of all the previous steps will be
+     possibly to issue some irrelevant warnings.
+
+     FIXME? There's a case for saying that if we are running
+     uninstalled, the eventual installation directories should not yet
+     be included in load-path.
+  */
 #ifdef CANNOT_DUMP
   normal = PATH_LOADSEARCH;
   Vload_path = decode_env_path (0, normal);
@@ -4125,23 +4164,28 @@ init_lread (void)
   else
     normal = PATH_DUMPLOADSEARCH;
 
-  /* In a dumped Emacs, we normally have to reset the value of
-     Vload_path from PATH_LOADSEARCH, since the value that was dumped
-     uses ../lisp, instead of the path of the installed elisp
-     libraries.  However, if it appears that Vload_path was changed
-     from the default before dumping, don't override that value.  */
+  /* In a dumped Emacs, we normally reset the value of Vload_path using
+     PATH_LOADSEARCH, since the value that was dumped uses lisp/ in
+     the source directory, instead of the path of the installed elisp
+     libraries.  However, if it appears that Vload_path has already been
+     changed from the default that was saved before dumping, don't
+     change it further.  */
   if (initialized)
     {
       if (! NILP (Fequal (dump_path, Vload_path)))
         {
           Vload_path = decode_env_path (0, normal);
-          if (!NILP (Vinstallation_directory))
+          if (no_site_lisp || !NILP (Vinstallation_directory))
             {
               Lisp_Object tem, tem1, sitelisp;
 
-              /* Remove site-lisp dirs from path temporarily and store
-                 them in sitelisp, then conc them on at the end so
-                 they're always first in path.  */
+              /* Remove "site-lisp" dirs from front of path temporarily
+                 and store them in sitelisp, then conc them on at the
+                 end so they're always first in path.
+                 Note that this won't work if you used a
+                 --enable-locallisppath element that does not happen
+                 to contain "site-lisp" in its name.
+              */
               sitelisp = Qnil;
               while (1)
                 {
@@ -4157,96 +4201,99 @@ init_lread (void)
                     break;
                 }
 
-              /* Add to the path the lisp subdir of the
-                 installation dir, if it exists.  */
-              tem = Fexpand_file_name (build_string ("lisp"),
-                                       Vinstallation_directory);
-              tem1 = Ffile_exists_p (tem);
-              if (!NILP (tem1))
-                {
-                  if (NILP (Fmember (tem, Vload_path)))
-                    {
-                      turn_off_warning = 1;
-                      Vload_path = Fcons (tem, Vload_path);
-                    }
-                }
-              else
-                /* That dir doesn't exist, so add the build-time
-                   Lisp dirs instead.  */
-                Vload_path = nconc2 (Vload_path, dump_path);
-
-              /* Add leim under the installation dir, if it exists.  */
-              tem = Fexpand_file_name (build_string ("leim"),
-                                       Vinstallation_directory);
-              tem1 = Ffile_exists_p (tem);
-              if (!NILP (tem1))
-                {
-                  if (NILP (Fmember (tem, Vload_path)))
-                    Vload_path = Fcons (tem, Vload_path);
-                }
-
-              /* Add site-lisp under the installation dir, if it exists.  */
-              if (!no_site_lisp)
+              if (!NILP (Vinstallation_directory))
                 {
-                  tem = Fexpand_file_name (build_string ("site-lisp"),
+                  /* Add to the path the lisp subdir of the
+                     installation dir, if it exists.  */
+                  tem = Fexpand_file_name (build_string ("lisp"),
                                            Vinstallation_directory);
                   tem1 = Ffile_exists_p (tem);
                   if (!NILP (tem1))
                     {
                       if (NILP (Fmember (tem, Vload_path)))
-                        Vload_path = Fcons (tem, Vload_path);
+                        {
+                          turn_off_warning = 1;
+                          Vload_path = Fcons (tem, Vload_path);
+                        }
                     }
-                }
-
-              /* If Emacs was not built in the source directory,
-                 and it is run from where it was built, add to load-path
-                 the lisp, leim and site-lisp dirs under that directory.  */
-
-              if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
-                {
-                  Lisp_Object tem2;
+                  else
+                    /* That dir doesn't exist, so add the build-time
+                       Lisp dirs instead.  */
+                    Vload_path = nconc2 (Vload_path, dump_path);
 
-                  tem = Fexpand_file_name (build_string ("src/Makefile"),
+                  /* Add leim under the installation dir, if it exists.  */
+                  tem = Fexpand_file_name (build_string ("leim"),
                                            Vinstallation_directory);
                   tem1 = Ffile_exists_p (tem);
-
-                  /* Don't be fooled if they moved the entire source tree
-                     AFTER dumping Emacs.  If the build directory is indeed
-                     different from the source dir, src/Makefile.in and
-                     src/Makefile will not be found together.  */
-                  tem = Fexpand_file_name (build_string ("src/Makefile.in"),
-                                           Vinstallation_directory);
-                  tem2 = Ffile_exists_p (tem);
-                  if (!NILP (tem1) && NILP (tem2))
+                  if (!NILP (tem1))
                     {
-                      tem = Fexpand_file_name (build_string ("lisp"),
-                                               Vsource_directory);
-
                       if (NILP (Fmember (tem, Vload_path)))
                         Vload_path = Fcons (tem, Vload_path);
+                    }
 
-                      tem = Fexpand_file_name (build_string ("leim"),
-                                               Vsource_directory);
+                  /* Add site-lisp under the installation dir, if it exists.  */
+                  if (!no_site_lisp)
+                    {
+                      tem = Fexpand_file_name (build_string ("site-lisp"),
+                                               Vinstallation_directory);
+                      tem1 = Ffile_exists_p (tem);
+                      if (!NILP (tem1))
+                        {
+                          if (NILP (Fmember (tem, Vload_path)))
+                            Vload_path = Fcons (tem, Vload_path);
+                        }
+                    }
 
-                      if (NILP (Fmember (tem, Vload_path)))
-                        Vload_path = Fcons (tem, Vload_path);
+                  /* If Emacs was not built in the source directory,
+                     and it is run from where it was built, add to load-path
+                     the lisp, leim and site-lisp dirs under that directory.  */
 
-                      if (!no_site_lisp)
+                  if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
+                    {
+                      Lisp_Object tem2;
+
+                      tem = Fexpand_file_name (build_string ("src/Makefile"),
+                                               Vinstallation_directory);
+                      tem1 = Ffile_exists_p (tem);
+
+                      /* Don't be fooled if they moved the entire source tree
+                         AFTER dumping Emacs.  If the build directory is indeed
+                         different from the source dir, src/Makefile.in and
+                         src/Makefile will not be found together.  */
+                      tem = Fexpand_file_name (build_string ("src/Makefile.in"),
+                                               Vinstallation_directory);
+                      tem2 = Ffile_exists_p (tem);
+                      if (!NILP (tem1) && NILP (tem2))
                         {
-                          tem = Fexpand_file_name (build_string ("site-lisp"),
+                          tem = Fexpand_file_name (build_string ("lisp"),
+                                                   Vsource_directory);
+
+                          if (NILP (Fmember (tem, Vload_path)))
+                            Vload_path = Fcons (tem, Vload_path);
+
+                          tem = Fexpand_file_name (build_string ("leim"),
                                                    Vsource_directory);
 
                           if (NILP (Fmember (tem, Vload_path)))
                             Vload_path = Fcons (tem, Vload_path);
+
+                          if (!no_site_lisp)
+                            {
+                              tem = Fexpand_file_name (build_string ("site-lisp"),
+                                                       Vsource_directory);
+
+                              if (NILP (Fmember (tem, Vload_path)))
+                                Vload_path = Fcons (tem, Vload_path);
+                            }
                         }
-                    }
-                }
+                    } /* Vinstallation_directory != Vsource_directory */
+                }     /* if Vinstallation_directory */
               if (!NILP (sitelisp) && !no_site_lisp)
                 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path);
-            }
-        }
+            } /* if Vinstallation_directory || no_site_lisp */
+        }     /* if dump_path == Vload_path */
     }
-  else
+  else                          /* !initialized */
     {
       /* NORMAL refers to the lisp dir in the source directory.  */
       /* We used to add ../lisp at the front here, but
@@ -4256,7 +4303,7 @@ init_lread (void)
       Vload_path = decode_env_path (0, normal);
       dump_path = Vload_path;
     }
-#endif
+#endif  /* CANNOT_DUMP */
 
 #if (!(defined (WINDOWSNT) || (defined (HAVE_NS))))
   /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
@@ -4264,6 +4311,8 @@ init_lread (void)
      confuses users.  Since PATH_LOADSEARCH is always overridden by the
      EMACSLOADPATH environment variable below, disable the warning on NT.  */
 
+  /* HAVE_NS also uses EMACSLOADPATH.  */
+
   /* Warn if dirs in the *standard* path don't exist.  */
   if (!turn_off_warning)
     {
@@ -4278,6 +4327,10 @@ init_lread (void)
           if (STRINGP (dirfile))
             {
               dirfile = Fdirectory_file_name (dirfile);
+              /* Do we really need to warn about missing site-lisp dirs?
+                 It's true that the installation should have created
+                 them and added subdirs.el, but it's harmless if they
+                 are not there.  */
               if (access (SSDATA (dirfile), 0) < 0)
                 dir_warning ("Warning: Lisp directory `%s' does not exist.\n",
                              XCAR (path_tail));
diff --git a/src/w32fns.c b/src/w32fns.c
index d7a6eefab67..3a6929844de 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2479,6 +2479,10 @@ signal_user_input (void)
   if (!NILP (Vthrow_on_input))
     {
       Vquit_flag = Vthrow_on_input;
+      /* Doing a QUIT from this thread is a bad idea, since this
+         unwinds the stack of the Lisp thread, and the Windows runtime
+         rightfully barfs.  Disabled.  */
+#if 0
       /* If we're inside a function that wants immediate quits,
          do it now.  */
       if (immediate_quit && NILP (Vinhibit_quit))
@@ -2486,6 +2490,7 @@ signal_user_input (void)
           immediate_quit = 0;
           QUIT;
         }
+#endif
     }
 }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index d3a1dfc4b20..58678fc6385 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25822,12 +25822,14 @@ cursor_in_mouse_face_p (struct window *w)
 
 /* Find the glyph rows START_ROW and END_ROW of window W that display
    characters between buffer positions START_CHARPOS and END_CHARPOS
-   (excluding END_CHARPOS).  This is similar to row_containing_pos,
-   but is more accurate when bidi reordering makes buffer positions
-   change non-linearly with glyph rows.  */
+   (excluding END_CHARPOS).  DISP_STRING is a display string that
+   covers these buffer positions.  This is similar to
+   row_containing_pos, but is more accurate when bidi reordering makes
+   buffer positions change non-linearly with glyph rows.  */
 static void
 rows_from_pos_range (struct window *w,
                      ptrdiff_t start_charpos, ptrdiff_t end_charpos,
+                     Lisp_Object disp_string,
                      struct glyph_row **start, struct glyph_row **end)
 {
   struct glyph_row *first = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
@@ -25879,8 +25881,11 @@ rows_from_pos_range (struct window *w,
 
           while (g < e)
             {
-              if ((BUFFERP (g->object) || INTEGERP (g->object))
-                  && start_charpos <= g->charpos && g->charpos < end_charpos)
+              if (((BUFFERP (g->object) || INTEGERP (g->object))
+                   && start_charpos <= g->charpos && g->charpos < end_charpos)
+                  /* A glyph that comes from DISP_STRING is by
+                     definition to be highlighted.  */
+                  || EQ (g->object, disp_string))
                 *start = row;
               g++;
             }
@@ -25899,14 +25904,15 @@ rows_from_pos_range (struct window *w,
   for ( ; row->enabled_p && MATRIX_ROW_BOTTOM_Y (row) <= last_y; row++)
     {
       struct glyph_row *next = row + 1;
+      ptrdiff_t next_start = MATRIX_ROW_START_CHARPOS (next);
 
       if (!next->enabled_p
           || next >= MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w)
           /* The first row >= START whose range of displayed characters
              does NOT intersect the range [START_CHARPOS..END_CHARPOS]
              is the row END + 1.  */
-          || (start_charpos < MATRIX_ROW_START_CHARPOS (next)
-              && end_charpos < MATRIX_ROW_START_CHARPOS (next))
+          || (start_charpos < next_start
+              && end_charpos < next_start)
           || ((start_charpos > MATRIX_ROW_END_CHARPOS (next)
                || (start_charpos == MATRIX_ROW_END_CHARPOS (next)
                    && !next->ends_at_zv_p
@@ -25925,12 +25931,29 @@ rows_from_pos_range (struct window *w,
              but none of the characters it displays are in the range, it is
              also END + 1. */
           struct glyph *g = next->glyphs[TEXT_AREA];
+          struct glyph *s = g;
           struct glyph *e = g + next->used[TEXT_AREA];
 
           while (g < e)
             {
-              if ((BUFFERP (g->object) || INTEGERP (g->object))
-                  && start_charpos <= g->charpos && g->charpos < end_charpos)
+              if (((BUFFERP (g->object) || INTEGERP (g->object))
+                   && ((start_charpos <= g->charpos && g->charpos < end_charpos)
+                       /* If the buffer position of the first glyph in
+                          the row is equal to END_CHARPOS, it means
+                          the last character to be highlighted is the
+                          newline of ROW, and we must consider NEXT as
+                          END, not END+1.  */
+                       || (((!next->reversed_p && g == s)
+                            || (next->reversed_p && g == e - 1))
+                           && (g->charpos == end_charpos
+                               /* Special case for when NEXT is an
+                                  empty line at ZV.  */
+                               || (g->charpos == -1
+                                   && !row->ends_at_zv_p
+                                   && next_start == end_charpos)))))
+                  /* A glyph that comes from DISP_STRING is by
+                     definition to be highlighted.  */
+                  || EQ (g->object, disp_string))
                 break;
               g++;
             }
@@ -25939,6 +25962,13 @@ rows_from_pos_range (struct window *w,
               *end = row;
               break;
             }
+          /* The first row that ends at ZV must be the last to be
+             highlighted.  */
+          else if (next->ends_at_zv_p)
+            {
+              *end = next;
+              break;
+            }
         }
     }
 }
@@ -25974,7 +26004,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
   xassert (NILP (after_string) || STRINGP (after_string));
 
   /* Find the rows corresponding to START_CHARPOS and END_CHARPOS.  */
-  rows_from_pos_range (w, start_charpos, end_charpos, &r1, &r2);
+  rows_from_pos_range (w, start_charpos, end_charpos, disp_string, &r1, &r2);
   if (r1 == NULL)
     r1 = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
   /* If the before-string or display-string contains newlines,
@@ -26252,6 +26282,19 @@ mouse_face_from_buffer_pos (Lisp_Object window,
             }
           x += end->pixel_width;
         }
+      /* If we exited the above loop because we arrived at the last
+         glyph of the row, and its buffer position is still not in
+         range, it means the last character in range is the preceding
+         newline.  Bump the end column and x values to get past the
+         last glyph.  */
+      if (end == glyph
+          && BUFFERP (end->object)
+          && (end->charpos < start_charpos
+              || end->charpos >= end_charpos))
+        {
+          x += end->pixel_width;
+          ++end;
+        }
       hlinfo->mouse_face_end_x = x;
       hlinfo->mouse_face_end_col = end - r2->glyphs[TEXT_AREA];
     }