Merge from trunk.

71 files changed, 908 insertions, 612 deletions

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