upstream i think

348 files changed, 8125 insertions, 5197 deletions

diff --git a/ChangeLog b/ChangeLog
index 0232a3f8415..fe4b74535ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2011-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * INSTALL.BZR: Mention configure -C, --disable-maintainer-mode.
+
+        Propagate configure flags to sub-configures.
+        * Makefile.in (cache_file, MAINTAINER_MODE_FLAG, CONFIGUREFLAGS):
+        New macros.
+        (config.status, bootstrap): Use them to propagate configure flags
+        to sub-configures.
+        * configure.in (cache_file): AC_SUBST this, for Makefile.in.
+
+2011-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * .bzrignore: Add config.cache.
+
+2011-11-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.in: Check for gtk_window_set_has_resize_grip.
+
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * configure.in (HAVE_XPM): Fix typo.
+
 2011-11-22  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (EMACSDATA, EMACSDOC): If set, print, since they can
@@ -1434,7 +1457,7 @@
 
 2010-10-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * configure.in: Remove the BROKEN annotation from gnutls.
+        * configure.in: Remove the BROKEN annotation from GnuTLS.
 
 2010-10-22  Glenn Morris  <rgm@gnu.org>
 
@@ -1517,7 +1540,7 @@
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * configure.in (HAVE_GNUTLS): Don't break if we don't have the
-        gnutls libraries.
+        GnuTLS libraries.
 
 2010-09-26  Teodor Zlatanov  <tzz@lifelogs.com>
 
diff --git a/INSTALL.BZR b/INSTALL.BZR
index 664aab1c765..69babac7a8b 100644
--- a/INSTALL.BZR
+++ b/INSTALL.BZR
@@ -28,6 +28,10 @@ options you can set):
 
   $ ./configure
 
+If you want later builds to go faster, at the expense of sometimes
+doing the wrong thing if you update the build procedure, you can
+invoke "./configure -C --disable-maintainer-mode" instead.
+
 Some of the files that are included in the Emacs tarball, such as
 byte-compiled Lisp files, are not stored in Bazaar.  Therefore, to
 build from Bazaar you must run "make bootstrap" instead of just "make":
diff --git a/Makefile.in b/Makefile.in
index c0d108877c1..3ba7c9baae7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,6 +66,11 @@ CDPATH=
 
 # ==================== Things `configure' Might Edit ====================
 
+MAINTAINER_MODE_FLAG = --disable-maintainer-mode
+@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode
+cache_file = @cache_file@
+CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG)
+
 CC=@CC@
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
@@ -404,7 +409,7 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
         if [ -x ./config.status ]; then \
             ./config.status --recheck;  \
         else                            \
-            ./configure;                \
+            ./configure $(CONFIGURE_FLAGS); \
         fi
 
 AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
@@ -936,7 +941,7 @@ bootstrap: bootstrap-clean FRC
         if [ -x ./config.status ]; then           \
             ./config.status;                      \
         else                                      \
-            ./configure --enable-maintainer-mode; \
+            ./configure $(CONFIGURE_FLAGS);       \
         fi
         $(MAKE) $(MFLAGS) info all
 
diff --git a/README b/README
index 5ec5fa29570..eda81de1bbe 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 24.0.91 of GNU Emacs, the extensible,
+This directory tree holds version 24.0.92 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
diff --git a/admin/ChangeLog b/admin/ChangeLog
index aa815c552b4..4da85943b7f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,16 @@
+2011-11-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
+        Avoid warning about old-style backquote.
+
+        * grammars/wisent-grammar.el (auto-mode-alist): Change `$' to `\''
+        in regexp.
+        (wisent-make-parsers): Likewise.  Quote `.'.
+
+        * grammars/bovine-grammar.el (auto-mode-alist): Change `$' to `\''
+        in regexp.
+        (bovine-make-parsers): Likewise.  Quote `.'.
+
 2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
 
         * CPP-DEFINES (VIRT_ADDR_VARIES): Remove.
@@ -897,11 +910,11 @@
 
         * FOR-RELEASE (NEW FEATURES): Completed work on this item:
         Rework how fringe bitmaps are defined and used.
-        Currently, bitmap usage and bitmap appearence are "mixed-up" in a
+        Currently, bitmap usage and bitmap appearance are "mixed-up" in a
         one-level representation.  It would be cleaner to split the
         representation into a two-level model where first level maps
         bitmap usage to a bitmap name, and second level maps bitmap name to
-        a bitmap appearence.
+        a bitmap appearance.
 
 2006-01-27  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 01d488c97e3..23d2bd2b16a 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -170,10 +170,10 @@ entering.texi     cyd
 files.texi        cyd
 fixit.texi        
 fortran-xtra.texi 
-frames.texi       
+frames.texi       cyd
 glossary.texi
 help.texi         cyd
-indent.texi       
+indent.texi       cyd
 killing.texi      cyd
 kmacro.texi       cyd
 macos.texi        
@@ -182,6 +182,7 @@ major.texi
 mark.texi         cyd
 mini.texi         
 misc.texi         
+modes.texi        cyd
 msdog.texi        
 msdog-xtra.texi   
 mule.texi         
@@ -197,7 +198,7 @@ text.texi
 trouble.texi      
 vc-xtra.texi
 vc1-xtra.texi
-windows.texi      
+windows.texi      cyd
 xresources.texi   
 
 ** Check the Lisp manual.
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index e4a04763061..bfac347eb15 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -99,6 +99,7 @@ Eli Zaretskii
         src/xfaces.c
         src/xdisp.c
         src/term.c
+        src/dispnew.c
         src/frame.c
         src/dired.c
 
@@ -108,6 +109,7 @@ Eli Zaretskii
         lisp/info.el
         lisp/ls-lisp.el
         lisp/startup.el
+        lisp/w32*.el
 
 Stefan Monnier
         src/intervals.c
@@ -148,7 +150,6 @@ src/coding.c
 src/composite.c
 src/config.in
 src/data.c
-src/dispnew.c
 src/doc.c
 src/doprnt.c
 src/ecrt0.c
@@ -214,7 +215,6 @@ src/w32term.c
 src/w32xfns.c
 src/widget.c
 src/window.c
-src/xdisp.c
 src/xfns.c
 src/xmenu.c
 src/xrdb.c
diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index b611def710d..c8879b30200 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -32,7 +32,7 @@
 
 BEGIN {
   print ";;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-";
-  print ";;; Automatically genrated from CP932-2BYTE.map";
+  print ";;; Automatically generated from CP932-2BYTE.map";
   print "(let ((map";
   printf "       '(;JISEXT<->UNICODE";
 }
diff --git a/admin/grammars/README b/admin/grammars/README
index c8328bbc885..419797e0dcb 100644
--- a/admin/grammars/README
+++ b/admin/grammars/README
@@ -3,17 +3,8 @@ generate the parser data in the lisp/semantic/bovine/ and
 lisp/semantic/wisent/ directories.  You can run the parser generators
 with
 
-emacs -batch --no-site-file -l bovine-grammar.el -f semantic-mode \
- -f semantic-grammar-batch-build-packages *.by
-
-emacs -batch --no-site-file -l wisent-grammar.el -f semantic-mode \
- -f semantic-grammar-batch-build-packages *.wy
-
-The output files were subsequently edited by hand to fix copyright
-headers, variable names (to follow library name conventions), and
-feature names.  These changes do not alter the code logic, and can be
-viewed by diffing to the files in lisp/semantic/bovine/ and
-lisp/semantic/wisent/.
+emacs -batch -Q -l bovine-grammar.el -f bovine-make-parsers
+emacs -batch -Q -l wisent-grammar.el -f wisent-make-parsers
 
 Currently, the parser files in lisp/ are not generated directly from
 these grammar files when making Emacs.  This state of affairs, and the
diff --git a/admin/grammars/bovine-grammar.el b/admin/grammars/bovine-grammar.el
index 0e8756e1c5b..eda7b42adbd 100644
--- a/admin/grammars/bovine-grammar.el
+++ b/admin/grammars/bovine-grammar.el
@@ -115,7 +115,7 @@ NAME, ALIASCLASS, DEFINITION and ATTRIBUTES."
 ;; when it is released, but at the moment it might be possible that people
 ;; are using an older snapshot.
 (defvar bovine--grammar-newstyle-unquote
-  (equal '(, test) (read ",test")))
+  (equal '(\, test) (read ",test")))
 
 (defun bovine-grammar-expand-form (form quotemode &optional inplace)
   "Expand FORM into a new one suitable to the bovine parser.
@@ -434,7 +434,7 @@ Menu items are appended to the common grammar menu.")
      (grammar-setupcode-builder  . bovine-grammar-setupcode-builder)
      )))
 
-(add-to-list 'auto-mode-alist '("\\.by$" . bovine-grammar-mode))
+(add-to-list 'auto-mode-alist '("\\.by\\'" . bovine-grammar-mode))
 
 (defvar-mode-local bovine-grammar-mode semantic-grammar-macros
   '(
@@ -454,4 +454,66 @@ Menu items are appended to the common grammar menu.")
 
 (provide 'semantic/bovine/grammar)
 
+(defun bovine-make-parsers ()
+  "Generate Emacs' built-in Bovine-based parser files."
+  (semantic-mode 1)
+  ;; Loop through each .by file in current directory, and run
+  ;; `semantic-grammar-batch-build-one-package' to build the grammar.
+  (dolist (f (directory-files default-directory nil "\\.by\\'"))
+    (let ((packagename
+           (condition-case err
+               (with-current-buffer (find-file-noselect f)
+                 (semantic-grammar-create-package))
+             (error (message "%s" (error-message-string err)) nil)))
+          lang)
+      (when (and packagename
+                 (string-match "^semantic-\\(.*\\)-by\\.el\\'" packagename))
+        (setq lang (match-string 1 packagename))
+        (with-temp-buffer
+          (insert-file-contents packagename)
+          (setq buffer-file-name (expand-file-name packagename))
+          ;; Fix copyright header:
+          (goto-char (point-min))
+          (re-search-forward "^;; Author:")
+          (setq copyright-end (match-beginning 0))
+          (re-search-forward "^;;; Code:\n")
+          (delete-region copyright-end (match-end 0))
+          (goto-char copyright-end)
+          (insert ";; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This file was generated from admin/grammars/"
+                  lang ".by.
+
+;;; Code:
+
+\(require 'semantic/lex)
+\(eval-when-compile (require 'semantic/bovine))\n")
+          (goto-char (point-min))
+          (delete-region (point-min) (line-end-position))
+          (insert ";;; semantic/bovine/" lang
+                  "-by.el --- Generated parser support file")
+          (delete-trailing-whitespace)
+          ;; Fix footer:
+          (goto-char (point-max))
+          (re-search-backward ".\n;;; Analyzers")
+          (delete-region (point) (point-max))
+          (insert "(provide 'semantic/bovine/" lang "-by)\n\n")
+          (insert ";;; semantic/bovine/" lang "-by.el ends here\n")
+          (save-buffer))))))
+
 ;;; bovine-grammar.el ends here
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
new file mode 100644
index 00000000000..18e8b814303
--- /dev/null
+++ b/admin/grammars/grammar.wy
@@ -0,0 +1,434 @@
+;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
+;;
+;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;;
+;; Author: David Ponce <david@dponce.com>
+;; Maintainer: David Ponce <david@dponce.com>
+;; Created: 26 Aug 2002
+;; Keywords: syntax
+;; X-RCS: $Id: semantic-grammar.wy,v 1.16 2005/09/30 20:20:27 zappo Exp $
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+%{
+(defvar semantic-grammar-lex-c-char-re)
+
+;; Current parsed nonterminal name.
+(defvar semantic-grammar-wy--nterm nil)
+;; Index of rule in a nonterminal clause.
+(defvar semantic-grammar-wy--rindx nil)
+}
+
+%package semantic-grammar-wy
+
+%languagemode wy-mode
+
+;; Main
+%start grammar
+;; Reparse
+%start prologue epilogue declaration nonterminal rule
+;; EXPANDFULL
+%start put_names put_values use_names
+
+;; Keywords
+%type    <keyword>
+%keyword DEFAULT-PREC    "%default-prec"
+%keyword NO-DEFAULT-PREC "%no-default-prec"
+%keyword KEYWORD         "%keyword"
+%keyword LANGUAGEMODE    "%languagemode"
+%keyword LEFT            "%left"
+%keyword NONASSOC        "%nonassoc"
+%keyword PACKAGE         "%package"
+%keyword PREC            "%prec"
+%keyword PUT             "%put"
+%keyword QUOTEMODE       "%quotemode"
+%keyword RIGHT           "%right"
+%keyword SCOPESTART      "%scopestart"
+%keyword START           "%start"
+%keyword TOKEN           "%token"
+%keyword TYPE            "%type"
+%keyword USE-MACROS      "%use-macros"
+
+;; Literals
+%type  <string>
+%token <string>      STRING
+
+%type  <symbol>      syntax ":?\\(\\sw\\|\\s_\\)+"
+%token <symbol>      SYMBOL
+%token <symbol>      PERCENT_PERCENT "\\`%%\\'"
+
+%type  <char>        syntax semantic-grammar-lex-c-char-re
+%token <char>        CHARACTER
+
+%type  <qlist>       matchdatatype sexp syntax "\\s'\\s-*("
+%token <qlist>       PREFIXED_LIST
+
+%type  <sexp>        matchdatatype sexp syntax "\\="
+%token <sexp>        SEXP
+
+;; Don't generate these analyzers which needs special handling code.
+%token <code>        PROLOGUE "%{...%}"
+%token <code>        EPILOGUE "%%...EOF"
+
+;; Blocks & Parenthesis
+%type  <block>
+%token <block>       PAREN_BLOCK "(LPAREN RPAREN)"
+%token <block>       BRACE_BLOCK "(LBRACE RBRACE)"
+%token <open-paren>  LPAREN      "("
+%token <close-paren> RPAREN      ")"
+%token <open-paren>  LBRACE      "{"
+%token <close-paren> RBRACE      "}"
+
+;; Punctuations
+%type  <punctuation>
+%token <punctuation> COLON       ":"
+%token <punctuation> SEMI        ";"
+%token <punctuation> OR          "|"
+%token <punctuation> LT          "<"
+%token <punctuation> GT          ">"
+
+%%
+
+grammar:
+    prologue
+  | epilogue
+  | declaration
+  | nonterminal
+  | PERCENT_PERCENT
+  ;
+
+;;; Prologue/Epilogue
+;;
+prologue:
+    PROLOGUE
+    (CODE-TAG "prologue" nil)
+  ;
+
+epilogue:
+    EPILOGUE
+    (CODE-TAG "epilogue" nil)
+  ;
+
+;;; Declarations
+;;
+declaration:
+    decl
+    (eval $1)
+  ;
+
+decl:
+    default_prec_decl
+  | no_default_prec_decl
+  | languagemode_decl
+  | package_decl
+  | precedence_decl
+  | put_decl
+  | quotemode_decl
+  | scopestart_decl
+  | start_decl
+  | keyword_decl
+  | token_decl
+  | type_decl
+  | use_macros_decl
+  ;
+
+default_prec_decl:
+    DEFAULT-PREC
+    `(TAG "default-prec" 'assoc :value '("t"))
+  ;
+
+no_default_prec_decl:
+    NO-DEFAULT-PREC
+    `(TAG "default-prec" 'assoc :value '("nil"))
+  ;
+
+languagemode_decl:
+    LANGUAGEMODE symbols
+    `(TAG ',(car $2) 'languagemode :rest ',(cdr $2))
+  ;
+
+package_decl:
+    PACKAGE SYMBOL
+    `(PACKAGE-TAG ',$2 nil)
+  ;
+
+precedence_decl:
+    associativity token_type_opt items
+    `(TAG ',$1 'assoc :type ',$2 :value ',$3)
+  ;
+
+associativity:
+    LEFT
+    (progn "left")
+  | RIGHT
+    (progn "right")
+  | NONASSOC
+    (progn "nonassoc")
+  ;
+
+put_decl:
+    PUT put_name put_value
+    `(TAG ',$2 'put :value ',(list $3))
+  | PUT put_name put_value_list
+    `(TAG ',$2 'put :value ',$3)
+  | PUT put_name_list put_value
+    `(TAG ',(car $2) 'put :rest ',(cdr $2) :value ',(list $3))
+  | PUT put_name_list put_value_list
+    `(TAG ',(car $2) 'put :rest ',(cdr $2) :value ',$3)
+  ;
+
+put_name_list:
+    BRACE_BLOCK
+    (mapcar 'semantic-tag-name (EXPANDFULL $1 put_names))
+  ;
+
+put_names:
+    LBRACE
+    ()
+  | RBRACE
+    ()
+  | put_name
+ ;; Must return a list of Semantic tags to EXPANDFULL!
+    (TAG $1 'put-name)
+  ;
+
+put_name:
+    SYMBOL
+  | token_type
+  ;
+
+put_value_list:
+    BRACE_BLOCK
+    (mapcar 'semantic-tag-code-detail (EXPANDFULL $1 put_values))
+  ;
+
+put_values:
+    LBRACE
+    ()
+  | RBRACE
+    ()
+  | put_value
+ ;; Must return a list of Semantic tags to EXPANDFULL!
+    (CODE-TAG "put-value" $1)
+  ;
+
+put_value:
+    SYMBOL any_value
+    (cons $1 $2)
+  ;
+
+scopestart_decl:
+    SCOPESTART SYMBOL
+    `(TAG ',$2 'scopestart)
+  ;
+
+quotemode_decl:
+    QUOTEMODE SYMBOL
+    `(TAG ',$2 'quotemode)
+  ;
+
+start_decl:
+    START symbols
+    `(TAG ',(car $2) 'start :rest ',(cdr $2))
+  ;
+
+keyword_decl:
+    KEYWORD SYMBOL string_value
+    `(TAG ',$2 'keyword :value ',$3)
+  ;
+
+token_decl:
+    TOKEN token_type_opt SYMBOL string_value
+    `(TAG ',$3 ',(if $2 'token 'keyword) :type ',$2 :value ',$4)
+  | TOKEN token_type_opt symbols
+    `(TAG ',(car $3) 'token :type ',$2 :rest ',(cdr $3))
+  ;
+
+token_type_opt:
+ ;; EMPTY
+  | token_type
+  ;
+
+token_type:
+    LT SYMBOL GT
+    (progn $2)
+  ;
+
+type_decl:
+    TYPE token_type plist_opt
+    `(TAG ',$2 'type :value ',$3)
+  ;
+
+plist_opt:
+ ;;EMPTY
+  | plist
+  ;
+
+plist:
+    plist put_value
+    (append (list $2) $1)
+  | put_value
+    (list $1)
+  ;
+
+use_name_list:
+    BRACE_BLOCK
+    (mapcar 'semantic-tag-name (EXPANDFULL $1 use_names))
+  ;
+
+use_names:
+    LBRACE
+    ()
+  | RBRACE
+    ()
+  | SYMBOL
+ ;; Must return a list of Semantic tags to EXPANDFULL!
+    (TAG $1 'use-name)
+  ;
+
+use_macros_decl:
+    USE-MACROS SYMBOL use_name_list
+    `(TAG "macro" 'macro :type ',$2 :value ',$3)
+  ;
+
+string_value:
+    STRING
+    (read $1)
+  ;
+
+;; Return a Lisp readable form
+any_value:
+    SYMBOL
+  | STRING
+  | PAREN_BLOCK
+  | PREFIXED_LIST
+  | SEXP
+  ;
+
+symbols:
+    lifo_symbols
+    (nreverse $1)
+  ;
+
+lifo_symbols:
+    lifo_symbols SYMBOL
+    (cons $2 $1)
+  | SYMBOL
+    (list $1)
+  ;
+
+;;; Grammar rules
+;;
+nonterminal:
+    SYMBOL
+    (setq semantic-grammar-wy--nterm $1
+          semantic-grammar-wy--rindx 0)
+    COLON rules SEMI
+    (TAG $1 'nonterminal :children $4)
+  ;
+
+rules:
+    lifo_rules
+    (apply 'nconc (nreverse $1))
+  ;
+
+lifo_rules:
+    lifo_rules OR rule
+    (cons $3 $1)
+  | rule
+    (list $1)
+  ;
+
+rule:
+    rhs
+    (let* ((nterm semantic-grammar-wy--nterm)
+           (rindx semantic-grammar-wy--rindx)
+           (rhs   $1)
+           comps prec action elt)
+      (setq semantic-grammar-wy--rindx (1+ semantic-grammar-wy--rindx))
+      (while rhs
+        (setq elt (car rhs)
+              rhs (cdr rhs))
+        (cond
+         ;; precedence level
+         ((vectorp elt)
+          (if prec
+              (error "Duplicate %%prec in `%s:%d' rule" nterm rindx))
+          (setq prec (aref elt 0)))
+         ;; action
+         ((consp elt)
+          ;; don't forget that rhs items are in reverse order, so
+          ;; the end-of-rule semantic action is the first item.
+          (if (or action comps)
+              ;; a mid-rule action
+              (setq comps (cons elt comps)
+                    ;; keep rule and action index synchronized
+                    semantic-grammar-wy--rindx
+                    (1+ semantic-grammar-wy--rindx))
+            ;; the end-of-rule action
+            (setq action (car elt))))
+         ;; item
+         (t
+          (setq comps (cons elt comps)))))
+      (EXPANDTAG
+       (TAG (format "%s:%d" nterm rindx) 'rule
+            :type (if comps "group" "empty")
+            :value comps :prec prec :expr action)))
+  ;
+
+rhs:
+ ;; EMPTY
+  | rhs item
+    (cons $2 $1)
+  | rhs action
+    (cons (list $2) $1)
+  | rhs PREC item
+    (cons (vector $3) $1)
+  ;
+
+action:
+    PAREN_BLOCK
+  | PREFIXED_LIST
+  | BRACE_BLOCK
+    (format "(progn\n%s)"
+            (let ((s $1))
+              (if (string-match "^{[\r\n\t ]*" s)
+                  (setq s (substring s (match-end 0))))
+              (if (string-match "[\r\n\t ]*}$" s)
+                  (setq s (substring s 0 (match-beginning 0))))
+              s))
+  ;
+
+items:
+    lifo_items
+    (nreverse $1)
+  ;
+
+lifo_items:
+    lifo_items item
+    (cons $2 $1)
+  | item
+    (list $1)
+  ;
+
+item:
+    SYMBOL
+  | CHARACTER
+  ;
+
+%%
+
+;;; grammar.wy ends here
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
new file mode 100644
index 00000000000..4ff2d7e4e41
--- /dev/null
+++ b/admin/grammars/srecode-template.wy
@@ -0,0 +1,235 @@
+;;; srecode-template.wy --- Semantic Recoder Template parser
+
+;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
+
+;; Author: Eric Ludlam <zappo@gnu.org>
+;; Keywords: syntax
+;; X-RCS: $Id: srecode-template.wy,v 1.10 2009-01-09 23:01:54 zappo Exp $
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Parser for the Semantic Recoder template language
+;;
+;; Semantic Recoder templates are based on Google Templates
+;; and are at the bottom of the Semantic Recoder API.
+
+%languagemode  srecode-mode
+
+%start template_file
+
+;;; KEYWORDS
+%type    <keyword>
+%keyword SET  "set"
+%put     SET  summary "set <name> <value>"
+%keyword SHOW "show"
+%put     SHOW summary "show <name>   ; to show a section"
+%keyword MACRO "macro"
+%put     MACRO summary "... macro \"string\" ..."
+%keyword CONTEXT "context"
+%put     CONTEXT summary "context <name>"
+%keyword TEMPLATE  "template"
+%put     TEMPLATE  summary "template <name>\\n <template definition>"
+%keyword SECTIONDICTIONARY "sectiondictionary"
+%put     SECTIONDICTIONARY summary "sectiondictionary <name>\\n <dictionary entries>"
+%keyword PROMPT "prompt"
+%keyword DEFAULT "default"
+%keyword DEFAULTMACRO "defaultmacro"
+%keyword READ "read"
+%put     { PROMPT DEFAULT DEFAULTMACRO READ } summary "prompt <symbol> \"Describe Symbol: \" [default[macro] <lispsym>|\"valuetext\"] [read <lispsym>]"
+%keyword BIND "bind"
+%put     BIND summary "bind \"<letter>\""
+
+;;; Punctuation Types
+%type <punctuation> syntax "\\s.+"
+%type <newline>
+%token <newline> newline
+
+%token <separator> TEMPLATE_BLOCK "^----"
+
+;;; Bland default types
+%type <property> ":\\(\\w\\|\\s_\\)*"
+%token <property> property
+
+%type  <symbol>
+%token <symbol> symbol
+
+%type  <string>
+%token <string> string
+
+%type  <number>
+%token <number> number
+
+%%
+
+template_file
+  : newline ( )
+  | context
+  | prompt
+  | variable
+  | template
+  ;
+
+context
+  : CONTEXT symbol newline
+    (TAG $2 'context)
+  ;
+
+prompt
+  : PROMPT symbol string opt-default-fcn opt-read-fcn newline
+    (TAG $2 'prompt :text (read $3) :default $4 :read $5)
+  ;
+
+opt-default-fcn
+  : DEFAULT symbol
+    (progn (read $2))
+  | DEFAULT string
+    (progn (read $2))
+  | DEFAULTMACRO string
+    (progn (cons 'macro (read $2)))
+  | ()
+  ;
+
+opt-read-fcn
+  : READ symbol
+    (progn (read $2))
+  | ()
+  ;
+
+variable
+  : SET symbol insertable-string-list newline
+    (VARIABLE-TAG $2 nil $3)
+  | SHOW symbol newline
+    (VARIABLE-TAG $2 nil t)
+  ;
+
+insertable-string-list
+  : insertable-string
+    (list $1)
+  | insertable-string-list insertable-string
+    (append $1 (list $2))
+  ;
+
+insertable-string
+  : string
+    (read $1)
+  | MACRO string
+    (cons 'macro (read $2))
+  ;
+
+template
+  : TEMPLATE templatename opt-dynamic-arguments newline
+    opt-string
+    opt-section-dictionaries
+    TEMPLATE_BLOCK newline
+    opt-bind
+    (FUNCTION-TAG $2 nil $3 :documentation $5 :code $7
+                  :dictionaries $6 :binding $9 )
+  ;
+
+templatename
+  : symbol
+  | PROMPT
+  | CONTEXT
+  | TEMPLATE
+  | DEFAULT
+  | MACRO
+  | DEFAULTMACRO
+  | READ
+  | SET
+  ;
+
+opt-dynamic-arguments
+  : property opt-dynamic-arguments
+    (cons $1 $2)
+  | ()
+  ;
+
+opt-string
+  : string newline
+    ( read $1 )
+  | ()
+  ;
+
+opt-section-dictionaries
+  : () ;; EMPTY
+  | section-dictionary-list
+  ;
+
+section-dictionary-list
+  : one-section-dictionary
+    (list $1)
+  | section-dictionary-list one-section-dictionary
+    (append $1 (list $2))
+  ;
+
+one-section-dictionary
+  : SECTIONDICTIONARY string newline
+    variable-list
+    (cons (read $2) $4)
+  ;
+
+variable-list
+  : variable
+    (EXPANDTAG $1)
+  | variable-list variable
+    (append $1 (EXPANDTAG $2))
+  ;
+
+opt-bind
+  : BIND string newline
+    ( read $2 )
+  | ()
+  ;
+
+%%
+(define-lex-simple-regex-analyzer srecode-template-property-analyzer
+  "Detect and create a dynamic argument properties."
+  ":\\(\\w\\|\\s_\\)*" 'property 0)
+
+(define-lex-regex-analyzer srecode-template-separator-block
+  "Detect and create a template quote block."
+  "^----\n"
+  (semantic-lex-push-token
+   (semantic-lex-token
+    'TEMPLATE_BLOCK
+    (match-end 0)
+    (semantic-lex-unterminated-syntax-protection 'TEMPLATE_BLOCK
+      (goto-char (match-end 0))
+      (re-search-forward "^----$")
+      (match-beginning 0))))
+  (setq semantic-lex-end-point (point)))
+
+
+(define-lex wisent-srecode-template-lexer
+  "Lexical analyzer that handles SRecode Template buffers.
+It ignores whitespace, newlines and comments."
+  semantic-lex-newline
+  semantic-lex-ignore-whitespace
+  semantic-lex-ignore-newline
+  semantic-lex-ignore-comments
+  srecode-template-separator-block
+  srecode-template-wy--<keyword>-keyword-analyzer
+  srecode-template-property-analyzer
+  srecode-template-wy--<symbol>-regexp-analyzer
+  srecode-template-wy--<number>-regexp-analyzer
+  srecode-template-wy--<string>-sexp-analyzer
+  srecode-template-wy--<punctuation>-string-analyzer
+  semantic-lex-default-action
+  )
+
+;;; wisent-dot.wy ends here
diff --git a/admin/grammars/wisent-grammar.el b/admin/grammars/wisent-grammar.el
index d7de1ee6f7b..66045c2294d 100644
--- a/admin/grammars/wisent-grammar.el
+++ b/admin/grammars/wisent-grammar.el
@@ -331,7 +331,7 @@ Menu items are appended to the common grammar menu.")
      (grammar-setupcode-builder  . wisent-grammar-setupcode-builder)
      )))
 
-(add-to-list 'auto-mode-alist '("\\.wy$" . wisent-grammar-mode))
+(add-to-list 'auto-mode-alist '("\\.wy\\'" . wisent-grammar-mode))
 
 (defvar-mode-local wisent-grammar-mode semantic-grammar-macros
   '(
@@ -358,4 +358,180 @@ Menu items are appended to the common grammar menu.")
     )
   "Semantic grammar macros used in wisent grammars.")
 
+(defvar wisent-make-parsers--emacs-license
+  ";; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.")
+
+(defvar wisent-make-parsers--python-license
+  ";; It is derived in part from the Python grammar, used under the
+;; following license:
+;;
+;; PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+;; --------------------------------------------
+;; 1. This LICENSE AGREEMENT is between the Python Software Foundation
+;; (\"PSF\"), and the Individual or Organization (\"Licensee\") accessing
+;; and otherwise using this software (\"Python\") in source or binary
+;; form and its associated documentation.
+;;
+;; 2. Subject to the terms and conditions of this License Agreement,
+;; PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide
+;; license to reproduce, analyze, test, perform and/or display
+;; publicly, prepare derivative works, distribute, and otherwise use
+;; Python alone or in any derivative version, provided, however, that
+;; PSF's License Agreement and PSF's notice of copyright, i.e.,
+;; \"Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Python Software Foundation; All Rights Reserved\" are
+;; retained in Python alone or in any derivative version prepared by
+;; Licensee.
+;;
+;; 3. In the event Licensee prepares a derivative work that is based
+;; on or incorporates Python or any part thereof, and wants to make
+;; the derivative work available to others as provided herein, then
+;; Licensee hereby agrees to include in any such work a brief summary
+;; of the changes made to Python.
+;;
+;; 4. PSF is making Python available to Licensee on an \"AS IS\"
+;; basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+;; IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+;; DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+;; FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+;; INFRINGE ANY THIRD PARTY RIGHTS.
+;;
+;; 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+;; FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+;; RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR
+;; ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+;;
+;; 6. This License Agreement will automatically terminate upon a
+;; material breach of its terms and conditions.
+;;
+;; 7. Nothing in this License Agreement shall be deemed to create any
+;; relationship of agency, partnership, or joint venture between PSF
+;; and Licensee.  This License Agreement does not grant permission to
+;; use PSF trademarks or trade name in a trademark sense to endorse or
+;; promote products or services of Licensee, or any third party.
+;;
+;; 8. By copying, installing or otherwise using Python, Licensee
+;; agrees to be bound by the terms and conditions of this License
+;; Agreement.")
+
+(defvar wisent-make-parsers--ecmascript-license
+  "\n;; It is derived from the grammar in the ECMAScript Language
+;; Specification published at
+;;
+;; http://www.ecma-international.org/publications/standards/Ecma-262.htm
+;;
+;; and redistributed under the following license:
+;;
+;; Redistribution and use in source and binary forms, with or without
+;; modification, are permitted provided that the following conditions
+;; are met:
+;;
+;; 1. Redistributions of source code must retain the above copyright
+;; notice, this list of conditions and the following disclaimer.
+;;
+;; 2. Redistributions in binary form must reproduce the above
+;; copyright notice, this list of conditions and the following
+;; disclaimer in the documentation and/or other materials provided
+;; with the distribution.
+;;
+;; 3. Neither the name of the authors nor Ecma International may be
+;; used to endorse or promote products derived from this software
+;; without specific prior written permission.  THIS SOFTWARE IS
+;; PROVIDED BY THE ECMA INTERNATIONAL \"AS IS\" AND ANY EXPRESS OR
+;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR
+;; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+;; DAMAGE.")
+
+(defvar wisent-make-parsers--parser-file-name
+  `(("semantic-grammar-wy.el"
+     "semantic/grammar-wy")
+    ("srecode-template-wy.el"
+     "srecode/srt-wy")
+    ("wisent-javascript-jv-wy.el"
+     "semantic/wisent/js-wy"
+     "Copyright (C) 1998-2011 Ecma International"
+     ,wisent-make-parsers--ecmascript-license)
+    ("wisent-java-tags-wy.el"
+     "semantic/wisent/javat-wy")
+    ("wisent-python-wy.el"
+     "semantic/wisent/python-wy"
+     "Copyright (C) 2001-2010 Python Software Foundation"
+     ,wisent-make-parsers--python-license)))
+
+(defun wisent-make-parsers ()
+  "Generate Emacs' built-in Wisent-based parser files."
+  (semantic-mode 1)
+  ;; Loop through each .wy file in current directory, and run
+  ;; `semantic-grammar-batch-build-one-package' to build the grammar.
+  (dolist (f (directory-files default-directory nil "\\.wy\\'"))
+    (let ((packagename
+           (condition-case err
+               (with-current-buffer (find-file-noselect f)
+                 (semantic-grammar-create-package))
+             (error (message "%s" (error-message-string err)) nil)))
+          output-data)
+      (when (setq output-data (assoc packagename wisent-make-parsers--parser-file-name))
+        (let ((require-name         (nth 1 output-data))
+              (additional-copyright (nth 2 output-data))
+              (additional-license   (nth 3 output-data))
+              copyright-end)
+          ;; Touch up the generated parsers for Emacs integration.
+          (with-temp-buffer
+            (insert-file-contents packagename)
+            ;; Fix copyright header:
+            (goto-char (point-min))
+            (when additional-copyright
+              (re-search-forward "Copyright (C).*$")
+              (insert "\n;; " additional-copyright))
+            (re-search-forward "^;; Author:")
+            (setq copyright-end (match-beginning 0))
+            (re-search-forward "^;;; Code:\n")
+            (delete-region copyright-end (match-end 0))
+            (goto-char copyright-end)
+            (insert wisent-make-parsers--emacs-license)
+            (insert "\n\n;;; Commentary:
+;;
+;; This file was generated from admin/grammars/"
+                        f ".")
+            (when additional-license
+              (insert "\n" additional-license))
+            (insert "\n\n;;; Code:\n
+\(require 'semantic/lex)\n")
+            (goto-char (point-min))
+            (delete-region (point-min) (line-end-position))
+            (insert ";;; " require-name
+                    ".el --- Generated parser support file")
+            (delete-trailing-whitespace)
+            (re-search-forward ";;\n(require 'semantic/lex)\n")
+            (delete-region (match-beginning 0) (match-end 0))
+            ;; Fix footer:
+            (goto-char (point-max))
+            (re-search-backward "^(provide")
+            (delete-region (match-beginning 0) (point-max))
+            (goto-char (point-max))
+            (insert "(provide '" require-name ")\n\n")
+            (insert ";;; " require-name ".el ends here\n")
+            (write-region nil nil (expand-file-name packagename))))))))
+
 ;;; wisent-grammar.el ends here
diff --git a/autogen/config.in b/autogen/config.in
index f1f950cc034..fde44761db4 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -351,6 +351,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `gtk_widget_set_has_window' function. */
 #undef HAVE_GTK_WIDGET_SET_HAS_WINDOW
 
+/* Define to 1 if you have the `gtk_window_set_has_resize_grip' function. */
+#undef HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP
+
 /* Define to 1 if you have the `g_type_init' function. */
 #undef HAVE_G_TYPE_INIT
 
@@ -900,7 +903,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the XkbGetKeyboard function. */
 #undef HAVE_XKBGETKEYBOARD
 
-/* Define to 1 if you have the Xpm libary (-lXpm). */
+/* Define to 1 if you have the Xpm library (-lXpm). */
 #undef HAVE_XPM
 
 /* Define to 1 if you have the `XrmSetDatabase' function. */
diff --git a/autogen/configure b/autogen/configure
index eae55274761..e75d73196dd 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for emacs 24.0.91.
+# Generated by GNU Autoconf 2.65 for emacs 24.0.92.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='emacs'
 PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION='24.0.91'
-PACKAGE_STRING='emacs 24.0.91'
+PACKAGE_VERSION='24.0.92'
+PACKAGE_STRING='emacs 24.0.92'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1845,7 +1845,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures emacs 24.0.91 to adapt to many kinds of systems.
+\`configure' configures emacs 24.0.92 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1919,7 +1919,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of emacs 24.0.91:";;
+     short | recursive ) echo "Configuration of emacs 24.0.92:";;
    esac
   cat <<\_ACEOF
 
@@ -2081,7 +2081,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-emacs configure 24.0.91
+emacs configure 24.0.92
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2917,7 +2917,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by emacs $as_me 24.0.91, which was
+It was created by emacs $as_me 24.0.92, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3749,7 +3749,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='emacs'
- VERSION='24.0.91'
+ VERSION='24.0.92'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11366,7 +11366,8 @@ done
     for ac_func in gtk_widget_get_window gtk_widget_set_has_window \
                  gtk_dialog_get_action_area gtk_widget_get_sensitive \
                  gtk_widget_get_mapped gtk_adjustment_get_page_size \
-                 gtk_orientable_set_orientation
+                 gtk_orientable_set_orientation \
+                 gtk_window_set_has_resize_grip
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -11379,7 +11380,6 @@ _ACEOF
 fi
 done
 
-
 fi
 
 HAVE_DBUS=no
@@ -24968,7 +24968,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by emacs $as_me 24.0.91, which was
+This file was extended by emacs $as_me 24.0.92, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25034,7 +25034,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-emacs config.status 24.0.91
+emacs config.status 24.0.92
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 5b686e017f6..22cec282202 100644
--- a/configure.in
+++ b/configure.in
@@ -22,7 +22,7 @@ dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.65)
-AC_INIT(emacs, 24.0.91)
+AC_INIT(emacs, 24.0.92)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -184,6 +184,9 @@ OPTION_DEFAULT_OFF([xwidgets],[enable use of some gtk widgets it Emacs buffers])
 dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
 OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
 
+## Makefile.in needs the cache file name.
+AC_SUBST(cache_file)
+
 ## This is an option because I do not know if all info/man support
 ## compressed files, nor how to test if they do so.
 OPTION_DEFAULT_ON([compress-info],[don't compress the installed Info pages])
@@ -1992,8 +1995,8 @@ if test "${HAVE_GTK}" = "yes"; then
   AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
                  gtk_dialog_get_action_area gtk_widget_get_sensitive \
                  gtk_widget_get_mapped gtk_adjustment_get_page_size \
-                 gtk_orientable_set_orientation)
-
+                 gtk_orientable_set_orientation \
+                 gtk_window_set_has_resize_grip)
 fi
 
 
@@ -2486,7 +2489,7 @@ no_return_alloc_pixels
   fi
 
   if test "${HAVE_XPM}" = "yes"; then
-    AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm libary (-lXpm).])
+    AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).])
     LIBXPM=-lXpm
   fi
 fi
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6e687bcefc9..d16443ccf31 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,121 @@
+2011-12-03  Chong Yidong  <cyd@gnu.org>
+
+        * text.texi (TeX Mode): Mention AUCTeX package.
+        (TeX Editing): Add xref to documentation for Occur.
+        (LaTeX Editing): Add xref to Completion node.
+        (TeX Print): Fix description of tex-directory.
+        (Enriched Text): Renamed from Formatted Text.  Make this node and
+        its subnodes less verbose, since text/enriched files are
+        practically unused.
+        (Enriched Mode): Renamed from Requesting Formatted Text.
+        (Format Colors): Node deleted.
+        (Enriched Faces): Renamed from Format Faces.  Describe commands
+        for applying colors too.
+        (Forcing Enriched Mode): Node deleted; merged into Enriched Mode.
+
+        * frames.texi (Menu Mouse Clicks): Tweak description of C-Mouse-2.
+
+        * display.texi (Colors): New node.
+
+        * cmdargs.texi (Colors X):
+        * xresources.texi (GTK styles):
+        * custom.texi (Face Customization): Reference it.
+
+        * glossary.texi (Glossary): Remove "formatted text" and "WYSIWYG".
+        Link to Fill Commands for Justification entry.
+
+2011-12-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Auto Scrolling): More accurate description of what
+        scroll-*-aggressively does, including the effect of non-zero
+        margin.  Fix "i.e." markup.
+
+2011-12-02  Chong Yidong  <cyd@gnu.org>
+
+        * text.texi (Pages): Mention how formfeed chars are displayed.
+        (Auto Fill): Note convention for calling auto-fill-mode from Lisp.
+        Describe adaptive filling more precisely.
+        (Fill Commands): Note that filling removes excess whitespace.
+        (Text Mode): Note auto-mode-alist entries for Text mode.  TAB is
+        now bound to indent-for-tab-command in Text mode.
+        (Outline Mode): Copyedits.
+        (Outline Visibility): Note that Reveal mode is a buffer-local
+        minor mode.
+
+        * modes.texi (Major Modes): Move note about checking major-mode in
+        a hook function here, from Text mode.
+
+2011-11-28  Chong Yidong  <cyd@gnu.org>
+
+        * text.texi (Words): Add xref to Position Info.
+        (Paragraphs): Add xref to Regexps.
+
+        * indent.texi (Indentation): Rewrite introduction.  Move table to
+        Indentation Commands node.
+        (Indentation Commands): Add index entries to table.  Copyedits.
+        (Tab Stops, Just Spaces): Copyedits.
+        (Indent Convenience): New node.  Document electric-indent-mode.
+
+        * programs.texi (Basic Indent):
+        * windows.texi (Pop Up Window): Fix kindex entry.
+
+2011-11-28  Chong Yidong  <cyd@gnu.org>
+
+        * modes.texi (Major Modes): Move major-mode variable doc here from
+        Choosing Modes.  Document describe-mode.  Document prog-mode-hook
+        and text-mode-hook.  Add example of using hooks.
+        (Minor Modes): Document behavior of mode command calls from Lisp.
+        Note that setting the mode variable using Customize will DTRT.
+        (Choosing Modes): Add example of setting a minor mode using a
+        local variable.
+
+2011-11-27  Chong Yidong  <cyd@gnu.org>
+
+        * frames.texi (Creating Frames): Move frame parameter example to
+        Frame Parameters node.
+        (Frame Commands): C-x 5 o does not warp the mouse by default.
+        (Fonts): Add more GTK-style properties; also, they should be
+        capitalized.
+        (Special Buffer Frames): Node deleted; special-display is on the
+        way out.
+        (Frame Parameters): Example moved here from Creating Frames.
+        Clarify that default-frame-alist affects the initial frame too.
+        Delete auto-raise-mode and auto-lower-mode.
+        (Wheeled Mice): Node deleted.  Content moved to Mouse Commands.
+        (Dialog Boxes): Delete x-gtk-use-old-file-dialog.
+
+        * windows.texi (Window Choice): Add xref to Lisp manual for
+        special-display-*.
+
+2011-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Text Display): Update the description,
+        cross-references, and indexing related to display of control
+        characters and raw bytes.
+
+2011-11-25  Chong Yidong  <cyd@gnu.org>
+
+        * frames.texi (Frames): Rewrite introduction.
+        (Mouse Commands): Default for mouse-drag-copy-region is now t.
+        Mouse-3 does not copy to kill ring by default.  DEL does not
+        behave specially for mouse commands any more.
+        (Mouse References): Document mouse-1-click-follows-link more
+        thoroughly.
+        (Menu Mouse Clicks): Move footnote to the main text and add xref
+        to Init Rebinding node.
+        (Mode Line Mouse): Mouse-3 on the mode-line does not bury buffer.
+
+        * files.texi (Visiting): `C-x 5 f' works on ttys too.
+
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * display.texi (Font Lock): Fix typo.
+
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * rmail.texi (Rmail Output):
+        Mention rmail-automatic-folder-directives.  (Bug#9657)
+
 2011-11-21  Chong Yidong  <cyd@gnu.org>
 
         * mark.texi (Global Mark Ring): Fix description of global mark
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index ac62e2d9652..9c5b2e7dcd7 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -995,7 +995,7 @@ breakpoint}, the breakpoint which point is on.
 Enable/disable current breakpoint (@code{gdb-toggle-breakpoint}).
 On a graphical display, this changes the color of a bullet in the
 margin of a source buffer at the relevant line.  This is red when
-the breakpoint is enabled and grey when it is disabled.  Text-only
+the breakpoint is enabled and gray when it is disabled.  Text-only
 terminals correspondingly display a @samp{B} or @samp{b}.
 
 @item D
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 07cca53ce4d..d9109045570 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -69,7 +69,7 @@ arguments.)
 * Environment::         Environment variables that Emacs uses.
 * Display X::           Changing the default display and using remote login.
 * Font X::              Choosing a font for text, under X.
-* Colors::              Choosing display colors.
+* Colors X::            Choosing display colors.
 * Window Size X::       Start-up window size, under X.
 * Borders X::           Internal and external borders, under X.
 * Title X::             Specifying the initial frame's title.
@@ -784,7 +784,7 @@ Use @var{font} as the default font.
 
 When passing a font specification to Emacs on the command line, you
 may need to ``quote'' it, by enclosing it in quotation marks, if it
-contains characters that the shell treats specially (e.g. spaces).
+contains characters that the shell treats specially (e.g.@: spaces).
 For example:
 
 @smallexample
@@ -794,27 +794,14 @@ emacs -fn "DejaVu Sans Mono-12"
 @xref{Fonts}, for other ways to specify the default font and font name
 formats.
 
-@node Colors
+@node Colors X
 @appendixsec Window Color Options
 @cindex color of window, from command line
 @cindex text colors, from command line
 
-@findex list-colors-display
-@cindex available colors
-  On a color display, you can specify which color to use for various
-parts of the Emacs display.  To find out what colors are available on
-your system, type @kbd{M-x list-colors-display}, or press
-@kbd{C-Mouse-2} and select @samp{Display Colors} from the pop-up menu.
-(A particular window system might support many more colors, but the
-list displayed by @code{list-colors-display} shows their portable
-subset that can be safely used on any display supported by Emacs.)
-If you do not specify colors, on windowed displays the default for the
-background is white and the default for all other colors is black.  On a
-monochrome display, the foreground is black, the background is white,
-and the border is gray if the display supports that.  On terminals, the
-background is usually black and the foreground is white.
-
-  Here is a list of the command-line options for specifying colors:
+  You can use the following command-line options to specify the colors
+to use for various parts of the Emacs display.  Colors may be
+specified using either color names or RGB triplets (@pxref{Colors}).
 
 @table @samp
 @item -fg @var{color}
@@ -822,15 +809,15 @@ background is usually black and the foreground is white.
 @itemx --foreground-color=@var{color}
 @opindex --foreground-color
 @cindex foreground color, command-line argument
-Specify the foreground color.  @var{color} should be a standard color
-name, or a numeric specification of the color's red, green, and blue
-components as in @samp{#4682B4} or @samp{RGB:46/82/B4}.
+Specify the foreground color, overriding the color specified by the
+@code{default} face (@pxref{Faces}).
 @item -bg @var{color}
 @opindex -bg
 @itemx --background-color=@var{color}
 @opindex --background-color
 @cindex background color, command-line argument
-Specify the background color.
+Specify the background color, overriding the color specified by the
+@code{default} face.
 @item -bd @var{color}
 @opindex -bd
 @itemx --border-color=@var{color}
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 5b98216369d..e807aebdeee 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -430,15 +430,8 @@ means that it's disabled.  You can enable or disable the attribute by
 clicking that button.  When the attribute is enabled, you can change
 the attribute value in the usual ways.
 
-  You can specify a color name (use @kbd{M-x list-colors-display} for
-a list of them) or a hexadecimal color specification of the form
-@samp{#@var{rr}@var{gg}@var{bb}}.  (@samp{#000000} is black,
-@samp{#ff0000} is red, @samp{#00ff00} is green, @samp{#0000ff} is
-blue, and @samp{#ffffff} is white.)  On a black-and-white display, the
-colors you can use for the background are @samp{black}, @samp{white},
-@samp{gray}, @samp{gray1}, and @samp{gray3}.  Emacs supports these
-shades of gray by using background stipple patterns instead of a
-color.
+  The foreground and background colors can be specified using color
+names or RGB triplets.  @xref{Colors}.
 
   Setting, saving and resetting a face work like the same operations for
 variables (@pxref{Changing a Variable}).
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 8995b1242b1..ea9bd95b8ee 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -21,6 +21,7 @@ the text is displayed.
 * View Mode::              Viewing read-only buffers.
 * Follow Mode::            Follow mode lets two windows scroll as one.
 * Faces::                  How to change the display style using faces.
+* Colors::                 Specifying colors for faces.
 * Standard Faces::         Emacs' predefined faces.
 * Text Scale::             Increasing or decreasing text size in a buffer.
 * Font Lock::              Minor mode for syntactic highlighting using faces.
@@ -122,7 +123,7 @@ moving it to the topmost or bottommost line.  With any other
 non-@code{nil} value, Emacs adjusts point this way even if the scroll
 command leaves point in the window.  This variable affects all the
 scroll commands documented in this section, as well as scrolling with
-the mouse wheel (@pxref{Wheeled Mice}); in general, it affects any
+the mouse wheel (@pxref{Mouse Commands}); in general, it affects any
 command that has a non-@code{nil} @code{scroll-command} property.
 @xref{Property Lists,,, elisp, The Emacs Lisp Reference Manual}.
 
@@ -238,26 +239,32 @@ centered after scrolling.
 @cindex aggressive scrolling
 @vindex scroll-up-aggressively
 @vindex scroll-down-aggressively
-  When the window does scroll by a longer distance, you can control
-how aggressively it scrolls by setting the variables
-@code{scroll-up-aggressively} and @code{scroll-down-aggressively}.
-The value of @code{scroll-up-aggressively} should be either
-@code{nil}, or a fraction @var{f} between 0 and 1.  A fraction
-specifies where on the screen to put point when scrolling upward,
-i.e. forward.  When point goes off the window end, the new start
-position is chosen to put point @var{f} parts of the window height
-from the bottom.  Thus, larger @var{f} means more aggressive
-scrolling: more new text is brought into view.  The default value,
-@code{nil}, is equivalent to 0.5.
+  When the window does scroll by a distance longer than
+@code{scroll-step}, you can control how aggressively it scrolls by
+setting the variables @code{scroll-up-aggressively} and
+@code{scroll-down-aggressively}.  The value of
+@code{scroll-up-aggressively} should be either @code{nil}, or a
+fraction @var{f} between 0 and 1.  A fraction specifies where on the
+screen to put point when scrolling upward, i.e.@: forward.  When point
+goes off the window end, the new start position is chosen to put point
+@var{f} parts of the window height from the bottom margin.  Thus,
+larger @var{f} means more aggressive scrolling: more new text is
+brought into view.  The default value, @code{nil}, is equivalent to
+0.5.
 
   Likewise, @code{scroll-down-aggressively} is used for scrolling
-down, i.e. backward.  The value specifies how far point should be
-placed from the top of the window; thus, as with
+down, i.e.@: backward.  The value specifies how far point should be
+placed from the top margin of the window; thus, as with
 @code{scroll-up-aggressively}, a larger value is more aggressive.
 
   These two variables are ignored if either @code{scroll-step} or
 @code{scroll-conservatively} are set to a non-zero value.
 
+  Note that @code{scroll-margin}, described below, limits the amount
+of scrolling so as to put point outside of the top or bottom margin,
+even if aggressive scrolling specifies a fraction @var{f} that is
+larger than the window portion between the top and the bottom margins.
+
 @vindex scroll-margin
   The variable @code{scroll-margin} restricts how close point can come
 to the top or bottom of a window.  Its value is a number of screen
@@ -455,7 +462,7 @@ one large window.
   To turn off Follow mode, type @kbd{M-x follow-mode} a second time.
 
 @node Faces
-@section Faces: Controlling Text Display Style
+@section Text Faces
 @cindex faces
 
   Emacs can display text in several different styles, called
@@ -474,10 +481,8 @@ matching that regular expression (@pxref{Regexps}).
   It's possible for a given face to look different in different
 frames.  For instance, some text-only terminals do not support all
 face attributes, particularly font, height, and width, and some
-support a limited range of colors.  The @code{list-faces-display}
-command shows the appearance for the selected frame.
+support a limited range of colors.
 
-@cindex face colors, setting
 @cindex background color
 @cindex default face
   You can customize a face to alter its appearance, and save those
@@ -492,25 +497,58 @@ background color.
   You can also use X resources to specify attributes of any particular
 face.  @xref{Resources}.
 
+  Emacs can display variable-width fonts, but some Emacs commands,
+particularly indentation commands, do not account for variable
+character display widths.  Therefore, we recommend not using
+variable-width fonts for most faces, particularly those assigned by
+Font Lock mode.
+
+@node Colors
+@section Colors for Faces
+@cindex color name
+@cindex RGB triplet
+
+  Faces can have various foreground and background colors.  When you
+specify a color for a face---for instance, when customizing the face
+(@pxref{Face Customization})---you can use either a @dfn{color name}
+or an @dfn{RGB triplet}.
+
+@findex list-colors-display
+  A color name is a pre-defined name, such as @samp{dark orange} or
+@samp{medium sea green}.  To view a list of color names, type @kbd{M-x
+list-colors-display}.  If you run this command on a graphical display,
+it shows the full range of color names known to Emacs (these are the
+standard X11 color names, defined in X's @file{rgb.txt} file).  If you
+run the command on a text-only terminal, it shows only a small subset
+of colors that can be safely displayed on such terminals.  However,
+Emacs understands X11 color names even on text-only terminals; if a
+face is given a color specified by an X11 color name, it is displayed
+using the closest-matching terminal color.
+
+  An RGB triplet is a string of the form @samp{#RRGGBB}.  Each of the
+R, G, and B components is a hexadecimal number specifying the
+component's relative intensity, one to four digits long (usually two
+digits are used).  The components must have the same number of digits.
+For hexadecimal values A to F, either upper or lower case are
+acceptable.
+
+  The @kbd{M-x list-colors-display} command also shows the equivalent
+RGB triplet for each named color.  For instance, @samp{medium sea
+green} is equivalent to @samp{#3CB371}.
+
+@cindex face colors, setting
 @findex set-face-foreground
 @findex set-face-background
-  You can also change the foreground and background colors of a face
-with @kbd{M-x set-face-foreground} and @kbd{M-x set-face-background}.
-These commands prompt in the minibuffer for a face name and a color
-name, with completion, and then set that face to use the specified
-color (@pxref{Face Customization}, for information about color names).
+  You can change the foreground and background colors of a face with
+@kbd{M-x set-face-foreground} and @kbd{M-x set-face-background}.
+These commands prompt in the minibuffer for a face name and a color,
+with completion, and then set that face to use the specified color.
 They affect the face colors on all frames, but their effects do not
 persist for future Emacs sessions, unlike using the customization
 buffer or X resources.  You can also use frame parameters to set
-foreground and background colors for a specific frame; see @ref{Frame
+foreground and background colors for a specific frame; @xref{Frame
 Parameters}.
 
-  Emacs can display variable-width fonts, but some Emacs commands,
-particularly indentation commands, do not account for variable
-character display widths.  Therefore, we recommend not using
-variable-width fonts for most faces, particularly those assigned by
-Font Lock mode.
-
 @node Standard Faces
 @section Standard Faces
 
@@ -762,7 +800,7 @@ relies on analysis of the syntactic structure of the buffer text.  For
 the sake of speed, some modes, including Lisp mode, rely on a special
 convention: an open-parenthesis or open-brace in the leftmost column
 always defines the beginning of a defun, and is thus always outside
-any string or comment.  Therefore, you should avoid placing a an
+any string or comment.  Therefore, you should avoid placing an
 open-parenthesis or open-brace in the leftmost column, if it is inside
 a string or comment.  @xref{Left Margin Paren}, for details.
 
@@ -1016,13 +1054,13 @@ trailing whitespace in the region instead.
 @cindex fringes, and unused line indication
   On graphical displays, Emacs can indicate unused lines at the end of
 the window with a small image in the left fringe (@pxref{Fringes}).
-The image appears for window lines that do not correspond to any
-buffer text.  Blank lines at the end of the buffer then stand out
-because they do not have this image in the fringe.  To enable this
-feature, set the buffer-local variable @code{indicate-empty-lines} to
-a non-@code{nil} value.  You can enable or disable this feature for
-all new buffers by setting the default value of this variable,
-e.g.@:@code{(setq-default indicate-empty-lines t)}.
+The image appears for screen lines that do not correspond to any
+buffer text, so blank lines at the end of the buffer stand out because
+they lack this image.  To enable this feature, set the buffer-local
+variable @code{indicate-empty-lines} to a non-@code{nil} value.  You
+can enable or disable this feature for all new buffers by setting the
+default value of this variable, e.g.@: @code{(setq-default
+indicate-empty-lines t)}.
 
 @node Selective Display
 @section Selective Display
@@ -1216,7 +1254,7 @@ characters include @acronym{ASCII} numbers, letters, and punctuation
 characters, as well as many non-@acronym{ASCII} characters.
 
 @vindex tab-width
-@cindex control character
+@cindex control characters on display
   The @acronym{ASCII} character set contains non-printing @dfn{control
 characters}.  Two of these are displayed specially: the newline
 character (Unicode code point @code{U+000A}) is displayed by starting
@@ -1228,19 +1266,21 @@ value between 1 and 1000, inclusive.  Note that how the tab character
 in the buffer is displayed has nothing to do with the definition of
 @key{TAB} as a command.
 
-  Other @acronym{ASCII} control characters are displayed as a caret
+  Other @acronym{ASCII} control characters, whose codes are below
+@code{U+0020} (octal 40, decimal 32), are displayed as a caret
 (@samp{^}) followed by the non-control version of the character, with
 the @code{escape-glyph} face.  For instance, the @samp{control-A}
 character, @code{U+0001}, is displayed as @samp{^A}.
 
+@cindex octal escapes
 @vindex ctl-arrow
-  The non-@acronym{ASCII}, non-printing characters @code{U+0080}
-(octal 200) through @code{U+009F} (octal 237) are displayed as octal
-escape sequences, with the @code{escape-glyph} face.  For instance,
+  The raw bytes with codes @code{U+0080} (octal 200) through
+@code{U+009F} (octal 237) are displayed as @dfn{octal escape
+sequences}, with the @code{escape-glyph} face.  For instance,
 character code @code{U+0098} (octal 230) is displayed as @samp{\230}.
 If you change the buffer-local variable @code{ctl-arrow} to
-@code{nil}, @acronym{ASCII} control characters are also displayed as
-octal escape sequences instead of caret escape sequences.
+@code{nil}, the @acronym{ASCII} control characters are also displayed
+as octal escape sequences instead of caret escape sequences.
 
 @vindex nobreak-char-display
 @cindex non-breaking space
@@ -1249,7 +1289,7 @@ octal escape sequences instead of caret escape sequences.
   Some non-@acronym{ASCII} characters have the same appearance as an
 @acronym{ASCII} space or hyphen (minus) character.  Such characters
 can cause problems if they are entered into a buffer without your
-realization, e.g. by yanking; for instance, source code compilers
+realization, e.g.@: by yanking; for instance, source code compilers
 typically do not treat non-@acronym{ASCII} spaces as whitespace
 characters.  To deal with this problem, Emacs displays such characters
 specially: it displays @code{U+00A0} (no-break space) with the
@@ -1270,10 +1310,12 @@ elisp, The Emacs Lisp Reference Manual}.
   On graphical displays, some characters may have no glyphs in any of
 the fonts available to Emacs.  These @dfn{glyphless characters} are
 normally displayed as boxes containing the hexadecimal character code.
-You can control the display method by customizing the variable
-@code{glyphless-char-display-control}.  @xref{Glyphless Chars,,
-Glyphless Character Display, elisp, The Emacs Lisp Reference Manual},
-for details.
+Similarly, on text terminals, characters that cannot be displayed
+using the terminal encoding (@pxref{Terminal Coding}) are normally
+displayed as question signs.  You can control the display method by
+customizing the variable @code{glyphless-char-display-control}.
+@xref{Glyphless Chars,, Glyphless Character Display, elisp, The Emacs
+Lisp Reference Manual}, for details.
 
 @node Cursor Display
 @section Displaying the Cursor
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 55fdb9ec875..aca3735ff03 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -113,25 +113,6 @@ Emacs Lisp Reference Manual}.
 @insertcopying
 @end ifnottex
 
-@ignore
-These subcategories have been deleted for simplicity
-and to avoid conflicts.
-Completion
-Backup Files
-Auto-Saving: Protection Against Disasters
-Tags
-Text Mode
-Outline Mode
-@TeX{} Mode
-Formatted Text
-Shell Command History
-
-The ones for Dired and Rmail have had the items turned into :: items
-to avoid conflicts.
-Also Running Shell Commands from Emacs
-and Sending Mail and Registers and Minibuffer.
-@end ignore
-
 @menu
 * Distrib::             How to get the latest Emacs distribution.
 * Intro::               An introduction to Emacs concepts.
@@ -350,6 +331,7 @@ Controlling the Display
 * View Mode::              Viewing read-only buffers.
 * Follow Mode::            Follow mode lets two windows scroll as one.
 * Faces::                  How to change the display style using faces.
+* Colors::                 Specifying colors for faces.
 * Standard Faces::         Emacs' predefined faces.
 * Text Scale::             Increasing or decreasing text size in a buffer.
 * Font Lock::              Minor mode for syntactic highlighting using faces.
@@ -505,10 +487,8 @@ Frames and Graphical Displays
 * Fonts::               Changing the frame font.
 * Speedbar::            How to make and use a speedbar frame.
 * Multiple Displays::   How one Emacs job can talk to several displays.
-* Special Buffer Frames::  You can make certain buffers have their own frames.
 * Frame Parameters::    Changing the colors and other modes of frames.
 * Scroll Bars::         How to enable and disable scroll bars; how to use them.
-* Wheeled Mice::        Using mouse wheels for scrolling.
 * Drag and Drop::       Using drag and drop to open files and insert text.
 * Menu Bars::           Enabling and disabling the menu bar.
 * Tool Bars::           Enabling and disabling the tool bar.
@@ -553,10 +533,10 @@ Modes
 
 Indentation
 
-* Indentation Commands::  Various commands and techniques for indentation.
-* Tab Stops::             You can set arbitrary "tab stops" and then
-                            indent to the next tab stop when you want to.
-* Just Spaces::           You can request indentation using just spaces.
+* Indentation Commands::  More commands for performing indentation.
+* Tab Stops::             Stop points for indentation in Text modes.
+* Just Spaces::           Using only space characters for indentation.
+* Indent Convenience::    Optional indentation features.
 
 Commands for Human Languages
 
@@ -571,8 +551,8 @@ Commands for Human Languages
 * TeX Mode::            Editing input to the formatter TeX.
 * HTML Mode::           Editing HTML and SGML files.
 * Nroff Mode::          Editing input to the formatter nroff.
-* Formatted Text::      Editing formatted text directly in WYSIWYG fashion.
-* Text Based Tables::   Editing text-based tables in WYSIWYG fashion.
+* Enriched Text::       Editing text ``enriched'' with fonts, colors, etc.
+* Text Based Tables::   Commands for editing text-based tables.
 * Two-Column::          Splitting text columns into separate windows.
 
 Filling Text
@@ -599,18 +579,16 @@ Outline Mode
 * TeX Print::           Commands for printing part of a file with TeX.
 * TeX Misc::            Customization of TeX mode, and related features.
 
-Editing Formatted Text
+Editing Enriched Text
 
-* Requesting Formatted Text::   Entering and exiting Enriched mode.
-* Hard and Soft Newlines::      There are two different kinds of newlines.
-* Editing Format Info::         How to edit text properties.
-* Format Faces::                Bold, italic, underline, etc.
-* Format Colors::               Changing the color of text.
-* Format Indentation::          Changing the left and right margins.
-* Format Justification::        Centering, setting text flush with the
-                                  left or right margin, etc.
-* Format Properties::           The "special" text properties submenu.
-* Forcing Enriched Mode::       How to force use of Enriched mode.
+* Enriched Mode::           Entering and exiting Enriched mode.
+* Hard and Soft Newlines::  There are two different kinds of newlines.
+* Editing Format Info::     How to edit text properties.
+* Enriched Faces::          Bold, italic, underline, etc.
+* Enriched Indentation::    Changing the left and right margins.
+* Enriched Justification::  Centering, setting text flush with the
+                              left or right margin, etc.
+* Enriched Properties::     The "special" text properties submenu.
 
 @c The automatic texinfo menu update inserts some duplicate items here
 @c (faces, colors, indentation, justification, properties), because
@@ -1152,7 +1130,7 @@ Command Line Arguments for Emacs Invocation
 * Environment::         Environment variables that Emacs uses.
 * Display X::           Changing the default display and using remote login.
 * Font X::              Choosing a font for text, under X.
-* Colors::              Choosing display colors.
+* Colors X::            Choosing display colors.
 * Window Size X::       Start-up window size, under X.
 * Borders X::           Internal and external borders, under X.
 * Title X::             Specifying the initial frame's title.
diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index 87f9dddbba8..cb3f3f39778 100644
--- a/doc/emacs/emacsver.texi
+++ b/doc/emacs/emacsver.texi
@@ -1,4 +1,4 @@
 @c It would be nicer to generate this using configure and @version@.
 @c However, that would mean emacsver.texi would always be newer
 @c then the info files in release tarfiles.
-@set EMACSVER 24.0.91
+@set EMACSVER 24.0.92
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 2317f876b08..e3da0ca44e6 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -267,9 +267,8 @@ newly requested file.  @xref{Windows}.
 @kindex C-x 5 f
 @findex find-file-other-frame
   @kbd{C-x 5 f} (@code{find-file-other-frame}) is similar, but opens a
-new frame, or makes visible any existing frame showing the file you
-seek.  This feature is available only when you are using a window
-system.  @xref{Frames}.
+new frame, or selects any existing frame showing the specified file.
+@xref{Frames}.
 
 @cindex file selection dialog
   On graphical displays, there are two additional methods for visiting
@@ -298,8 +297,9 @@ original encoding and end-of-line convention.  @xref{Coding Systems}.
   If you wish to edit a file as a sequence of @acronym{ASCII}
 characters with no special encoding or conversion, use the @kbd{M-x
 find-file-literally} command.  This visits a file, like @kbd{C-x C-f},
-but does not do format conversion (@pxref{Formatted Text}), character
-code conversion (@pxref{Coding Systems}), or automatic uncompression
+but does not do format conversion (@pxref{Format Conversion,, Format
+Conversion, elisp, the Emacs Lisp Reference Manual}), character code
+conversion (@pxref{Coding Systems}), or automatic uncompression
 (@pxref{Compressed Files}), and does not add a final newline because
 of @code{require-final-newline} (@pxref{Customize Save}).  If you have
 already visited the same file in the usual (non-literal) manner, this
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 49222451cce..1445d25be15 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -6,31 +6,41 @@
 @chapter Frames and Graphical Displays
 @cindex frames
 
-  When using a graphical display, you can create multiple system-level
-``windows'' in a single Emacs session.  We refer to these system-level
-windows as @dfn{frames}.  A frame initially contains a single Emacs
-window; however, you can subdivide this Emacs window into smaller
-windows, all fitting into the same frame.  Each frame normally
-contains its own echo area and minibuffer.
-
-  To avoid confusion, we reserve the word ``window'' for the
-subdivisions that Emacs implements, and never use it to refer to a
-frame.
-
-  Any editing you do in one frame affects the other frames.  For
-instance, if you put text in the kill ring in one frame, you can yank
-it in another frame.  If you exit Emacs through @kbd{C-x C-c} in one
-frame, it terminates all the frames.  To delete just one frame, use
+  When Emacs is started on a graphical display, e.g.@: on the X Window
+System, it occupies a graphical system-level ``window''.  In this
+manual, we call this a @dfn{frame}, reserving the word ``window'' for
+the part of the frame used for displaying a buffer.  A frame initially
+contains one window, but it can be subdivided into multiple windows
+(@pxref{Windows}).  A frame normally also contains a menu bar, tool
+bar, and echo area.
+
+  You can also create additional frames (@pxref{Creating Frames}).
+All frames created in the same Emacs session have access to the same
+underlying buffers and other data.  For instance, if a buffer is being
+shown in more than one frame, any changes made to it in one frame show
+up immediately in the other frames too.
+
+  Typing @kbd{C-x C-c} closes all the frames on the current display,
+and ends the Emacs session if it has no frames open on any other
+displays (@pxref{Exiting}).  To close just the selected frame, type
 @kbd{C-x 5 0} (that is zero, not @kbd{o}).
 
-  Emacs compiled for MS-DOS emulates some windowing functionality,
-so that you can use many of the features described in this chapter.
+  This chapter describes Emacs features specific to graphical displays
+(particularly mouse commands), and features for managing multiple
+frames.  On text-only terminals, many of these features are
+unavailable.  However, it is still possible to create multiple
+``frames'' on text-only terminals; such frames are displayed one at a
+time, filling the entire terminal screen (@pxref{Non-Window
+Terminals}).  It is also possible to use the mouse on some text-only
+terminals (@pxref{Text-Only Mouse}, for doing so on GNU and UNIX
+systems; and
 @iftex
-@xref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features}.
+@pxref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features},
 @end iftex
 @ifnottex
-@xref{MS-DOS Mouse}.
+@pxref{MS-DOS Mouse},
 @end ifnottex
+for doing so on MS-DOS).
 
 @menu
 * Mouse Commands::      Moving, cutting, and pasting, with the mouse.
@@ -43,10 +53,8 @@ so that you can use many of the features described in this chapter.
 * Fonts::               Changing the frame font.
 * Speedbar::            How to make and use a speedbar frame.
 * Multiple Displays::   How one Emacs job can talk to several displays.
-* Special Buffer Frames::  You can make certain buffers have their own frames.
 * Frame Parameters::    Changing the colors and other modes of frames.
 * Scroll Bars::         How to enable and disable scroll bars; how to use them.
-* Wheeled Mice::        Using mouse wheels for scrolling.
 * Drag and Drop::       Using drag and drop to open files and insert text.
 * Menu Bars::           Enabling and disabling the menu bar.
 * Tool Bars::           Enabling and disabling the tool bar.
@@ -85,31 +93,32 @@ ring; on a second click, kill it (@code{mouse-save-then-kill}).
 
 @findex mouse-set-point
   The most basic mouse command is @code{mouse-set-point}, which is
-called by clicking with the left mouse button, @kbd{Mouse-1}, in the
+invoked by clicking with the left mouse button, @kbd{Mouse-1}, in the
 text area of a window.  This moves point to the position where you
-clicked.
+clicked.  If that window was not the selected window, it becomes the
+selected window.
 
 @vindex x-mouse-click-focus-ignore-position
-  Normally, Emacs does not distinguish between ordinary mouse clicks
-and clicks that select a frame.  When you click on a frame to select
-it, that also changes the selected window and cursor position
-according to the mouse click position.  On the X Window System, you
-can change this behavior by setting the variable
-@code{x-mouse-click-focus-ignore-position} to @code{t}.  Then the
-first click selects the frame, but does not affect the selected window
-or cursor position.  If you click again in the same place, that click
-will be in the selected frame, so it will change the window or cursor
-position.
+  Normally, if the frame you clicked in was not the selected frame, it
+is made the selected frame, in addition to selecting the window and
+setting the cursor.  On the X Window System, you can change this by
+setting the variable @code{x-mouse-click-focus-ignore-position} to
+@code{t}.  In that case, the initial click on an unselected frame just
+selects the frame, without doing anything else; clicking again selects
+the window and sets the cursor position.
 
 @findex mouse-set-region
-@vindex mouse-drag-copy-region
   Holding down @kbd{Mouse-1} and ``dragging'' the mouse over a stretch
 of text activates the region around that text
-(@code{mouse-set-region}).  @xref{Mark}.  Emacs places the mark where
-you started holding down the mouse button, and point where you release
-it.  In addition, the region is copied into the kill ring (@pxref{Kill
-Ring}).  If you don't want Emacs to copy the region, change the
-variable @code{mouse-drag-copy-region} to @code{nil}.
+(@code{mouse-set-region}), placing the mark where you started holding
+down the mouse button, and point where you release it (@pxref{Mark}).
+In addition, the text in the region becomes the primary selection
+(@pxref{Primary Selection}).
+
+@vindex mouse-drag-copy-region
+  If you change the variable @code{mouse-drag-copy-region} to a
+non-@code{nil} value, dragging the mouse over a stretch of text also
+adds the text to the kill ring.  The default is @code{nil}.
 
 @vindex mouse-scroll-min-lines
   If you move the mouse off the top or bottom of the window while
@@ -124,7 +133,7 @@ on how far away from the window edge the mouse has gone; the variable
   Clicking with the middle mouse button, @kbd{Mouse-2}, moves point to
 the position where you clicked and inserts the contents of the primary
 selection (@code{mouse-yank-primary}).  @xref{Primary Selection}.
-This behavior is consistent with other X applications; alternatively,
+This behavior is consistent with other X applications.  Alternatively,
 you can rebind @kbd{Mouse-2} to @code{mouse-yank-at-click}, which
 performs a yank at point.
 
@@ -144,7 +153,6 @@ depending on where you click and the status of the region:
 @item
 If no region is active, clicking @kbd{Mouse-3} activates the region,
 placing the mark where point was and point at the clicked position.
-In addition, the text in the region is copied to the kill ring.
 
 @item
 If a region is active, clicking @kbd{Mouse-3} adjusts the nearer end
@@ -155,8 +163,8 @@ region was already on the kill ring, it replaces it there.
 @item
 If you originally specified the region using a double or triple
 @kbd{Mouse-1}, so that the region is defined to consist of entire
-words or lines, then adjusting the region with @kbd{Mouse-3} also
-proceeds by entire words or lines.
+words or lines (@pxref{Word and Line Mouse}), then adjusting the
+region with @kbd{Mouse-3} also proceeds by entire words or lines.
 
 @item
 If you use @kbd{Mouse-3} a second time consecutively, at the same
@@ -168,23 +176,33 @@ just once---or just drag across the text with @kbd{Mouse-1}.  Then you
 can copy it elsewhere by yanking it.
 @end itemize
 
+  The @code{mouse-save-then-kill} command also obeys the variable
+@code{mouse-drag-copy-region} (described above).  If the value is
+non-@code{nil}, then whenever the command sets or adjusts the active
+region, the text in the region is also added to the kill ring.  If the
+latest kill ring entry had been added the same way, that entry is
+replaced rather than making a new entry.
+
   Whenever you set the region using any of the mouse commands
 described above, the mark will be deactivated by any subsequent
 unshifted cursor motion command, in addition to the usual ways of
-deactivating the mark.  @xref{Shift Selection}.  While the region
-remains active, typing @key{Backspace} or @key{Delete} deletes the
-text in that region and deactivates the mark; this behavior follows a
-convention established by other graphical programs, and it does
-@emph{not} apply when you set the region any other way, including
-shift-selection (@pxref{Shift Selection}).
-
-@cindex Delete Selection mode
-@cindex mode, Delete Selection
-@findex delete-selection-mode
-  Many graphical applications also follow the convention that
-insertion while text is selected deletes the selected text.  You can
-make Emacs behave this way by enabling Delete Selection mode.
-@xref{Using Region}.
+deactivating the mark.  @xref{Shift Selection}.
+
+@cindex mouse wheel
+@findex mouse-wheel-mode
+@cindex Mouse Wheel minor mode
+@cindex mode, Mouse Wheel
+@vindex mouse-wheel-follow-mouse
+@vindex mouse-wheel-scroll-amount
+@vindex mouse-wheel-progressive-speed
+  Some mice have a ``wheel'' which can be used for scrolling.  Emacs
+supports scrolling windows with the mouse wheel, by default, on most
+graphical displays.  To toggle this feature, use @kbd{M-x
+mouse-wheel-mode}.  The variables @code{mouse-wheel-follow-mouse} and
+@code{mouse-wheel-scroll-amount} determine where and by how much
+buffers are scrolled.  The variable
+@code{mouse-wheel-progressive-speed} determines whether the scroll
+speed is linked to how fast you move the wheel.
 
 @node Word and Line Mouse
 @section Mouse Commands for Words and Lines
@@ -202,7 +220,7 @@ underscore, in C mode) selects the symbol surrounding that character.
 Double-clicking on a character with open- or close-parenthesis syntax
 selects the parenthetical grouping which that character starts or
 ends.  Double-clicking on a character with string-delimiter syntax
-(such as a singlequote or doublequote in C) selects the string
+(such as a single-quote or double-quote in C) selects the string
 constant (Emacs uses heuristics to figure out whether that character
 is the beginning or the end of it).
 
@@ -220,50 +238,54 @@ Select the text you drag across, in the form of whole lines.
 @section Following References with the Mouse
 @kindex Mouse-1 @r{(selection)}
 @kindex Mouse-2 @r{(selection)}
+@cindex hyperlinks
+@cindex links
+@cindex text buttons
+@cindex buttons
 
 @vindex mouse-highlight
-  Some Emacs buffers include @dfn{buttons}.  A button is a piece of
-text that performs some action when you activate it, such as following
-a reference.  Usually, a button's text is visually highlighted: it is
-underlined, or a box is drawn around it.  If you move the mouse over a
-button, the shape of the mouse cursor changes and the button lights up
-(if you change the variable @code{mouse-highlight} to @code{nil},
-Emacs disables this highlighting).
+  Some Emacs buffers include @dfn{buttons}, or @dfn{hyperlinks}:
+pieces of text that perform some action (e.g.@: following a reference)
+when activated (e.g.@: by clicking on them).  Usually, a button's text
+is visually highlighted: it is underlined, or a box is drawn around
+it.  If you move the mouse over a button, the shape of the mouse
+cursor changes and the button lights up.  If you change the variable
+@code{mouse-highlight} to @code{nil}, Emacs disables this
+highlighting.
 
   You can activate a button by moving point to it and typing
 @key{RET}, or by clicking either @kbd{Mouse-1} or @kbd{Mouse-2} on the
-button.  For example, typing @key{RET} or clicking on a file name in a
-Dired buffer visits that file (@pxref{Dired}).  Doing it on an error
-message in the @samp{*Compilation*} buffer goes to the source code for
-that error message (@pxref{Compilation}).  Doing it on a completion in
-the @samp{*Completions*} buffer chooses that completion
-(@pxref{Completion}).
-
-  Although clicking @kbd{Mouse-1} on a button usually activates that
-button, if you hold the mouse button down for a short period of time
-before releasing it (specifically, for more than 450 milliseconds),
-then Emacs moves point where you clicked instead.  This behavior
-allows you to use the mouse to move point over a button without
-following it.  Dragging---moving the mouse while it is held down---has
-its usual behavior of setting the region, even if you drag from or
-onto a button.
+button.  For example, in a Dired buffer, each file name is a button;
+activating it causes Emacs to visit that file (@pxref{Dired}).  In a
+@samp{*Compilation*} buffer, each error message is a button, and
+activating it visits the source code for that error
+(@pxref{Compilation}).
+
+  Although clicking @kbd{Mouse-1} on a button usually activates the
+button, if you hold the mouse button down for a period of time before
+releasing it (specifically, for more than 450 milliseconds), then
+Emacs moves point where you clicked, without activating the button.
+In this way, you can use the mouse to move point over a button without
+activating it.  Dragging the mouse over or onto a button has its usual
+behavior of setting the region, and does not activate the button.
+
+  You can change how @kbd{Mouse-1} applies to buttons by customizing
+the variable @code{mouse-1-click-follows-link}.  If the value is a
+positive integer, that determines how long you need to hold the mouse
+button down for, in milliseconds, to cancel button activation; the
+default is 450, as described in the previous paragraph.  If the value
+is @code{nil}, @kbd{Mouse-1} just sets point where you clicked, and
+does not activate buttons.  If the value is @code{double}, double
+clicks activate buttons but single clicks just set point.
 
 @vindex mouse-1-click-in-non-selected-windows
-  Normally, clicking @kbd{Mouse-1} on a button activates the button
-even if it is in a nonselected window.  If you change the variable
-@code{mouse-1-click-in-non-selected-windows} to @code{nil}, clicking
-@kbd{Mouse-1} on a button in an un-selected window moves point to the
+  Normally, @kbd{Mouse-1} on a button activates the button even if it
+is in a non-selected window.  If you change the variable
+@code{mouse-1-click-in-non-selected-windows} to @code{nil},
+@kbd{Mouse-1} on a button in an unselected window moves point to the
 clicked position and selects that window, without activating the
 button.
 
-@vindex mouse-1-click-follows-link
-  In Emacs versions before 22, only @kbd{Mouse-2} activates buttons
-and @kbd{Mouse-1} always sets point.  If you prefer this older
-behavior, set the variable @code{mouse-1-click-follows-link} to
-@code{nil}.  This variable also lets you choose various other
-alternatives for following links with the mouse.  Type @kbd{C-h v
-mouse-1-click-follows-link @key{RET}} for more details.
-
 @node Menu Mouse Clicks
 @section Mouse Clicks for Menus
 
@@ -280,28 +302,35 @@ menu smarter and more customizable.  @xref{Buffer Menus}.
 
 @item C-Mouse-2
 @kindex C-Mouse-2
-This menu is for specifying faces and other text properties
-for editing formatted text.  @xref{Formatted Text}.
+This menu contains entries for examining faces and other text
+properties, and well as for setting them (the latter is mainly useful
+when editing enriched text; @pxref{Enriched Text}).
 
 @item C-Mouse-3
 @kindex C-Mouse-3
 This menu is mode-specific.  For most modes if Menu-bar mode is on,
 this menu has the same items as all the mode-specific menu-bar menus
 put together.  Some modes may specify a different menu for this
-button.@footnote{Some systems use @kbd{Mouse-3} for a mode-specific
-menu.  We took a survey of users, and found they preferred to keep
-@kbd{Mouse-3} for selecting and killing regions.  Hence the decision
-to use @kbd{C-Mouse-3} for this menu.  To use @kbd{Mouse-3} instead,
-do @code{(global-set-key [mouse-3] 'mouse-popup-menubar-stuff)}.}  If
-Menu-bar mode is off, this menu contains all the items which would be
-present in the menu bar---not just the mode-specific ones---so that
-you can access them without having to display the menu bar.
+button.  If Menu Bar mode is off, this menu contains all the items
+which would be present in the menu bar---not just the mode-specific
+ones---so that you can access them without having to display the menu
+bar.
 
 @item S-Mouse-1
 This menu is for changing the default face within the window's buffer.
 @xref{Text Scale}.
 @end table
 
+  Some graphical applications use @kbd{Mouse-3} for a mode-specific
+menu.  If you prefer @kbd{Mouse-3} in Emacs to bring up such a menu
+instead of running the @code{mouse-save-then-kill} command, rebind
+@kbd{Mouse-3} by adding the following line to your init file
+(@pxref{Init Rebinding}):
+
+@smallexample
+(global-set-key [mouse-3] 'mouse-popup-menubar-stuff)
+@end smallexample
+
 @node Mode Line Mouse
 @section Mode Line Mouse Commands
 @cindex mode line, mouse
@@ -332,34 +361,33 @@ make any window smaller than the minimum height.
 @item Mouse-3
 @kindex Mouse-3 @r{(mode line)}
 @kbd{Mouse-3} on a mode line deletes the window it belongs to.  If the
-frame has only one window, it buries the current buffer instead, and
-switches to another buffer.
+frame has only one window, it does nothing.
 
 @item C-Mouse-2
 @kindex C-mouse-2 @r{(mode line)}
-@kbd{C-Mouse-2} on a mode line splits the window above
-horizontally, above the place in the mode line where you click.
+@kbd{C-Mouse-2} on a mode line splits that window, producing two
+side-by-side windows with the boundary running through the click
+position (@pxref{Split Window}).
 @end table
 
 @kindex C-Mouse-2 @r{(scroll bar)}
 @kindex Mouse-1 @r{(scroll bar)}
-  Using @kbd{Mouse-1} on the divider between two side-by-side mode
-lines, you can move the vertical boundary left or right.  Using
-@kbd{C-Mouse-2} on a scroll bar splits the corresponding window
-vertically.  @xref{Split Window}.
+  Furthermore, by clicking and dragging @kbd{Mouse-1} on the divider
+between two side-by-side mode lines, you can move the vertical
+boundary to the left or right.
 
 @node Creating Frames
 @section Creating Frames
 @cindex creating frames
 
 @kindex C-x 5
-  The prefix key @kbd{C-x 5} is analogous to @kbd{C-x 4}, with
-parallel subcommands.  The difference is that @kbd{C-x 5} commands
-create a new frame rather than just a new window in the selected frame
-(@pxref{Pop Up Window}).  If an existing visible or iconified
-(``minimized'') frame already displays the requested material, these
-commands use the existing frame, after raising or deiconifying
-(``un-minimizing'') as necessary.
+  The prefix key @kbd{C-x 5} is analogous to @kbd{C-x 4}.  Whereas
+each @kbd{C-x 4} command pops up a buffer in a different window in the
+selected frame (@pxref{Pop Up Window}), the @kbd{C-x 5} commands use a
+different frame.  If an existing visible or iconified (``minimized'')
+frame already displays the requested buffer, that frame is raised and
+deiconified (``un-minimized''); otherwise, a new frame is created on
+the current display terminal.
 
   The various @kbd{C-x 5} commands differ in how they find or create the
 buffer to select:
@@ -394,56 +422,32 @@ frame.  This runs @code{find-file-read-only-other-frame}.
 @xref{Visiting}.
 @end table
 
-@cindex default-frame-alist
-@cindex initial-frame-alist
-@cindex face customization, in init file
-@cindex color customization, in init file
-  You can control the appearance of new frames you create by setting the
-frame parameters in @code{default-frame-alist}.  You can use the
-variable @code{initial-frame-alist} to specify parameters that affect
-only the initial frame.  @xref{Initial Parameters,,, elisp, The Emacs
-Lisp Reference Manual}, for more information.
-
-@cindex font (default)
-  Here is an example of using @code{default-frame-alist} to specify
-the default foreground color and font:
-
-@example
-(add-to-list 'default-frame-alist '(font . "10x20"))
-(add-to-list 'default-frame-alist
-             '(foreground-color . "blue"))
-@end example
-
-@noindent
-By putting such customizations in your init file, you can control the
-appearance of all the frames Emacs creates, including the initial one
-(@pxref{Init File}).  @xref{Fonts}, for other ways to set the default
-font.
+  You can control the appearance and behavior of the newly-created
+frames by specifying @dfn{frame parameters}.  @xref{Frame Parameters}.
 
 @node Frame Commands
 @section Frame Commands
 
-  The following commands let you create, delete and operate on frames:
+  The following commands are used to delete and operate on frames:
 
 @table @kbd
+@item C-x 5 0
+@kindex C-x 5 0
+@findex delete-frame
+Delete the selected frame (@code{delete-frame}).  This signals an
+error if there is only one frame.
+
 @item C-z
 @kindex C-z @r{(X windows)}
 @findex suspend-frame
 Minimize (or ``iconify) the selected Emacs frame
 (@code{suspend-frame}).  @xref{Exiting}.
 
-@item C-x 5 0
-@kindex C-x 5 0
-@findex delete-frame
-Delete the selected frame (@code{delete-frame}).  This is not allowed
-if there is only one frame.
-
 @item C-x 5 o
 @kindex C-x 5 o
 @findex other-frame
-Select another frame, raise it, and warp the mouse to it.  If you
-repeat this command, it cycles through all the frames on your
-terminal.
+Select another frame, and raise it.  If you repeat this command, it
+cycles through all the frames on your terminal.
 
 @item C-x 5 1
 @kindex C-x 5 1
@@ -451,43 +455,37 @@ terminal.
 Delete all frames on the current terminal, except the selected one.
 @end table
 
-  The @kbd{C-x 5 0} (@code{delete-frame}) command never deletes the
-last frame.  This prevents you from losing the ability to interact
-with the Emacs process.  Note that when Emacs is run as a daemon
-(@pxref{Emacs Server}), there is always a ``virtual frame'' that
-remains after all the ordinary, interactive frames are deleted.  In
-this case, @kbd{C-x 5 0} can delete the last interactive frame; you
-can use @command{emacsclient} to reconnect to the Emacs session.
-
-  The @kbd{C-x 5 1} (@code{delete-other-frames}) command only deletes
-frames on the current terminal.  For example, if you call it from an X
-frame, it deletes the other frames on that X display; if the Emacs
-process has frames open on other X displays or text terminals, those
-are not deleted.
+  The @kbd{C-x 5 0} (@code{delete-frame}) command deletes the selected
+frame.  However, it will refuse to delete the last frame in an Emacs
+session, to prevent you from losing the ability to interact with the
+Emacs session.  Note that when Emacs is run as a daemon (@pxref{Emacs
+Server}), there is always a ``virtual frame'' that remains after all
+the ordinary, interactive frames are deleted.  In this case, @kbd{C-x
+5 0} can delete the last interactive frame; you can use
+@command{emacsclient} to reconnect to the Emacs session.
+
+  The @kbd{C-x 5 1} (@code{delete-other-frames}) command deletes all
+other frames on the current terminal (this terminal refers to either a
+graphical display, or a text-only terminal; @pxref{Non-Window
+Terminals}).  If the Emacs session has frames open on other graphical
+displays or text terminals, those are not deleted.
 
 @vindex focus-follows-mouse
-  On X, you may have to tell Emacs how the window manager handles
-focus-switching between windows, in order for @kbd{C-x 5 o}
-(@code{other-frame}) to work properly.  Unfortunately, there is no way
-for Emacs to detect this automatically, so you should set the variable
-@code{focus-follows-mouse}.  The default is @code{nil}, meaning you
-have to click on the window to select it (the default for most modern
-window managers).  You should change it to @code{t} if your window
-manager selects a window and gives it focus anytime you move the mouse
-onto the window.
-
-  The window manager that is part of MS-Windows always gives focus to
-a frame that raises, so this variable has no effect in the native
-MS-Windows build of Emacs.  However, you may still wish to set this
-variable to @code{t} to have Emacs automatically move the mouse
-pointer to the raised frame.
+  The @kbd{C-x 5 o} (@code{other-frame}) command selects the next
+frame on the current terminal.  If you are using Emacs on the X Window
+System with a window manager that selects (or @dfn{gives focus to})
+whatever frame the mouse cursor is over, you have to change the
+variable @code{focus-follows-mouse} to @code{t} in order for this
+command to work properly.  Then invoking @kbd{C-x 5 o} will also warp
+the mouse cursor to the chosen frame.
 
 @node Fonts
 @section Fonts
 @cindex fonts
 
-  By default, Emacs displays text in X using a 12-point monospace
-font.  There are several different ways to specify a different font:
+  By default, Emacs displays text on graphical displays using a
+12-point monospace font.  There are several different ways to specify
+a different font:
 
 @itemize
 @item
@@ -501,7 +499,7 @@ variable @code{default-frame-alist} to specify the @code{font}
 parameter (@pxref{Creating Frames}), like this:
 
 @smallexample
-(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-12"))
+(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
 @end smallexample
 
 @cindex X defaults file
@@ -523,18 +521,16 @@ font in your X resources file, you should not quote it.
 If you are running Emacs on the GNOME desktop, you can tell Emacs to
 use the default system font by setting the variable
 @code{font-use-system-font} to @code{t} (the default is @code{nil}).
-For this to work, Emacs must be compiled with Gconf support; this is
-done automatically if the libraries are present at compile time.
+For this to work, Emacs must have been compiled with Gconf support.
 
 @item
 Use the command line option @samp{-fn} (or @samp{--font}).  @xref{Font
 X}.
 @end itemize
 
-To check what font you're currently using, the @kbd{C-u C-x =}
-command can be helpful.  It'll describe the character under point, and
-also say what font it's rendered in, if the window system you're
-running under supports that.
+  To check what font you're currently using, the @kbd{C-u C-x =}
+command can be helpful.  It describes the character at point, and
+names the font that it's rendered in.
 
 @cindex fontconfig
   On X, there are four different ways to express a ``font name''.  The
@@ -548,7 +544,7 @@ the following form:
 @noindent
 Within this format, any of the elements in braces may be omitted.
 Here, @var{fontname} is the @dfn{family name} of the font, such as
-@samp{Monospace} or @samp{DejaVu Serif}; @var{fontsize} is the
+@samp{Monospace} or @samp{DejaVu Sans Mono}; @var{fontsize} is the
 @dfn{point size} of the font (one @dfn{printer's point} is about 1/72
 of an inch); and the @samp{@var{name}=@var{values}} entries specify
 settings such as the slant and weight of the font.  Each @var{values}
@@ -561,7 +557,7 @@ Here is a list of common font properties:
 
 @table @samp
 @item slant
-One of @samp{italic}, @samp{oblique} or @samp{roman}.
+One of @samp{italic}, @samp{oblique}, or @samp{roman}.
 
 @item weight
 One of @samp{light}, @samp{medium}, @samp{demibold}, @samp{bold} or
@@ -595,8 +591,9 @@ For a more detailed description of Fontconfig patterns, see the
 Fontconfig manual, which is distributed with Fontconfig and available
 online at @url{http://fontconfig.org/fontconfig-user.html}.
 
-  The second way to specify a font is to use a @dfn{GTK font
-description}.  These have the syntax
+@cindex GTK font pattern
+  The second way to specify a font is to use a @dfn{GTK font pattern}.
+These have the syntax
 
 @smallexample
 @var{fontname} [@var{properties}] [@var{fontsize}]
@@ -605,20 +602,24 @@ description}.  These have the syntax
 @noindent
 where @var{fontname} is the family name, @var{properties} is a list of
 property values separated by spaces, and @var{fontsize} is the point
-size.  The properties that you may specify are as follows:
+size.  The properties that you may specify for GTK font patterns are
+as follows:
 
-@table @samp
-@item style
-One of @samp{roman}, @samp{italic} or @samp{oblique}.  If omitted, the
-@samp{roman} style is used.
-@item weight
-One of @samp{medium}, @samp{ultra-light}, @samp{light},
-@samp{semi-bold}, or @samp{bold}.  If omitted, @samp{medium} weight is
-used.
-@end table
+@itemize
+@item
+Slant properties: @samp{Italic} or @samp{Oblique}.  If omitted, the
+default (roman) slant is implied.
+@item
+Weight properties: @samp{Bold}, @samp{Book}, @samp{Light},
+@samp{Medium}, @samp{Semi-bold}, or @samp{Ultra-light}.  If omitted,
+@samp{Medium} weight is implied.
+@item
+Width properties: @samp{Semi-Condensed} or @samp{Condensed}.  If
+omitted, a default width is used.
+@end itemize
 
 @noindent
-Here are some examples of GTK font descriptions:
+Here are some examples of GTK font patterns:
 
 @smallexample
 Monospace 12
@@ -657,7 +658,7 @@ The entries have the following meanings:
 @item maker
 The name of the font manufacturer.
 @item family
-The name of the font family (e.g. @samp{courier}).
+The name of the font family (e.g.@: @samp{courier}).
 @item weight
 The font weight---normally either @samp{bold}, @samp{medium} or
 @samp{light}.  Some font names support other values.
@@ -670,8 +671,8 @@ The font width---normally @samp{normal}, @samp{condensed},
 @samp{extended}, or @samp{semicondensed} (some font names support
 other values).
 @item style
-An optional additional style name.  Usually it is empty---most long
-font names have two hyphens in a row at this point.
+An optional additional style name.  Usually it is empty---most XLFDs
+have two hyphens in a row at this point.
 @item pixels
 The font height, in pixels.
 @item height
@@ -840,116 +841,40 @@ input stream for each server.  Each server also has its own selected
 frame.  The commands you enter with a particular X server apply to
 that server's selected frame.
 
-  It is even possible to use this feature to let two or more users
-type simultaneously on the two displays, within the same Emacs job.
-In practice, however, the different users can easily interfere with
-each others' edits if they are not careful.
-
-@node Special Buffer Frames
-@section Special Buffer Frames
-
-@vindex special-display-buffer-names
-  You can make certain chosen buffers, which Emacs normally displays
-in ``some other window'' (@pxref{Displaying Buffers}), appear in
-special frames of their own.  To do this, set the variable
-@code{special-display-buffer-names} to a list of buffer names; any
-buffer whose name is in that list automatically gets a special frame.
-@xref{Window Choice}, for how this fits in with the other ways for
-Emacs to choose a window to display in.
-
-  For example, if you set the variable this way,
+@node Frame Parameters
+@section Frame Parameters
+@cindex default-frame-alist
 
-@example
-(setq special-display-buffer-names
-      '("*Completions*" "*grep*" "*tex-shell*"))
-@end example
+  You can control the default appearance and behavior of all frames by
+specifying a default list of @dfn{frame parameters} in the variable
+@code{default-frame-alist}.  Its value should be a list of entries,
+each specifying a parameter name and a value for that parameter.
+These entries take effect whenever Emacs creates a new frame,
+including the initial frame.
 
-@noindent
-then completion lists, @code{grep} output and the @TeX{} mode shell
-buffer get individual frames of their own.  These frames, and the
-windows in them, are never automatically split or reused for any other
-buffers.  They continue to show the buffers they were created for,
-unless you alter them by hand.  Killing the special buffer deletes its
-frame automatically.
-
-@vindex special-display-regexps
-  More generally, you can set @code{special-display-regexps} to a list
-of regular expressions; then a buffer gets its own frame if its name
-matches any of those regular expressions.  (Once again, this applies only
-to buffers that normally get displayed for you in ``another window.'')
-
-@vindex special-display-frame-alist
-  The variable @code{special-display-frame-alist} specifies the frame
-parameters for these frames.  It has a default value, so you don't need
-to set it.
-
-  For those who know Lisp, an element of
-@code{special-display-buffer-names} or @code{special-display-regexps}
-can also be a list.  Then the first element is the buffer name or
-regular expression; the rest of the list specifies how to create the
-frame.  It can be an association list specifying frame parameter
-values; these values take precedence over parameter values specified
-in @code{special-display-frame-alist}.  If you specify the symbol
-@code{same-window} as a ``frame parameter'' in this list, with a
-non-@code{nil} value, that means to use the selected window if
-possible.  If you use the symbol @code{same-frame} as a ``frame
-parameter'' in this list, with a non-@code{nil} value, that means to
-use the selected frame if possible.
-
-  Alternatively, the value can have this form:
+@cindex frame size, specifying default
+  For example, you can add the following lines to your init file
+(@pxref{Init File}) to set the default frame width to 90 character
+columns, the default frame height to 40 character rows, and the
+default font to @samp{Monospace-10}:
 
 @example
-(@var{function} @var{args}...)
+(add-to-list 'default-frame-alist '(width  . 90))
+(add-to-list 'default-frame-alist '(height . 40))
+(add-to-list 'default-frame-alist '(font . "Monospace-10"))
 @end example
 
-@noindent
-where @var{function} is a symbol.  Then the frame is constructed by
-calling @var{function}; its first argument is the buffer, and its
-remaining arguments are @var{args}.
-
-@node Frame Parameters
-@section Setting Frame Parameters
-@cindex Auto-Raise mode
-@cindex Auto-Lower mode
-
-  These commands are available for controlling the window management
-behavior of the selected frame:
+  For a list of frame parameters and their effects, see @ref{Frame
+Parameters,,, elisp, The Emacs Lisp Reference Manual}.
 
-@table @kbd
-@findex auto-raise-mode
-@item M-x auto-raise-mode
-Toggle whether or not the selected frame should auto-raise.  Auto-raise
-means that every time you move the mouse onto the frame, it raises the
-frame.
-
-Some window managers also implement auto-raise.  If you enable
-auto-raise for Emacs frames in your window manager, it will work, but
-it is beyond Emacs' control, so @code{auto-raise-mode} has no effect
-on it.
-
-@findex auto-lower-mode
-@item M-x auto-lower-mode
-Toggle whether or not the selected frame should auto-lower.
-Auto-lower means that every time you move the mouse off the frame,
-the frame moves to the bottom of the stack on the screen.
-
-The command @code{auto-lower-mode} has no effect on auto-lower
-implemented by the window manager.  To control that, you must use the
-appropriate window manager features.
-@end table
+@cindex initial-frame-alist
+  You can also specify a list of frame parameters which apply to just
+the initial frame, by customizing the variable
+@code{initial-frame-alist}.
 
-  In Emacs versions that use an X toolkit, the color-setting and
-font-setting functions don't affect menus and the menu bar, since they
-are displayed by their own widget classes.  To change the appearance of
-the menus and menu bar, you must use X resources (@pxref{Resources}).
-@xref{Colors}, regarding colors.  @xref{Font X}, regarding choice of
-font.
-
-  Colors, fonts, and other attributes of the frame's display can also
-be customized by setting frame parameters in the variable
-@code{default-frame-alist} (@pxref{Creating Frames}).  For a detailed
-description of frame parameters and customization, see @ref{Frame
-Parameters,,, elisp, The Emacs Lisp Reference Manual}.
+  If Emacs is compiled to use an X toolkit, frame parameters that
+specify colors and fonts don't affect menus and the menu bar, since
+those are drawn by the toolkit and not directly by Emacs.
 
 @node Scroll Bars
 @section Scroll Bars
@@ -994,41 +919,17 @@ or disable the scroll bars (@pxref{Resources}).  To control the scroll
 bar width, change the @code{scroll-bar-width} frame parameter
 (@pxref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}).
 
-@node Wheeled Mice
-@section Scrolling With ``Wheeled'' Mice
-
-@cindex mouse wheel
-@cindex wheel, mouse
-@findex mouse-wheel-mode
-@cindex Mouse Wheel minor mode
-@cindex mode, Mouse Wheel
-  Some mice have a ``wheel'' instead of a third button.  You can
-usually click the wheel to act as either @kbd{Mouse-2} or
-@kbd{Mouse-3}, depending on the setup.  You can also use the wheel to
-scroll windows instead of using the scroll bar or keyboard commands.
-Mouse wheel support only works if the system generates appropriate
-events; whenever possible, it is turned on by default.  To toggle this
-feature, use @kbd{M-x mouse-wheel-mode}.
-
-@vindex mouse-wheel-follow-mouse
-@vindex mouse-wheel-scroll-amount
-@vindex mouse-wheel-progressive-speed
-  The two variables @code{mouse-wheel-follow-mouse} and
-@code{mouse-wheel-scroll-amount} determine where and by how much
-buffers are scrolled.  The variable
-@code{mouse-wheel-progressive-speed} determines whether the scroll
-speed is linked to how fast you move the wheel.
-
 @node Drag and Drop
 @section Drag and Drop
 @cindex drag and drop
 
-  Emacs supports @dfn{drag and drop} using the mouse.  For instance,
-dropping text onto an Emacs frame inserts the text where it is dropped.
-Dropping a file onto an Emacs frame visits that file.  As a special
-case, dropping the file on a Dired buffer moves or copies the file
-(according to the conventions of the application it came from) into the
-directory displayed in that buffer.
+  In most graphical desktop environments, Emacs has basic support for
+@dfn{drag and drop} operations.  For instance, dropping text onto an
+Emacs frame inserts the text where it is dropped.  Dropping a file
+onto an Emacs frame visits that file.  As a special case, dropping the
+file on a Dired buffer moves or copies the file (according to the
+conventions of the application it came from) into the directory
+displayed in that buffer.
 
 @vindex dnd-open-file-other-window
   Dropping a file normally visits it in the window you drop it on.  If
@@ -1045,13 +946,12 @@ protocol, are currently supported.
 @findex menu-bar-mode
 @vindex menu-bar-mode
 
-  You can turn display of menu bars on or off with @kbd{M-x
-menu-bar-mode} or by customizing the variable @code{menu-bar-mode}.
-With no argument, this command toggles Menu Bar mode, a
-minor mode.  With an argument, the command turns Menu Bar mode on if the
-argument is positive, off if the argument is not positive.  You can use
-the X resource @samp{menuBar} to control the initial setting of
-Menu Bar mode.  @xref{Resources}.
+  You can toggle the use of menu bars with @kbd{M-x menu-bar-mode}.
+With no argument, this command toggles Menu Bar mode, a global minor
+mode.  With an argument, the command turns Menu Bar mode on if the
+argument is positive, off if the argument is not positive.  To control
+the use of menu bars at startup, customize the variable
+@code{menu-bar-mode}.
 
 @kindex C-Mouse-3 @r{(when menu bar is disabled)}
   Expert users often turn off the menu bar, especially on text-only
@@ -1135,47 +1035,39 @@ toggle to be activated by default, change the variable
 help text to the GTK+ file chooser dialog; to disable this help text,
 change the variable @code{x-gtk-file-dialog-help-text} to @code{nil}.
 
-@vindex x-gtk-use-old-file-dialog
-  In GTK+ versions 2.4 through 2.10, you can choose to use an older
-version of the GTK+ file dialog by setting the variable
-@code{x-gtk-use-old-file-dialog} to a non-@code{nil} value.  If Emacs
-is built with a GTK+ version that has only one file dialog, this
-variable has no effect.
-
 @node Tooltips
 @section Tooltips
 @cindex tooltips
 
-  @dfn{Tooltips} are small windows that display text information at the
-current mouse position.  They activate when there is a pause in mouse
-movement.  There are two types of tooltip: help tooltips and GUD
-tooltips.
-
-  @dfn{Help tooltips} typically display over text---including the mode
-line---but are also available for other parts of the Emacs frame, such
-as the tool bar and menu items.
+  @dfn{Tooltips} are small windows that display text information at
+the current mouse position.  They activate when there is a pause in
+mouse movement over some significant piece of text in a window, or the
+mode line, or some other part of the Emacs frame such as a tool bar
+button or menu item.
 
 @findex tooltip-mode
-  You can toggle display of help tooltips (Tooltip mode) with the
-command @kbd{M-x tooltip-mode}.  When Tooltip mode is disabled, the
-help text is displayed in the echo area instead.
-
-  @dfn{GUD tooltips} show values of variables.  They are useful when
-you are debugging a program.  @xref{Debugger Operation}.
+  You can toggle the use of tooltips with the command @kbd{M-x
+tooltip-mode}.  When Tooltip mode is disabled, the help text is
+displayed in the echo area instead.  To control the use of tooltips at
+startup, customize the variable @code{tooltip-mode}.
 
 @vindex tooltip-delay
   The variables @code{tooltip-delay} specifies how long Emacs should
 wait before displaying a tooltip.  For additional customization
 options for displaying tooltips, use @kbd{M-x customize-group
-@key{RET} tooltip @key{RET}}.  @xref{X Resources}, for information on
-customizing the windows that display tooltips.
+@key{RET} tooltip @key{RET}}.
 
 @vindex x-gtk-use-system-tooltips
   If Emacs is built with GTK+ support, it displays tooltips via GTK+,
 using the default appearance of GTK+ tooltips.  To disable this,
 change the variable @code{x-gtk-use-system-tooltips} to @code{nil}.
-If you do this, or if Emacs is built without GTK+ support, the
-@code{tooltip} face specifies most attributes of the tooltip text.
+If you do this, or if Emacs is built without GTK+ support, most
+attributes of the tooltip text are specified by the @code{tooltip}
+face, and by X resources (@pxref{X Resources}).
+
+  @dfn{GUD tooltips} are special tooltips that show the values of
+variables when debugging a program with GUD.  @xref{Debugger
+Operation}.
 
 @node Mouse Avoidance
 @section Mouse Avoidance
@@ -1248,23 +1140,31 @@ to select a frame according to its name.  The name you specify appears
 in the mode line when the frame is selected.
 
 @node Text-Only Mouse
-@section Using a Mouse in Terminal Emulators
+@section Using a Mouse in Text-only Terminals
 @cindex mouse support
 @cindex terminal emulators, mouse support
 
 Some text-only terminals support mouse clicks in the terminal window.
 
 @cindex xterm
-In a terminal emulator which is compatible with @code{xterm},
-you can use @kbd{M-x xterm-mouse-mode} to give Emacs control over
-simple use of the mouse---basically, only non-modified single clicks
-are supported.  The normal @code{xterm} mouse functionality for such
+  In a terminal emulator which is compatible with @command{xterm}, you
+can use @kbd{M-x xterm-mouse-mode} to give Emacs control over simple
+uses of the mouse---basically, only non-modified single clicks are
+supported.  The normal @command{xterm} mouse functionality for such
 clicks is still available by holding down the @kbd{SHIFT} key when you
 press the mouse button.  Xterm Mouse mode is a global minor mode
 (@pxref{Minor Modes}).  Repeating the command turns the mode off
 again.
 
 @findex gpm-mouse-mode
-In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to
-enable terminal mouse support.  You must have the gpm package
-installed and running on your system in order for this to work.
+  In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to
+enable mouse support.  You must have the gpm server installed and
+running on your system in order for this to work.
+
+@iftex
+@pxref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features},
+@end iftex
+@ifnottex
+@pxref{MS-DOS Mouse},
+@end ifnottex
+for information about mouse support on MS-DOS.
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index e37e80bfab8..3af75245e69 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -509,11 +509,6 @@ character sets and which font to use to display each of them.  Fontsets
 make it easy to change several fonts at once by specifying the name of a
 fontset, rather than changing each font separately.  @xref{Fontsets}.
 
-@item Formatted Text
-Formatted text is text that displays with formatting information while
-you edit.  Formatting information includes fonts, colors, and specified
-margins.  @xref{Formatted Text}.
-
 @item Formfeed Character
 See `page.'
 
@@ -702,9 +697,8 @@ that someone else is already editing.
 See `incremental search.'
 
 @item Justification
-Justification means adding extra spaces within lines of text
-in order to adjust the position of the text edges.
-@xref{Format Justification}.
+Justification means adding extra spaces within lines of text in order
+to adjust the position of the text edges.  @xref{Fill Commands}.
 
 @item Key Binding
 See `binding.'
@@ -1362,12 +1356,6 @@ See `abbrev.'
 Word search is searching for a sequence of words, considering the
 punctuation between them as insignificant.  @xref{Word Search}.
 
-@item WYSIWYG
-WYSIWYG stands for ``What you see is what you get.''  Emacs generally
-provides WYSIWYG editing for files of characters; in Enriched mode
-(@pxref{Formatted Text}), it provides WYSIWYG editing for files that
-include text formatting information.
-
 @item Yanking
 Yanking means reinserting text previously killed (q.v.@:).  It can be
 used to undo a mistaken kill, or for copying or moving text.  Some
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index e13b2808f09..f99e3519710 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -8,214 +8,154 @@
 @cindex tabs
 @cindex columns (indentation)
 
-  This chapter describes the Emacs commands that add, remove, or
-adjust indentation.
-
-@table @kbd
-@item @key{TAB}
-Indent the current line appropriately, in a mode-dependent fashion.
-@item @kbd{C-j}
-Perform @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
-@item M-^
-Merge the previous and the current line (@code{delete-indentation}).
-This would cancel the effect of a preceding @kbd{C-j}.
-@item C-M-o
-Split the current line at point; text on the line after point becomes a
-new line indented to the same column where point is located
-(@code{split-line}).
-@item M-m
-Move (forward or back) to the first nonblank character on the current
-line (@code{back-to-indentation}).
-@item C-M-\
-Indent lines in the region to the same column (@code{indent-region}).
-@item C-x @key{TAB}
-Shift lines in the region rigidly right or left (@code{indent-rigidly}).
-@item M-i
-Indent from point to the next prespecified tab stop column
-(@code{tab-to-tab-stop}).
-@item M-x indent-relative
-Indent from point to under an indentation point in the previous line.
+@cindex whitespace character
+  @dfn{Indentation} refers to inserting or adjusting @dfn{whitespace
+characters} (space and/or tab characters) at the beginning of a line
+of text.  This chapter documents indentation commands and options
+which are common to Text mode and related modes, as well as
+programming language modes.  @xref{Program Indent}, for additional
+documentation about indenting in programming modes.
+
+@findex indent-for-tab-command
+@kindex TAB @r{(indentation)}
+  The simplest way to perform indentation is the @key{TAB} key.  In
+most major modes, this runs the command @code{indent-for-tab-command}.
+(In C and related modes, @key{TAB} runs the command
+@code{c-indent-line-or-region}, which behaves similarly).
+
+@table @key
+@item TAB
+Insert whitespace, or indent the current line, in a mode-appropriate
+way (@code{indent-for-tab-command}).  If the region is active, indent
+all the lines within it.
 @end table
 
-@noindent
-The @key{TAB} key runs @code{indent-for-tab-command} in most major
-modes (in C and related modes, @key{TAB} runs a separate command,
-@code{c-indent-line-or-region}, which behaves similarly).  The major
-mode determines just what this entails.
-
-  In text modes, @key{TAB} inserts some combination of space and tab
-characters to advance point to the next tab stop (@pxref{Tab Stops}).
-If the region is active and spans multiple lines, it advances the
-first character of each of those lines to the next tab stop
-(@pxref{Using Region}).  For the purposes of this command, the
-position of the first non-whitespace character on the preceding line
-is treated as an additional tab stop.  Thus, you can use @key{TAB} to
-``align'' point with the preceding line.
-
-  In programming modes, @key{TAB} adds or removes some combination of
-space and tab characters at the start of the line, in a way that makes
-sense given the text in the preceding lines.  If the region is active
-and spans multiple lines, all those lines are indented this way.  If
-point was initially within the current line's indentation, it is
-positioned after that indentation; otherwise, it remains at same point
-in the newly-indented text.  @xref{Program Indent}.
+  The exact behavior of @key{TAB} depends on the major mode.  In Text
+mode and related major modes, @key{TAB} normally inserts some
+combination of space and tab characters to advance point to the next
+tab stop (@pxref{Tab Stops}).  For this purpose, the position of the
+first non-whitespace character on the preceding line is treated as an
+additional tab stop, so you can use @key{TAB} to ``align'' point with
+the preceding line.  If the region is active (@pxref{Using Region}),
+@key{TAB} acts specially: it indents each line in the region so that
+its first non-whitespace character is aligned with the preceding line.
+
+  In programming modes, @key{TAB} indents the current line of code in
+a way that makes sense given the code in the preceding lines.  If the
+region is active, all the lines in the region are indented this way.
+If point was initially within the current line's indentation, it is
+repositioned to the first non-whitespace character on the line.
 
-@vindex tab-width
-  Normally, indentation commands insert (or remove) an optimal mix of
-@dfn{tab characters} and spaces to align to the desired column.  Tab
-characters (@acronym{ASCII} code 9) are displayed as a stretch of
-empty space extending to the next @dfn{display tab stop}.  By default,
-there is one display tab stop every eight columns; the number of
-columns is determined by the variable @code{tab-width}.  You can
-insert a single tab character by typing @kbd{C-q @key{TAB}}.
-@xref{Text Display}.
+  If you just want to insert a tab character in the buffer, type
+@kbd{C-q @key{TAB}} (@pxref{Inserting Text}).
 
-@findex edit-tab-stops
-@findex tab-to-tab-stop
-@kindex M-i
-  The command @kbd{M-i} (@code{tab-to-tab-stop}) adjusts the
-whitespace characters around point, inserting just enough whitespace
-to advance point up to the next tab stop.  By default, this involves
-deleting the existing whitespace and inserting a single tab character.
+@menu
+* Indentation Commands::  More commands for performing indentation.
+* Tab Stops::             Stop points for indentation in Text modes.
+* Just Spaces::           Using only space characters for indentation.
+* Indent Convenience::    Optional indentation features.
+@end menu
 
-  @xref{Just Spaces}, for how to disable use of tabs.  However,
-@kbd{C-q @key{TAB}} always inserts a tab, even when tabs are disabled
-for the indentation commands.
+@node Indentation Commands
+@section Indentation Commands
 
-@vindex tab-always-indent
-  The variable @code{tab-always-indent} tweaks the behavior of the
-@key{TAB} (@code{indent-for-tab-command}) command.  The default value,
-@code{t}, gives the behavior described above.  If you change the value
-to the symbol @code{complete}, then @key{TAB} first tries to indent
-the current line, and if the line was already indented, it tries to
-complete the text at point (@pxref{Symbol Completion}).  If the value
-is @code{nil}, then @key{TAB} indents the current line only if point
-is at the left margin or in the line's indentation; otherwise, it
-inserts a real tab character.
+Apart from the @key{TAB} (@code{indent-for-tab-command}) command,
+Emacs provides a variety of commands to perform indentation in other
+ways.
 
-@menu
-* Indentation Commands::  Various commands and techniques for indentation.
-* Tab Stops::             You can set arbitrary "tab stops" and then
-                            indent to the next tab stop when you want to.
-* Just Spaces::           You can request indentation using just spaces.
-@end menu
+@table @kbd
+@item C-j
+@kindex C-j
+@findex newline-and-indent
+Perform @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
 
-@node Indentation Commands, Tab Stops, Indentation, Indentation
-@section Indentation Commands and Techniques
+@item C-M-o
+@kindex C-M-o
+@findex split-line
+Split the current line at point (@code{split-line}).  The text on the
+line after point becomes a new line, indented to the same column where
+point is located.  This command first moves point forward over any
+spaces and tabs.  Afterward, point is positioned before the inserted
+newline.
 
 @kindex M-m
 @findex back-to-indentation
-  To move over the indentation on a line, do @kbd{M-m}
-(@code{back-to-indentation}).  This command, given anywhere on a line,
-positions point at the first nonblank character on the line, if any,
-or else at the end of the line.
-
-  To insert an indented line before the current line, do @kbd{C-a C-o
-@key{TAB}}.  To make an indented line after the current line, use
-@kbd{C-e C-j}.
+@item M-m
+Move (forward or back) to the first non-whitespace character on the
+current line (@code{back-to-indentation}).  If there are no
+non-whitespace characters on the line, move to the end of the line.
 
-  If you just want to insert a tab character in the buffer, type
-@kbd{C-q @key{TAB}}.
+@item M-i
+@kindex M-i
+@findex tab-to-tab-stop
+Indent whitespace at point, up to the next tab stop
+(@code{tab-to-tab-stop}).  @xref{Tab Stops}.
 
-@kindex C-M-o
-@findex split-line
-  @kbd{C-M-o} (@code{split-line}) moves the text from point to the end of
-the line vertically down, so that the current line becomes two lines.
-@kbd{C-M-o} first moves point forward over any spaces and tabs.  Then it
-inserts after point a newline and enough indentation to reach the same
-column point is on.  Point remains before the inserted newline; in this
-regard, @kbd{C-M-o} resembles @kbd{C-o}.
+@findex indent-relative
+@item M-x indent-relative
+Insert whitespace at point, until point is aligned with the first
+non-whitespace character on the previous line (actually, the last
+non-blank line).  If point is already farther right than that, run
+@code{tab-to-tab-stop} instead---unless called with a numeric
+argument, in which case do nothing.
 
+@item M-^
 @kindex M-^
 @findex delete-indentation
-  To join two lines cleanly, use the @kbd{M-^}
-(@code{delete-indentation}) command.  It deletes the indentation at
-the front of the current line, and the line boundary as well,
-replacing them with a single space.  As a special case (useful for
-Lisp code) the single space is omitted if the characters to be joined
-are consecutive open parentheses or closing parentheses, or if the
-junction follows another newline.  To delete just the indentation of a
-line, go to the beginning of the line and use @kbd{M-\}
-(@code{delete-horizontal-space}), which deletes all spaces and tabs
-around the cursor.
-
-  If you have a fill prefix, @kbd{M-^} deletes the fill prefix if it
+Merge the previous and the current line (@code{delete-indentation}).
+This ``joins'' the two lines cleanly, by replacing any indentation at
+the front of the current line, together with the line boundary, with a
+single space.
+
+As a special case (useful for Lisp code), the single space is omitted
+if the characters to be joined are consecutive opening and closing
+parentheses, or if the junction follows another newline.
+
+If there is a fill prefix, @kbd{M-^} deletes the fill prefix if it
 appears after the newline that is deleted.  @xref{Fill Prefix}.
 
+@item C-M-\
 @kindex C-M-\
-@kindex C-x TAB
 @findex indent-region
-@findex indent-rigidly
-  There are also commands for changing the indentation of several lines
-at once.  They apply to all the lines that begin in the region.
-@kbd{C-M-\} (@code{indent-region}) indents each line in the ``usual''
-way, as if you had typed @key{TAB} at the beginning of the line.  A
-numeric argument specifies the column to indent to, and each line is
-shifted left or right so that its first nonblank character appears in
-that column.  @kbd{C-x @key{TAB}} (@code{indent-rigidly}) moves all of
-the lines in the region right by its argument (left, for negative
-arguments).  The whole group of lines moves rigidly sideways, which is
-how the command gets its name.
+Indent all the lines in the region, as though you had typed @key{TAB}
+at the beginning of each line (@code{indent-region}).
 
+If a numeric argument is supplied, indent every line in the region to
+that column number.
+
+@item C-x @key{TAB}
+@kindex C-x TAB
+@findex indent-rigidly
 @cindex remove indentation
-  To remove all indentation from all of the lines in the region,
-invoke @kbd{C-x @key{TAB}} with a large negative argument, such as
--1000.
+Shift each line in the region by a fixed distance, to the right or
+left (@code{indent-rigidly}).  The distance to move is determined by
+the numeric argument (positive to move rightward, negative to move
+leftward).
+
+This command can be used to remove all indentation from the lines in
+the region, by invoking it with a large negative argument,
+e.g. @kbd{C-u -1000 C-x @key{TAB}}.
+@end table
 
-@findex indent-relative
-  @kbd{M-x indent-relative} indents at point based on the previous line
-(actually, the last nonempty line).  It inserts whitespace at point, moving
-point, until it is underneath the next indentation point in the previous line.
-An indentation point is the end of a sequence of whitespace or the end of
-the line.  If point is farther right than any indentation point in the
-previous line, @code{indent-relative} runs @code{tab-to-tab-stop}
-@ifnottex
-(@pxref{Tab Stops}),
-@end ifnottex
-@iftex
-(see next section),
-@end iftex
-unless it is called with a numeric argument, in which case it does
-nothing.
-
-  @xref{Format Indentation}, for another way of specifying the
-indentation for part of your text.
-
-@node Tab Stops, Just Spaces, Indentation Commands, Indentation
+@node Tab Stops
 @section Tab Stops
-
 @cindex tab stops
-@cindex using tab stops in making tables
-@cindex tables, indentation for
-@kindex M-i
-@findex tab-to-tab-stop
-  For typing in tables, you can use @kbd{M-i} (@code{tab-to-tab-stop}).
-This command inserts indentation before point, enough to reach the
-next tab stop column.
+
+@vindex tab-stop-list
+  Emacs defines certain column numbers to be @dfn{tab stops}.  These
+are used as stopping points by @key{TAB} when inserting whitespace in
+Text mode and related modes (@pxref{Indentation}), and by commands
+like @kbd{M-i} (@pxref{Indentation Commands}).  By default, tab stops
+are located every 8 columns.  These positions are stored in the
+variable @code{tab-stop-list}, whose value is a list of column numbers
+in increasing order.
 
 @findex edit-tab-stops
-@findex edit-tab-stops-note-changes
 @kindex C-c C-c @r{(Edit Tab Stops)}
-@vindex tab-stop-list
-  You can change the tab stops used by @kbd{M-i} and other indentation
-commands, so that they need not be spaced every eight characters, or
-even regularly spaced.  The tab stops are stored in the variable
-@code{tab-stop-list}, as a list of column numbers in increasing order.
-
-  A convenient way to set the tab stops is with @kbd{M-x
-edit-tab-stops}, which creates and selects a buffer containing a
-description of the tab stop settings.  You can edit this buffer to
-specify different tab stops, and then type @kbd{C-c C-c} to make those
-new tab stops take effect.  The buffer uses Overwrite mode
-(@pxref{Minor Modes}).  @code{edit-tab-stops} records which buffer was
-current when you invoked it, and stores the tab stops back in that
-buffer; normally all buffers share the same tab stops and changing
-them in one buffer affects all, but if you happen to make
-@code{tab-stop-list} local in one buffer then @code{edit-tab-stops} in
-that buffer will edit the local settings.
-
-  Here is what the text representing the tab stops looks like for ordinary
-tab stops every eight columns.
+  Instead of customizing the variable @code{tab-stop-list} directly, a
+convenient way to view and set tab stops is via the command @kbd{M-x
+edit-tab-stops}.  This switches to a buffer containing a description
+of the tab stop settings, which looks like this:
 
 @example
         :       :       :       :       :       :
@@ -224,37 +164,77 @@ tab stops every eight columns.
 To install changes, type C-c C-c
 @end example
 
-  The first line contains a colon at each tab stop.  The remaining lines
-are present just to help you see where the colons are and know what to do.
+@noindent
+The first line contains a colon at each tab stop.  The numbers on the
+next two lines are present just to indicate where the colons are.
+
+  You can edit this buffer to specify different tab stops by placing
+colons on the desired columns.  The buffer uses Overwrite mode
+(@pxref{Minor Modes}).  When you are done, type @kbd{C-c C-c} to make
+the new tab stops take effect.  Normally, the new tab stop settings
+apply to all buffers.  However, if you have made the
+@code{tab-stop-list} variable local to the buffer where you called
+@kbd{M-x edit-tab-stops} (@pxref{Locals}), then the new tab stop
+settings apply only to that buffer.  To save the tab stop settings for
+future Emacs sessions, use the Customize interface to save the value
+of @code{tab-stop-list} (@pxref{Easy Customization}).
+
+  Note that the tab stops discussed in this section have nothing to do
+with how tab characters are displayed in the buffer.  Tab characters
+are always displayed as empty spaces extending to the next
+@dfn{display tab stop}.  @xref{Text Display}.
+
+@node Just Spaces
+@section Tabs vs. Spaces
 
-  Note that the tab stops that control @code{tab-to-tab-stop} have
-nothing to do with how tab characters are displayed in the buffer.
-Tab characters are always displayed as empty spaces extending to the
-next display tab stop, which occurs every @code{tab-width} columns
-regardless of the contents of @code{tab-stop-list}.  @xref{Text
+@vindex tab-width
+  Normally, indentation commands insert (or remove) an optimal mix of
+space characters and tab characters to align to the desired column.
+Tab characters are displayed as a stretch of empty space extending to
+the next @dfn{display tab stop}.  By default, there is one display tab
+stop every @code{tab-width} columns (the default is 8).  @xref{Text
 Display}.
 
-@node Just Spaces,, Tab Stops, Indentation
-@section Tabs vs. Spaces
-
 @vindex indent-tabs-mode
-  Emacs normally uses both tabs and spaces to indent lines.  If you
-prefer, all indentation can be made from spaces only.  To request
-this, set @code{indent-tabs-mode} to @code{nil}.  This is a per-buffer
-variable, so altering the variable affects only the current buffer,
-but there is a default value which you can change as well.
-@xref{Locals}.
-
-  A tab is not always displayed in the same way.  By default, tabs are
-eight columns wide, but some people like to customize their editors to
-use a different tab width (e.g., by changing the variable
-@code{tab-width} in Emacs).  By using spaces only, you can make sure
-that your file looks the same regardless of the tab width setting.
+  If you prefer, all indentation can be made from spaces only.  To
+request this, set the buffer-local variable @code{indent-tabs-mode} to
+@code{nil}.  @xref{Locals}, for information about setting buffer-local
+variables.  Note, however, that @kbd{C-q @key{TAB}} always inserts a
+tab character, regardless of the value of @code{indent-tabs-mode}.
+
+  One reason to set @code{indent-tabs-mode} to @code{nil} is that not
+all editors display tab characters in the same way.  Emacs users, too,
+may have different customized values of @code{tab-width}.  By using
+spaces only, you can make sure that your file always looks the same.
+If you only care about how it looks within Emacs, another way to
+tackle this problem is to set the @code{tab-width} variable in a
+file-local variable (@pxref{File Variables}).
 
 @findex tabify
 @findex untabify
   There are also commands to convert tabs to spaces or vice versa, always
-preserving the columns of all nonblank text.  @kbd{M-x tabify} scans the
+preserving the columns of all non-whitespace text.  @kbd{M-x tabify} scans the
 region for sequences of spaces, and converts sequences of at least two
 spaces to tabs if that can be done without changing indentation.  @kbd{M-x
 untabify} changes all tabs in the region to appropriate numbers of spaces.
+
+@node Indent Convenience
+@section Convenience Features for Indentation
+
+@vindex tab-always-indent
+  The variable @code{tab-always-indent} tweaks the behavior of the
+@key{TAB} (@code{indent-for-tab-command}) command.  The default value,
+@code{t}, gives the behavior described in @ref{Indentation}.  If you
+change the value to the symbol @code{complete}, then @key{TAB} first
+tries to indent the current line, and if the line was already
+indented, it tries to complete the text at point (@pxref{Symbol
+Completion}).  If the value is @code{nil}, then @key{TAB} indents the
+current line only if point is at the left margin or in the line's
+indentation; otherwise, it inserts a tab character.
+
+@cindex Electric Indent mode
+@cindex mode, Electric Indent
+@findex electric-indent-mode
+  Electric Indent mode is a global minor mode that automatically
+indents the line after every @key{RET} you type.  To toggle this minor
+mode, type @kbd{M-x electric-indent-mode}.
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index 5a786be62cf..4d574242c8d 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -3,11 +3,11 @@
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Modes, Indentation, International, Top
-@chapter Editing Modes
+@chapter Major and Minor Modes
 
-  Emacs contains many @dfn{editing modes}, each of which alters its
-basic behavior in useful ways.  These are divided into @dfn{major
-modes} and @dfn{minor modes}.
+  Emacs contains many @dfn{editing modes} that alter its basic
+behavior in useful ways.  These are divided into @dfn{major modes} and
+@dfn{minor modes}.
 
   Major modes provide specialized facilities for working on a
 particular file type, such as a C source file (@pxref{Programs}), or a
@@ -38,15 +38,8 @@ one another, and of the selected major mode.
 
   Every buffer possesses a major mode, which determines the editing
 behavior of Emacs while that buffer is current.  The mode line
-normally shows the name of the current major mode, in parentheses.
-@xref{Mode Line}.
-
-  Usually, the major mode is automatically set by Emacs, when you
-first visit a file or create a buffer.  @xref{Choosing Modes}.  You
-can explicitly select a new major mode by using an @kbd{M-x} command.
-Take the name of the mode and add @code{-mode} to get the name of the
-command to select that mode.  Thus, you can enter Lisp mode with
-@kbd{M-x lisp-mode}.
+normally shows the name of the current major mode, in parentheses
+(@pxref{Mode Line}).
 
   The least specialized major mode is called @dfn{Fundamental mode}.
 This mode has no mode-specific redefinitions or variable settings, so
@@ -55,73 +48,142 @@ user option variable is in its default state.
 
   For editing text of a specific type that Emacs knows about, such as
 Lisp code or English text, you typically use a more specialized major
-mode, such as Lisp mode or Text mode.  Such major modes change the
-meanings of some keys to become more specifically adapted to the
-language being edited.  The ones that are commonly changed are
-@key{TAB}, @key{DEL}, and @kbd{C-j}.  The prefix key @kbd{C-c}
-normally contains mode-specific commands.  In addition, the commands
-which handle comments use the mode to determine how comments are to be
-delimited.  Many major modes redefine the syntactical properties of
-characters appearing in the buffer.
-
-  The major modes fall into three major groups.  The first group
-contains modes for normal text, either plain or with mark-up.  It
-includes Text mode, HTML mode, SGML mode, @TeX{} mode and Outline
-mode.  The second group contains modes for specific programming
-languages.  These include Lisp mode (which has several variants), C
-mode, Fortran mode, and others.  The remaining major modes are not
-intended for use on users' files; they are used in buffers created for
-specific purposes by Emacs, such as Dired mode for buffers made by
-Dired (@pxref{Dired}), Message mode for buffers made by @kbd{C-x m}
-(@pxref{Sending Mail}), and Shell mode for buffers used for
-communicating with an inferior shell process (@pxref{Interactive
-Shell}).
-
-  Most programming-language major modes specify that only blank lines
-separate paragraphs.  This is to make the paragraph commands useful.
-(@xref{Paragraphs}.)  They also cause Auto Fill mode to use the
-definition of @key{TAB} to indent the new lines it creates.  This is
-because most lines in a program are usually indented
-(@pxref{Indentation}).
+mode, such as Lisp mode or Text mode.  Most major modes fall into
+three major groups.  The first group contains modes for normal text,
+either plain or with mark-up.  It includes Text mode, HTML mode, SGML
+mode, @TeX{} mode and Outline mode.  The second group contains modes
+for specific programming languages.  These include Lisp mode (which
+has several variants), C mode, Fortran mode, and others.  The third
+group consists of major modes that are not associated directly with
+files; they are used in buffers created for specific purposes by
+Emacs, such as Dired mode for buffers made by Dired (@pxref{Dired}),
+Message mode for buffers made by @kbd{C-x m} (@pxref{Sending Mail}),
+and Shell mode for buffers used to communicate with an inferior shell
+process (@pxref{Interactive Shell}).
+
+  Usually, the major mode is automatically set by Emacs, when you
+first visit a file or create a buffer (@pxref{Choosing Modes}).  You
+can explicitly select a new major mode by using an @kbd{M-x} command.
+Take the name of the mode and add @code{-mode} to get the name of the
+command to select that mode.  Thus, you can enter Lisp mode with
+@kbd{M-x lisp-mode}.
+
+@vindex major-mode
+  The value of the buffer-local variable @code{major-mode} is a symbol
+with the same name as the major mode command (e.g. @code{lisp-mode}).
+This variable is set automatically; you should not change it yourself.
+
+  The default value of @code{major-mode} determines the major mode to
+use for files that do not specify a major mode, and for new buffers
+created with @kbd{C-x b}.  Normally, this default value is the symbol
+@code{fundamental-mode}, which specifies Fundamental mode.  You can
+change this default value via the Customization interface (@pxref{Easy
+Customization}), or by adding a line like this to your init file
+(@pxref{Init File}):
+
+@smallexample
+(setq-default major-mode 'text-mode)
+@end smallexample
+
+@noindent
+If the default value of @code{major-mode} is @code{nil}, the major
+mode is taken from the previously current buffer.
+
+  Specialized major modes often change the meanings of certain keys to
+do something more suitable for the mode.  For instance, programming
+language modes bind @key{TAB} to indent the current line according to
+the rules of the language (@pxref{Indentation}).  The keys that are
+commonly changed are @key{TAB}, @key{DEL}, and @kbd{C-j}.  Many modes
+also define special commands of their own, usually bound in the prefix
+key @kbd{C-c}.  Major modes can also alter user options and variables;
+for instance, programming language modes typicaly set a buffer-local
+value for the variable @code{comment-start}, which determines how
+source code comments are delimited (@pxref{Comments}).
+
+@findex describe-mode
+@kindex C-h m
+  To view the documentation for the current major mode, including a
+list of its key bindings, type @code{C-h m} (@code{describe-mode}).
+
+@cindex mode hook
+@vindex text-mode-hook
+@vindex prog-mode-hook
+  Every major mode, apart from Fundamental mode, defines a @dfn{mode
+hook}, a customizable list of Lisp functions to run each time the mode
+is enabled in a buffer.  @xref{Hooks}, for more information about
+hooks.  Each mode hook is named after its major mode, e.g. Fortran
+mode has @code{fortran-mode-hook}.  Furthermore, all text-based major
+modes run @code{text-mode-hook}, and all programming language modes
+run @code{prog-mode-hook}, prior to running their own mode hooks.
+Hook functions can look at the value of the variable @code{major-mode}
+to see which mode is actually being entered.
+
+  Mode hooks are commonly used to enable minor modes (@pxref{Minor
+Modes}).  For example, you can put the following lines in your init
+file to enable Flyspell minor mode in all text-based major modes
+(@pxref{Spelling}), and Eldoc minor mode in Emacs Lisp mode
+(@pxref{Lisp Doc}):
+
+@example
+(add-hook 'text-mode-hook 'flyspell-mode)
+(add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
+@end example
 
 @node Minor Modes
 @section Minor Modes
 @cindex minor modes
 @cindex mode, minor
 
-  A minor mode is an optional editing modes that alters the behavior
-of Emacs in some well-defined way.  Unlike major modes, any number of
+  A minor mode is an optional editing mode that alters the behavior of
+Emacs in some well-defined way.  Unlike major modes, any number of
 minor modes can be in effect at any time.  Some minor modes are
-@dfn{buffer-local}: they apply only to the current buffer, so you can
-enable the mode in certain buffers and not others.  Other minor modes
-are @dfn{global}: while enabled, they affect everything you do in the
-Emacs session, in all buffers.  Some global minor modes are enabled by
-default.
-
-  Most minor modes say in the mode line when they are enabled, just
-after the major mode indicator.  For example, @samp{Fill} in the mode
-line means that Auto Fill mode is enabled.  @xref{Mode Line}.
-
-  Each minor mode is associated with a command, called the @dfn{mode
-command}, which turns it on or off.  The name of this command consists
-of the name of the minor mode, followed by @samp{-mode}; for instance,
-the mode command for Auto Fill mode is @code{auto-fill-mode}.  Calling
-the minor mode command with no prefix argument @dfn{toggles} the mode,
-turning it on if it was off, and off if it was on.  A positive
-argument always turns the mode on, and a zero or negative argument
-always turns it off.  Mode commands are usually invoked with
-@kbd{M-x}, but you can bind keys to them if you wish (@pxref{Key
-Bindings}).
+@dfn{buffer-local}, and can be turned on (enabled) in certain buffers
+and off (disabled) in others.  Other minor modes are @dfn{global}:
+while enabled, they affect everything you do in the Emacs session, in
+all buffers.  Most minor modes are disabled by default, but a few are
+enabled by default.
+
+  Most buffer-local minor modes say in the mode line when they are
+enabled, just after the major mode indicator.  For example,
+@samp{Fill} in the mode line means that Auto Fill mode is enabled.
+@xref{Mode Line}.
+
+@cindex mode commands for minor modes
+  Like major modes, each minor mode is associated with a @dfn{mode
+command}, whose name consists of the mode name followed by
+@samp{-mode}.  For instance, the mode command for Auto Fill mode is
+@code{auto-fill-mode}.  But unlike a major mode command, which simply
+enables the mode, the mode command for a minor mode can either enable
+or disable it:
+
+@itemize
+@item
+If you invoke the mode command directly with no prefix argument
+(either via @kbd{M-x}, or by binding it to a key and typing that key;
+@pxref{Key Bindings}), that @dfn{toggles} the minor mode.  The minor
+mode is turned on if it was off, and turned off if it was on.
+
+@item
+If you invoke the mode command with a prefix argument, the minor mode
+is unconditionally turned off if that argument is zero or negative;
+otherwise, it is unconditionally turned on.
+
+@item
+If the mode command is called via Lisp, the minor mode is
+unconditionally turned on if the argument is omitted or @code{nil}.
+This makes it easy to turn on a minor mode from a major mode's mode
+hook (@pxref{Major Modes}).  A non-@code{nil} argument is handled like
+an interactive prefix argument, as described above.
+@end itemize
 
   Most minor modes also have a @dfn{mode variable}, with the same name
 as the mode command.  Its value is non-@code{nil} if the mode is
-enabled, and @code{nil} if it is disabled.  In some minor modes---but
-not all---the value of the variable alone determines whether the mode
-is active: the mode command works simply by setting the variable, and
-changing the value of the variable has the same effect as calling the
-mode command.  Because not all minor modes work this way, we recommend
-that you avoid changing the mode variables directly; use the mode
-commands instead.
+enabled, and @code{nil} if it is disabled.  In general, you should not
+try to enable or disable the mode by changing the value of the mode
+variable directly in Lisp; you should run the mode command instead.
+However, setting the mode variable through the Customize interface
+(@pxref{Easy Customization}) will always properly enable or disable
+the mode, since Customize automatically runs the mode command for you.
 
   The following is a list of some buffer-local minor modes:
 
@@ -140,7 +202,7 @@ amount of work you can lose in case of a crash.  @xref{Auto Save}.
 
 @item
 Enriched mode enables editing and saving of formatted text.
-@xref{Formatted Text}.
+@xref{Enriched Text}.
 
 @item
 Flyspell mode automatically highlights misspelled words.
@@ -189,11 +251,8 @@ Visual Line mode performs ``word wrapping'', causing long lines to be
 wrapped at word boundaries.  @xref{Visual Line Mode}.
 @end itemize
 
-  Here are some useful global minor modes.  Since Line Number mode and
-Transient Mark mode can be enabled or disabled just by setting the
-value of the minor mode variable, you @emph{can} set them differently
-for particular buffers, by explicitly making the corresponding
-variable local in those buffers.  @xref{Locals}.
+@noindent
+And here are some useful global minor modes:
 
 @itemize @bullet
 @item
@@ -261,22 +320,27 @@ text may appear on the line as well.  For example,
 
 @noindent
 tells Emacs to use Lisp mode.  Note how the semicolon is used to make
-Lisp treat this line as a comment.  Alternatively, you could write
+Lisp treat this line as a comment.  You could equivalently write
 
 @example
 ; -*- mode: Lisp;-*-
 @end example
 
 @noindent
-The latter format allows you to specify local variables as well, like
-this:
+You can also use file-local variables to specify buffer-local minor
+modes, by using @code{eval} specifications.  For example, this first
+nonblank line puts the buffer in Lisp mode and enables Auto-Fill mode:
 
 @example
-; -*- mode: Lisp; tab-width: 4; -*-
+; -*- mode: Lisp; eval: (auto-fill-mode 1); -*-
 @end example
 
-  If a file variable specifies a buffer-local minor mode, Emacs
-enables that minor mode in the buffer.
+@noindent
+Note, however, that it is usually inappropriate to enable minor modes
+this way, since most minor modes represent individual user
+preferences.  If you personally want to use a minor mode for a
+particular file type, it is better to enable the minor mode via a
+major mode hook (@pxref{Major Modes}).
 
 @vindex interpreter-mode-alist
   Second, if there is no file variable specifying a major mode, Emacs
@@ -310,9 +374,9 @@ elements of the form
 
 @noindent
 where @var{regexp} is a regular expression (@pxref{Regexps}), and
-@var{mode-function} is a Lisp function that toggles a major mode.  If
-the text at the beginning of the file matches @var{regexp}, Emacs
-chooses the major mode specified by @var{mode-function}.
+@var{mode-function} is a major mode command.  If the text at the
+beginning of the file matches @var{regexp}, Emacs chooses the major
+mode specified by @var{mode-function}.
 
 Alternatively, an element of @code{magic-mode-alist} may have the form
 
@@ -323,7 +387,7 @@ Alternatively, an element of @code{magic-mode-alist} may have the form
 @noindent
 where @var{match-function} is a Lisp function that is called at the
 beginning of the buffer; if the function returns non-@code{nil}, Emacs
-set the major mode wit @var{mode-function}.
+set the major mode with @var{mode-function}.
 
   Fourth---if Emacs still hasn't found a suitable major mode---it
 looks at the file's name.  The correspondence between file names and
@@ -370,29 +434,6 @@ only after @code{auto-mode-alist}.  By default,
 @code{magic-fallback-mode-alist} contains forms that check for image
 files, HTML/XML/SGML files, and PostScript files.
 
-@vindex major-mode
-  Once a major mode is chosen, Emacs sets the value of the variable
-@code{major-mode} to the symbol for that major mode (e.g.,
-@code{text-mode} for Text mode).  This is a per-buffer variable
-(@pxref{Locals}); its buffer-local value is set automatically, and you
-should not change it yourself.
-
-  The default value of @code{major-mode} determines the major mode to
-use for files that do not specify a major mode, and for new buffers
-created with @kbd{C-x b}.  Normally, this default value is the symbol
-@code{fundamental-mode}, which specifies Fundamental mode.  You can
-change it via the Customization interface (@pxref{Easy
-Customization}), or by adding a line like this to your init file
-(@pxref{Init File}):
-
-@smallexample
-(setq-default major-mode 'text-mode)
-@end smallexample
-
-@noindent
-If the default value of @code{major-mode} is @code{nil}, the major
-mode is taken from the previously current buffer.
-
 @findex normal-mode
   If you have changed the major mode of a buffer, you can return to
 the major mode Emacs would have chosen automatically, by typing
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 2357902341e..675977c2c35 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -397,7 +397,7 @@ the syntax and conventions for its particular language.
 
   Use @kbd{C-q @key{TAB}} to insert a tab character at point.
 
-@kindex C-j
+@kindex C-j @r{(indenting source code)}
 @findex newline-and-indent
   When entering lines of new code, use @kbd{C-j}
 (@code{newline-and-indent}), which inserts a newline and then adjusts
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 71c23655608..0df4a3a7bb5 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -571,6 +571,22 @@ the file name to use, or more generally it may be any Lisp expression
 that returns a file name as a string.  @code{rmail-output-file-alist}
 applies to both @kbd{o} and @kbd{C-o}.
 
+@vindex rmail-automatic-folder-directives
+Rmail can automatically save messages from your primary Rmail file
+(the one that @code{rmail-file-name} specifies) to other files, based
+on the value of the variable @code{rmail-automatic-folder-directives}.
+This variable is a list of elements (@samp{directives}) that say which
+messages to save where.  Each directive is a list consisting of an
+output file, followed by one or more pairs of a header name and a regular
+expression.  If a message has a header matching the specified regular
+expression, that message is saved to the given file.  If the directive
+has more than one header entry, all must match.  Rmail checks directives
+when it shows a message from the file @code{rmail-file-name}, and
+applies the first that matches (if any).  If the output file is
+@code{nil}, the message is deleted, not saved.  For example, you can use
+this feature to save messages from a particular address, or with a
+particular subject, to a dedicated file.
+
 @node Rmail Labels
 @section Labels
 @cindex label (Rmail)
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 562ce92d427..8f353961afb 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -32,10 +32,9 @@ structure.
 @findex nxml-mode
   Emacs has other major modes for text which contains ``embedded''
 commands, such as @TeX{} and La@TeX{} (@pxref{TeX Mode}); HTML and
-SGML (@pxref{HTML Mode}); XML (@pxref{Top, nXML Mode,,nxml-mode, nXML
-Mode}); and Groff and Nroff (@pxref{Nroff Mode}).  In addition, you
-can edit formatted text in WYSIWYG style (``what you see is what you
-get''), using Enriched mode (@pxref{Formatted Text}).
+SGML (@pxref{HTML Mode}); XML (@pxref{Top,The nXML Mode
+Manual,,nxml-mode, nXML Mode}); and Groff and Nroff (@pxref{Nroff
+Mode}).
 
 @cindex ASCII art
   If you need to edit pictures made out of text characters (commonly
@@ -48,13 +47,14 @@ for editing such pictures.
 @xref{Picture Mode}.
 @end ifnottex
 
-
+@ifinfo
 @cindex skeletons
 @cindex templates
 @cindex autotyping
 @cindex automatic typing
   The ``automatic typing'' features may be useful when writing text.
-@inforef{Top,, autotype}.
+@inforef{Top,The Autotype Manual,autotype}.
+@end ifinfo
 
 @menu
 * Words::               Moving over and killing words.
@@ -68,8 +68,8 @@ for editing such pictures.
 * TeX Mode::            Editing input to the formatter TeX.
 * HTML Mode::           Editing HTML and SGML files.
 * Nroff Mode::          Editing input to the formatter nroff.
-* Formatted Text::      Editing formatted text directly in WYSIWYG fashion.
-* Text Based Tables::   Editing text-based tables in WYSIWYG fashion.
+* Enriched Text::       Editing text ``enriched'' with fonts, colors, etc.
+* Text Based Tables::   Commands for editing text-based tables.
 * Two-Column::          Splitting text columns into separate windows.
 @end menu
 
@@ -78,8 +78,8 @@ for editing such pictures.
 @cindex words
 @cindex Meta commands and words
 
-  Emacs has commands for moving over or operating on words.  By convention,
-the keys for them are all Meta characters.
+  Emacs defines several commands for moving over or operating on
+words:
 
 @table @kbd
 @item M-f
@@ -157,13 +157,17 @@ the syntax table.  Any character can, for example, be declared to be a
 word delimiter.  @xref{Syntax Tables,, Syntax Tables, elisp, The Emacs
 Lisp Reference Manual}.
 
+  In addition, see @ref{Position Info} for the @kbd{M-=}
+(@code{count-words-region}) and @kbd{M-x count-words} commands, which
+count and report the number of words in the region or buffer.
+
 @node Sentences
 @section Sentences
 @cindex sentences
 @cindex manipulating sentences
 
-  The Emacs commands for manipulating sentences and paragraphs are mostly
-on Meta keys, so as to be like the word-handling commands.
+  The Emacs commands for manipulating sentences and paragraphs are
+mostly on Meta keys, like the word-handling commands.
 
 @table @kbd
 @item M-a
@@ -180,12 +184,12 @@ Kill back to the beginning of the sentence (@code{backward-kill-sentence}).
 @kindex M-e
 @findex backward-sentence
 @findex forward-sentence
-  The commands @kbd{M-a} and @kbd{M-e} (@code{backward-sentence} and
-@code{forward-sentence}) move to the beginning and end of the current
-sentence, respectively.  They were chosen to resemble @kbd{C-a} and
-@kbd{C-e}, which move to the beginning and end of a line.  Unlike
-them, @kbd{M-a} and @kbd{M-e} move over successive sentences if
-repeated.
+  The commands @kbd{M-a} (@code{backward-sentence}) and @kbd{M-e}
+(@code{forward-sentence}) move to the beginning and end of the current
+sentence, respectively.  Their bindings were chosen to resemble
+@kbd{C-a} and @kbd{C-e}, which move to the beginning and end of a
+line.  Unlike them, @kbd{M-a} and @kbd{M-e} move over successive
+sentences if repeated.
 
   Moving backward over a sentence places point just before the first
 character of the sentence; moving forward places point right after the
@@ -207,15 +211,14 @@ it kills back to the beginning of the @var{n}th preceding sentence.
 to the beginning of a sentence.
 
   The sentence commands assume that you follow the American typist's
-convention of putting two spaces at the end of a sentence; they consider
-a sentence to end wherever there is a @samp{.}, @samp{?} or @samp{!}
+convention of putting two spaces at the end of a sentence.  That is, a
+sentence ends wherever there is a @samp{.}, @samp{?} or @samp{!}
 followed by the end of a line or two spaces, with any number of
-@samp{)}, @samp{]}, @samp{'}, or @samp{"} characters allowed in between.
-A sentence also begins or ends wherever a paragraph begins or ends.
-It is useful to follow this convention, because it makes a distinction
-between periods that end a sentence and periods that indicate
-abbreviations; that enables the Emacs sentence commands to distinguish,
-too.  These commands do not stop for periods that indicate abbreviations.
+@samp{)}, @samp{]}, @samp{'}, or @samp{"} characters allowed in
+between.  A sentence also begins or ends wherever a paragraph begins
+or ends.  It is useful to follow this convention, because it allows
+the Emacs sentence commands to distinguish between periods that end a
+sentence and periods that indicate abbreviations.
 
 @vindex sentence-end-double-space
   If you want to use just one space between sentences, you can set the
@@ -225,7 +228,7 @@ drawback: there is no way to distinguish between periods that end
 sentences and those that indicate abbreviations.  For convenient and
 reliable editing, we therefore recommend you follow the two-space
 convention.  The variable @code{sentence-end-double-space} also
-affects filling (@pxref{Fill Commands}) in related ways.
+affects filling (@pxref{Fill Commands}).
 
 @vindex sentence-end
   The variable @code{sentence-end} controls how to recognize the end
@@ -237,19 +240,14 @@ Emacs computes sentence ends according to various criteria such as the
 value of @code{sentence-end-double-space}.
 
 @vindex sentence-end-without-period
-  Some languages do not use periods to indicate the end of a sentence.
-For example, sentences in Thai end with a double space but without a
-period.  Set the variable @code{sentence-end-without-period} to
+  Some languages, such as Thai, do not use periods to indicate the end
+of a sentence.  Set the variable @code{sentence-end-without-period} to
 @code{t} in such cases.
 
 @node Paragraphs
 @section Paragraphs
 @cindex paragraphs
 @cindex manipulating paragraphs
-@kindex M-@{
-@kindex M-@}
-@findex backward-paragraph
-@findex forward-paragraph
 
   The Emacs commands for manipulating paragraphs are also on Meta keys.
 
@@ -262,23 +260,15 @@ Move forward to next paragraph end (@code{forward-paragraph}).
 Put point and mark around this or next paragraph (@code{mark-paragraph}).
 @end table
 
-  @kbd{M-@{} moves to the beginning of the current or previous
-paragraph, while @kbd{M-@}} moves to the end of the current or next
-paragraph.  Blank lines and text-formatter command lines separate
-paragraphs and are not considered part of any paragraph.  If there is
-a blank line before the paragraph, @kbd{M-@{} moves to the blank line,
-because that is convenient in practice.
-
-  In Text mode, an indented line is not a paragraph break.  If you
-want indented lines to have this effect, use Paragraph-Indent Text
-mode instead.  @xref{Text Mode}.
-
-  In major modes for programs, paragraphs begin and end only at blank
-lines.  This makes the paragraph commands useful, even though there
-are no paragraphs as such in a program.
-
-  When you have set a fill prefix, then paragraphs are delimited by
-all lines which don't start with the fill prefix.  @xref{Filling}.
+@kindex M-@{
+@kindex M-@}
+@findex backward-paragraph
+@findex forward-paragraph
+  @kbd{M-@{} (@code{backward-paragraph}) moves to the beginning of the
+current or previous paragraph (see below for the definition of a
+paragraph).  @kbd{M-@}} (@code{forward-paragraph}) moves to the end of
+the current or next paragraph.  If there is a blank line before the
+paragraph, @kbd{M-@{} moves to the blank line.
 
 @kindex M-h
 @findex mark-paragraph
@@ -287,46 +277,57 @@ all lines which don't start with the fill prefix.  @xref{Filling}.
 @kbd{M-h C-w} kills the paragraph around or after point.  @kbd{M-h}
 puts point at the beginning and mark at the end of the paragraph point
 was in.  If point is between paragraphs (in a run of blank lines, or
-at a boundary), the paragraph following point is surrounded by point
-and mark.  If there are blank lines preceding the first line of the
-paragraph, one of these blank lines is included in the region.  If the
-region is already active, the command sets the mark without changing
-point; furthermore, each subsequent @kbd{M-h} further advances the
+at a boundary), @kbd{M-h} sets the region around the paragraph
+following point.  If there are blank lines preceding the first line of
+the paragraph, one of these blank lines is included in the region.  If
+the region is already active, the command sets the mark without
+changing point, and each subsequent @kbd{M-h} further advances the
 mark by one paragraph.
 
+  The definition of a paragraph depends on the major mode.  In
+Fundamental mode, as well as Text mode and related modes, a paragraph
+is separated each neighboring paragraph another by one or more
+@dfn{blank lines}---lines that are either empty, or consist solely of
+space, tab and/or formfeed characters.  In programming language modes,
+paragraphs are usually defined in a similar way, so that you can use
+the paragraph commands even though there are no paragraphs as such in
+a program.
+
+  Note that an indented line is @emph{not} itself a paragraph break in
+Text mode.  If you want indented lines to separate paragraphs, use
+Paragraph-Indent Text mode instead.  @xref{Text Mode}.
+
+  If you set a fill prefix, then paragraphs are delimited by all lines
+which don't start with the fill prefix.  @xref{Filling}.
+
 @vindex paragraph-start
 @vindex paragraph-separate
   The precise definition of a paragraph boundary is controlled by the
 variables @code{paragraph-separate} and @code{paragraph-start}.  The
-value of @code{paragraph-start} is a regexp that should match any line
-that either starts or separates paragraphs.  The value of
-@code{paragraph-separate} is another regexp that should match only lines
-that separate paragraphs without being part of any paragraph (for
-example, blank lines).  Lines that start a new paragraph and are
-contained in it must match only @code{paragraph-start}, not
-@code{paragraph-separate}.  Each regular expression must match at the
-left margin.  For example, in Fundamental mode, @code{paragraph-start}
-is @w{@code{"\f\\|[ \t]*$"}}, and @code{paragraph-separate} is
-@w{@code{"[ \t\f]*$"}}.
-
-  Normally it is desirable for page boundaries to separate paragraphs.
-The default values of these variables recognize the usual separator for
-pages.
+value of @code{paragraph-start} is a regular expression that should
+match lines that either start or separate paragraphs
+(@pxref{Regexps}).  The value of @code{paragraph-separate} is another
+regular expression that should match lines that separate paragraphs
+without being part of any paragraph (for example, blank lines).  Lines
+that start a new paragraph and are contained in it must match only
+@code{paragraph-start}, not @code{paragraph-separate}.  For example,
+in Fundamental mode, @code{paragraph-start} is @w{@code{"\f\\|[
+\t]*$"}}, and @code{paragraph-separate} is @w{@code{"[ \t\f]*$"}}.
 
 @node Pages
 @section Pages
 
 @cindex pages
 @cindex formfeed character
-  Within some text files, text is divided into @dfn{pages}, which are
-delimited by the @dfn{formfeed character} (@acronym{ASCII} code 12,
-sometimes denoted as @key{control-L}).  When you print hardcopy for a
-file, the formfeed character forces a page break: each page of the
-file goes on a separate page on paper.  Most Emacs commands treat the
-formfeed character just like any other character: you can insert it
-with @kbd{C-q C-l}, and delete it with @key{DEL}.  However, since
-pages are often meaningful divisions of the file, Emacs provides
-commands to move over them and operate on them.
+  Within some text files, text is divided into @dfn{pages} delimited
+by the @dfn{formfeed character} (@acronym{ASCII} code 12, also denoted
+as @key{control-L}), which is displayed in Emacs as the escape
+sequence @samp{^L} (@pxref{Text Display}).  Traditionally, when such
+text files are printed to hardcopy, each formfeed character forces a
+page break.  Most Emacs commands treat it just like any other
+character, so you can insert it with @kbd{C-q C-l}, delete it with
+@key{DEL}, etc.  In addition, Emacs provides commands to move over
+pages and operate on them.
 
 @table @kbd
 @item M-x what-page
@@ -358,9 +359,9 @@ command moves forward past the next page delimiter.
 @kindex C-x C-p
 @findex mark-page
   The @kbd{C-x C-p} command (@code{mark-page}) puts point at the
-beginning of the current page and the mark at the end.  The page
-delimiter at the end is included (the mark follows it).  The page
-delimiter at the front is excluded (point follows it).
+beginning of the current page (after that page delimiter at the
+front), and the mark at the end of the page (after the page delimiter
+at the end).
 
   @kbd{C-x C-p C-w} is a handy way to kill a page to move it
 elsewhere.  If you move to another page delimiter with @kbd{C-x [} and
@@ -402,9 +403,7 @@ beginning of a line.
 specified width.  Emacs does filling in two ways.  In Auto Fill mode,
 inserting text with self-inserting characters also automatically fills
 it.  There are also explicit fill commands that you can use when editing
-text leaves it unfilled.  When you edit formatted text, you can specify
-a style of filling for each portion of the text (@pxref{Formatted
-Text}).
+text leaves it unfilled.
 
 @menu
 * Auto Fill::      Auto Fill mode breaks long lines automatically.
@@ -418,9 +417,9 @@ Text}).
 @cindex Auto Fill mode
 @cindex mode, Auto Fill
 
-  @dfn{Auto Fill} mode is a minor mode in which lines are broken
-automatically when they become too wide.  Breaking happens only when
-you type a @key{SPC} or @key{RET}.
+  @dfn{Auto Fill} mode is a buffer-local minor mode (@pxref{Minor
+Modes}) in which lines are broken automatically when they become too
+wide.  Breaking happens only when you type a @key{SPC} or @key{RET}.
 
 @table @kbd
 @item M-x auto-fill-mode
@@ -431,45 +430,43 @@ In Auto Fill mode, break lines when appropriate.
 @end table
 
 @findex auto-fill-mode
-  @kbd{M-x auto-fill-mode} turns Auto Fill mode on if it was off, or off
-if it was on.  With a positive numeric argument it always turns Auto
-Fill mode on, and with a negative argument always turns it off.  You can
-see when Auto Fill mode is in effect by the presence of the word
-@samp{Fill} in the mode line, inside the parentheses.  Auto Fill mode is
-a minor mode which is enabled or disabled for each buffer individually.
-@xref{Minor Modes}.
-
-  In Auto Fill mode, lines are broken automatically at spaces when they
-get longer than the desired width.  Line breaking and rearrangement
-takes place only when you type @key{SPC} or @key{RET}.  If you wish to
-insert a space or newline without permitting line-breaking, type
-@kbd{C-q @key{SPC}} or @kbd{C-q C-j} (recall that a newline is really a
-control-J).  Also, @kbd{C-o} inserts a newline without line breaking.
-
-  Auto Fill mode works well with programming-language modes, because it
-indents new lines with @key{TAB}.  If a line ending in a comment gets
-too long, the text of the comment is split into two comment lines.
-Optionally, new comment delimiters are inserted at the end of the first
-line and the beginning of the second so that each line is a separate
-comment; the variable @code{comment-multi-line} controls the choice
-(@pxref{Comments}).
-
-  Adaptive filling (@pxref{Adaptive Fill}) works for Auto Filling as
-well as for explicit fill commands.  It takes a fill prefix
-automatically from the second or first line of a paragraph.
-
-  Auto Fill mode does not refill entire paragraphs; it can break lines but
-cannot merge lines.  So editing in the middle of a paragraph can result in
-a paragraph that is not correctly filled.  The easiest way to make the
-paragraph properly filled again is usually with the explicit fill commands.
+  The mode command @kbd{M-x auto-fill-mode} toggles Auto Fill mode in
+the current buffer.  With a positive numeric argument, it enables Auto
+Fill mode, and with a negative argument it disables it.  If
+@code{auto-fill-mode} is called from Lisp with an omitted or
+@code{nil} argument, it enables Auto Fill mode.  To enable Auto Fill
+mode automatically in certain major modes, add @code{auto-fill-mode}
+to the mode hooks (@pxref{Major Modes}).  When Auto Fill mode is
+enabled, the mode indicator @samp{Fill} appears in the mode line
+(@pxref{Mode Line}).
+
+  Auto Fill mode breaks lines automatically at spaces whenever they
+get longer than the desired width.  This line breaking occurs only
+when you type @key{SPC} or @key{RET}.  If you wish to insert a space
+or newline without permitting line-breaking, type @kbd{C-q @key{SPC}}
+or @kbd{C-q C-j} respectively.  Also, @kbd{C-o} inserts a newline
+without line breaking.
+
+  When Auto Fill mode breaks a line, it tries to obey the
+@dfn{adaptive fill prefix}: if a fill prefix can be deduced from the
+first and/or second line of the current paragraph, it is inserted into
+the new line (@pxref{Adaptive Fill}).  Otherwise the new line is
+indented, as though you had typed @key{TAB} on it
+(@pxref{Indentation}).  In a programming language mode, if a line is
+broken in the middle of a comment, the comment is split by inserting
+new comment delimiters as appropriate.
+
+  Auto Fill mode does not refill entire paragraphs; it breaks lines
+but does not merge lines.  Therefore, editing in the middle of a
+paragraph can result in a paragraph that is not correctly filled.  To
+fill it, call the explicit fill commands
+@iftex
+described in the next section.
+@end iftex
 @ifnottex
-@xref{Fill Commands}.
+(@pxref{Fill Commands}).
 @end ifnottex
 
-  Many users like Auto Fill mode and want to use it in all text files.
-The section on init files says how to arrange this permanently for yourself.
-@xref{Init File}.
-
 @node Fill Commands
 @subsection Explicit Fill Commands
 
@@ -488,21 +485,23 @@ Center a line.
 
 @kindex M-q
 @findex fill-paragraph
-  To refill a paragraph, use the command @kbd{M-q}
-(@code{fill-paragraph}).  This operates on the paragraph that point is
-inside, or the one after point if point is between paragraphs.
-Refilling works by removing all the line-breaks, then inserting new
-ones where necessary.  When there is an active region, this command
-operates on the text within the region like @code{fill-region}.
+  The command @kbd{M-q} (@code{fill-paragraph}) @dfn{fills} the
+current paragraph.  It redistributes the line breaks within the
+paragraph, and deletes any excess space and tab characters occurring
+within the paragraph, in such a way that the lines end up fitting
+within a certain maximum width.
 
 @findex fill-region
-  To refill many paragraphs, use @kbd{M-x fill-region}, which
-finds the paragraphs in the region and fills each of them.
+  Normally, @kbd{M-q} acts on the paragraph where point is, but if
+point is between paragraphs, it acts on the paragraph after point.  If
+the region is active, it acts instead on the text in the region.  You
+can also call @kbd{M-x fill-region} to specifically fill the text in
+the region.
 
 @findex fill-region-as-paragraph
-  @kbd{M-q} and @code{fill-region} use the same criteria as @kbd{M-h}
-for finding paragraph boundaries (@pxref{Paragraphs}).  For more
-control, you can use @kbd{M-x fill-region-as-paragraph}, which refills
+  @kbd{M-q} and @code{fill-region} use the usual Emacs criteria for
+finding paragraph boundaries (@pxref{Paragraphs}).  For more control,
+you can use @kbd{M-x fill-region-as-paragraph}, which refills
 everything between point and mark as a single paragraph.  This command
 deletes any blank lines within the region, so separate blocks of text
 end up combined into one block.
@@ -512,9 +511,18 @@ end up combined into one block.
 as well as filling it.  This means that extra spaces are inserted to
 make the right margin line up exactly at the fill column.  To remove
 the extra spaces, use @kbd{M-q} with no argument.  (Likewise for
-@code{fill-region}.)  Another way to control justification, and choose
-other styles of filling, is with the @code{justification} text
-property; see @ref{Format Justification}.
+@code{fill-region}.)
+
+@vindex fill-column
+@kindex C-x f
+@findex set-fill-column
+  The maximum line width for filling is specified by the buffer-local
+variable @code{fill-column}.  The default value (@pxref{Locals}) is
+70.  The easiest way to set @code{fill-column} in the current buffer
+is to use the command @kbd{C-x f} (@code{set-fill-column}).  With a
+numeric argument, it uses that as the new fill column.  With just
+@kbd{C-u} as argument, it sets @code{fill-column} to the current
+horizontal position of point.
 
 @kindex M-o M-s @r{(Text mode)}
 @cindex centering
@@ -525,40 +533,27 @@ within the current fill column.  With an argument @var{n}, it centers
 made by Text mode and is available only in that and related modes
 (@pxref{Text Mode}).
 
-@vindex fill-column
-@kindex C-x f
-@findex set-fill-column
-  The maximum line width for filling is in the variable
-@code{fill-column}.  Altering the value of @code{fill-column} makes it
-local to the current buffer; until that time, the default value is in
-effect.  The default is initially 70.  @xref{Locals}.  The easiest way
-to set @code{fill-column} is to use the command @kbd{C-x f}
-(@code{set-fill-column}).  With a numeric argument, it uses that as the
-new fill column.  With just @kbd{C-u} as argument, it sets
-@code{fill-column} to the current horizontal position of point.
-
-  Emacs commands normally consider a period followed by two spaces or by
-a newline as the end of a sentence; a period followed by just one space
-indicates an abbreviation and not the end of a sentence.  To preserve
-the distinction between these two ways of using a period, the fill
-commands do not break a line after a period followed by just one space.
-
-  If the variable @code{sentence-end-double-space} is @code{nil}, the
-fill commands expect and leave just one space at the end of a sentence.
-Ordinarily this variable is @code{t}, so the fill commands insist on
-two spaces for the end of a sentence, as explained above.  @xref{Sentences}.
+  By default, Emacs considers a period followed by two spaces or by a
+newline as the end of a sentence; a period followed by just one space
+indicates an abbreviation, not the end of a sentence.  Accordingly,
+the fill commands will not break a line after a period followed by
+just one space.  If you change the variable
+@code{sentence-end-double-space} to a non-@code{nil} value, the fill
+commands will break a line after a period followed by one space, and
+put just one space after each period.  @xref{Sentences}, for other
+effects and possible drawbacks of this.
 
 @vindex colon-double-space
   If the variable @code{colon-double-space} is non-@code{nil}, the
 fill commands put two spaces after a colon.
 
 @vindex fill-nobreak-predicate
-  The variable @code{fill-nobreak-predicate} is a hook (an abnormal
-hook, @pxref{Hooks}) specifying additional conditions where
-line-breaking is not allowed.  Each function is called with no
-arguments, with point at a place where Emacs is considering breaking
-the line.  If a function returns a non-@code{nil} value, then that's
-a bad place to break the line.  Two standard functions you can use are
+  To specify additional conditions where line-breaking is not allowed,
+customize the abnormal hook variable @code{fill-nobreak-predicate}
+(@pxref{Hooks}).  Each function in this hook is called with no
+arguments, with point positioned where Emacs is considering breaking a
+line.  If a function returns a non-@code{nil} value, Emacs will not
+break the line there.  Two functions you can use are
 @code{fill-single-word-nobreak-p} (don't break after the first word of
 a sentence or before the last) and @code{fill-french-nobreak-p} (don't
 break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}).
@@ -567,12 +562,11 @@ break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}).
 @subsection The Fill Prefix
 
 @cindex fill prefix
-  To fill a paragraph in which each line starts with a special marker
-(which might be a few spaces, giving an indented paragraph), you can use
-the @dfn{fill prefix} feature.  The fill prefix is a string that Emacs
-expects every line to start with, and which is not included in filling.
-You can specify a fill prefix explicitly; Emacs can also deduce the
-fill prefix automatically (@pxref{Adaptive Fill}).
+  The @dfn{fill prefix} feature allows paragraphs to be filled so that
+each line starts with a special string of characters (such as a
+sequence of spaces, giving an indented paragraph).  You can specify a
+fill prefix explicitly; otherwise, Emacs tries to deduce one
+automatically (@pxref{Adaptive Fill}).
 
 @table @kbd
 @item C-x .
@@ -596,15 +590,15 @@ after the @kbd{C-x}.)  To turn off the fill prefix, specify an empty
 prefix: type @w{@kbd{C-x .}}@: with point at the beginning of a line.
 
   When a fill prefix is in effect, the fill commands remove the fill
-prefix from each line of the paragraph before filling and insert it on
-each line after filling.  (The beginning of the first line of the
+prefix from each line of the paragraph before filling, and insert it
+on each line after filling.  (The beginning of the first line of the
 paragraph is left unchanged, since often that is intentionally
 different.)  Auto Fill mode also inserts the fill prefix automatically
-when it makes a new line.  The @kbd{C-o} command inserts the fill
-prefix on new lines it creates, when you use it at the beginning of a
-line (@pxref{Blank Lines}).  Conversely, the command @kbd{M-^} deletes
-the prefix (if it occurs) after the newline that it deletes
-(@pxref{Indentation}).
+when it makes a new line (@pxref{Auto Fill}).  The @kbd{C-o} command
+inserts the fill prefix on new lines it creates, when you use it at
+the beginning of a line (@pxref{Blank Lines}).  Conversely, the
+command @kbd{M-^} deletes the prefix (if it occurs) after the newline
+that it deletes (@pxref{Indentation}).
 
   For example, if @code{fill-column} is 40 and you set the fill prefix
 to @samp{;; }, then @kbd{M-q} in the following text
@@ -657,7 +651,8 @@ per-buffer variable; altering the variable affects only the current buffer,
 but there is a default value which you can change as well.  @xref{Locals}.
 
   The @code{indentation} text property provides another way to control
-the amount of indentation paragraphs receive.  @xref{Format Indentation}.
+the amount of indentation paragraphs receive.  @xref{Enriched
+Indentation}.
 
 @node Adaptive Fill
 @subsection Adaptive Filling
@@ -754,17 +749,16 @@ Convert region to upper case (@code{upcase-region}).
 @findex downcase-word
 @findex upcase-word
 @findex capitalize-word
-  The word conversion commands are the most useful.  @kbd{M-l}
-(@code{downcase-word}) converts the word after point to lower case, moving
-past it.  Thus, repeating @kbd{M-l} converts successive words.
-@kbd{M-u} (@code{upcase-word}) converts to all capitals instead, while
-@kbd{M-c} (@code{capitalize-word}) puts the first letter of the word
-into upper case and the rest into lower case.  All these commands convert
-several words at once if given an argument.  They are especially convenient
-for converting a large amount of text from all upper case to mixed case,
-because you can move through the text using @kbd{M-l}, @kbd{M-u} or
-@kbd{M-c} on each word as appropriate, occasionally using @kbd{M-f} instead
-to skip a word.
+  @kbd{M-l} (@code{downcase-word}) converts the word after point to
+lower case, moving past it.  Thus, repeating @kbd{M-l} converts
+successive words.  @kbd{M-u} (@code{upcase-word}) converts to all
+capitals instead, while @kbd{M-c} (@code{capitalize-word}) puts the
+first letter of the word into upper case and the rest into lower case.
+All these commands convert several words at once if given an argument.
+They are especially convenient for converting a large amount of text
+from all upper case to mixed case, because you can move through the
+text using @kbd{M-l}, @kbd{M-u} or @kbd{M-c} on each word as
+appropriate, occasionally using @kbd{M-f} instead to skip a word.
 
   When given a negative argument, the word case conversion commands apply
 to the appropriate number of words before point, but do not move point.
@@ -798,9 +792,10 @@ enable the command, which means it will not ask for confirmation again.
 @cindex mode, Text
 @findex text-mode
 
-  When you edit files of text in a human language, it's more convenient
-to use Text mode rather than Fundamental mode.  To enter Text mode, type
-@kbd{M-x text-mode}.
+  Text mode is a major mode for editing files of text in a human
+language.  Files which have names ending in the extension @file{.txt}
+are usually opened in Text mode (@pxref{Choosing Modes}).  To
+explicitly switch to Text mode, type @kbd{M-x text-mode}.
 
   In Text mode, only blank lines and page delimiters separate
 paragraphs.  As a result, paragraphs can be indented, and adaptive
@@ -808,46 +803,49 @@ filling determines what indentation to use when filling a paragraph.
 @xref{Adaptive Fill}.
 
 @kindex TAB @r{(Text mode)}
-  Text mode defines @key{TAB} to run @code{indent-relative}
-(@pxref{Indentation}), so that you can conveniently indent a line like
-the previous line.
+  In Text mode, the @key{TAB} (@code{indent-for-tab-command}) command
+usually inserts whitespace up to the next tab stop, instead of
+indenting the current line.  @xref{Indentation}, for details.
 
   Text mode turns off the features concerned with comments except when
 you explicitly invoke them.  It changes the syntax table so that
-single-quotes are considered part of words.  However, if a word starts
-with single-quotes, these are treated as a prefix for purposes such as
-capitalization.  That is, @kbd{M-c} will convert @samp{'hello'} into
-@samp{'Hello'}, as expected.
+single-quotes are considered part of words (e.g.@: @samp{don't} is
+considered one word).  However, if a word starts with a single-quote,
+it is treated as a prefix for the purposes of capitalization
+(e.g.@: @kbd{M-c} converts @samp{'hello'} into @samp{'Hello'}, as
+expected).
 
 @cindex Paragraph-Indent Text mode
 @cindex mode, Paragraph-Indent Text
 @findex paragraph-indent-text-mode
 @findex paragraph-indent-minor-mode
   If you indent the first lines of paragraphs, then you should use
-Paragraph-Indent Text mode rather than Text mode.  In this mode, you
-do not need to have blank lines between paragraphs, because the
-first-line indentation is sufficient to start a paragraph; however
-paragraphs in which every line is indented are not supported.  Use
-@kbd{M-x paragraph-indent-text-mode} to enter this mode.  Use @kbd{M-x
-paragraph-indent-minor-mode} to enable an equivalent minor mode in
-situations where you can't change the major mode---in mail
+Paragraph-Indent Text mode (@kbd{M-x paragraph-indent-text-mode})
+rather than Text mode.  In that mode, you do not need to have blank
+lines between paragraphs, because the first-line indentation is
+sufficient to start a paragraph; however paragraphs in which every
+line is indented are not supported.  Use @kbd{M-x
+paragraph-indent-minor-mode} to enable an equivalent minor mode for
+situations where you shouldn't change the major mode---in mail
 composition, for instance.
 
 @kindex M-TAB @r{(Text mode)}
-  Text mode, and all the modes based on it, define @kbd{M-@key{TAB}}
-as the command @code{ispell-complete-word}, which performs completion
-of the partial word in the buffer before point, using the spelling
-dictionary as the space of possible words.  @xref{Spelling}.  If your
-window manager defines @kbd{M-@key{TAB}} to switch windows, you can
-type @kbd{@key{ESC} @key{TAB}} or @kbd{C-M-i}.
+  Text mode binds @kbd{M-@key{TAB}} to @code{ispell-complete-word}.
+This command performs completion of the partial word in the buffer
+before point, using the spelling dictionary as the space of possible
+words.  @xref{Spelling}.  If your window manager defines
+@kbd{M-@key{TAB}} to switch windows, you can type @kbd{@key{ESC}
+@key{TAB}} or @kbd{C-M-i} instead.
 
 @vindex text-mode-hook
-  Entering Text mode runs the hook @code{text-mode-hook}.  Other major
-modes related to Text mode also run this hook, followed by hooks of
-their own; this includes Paragraph-Indent Text mode, Nroff mode,
-@TeX{} mode, Outline mode, and Message mode.  Hook functions on
-@code{text-mode-hook} can look at the value of @code{major-mode} to
-see which of these modes is actually being entered.  @xref{Hooks}.
+  Entering Text mode runs the mode hook @code{text-mode-hook}
+(@pxref{Major Modes}).
+
+  The following sections describe several major modes that are
+@dfn{derived} from Text mode.  These derivatives share most of the
+features of Text mode described above.  In particular, derivatives of
+Text mode run @code{text-mode-hook} prior to running their own mode
+hooks.
 
 @node Outline Mode
 @section Outline Mode
@@ -858,29 +856,34 @@ see which of these modes is actually being entered.  @xref{Hooks}.
 @findex outline-mode
 @findex outline-minor-mode
 @vindex outline-minor-mode-prefix
-  Outline mode is a major mode much like Text mode but intended for
-editing outlines.  It allows you to make parts of the text temporarily
-invisible so that you can see the outline structure.  Type @kbd{M-x
-outline-mode} to switch to Outline mode as the major mode of the current
-buffer.
-
-  When Outline mode makes a line invisible, the line does not appear
-on the screen.  The screen appears exactly as if the invisible line
-were deleted, except that an ellipsis (three periods in a row) appears
-at the end of the previous visible line.  (Multiple consecutive
-invisible lines produce just one ellipsis.)
+@vindex outline-mode-hook
+  Outline mode is a major mode derived from Text mode, which is
+specialized for editing outlines.  It provides commands to navigate
+between entries in the outline structure, and commands to make parts
+of a buffer temporarily invisible, so that the outline structure may
+be more easily viewed.  Type @kbd{M-x outline-mode} to switch to
+Outline mode.  Entering Outline mode runs the hook
+@code{text-mode-hook} followed by the hook @code{outline-mode-hook}
+(@pxref{Hooks}).
+
+  When you use an Outline mode command to make a line invisible
+(@pxref{Outline Visibility}), the line disappears from the screen.  An
+ellipsis (three periods in a row) is displayed at the end of the
+previous visible line, to indicate the hidden text.  Multiple
+consecutive invisible lines produce just one ellipsis.
 
   Editing commands that operate on lines, such as @kbd{C-n} and
-@kbd{C-p}, treat the text of the invisible line as part of the previous
-visible line.  Killing the ellipsis at the end of a visible line
-really kills all the following invisible lines.
-
-  Outline minor mode provides the same commands as the major mode,
-Outline mode, but you can use it in conjunction with other major modes.
-Type @kbd{M-x outline-minor-mode} to enable the Outline minor mode in
-the current buffer.  You can also specify this in the text of a file,
-with a file local variable of the form @samp{mode: outline-minor}
-(@pxref{File Variables}).
+@kbd{C-p}, treat the text of the invisible line as part of the
+previous visible line.  Killing the ellipsis at the end of a visible
+line really kills all the following invisible text associated with the
+ellipsis.
+
+  Outline minor mode is a buffer-local minor mode which provides the
+same commands as the major mode, Outline mode, but can be used in
+conjunction with other major modes.  You can type @kbd{M-x
+outline-minor-mode} to toggle Outline minor mode in the current
+buffer, or use a file-local variable setting to enable it in a
+specific file (@pxref{File Variables}).
 
 @kindex C-c @@ @r{(Outline minor mode)}
   The major mode, Outline mode, provides special key bindings on the
@@ -889,17 +892,12 @@ with a file local variable of the form @samp{mode: outline-minor}
 major mode's special commands.  (The variable
 @code{outline-minor-mode-prefix} controls the prefix used.)
 
-@vindex outline-mode-hook
-  Entering Outline mode runs the hook @code{text-mode-hook} followed by
-the hook @code{outline-mode-hook} (@pxref{Hooks}).
-
 @menu
-* Format: Outline Format.          What the text of an outline looks like.
-* Motion: Outline Motion.          Special commands for moving through
-                                     outlines.
-* Visibility: Outline Visibility.  Commands to control what is visible.
-* Views: Outline Views.            Outlines and multiple views.
-* Foldout::                        Folding means zooming in on outlines.
+* Outline Format::      What the text of an outline looks like.
+* Outline Motion::      Special commands for moving through outlines.
+* Outline Visibility::  Commands to control what is visible.
+* Outline Views::       Outlines and multiple views.
+* Foldout::             Folding means zooming in on outlines.
 @end menu
 
 @node Outline Format
@@ -909,13 +907,13 @@ the hook @code{outline-mode-hook} (@pxref{Hooks}).
 @cindex body lines (Outline mode)
   Outline mode assumes that the lines in the buffer are of two types:
 @dfn{heading lines} and @dfn{body lines}.  A heading line represents a
-topic in the outline.  Heading lines start with one or more stars; the
-number of stars determines the depth of the heading in the outline
-structure.  Thus, a heading line with one star is a major topic; all the
-heading lines with two stars between it and the next one-star heading
-are its subtopics; and so on.  Any line that is not a heading line is a
-body line.  Body lines belong with the preceding heading line.  Here is
-an example:
+topic in the outline.  Heading lines start with one or more asterisk
+(@samp{*}) characters; the number of asterisks determines the depth of
+the heading in the outline structure.  Thus, a heading line with one
+@samp{*} is a major topic; all the heading lines with two @samp{*}s
+between it and the next one-@samp{*} heading are its subtopics; and so
+on.  Any line that is not a heading line is a body line.  Body lines
+belong with the preceding heading line.  Here is an example:
 
 @example
 * Food
@@ -997,12 +995,10 @@ Move point up to a lower-level (more inclusive) visible heading line
 @findex outline-previous-visible-heading
 @kindex C-c C-n @r{(Outline mode)}
 @kindex C-c C-p @r{(Outline mode)}
-  @kbd{C-c C-n} (@code{outline-next-visible-heading}) moves down to the next
-heading line.  @kbd{C-c C-p} (@code{outline-previous-visible-heading}) moves
-similarly backward.  Both accept numeric arguments as repeat counts.  The
-names emphasize that invisible headings are skipped, but this is not really
-a special feature.  All editing commands that look for lines ignore the
-invisible lines automatically.
+  @kbd{C-c C-n} (@code{outline-next-visible-heading}) moves down to
+the next heading line.  @kbd{C-c C-p}
+(@code{outline-previous-visible-heading}) moves similarly backward.
+Both accept numeric arguments as repeat counts.
 
 @findex outline-up-heading
 @findex outline-forward-same-level
@@ -1010,21 +1006,19 @@ invisible lines automatically.
 @kindex C-c C-f @r{(Outline mode)}
 @kindex C-c C-b @r{(Outline mode)}
 @kindex C-c C-u @r{(Outline mode)}
-  More powerful motion commands understand the level structure of headings.
-@kbd{C-c C-f} (@code{outline-forward-same-level}) and
+  The commands @kbd{C-c C-f} (@code{outline-forward-same-level}) and
 @kbd{C-c C-b} (@code{outline-backward-same-level}) move from one
-heading line to another visible heading at the same depth in
-the outline.  @kbd{C-c C-u} (@code{outline-up-heading}) moves
-backward to another heading that is less deeply nested.
+heading line to another visible heading at the same depth in the
+outline.  @kbd{C-c C-u} (@code{outline-up-heading}) moves backward to
+another heading that is less deeply nested.
 
 @node Outline Visibility
 @subsection Outline Visibility Commands
 
-  The other special commands of outline mode are used to make lines visible
-or invisible.  Their names all start with @code{hide} or @code{show}.
-Most of them fall into pairs of opposites.  They are not undoable; instead,
-you can undo right past them.  Making lines visible or invisible is simply
-not recorded by the undo mechanism.
+  Outline mode provides several commands for temporarily hiding or
+revealing parts of the buffer, based on the outline structure.  These
+commands are not undoable; their effects are simply not recorded by
+the undo mechanism, so you can undo right past them (@pxref{Undo}).
 
   Many of these commands act on the ``current'' heading line.  If
 point is on a heading line, that is the current heading line; if point
@@ -1068,72 +1062,64 @@ the headings leading up from there to the top level of the outline
 @findex show-entry
 @kindex C-c C-c @r{(Outline mode)}
 @kindex C-c C-e @r{(Outline mode)}
-  Two commands that are exact opposites are @kbd{C-c C-c}
-(@code{hide-entry}) and @kbd{C-c C-e} (@code{show-entry}).  They apply
-to the body lines directly following the current heading line.
-Subheadings and their bodies are not affected.
+  The simplest of these commands are @kbd{C-c C-c}
+(@code{hide-entry}), which hides the body lines directly following the
+current heading line, and @kbd{C-c C-e} (@code{show-entry}), which
+reveals them.  Subheadings and their bodies are not affected.
 
 @findex hide-subtree
 @findex show-subtree
 @kindex C-c C-s @r{(Outline mode)}
 @kindex C-c C-d @r{(Outline mode)}
 @cindex subtree (Outline mode)
-  Two more powerful opposites are @kbd{C-c C-d} (@code{hide-subtree})
-and @kbd{C-c C-s} (@code{show-subtree}).  Both apply to the current
-heading line's @dfn{subtree}: its body, all its subheadings, both
-direct and indirect, and all of their bodies.  In other words, the
-subtree contains everything following the current heading line, up to
-and not including the next heading of the same or higher rank.
+  The commands @kbd{C-c C-d} (@code{hide-subtree}) and @kbd{C-c C-s}
+(@code{show-subtree}) are more powerful.  They apply to the current
+heading line's @dfn{subtree}: its body, all of its subheadings, both
+direct and indirect, and all of their bodies.
 
 @findex hide-leaves
 @findex show-branches
+@findex show-children
 @kindex C-c C-l @r{(Outline mode)}
 @kindex C-c C-k @r{(Outline mode)}
-  Intermediate between a visible subtree and an invisible one is having
-all the subheadings visible but none of the body.  There are two
-commands for doing this, depending on whether you want to hide the
-bodies or make the subheadings visible.  They are @kbd{C-c C-l}
-(@code{hide-leaves}) and @kbd{C-c C-k} (@code{show-branches}).
-
 @kindex C-c C-i @r{(Outline mode)}
-@findex show-children
-  A little weaker than @code{show-branches} is @kbd{C-c C-i}
-(@code{show-children}).  It makes just the direct subheadings
-visible---those one level down.  Deeper subheadings remain invisible, if
-they were invisible.
+  The command @kbd{C-c C-l} (@code{hide-leaves}) hides the body of the
+current heading line as well as all the bodies in its subtree; the
+subheadings themselves are left visible.  The command @kbd{C-c C-k}
+(@code{show-branches}) reveals the subheadings, if they had previously
+been hidden (e.g.@: by @kbd{C-c C-d}).  The command @kbd{C-c C-i}
+(@code{show-children}) is a weaker version of this; it reveals just
+the direct subheadings, i.e.@: those one level down.
+
+@findex hide-other
+@kindex C-c C-o @r{(Outline mode)}
+  The command @kbd{C-c C-o} (@code{hide-other}) hides everything
+except the entry that point is in, plus its parents (the headers
+leading up from there to top level in the outline) and the top level
+headings.
 
 @findex hide-body
 @findex show-all
 @kindex C-c C-t @r{(Outline mode)}
 @kindex C-c C-a @r{(Outline mode)}
-  Two commands have a blanket effect on the whole file.  @kbd{C-c C-t}
-(@code{hide-body}) makes all body lines invisible, so that you see just
-the outline structure (as a special exception, it will not hide lines
-at the top of the file, preceding the first header line, even though
-these are technically body lines).  @kbd{C-c C-a} (@code{show-all})
-makes all lines visible.  These commands can be thought of as a pair
-of opposites even though @kbd{C-c C-a} applies to more than just body
-lines.
-
 @findex hide-sublevels
 @kindex C-c C-q @r{(Outline mode)}
-  The command @kbd{C-c C-q} (@code{hide-sublevels}) hides all but the
-top level headings.  With a numeric argument @var{n}, it hides everything
-except the top @var{n} levels of heading lines.
-
-@findex hide-other
-@kindex C-c C-o @r{(Outline mode)}
-  The command @kbd{C-c C-o} (@code{hide-other}) hides everything except
-the heading and body text that point is in, plus its parents (the headers
-leading up from there to top level in the outline) and the top level
-headings.
+  The remaining commands affect the whole buffer.  @kbd{C-c C-t}
+(@code{hide-body}) makes all body lines invisible, so that you see
+just the outline structure (as a special exception, it will not hide
+lines at the top of the file, preceding the first header line, even
+though these are technically body lines).  @kbd{C-c C-a}
+(@code{show-all}) makes all lines visible.  @kbd{C-c C-q}
+(@code{hide-sublevels}) hides all but the top level headings; with a
+numeric argument @var{n}, it hides everything except the top @var{n}
+levels of heading lines.
 
 @findex reveal-mode
   When incremental search finds text that is hidden by Outline mode,
-it makes that part of the buffer visible.  If you exit the search
-at that position, the text remains visible.  You can also
-automatically make text visible as you navigate in it by using
-@kbd{M-x reveal-mode}.
+it makes that part of the buffer visible.  If you exit the search at
+that position, the text remains visible.  You can also automatically
+make text visible as you navigate in it by using Reveal mode (@kbd{M-x
+reveal-mode}), a buffer-local minor mode.
 
 @node Outline Views
 @subsection Viewing One Outline in Multiple Views
@@ -1253,7 +1239,7 @@ it in order for this to take effect.
 
   To use the Foldout package, you can type @kbd{M-x load-library
 @key{RET} foldout @key{RET}}; or you can arrange for to do that
-automatically by putting this in your @file{.emacs} file:
+automatically by putting this in your init file (@pxref{Init File}):
 
 @example
 (eval-after-load "outline" '(require 'foldout))
@@ -1300,18 +1286,48 @@ Emacs does not guess right, you can select the correct variant of
 @TeX{} mode using the command @kbd{M-x plain-tex-mode}, @kbd{M-x
 latex-mode}, @kbd{M-x slitex-mode}, or @kbd{doctex-mode}.
 
-  Emacs also provides Bib@TeX{} mode, a major mode for editing
-Bib@TeX{} files.  Bib@TeX{} is a tool for storing and formatting
-bibliographic references, which is commonly used together with
-La@TeX{}.  In addition, the Ref@TeX{} package provides a minor mode
-which can be used in conjunction with La@TeX{} mode to manage
-bibliographic references.  @inforef{Top,, reftex}.
+  The following sections document the features of @TeX{} mode and its
+variants.  There are several other @TeX{}-related Emacs packages,
+which are not documented in this manual:
+
+@itemize @bullet
+@item
+Bib@TeX{} mode is a major mode for Bib@TeX{} files, which are commonly
+used for keeping bibliographic references for La@TeX{} documents.  For
+more information, see the documentation string for the command
+@code{bibtex-mode}.
+
+@item
+The Ref@TeX{} package provides a minor mode which can be used in
+conjunction with La@TeX{} mode to manage bibliographic references.
+@ifinfo
+@xref{Top,The Ref@TeX{} Manual,,reftex}.
+@end ifinfo
+@ifnotinfo
+For more information, see the Ref@TeX{} Info manual, which is
+distributed with Emacs.
+@end ifnotinfo
+
+@item
+The AUC@TeX{} package provides more advanced features for editing
+@TeX{} and its related formats, including the ability to preview
+@TeX{} equations within Emacs buffers.  Unlike Bib@TeX{} mode and the
+Ref@TeX{} package, AUC@TeX{} is not distributed with Emacs by default.
+It can be downloaded via the Package Menu (@pxref{Packages}); once
+installed, see
+@ifinfo
+@ref{Top,The AUC@TeX{} Manual,,auctex}.
+@end ifinfo
+@ifnotinfo
+the AUC@TeX{} manual, which is included with the package.
+@end ifnotinfo
+@end itemize
 
 @menu
-* Editing: TeX Editing.   Special commands for editing in TeX mode.
-* LaTeX: LaTeX Editing.   Additional commands for LaTeX input files.
-* Printing: TeX Print.    Commands for printing part of a file with TeX.
-* Misc: TeX Misc.         Customization of TeX mode, and related features.
+* TeX Editing::   Special commands for editing in TeX mode.
+* LaTeX Editing:: Additional commands for LaTeX input files.
+* TeX Print::     Commands for printing part of a file with TeX.
+* TeX Misc::      Customization of TeX mode, and related features.
 @end menu
 
 @node TeX Editing
@@ -1336,12 +1352,10 @@ Move forward past the next unmatched close brace (@code{up-list}).
 @findex tex-insert-quote
 @kindex " @r{(@TeX{} mode)}
   In @TeX{}, the character @samp{"} is not normally used; instead,
-quotations begin with @samp{``} and end with @samp{''}.  For
-convenience, @TeX{} mode overrides the normal meaning of the key
-@kbd{"} with a command that inserts a pair of single-quotes or
-backquotes (@code{tex-insert-quote}).  To be precise, it inserts
-@samp{``} after whitespace or an open brace, @samp{"} after a
-backslash, and @samp{''} after any other character.
+quotations begin with @samp{``} and end with @samp{''}.  @TeX{} mode
+therefore binds the @kbd{"} key to the @code{tex-insert-quote}
+command.  This inserts @samp{``} after whitespace or an open brace,
+@samp{"} after a backslash, and @samp{''} after any other character.
 
   As a special exception, if you type @kbd{"} when the text before
 point is either @samp{``} or @samp{''}, Emacs replaces that preceding
@@ -1349,9 +1363,6 @@ text with a single @samp{"} character.  You can therefore type
 @kbd{""} to insert @samp{"}, should you ever need to do so.  (You can
 also use @kbd{C-q "} to insert this character.)
 
-  To disable the @kbd{"} expansion feature, eliminate that binding in
-the local map (@pxref{Key Bindings}).
-
   In @TeX{} mode, @samp{$} has a special syntax code which attempts to
 understand the way @TeX{} math mode delimiters match.  When you insert a
 @samp{$} that is meant to exit math mode, the position of the matching
@@ -1376,13 +1387,14 @@ text that belongs inside.  Afterward, use the command @kbd{C-c @}}
 @findex tex-validate-region
 @findex tex-terminate-paragraph
 @kindex C-j @r{(@TeX{} mode)}
-  There are two commands for checking the matching of braces.  @kbd{C-j}
-(@code{tex-terminate-paragraph}) checks the paragraph before point, and
-inserts two newlines to start a new paragraph.  It outputs a message in
-the echo area if any mismatch is found.  @kbd{M-x tex-validate-region}
-checks a region, paragraph by paragraph.  The errors are listed in the
-@samp{*Occur*} buffer, and you can use @kbd{C-c C-c} or @kbd{Mouse-2} in
-that buffer to go to a particular mismatch.
+  There are two commands for checking the matching of braces.
+@kbd{C-j} (@code{tex-terminate-paragraph}) checks the paragraph before
+point, and inserts two newlines to start a new paragraph.  It outputs
+a message in the echo area if any mismatch is found.  @kbd{M-x
+tex-validate-region} checks a region, paragraph by paragraph.  The
+errors are listed in an @samp{*Occur*} buffer; you can use the usual
+Occur mode commands in that buffer, such as @kbd{C-c C-c}, to visit a
+particular mismatch (@pxref{Other Repeating Search}).
 
   Note that Emacs commands count square brackets and parentheses in
 @TeX{} mode, not just braces.  This is not strictly correct for the
@@ -1394,8 +1406,8 @@ to work with them.
 @node LaTeX Editing
 @subsection La@TeX{} Editing Commands
 
-  La@TeX{} mode (and its obsolete variant, Sli@TeX{} mode) provide a
-few extra features not applicable to plain @TeX{}:
+  La@TeX{} mode provides a few extra features not applicable to plain
+@TeX{}:
 
 @table @kbd
 @item C-c C-o
@@ -1408,60 +1420,59 @@ Close the innermost La@TeX{} block not yet closed
 
 @findex tex-latex-block
 @kindex C-c C-o @r{(La@TeX{} mode)}
-@vindex latex-block-names
-  In La@TeX{} input, @samp{\begin} and @samp{\end} commands are used to
-group blocks of text.  To insert a @samp{\begin} and a matching
-@samp{\end} (on a new line following the @samp{\begin}), use @kbd{C-c
-C-o} (@code{tex-latex-block}).  A blank line is inserted between the
-two, and point is left there.  You can use completion when you enter the
-block type; to specify additional block type names beyond the standard
-list, set the variable @code{latex-block-names}.  For example, here's
-how to add @samp{theorem}, @samp{corollary}, and @samp{proof}:
+  In La@TeX{} input, @samp{\begin} and @samp{\end} tags are used to
+group blocks of text.  To insert a block, type @kbd{C-c C-o}
+(@code{tex-latex-block}).  This prompts for a block type, and inserts
+the appropriate matching @samp{\begin} and @samp{\end} tags, leaving a
+blank line between the two and moving point there.
 
-@example
-(setq latex-block-names '("theorem" "corollary" "proof"))
-@end example
+@vindex latex-block-names
+  When entering the block type argument to @kbd{C-c C-o}, you can use
+the usual completion commands (@pxref{Completion}).  The default
+completion list contains the standard La@TeX{} block types.  If you
+want additional block types for completion, customize the list
+variable @code{latex-block-names}.
 
 @findex tex-close-latex-block
 @kindex C-c C-e @r{(La@TeX{} mode)}
-  In La@TeX{} input, @samp{\begin} and @samp{\end} commands must
-balance.  You can use @kbd{C-c C-e} (@code{tex-close-latex-block}) to
-insert automatically a matching @samp{\end} to match the last unmatched
-@samp{\begin}.  It indents the @samp{\end} to match the corresponding
-@samp{\begin}.  It inserts a newline after @samp{\end} if point is at
-the beginning of a line.
+  In La@TeX{} input, @samp{\begin} and @samp{\end} tags must balance.
+You can use @kbd{C-c C-e} (@code{tex-close-latex-block}) to insert an
+@samp{\end} tag which matches the last unmatched @samp{\begin}.  It
+also indents the @samp{\end} to match the corresponding @samp{\begin},
+and inserts a newline after the @samp{\end} tag if point is at the
+beginning of a line.
 
 @node TeX Print
 @subsection @TeX{} Printing Commands
 
-  You can invoke @TeX{} as an inferior of Emacs on either the entire
-contents of the buffer or just a region at a time.  Running @TeX{} in
-this way on just one chapter is a good way to see what your changes
-look like without taking the time to format the entire file.
+  You can invoke @TeX{} as an subprocess of Emacs, supplying either
+the entire contents of the buffer or just part of it (e.g.@: one
+chapter of a larger document).
 
 @table @kbd
+@item C-c C-b
+Invoke @TeX{} on the entire current buffer (@code{tex-buffer}).
 @item C-c C-r
 Invoke @TeX{} on the current region, together with the buffer's header
 (@code{tex-region}).
-@item C-c C-b
-Invoke @TeX{} on the entire current buffer (@code{tex-buffer}).
-@item C-c @key{TAB}
-Invoke Bib@TeX{} on the current file (@code{tex-bibtex-file}).
 @item C-c C-f
 Invoke @TeX{} on the current file (@code{tex-file}).
-@item C-c C-l
-Recenter the window showing output from the inferior @TeX{} so that
-the last line can be seen (@code{tex-recenter-output-buffer}).
-@item C-c C-k
-Kill the @TeX{} subprocess (@code{tex-kill-job}).
-@item C-c C-p
-Print the output from the last @kbd{C-c C-r}, @kbd{C-c C-b}, or @kbd{C-c
-C-f} command (@code{tex-print}).
+
 @item C-c C-v
 Preview the output from the last @kbd{C-c C-r}, @kbd{C-c C-b}, or @kbd{C-c
 C-f} command (@code{tex-view}).
-@item C-c C-q
-Show the printer queue (@code{tex-show-print-queue}).
+
+@item C-c C-p
+Print the output from the last @kbd{C-c C-b}, @kbd{C-c C-r}, or
+@kbd{C-c C-f} command (@code{tex-print}).
+
+@item C-c @key{TAB}
+Invoke Bib@TeX{} on the current file (@code{tex-bibtex-file}).
+@item C-c C-l
+Recenter the window showing output from @TeX{} so that the last line
+can be seen (@code{tex-recenter-output-buffer}).
+@item C-c C-k
+Kill the @TeX{} subprocess (@code{tex-kill-job}).
 @item C-c C-c
 Invoke some other compilation command on the entire current buffer
 (@code{tex-compile}).
@@ -1469,49 +1480,51 @@ Invoke some other compilation command on the entire current buffer
 
 @findex tex-buffer
 @kindex C-c C-b @r{(@TeX{} mode)}
-@findex tex-print
-@kindex C-c C-p @r{(@TeX{} mode)}
 @findex tex-view
 @kindex C-c C-v @r{(@TeX{} mode)}
-@findex tex-show-print-queue
-@kindex C-c C-q @r{(@TeX{} mode)}
-  You can pass the current buffer through an inferior @TeX{} by means of
-@kbd{C-c C-b} (@code{tex-buffer}).  The formatted output appears in a
-temporary file; to print it, type @kbd{C-c C-p} (@code{tex-print}).
-Afterward, you can use @kbd{C-c C-q} (@code{tex-show-print-queue}) to
-view the progress of your output towards being printed.  If your terminal
-has the ability to display @TeX{} output files, you can preview the
-output on the terminal with @kbd{C-c C-v} (@code{tex-view}).
+@findex tex-print
+@kindex C-c C-p @r{(@TeX{} mode)}
+  To pass the current buffer through @TeX{}, type @kbd{C-c C-b}
+(@code{tex-buffer}).  The formatted output goes in a temporary file,
+normally a @file{.dvi} file.  Afterwards, you can type @kbd{C-c C-v}
+(@code{tex-view}) to launch an external program, such as
+@command{xdvi}, to view this output file.  You can also type @kbd{C-c
+C-p} (@code{tex-print}) to print a hardcopy of the output file.
 
 @cindex @env{TEXINPUTS} environment variable
 @vindex tex-directory
-  You can specify the directory to use for running @TeX{} by setting the
-variable @code{tex-directory}.  @code{"."} is the default value.  If
-your environment variable @env{TEXINPUTS} contains relative directory
-names, or if your files contains @samp{\input} commands with relative
-file names, then @code{tex-directory} @emph{must} be @code{"."} or you
-will get the wrong results.  Otherwise, it is safe to specify some other
-directory, such as @code{"/tmp"}.
+  By default, @kbd{C-c C-b} runs @TeX{} in the current directory.  The
+output of @TeX{} also goes in this directory.  To run @TeX{} in a
+different directory, change the variable @code{tex-directory} to the
+desired directory name.  If your environment variable @env{TEXINPUTS}
+contains relative directory names, or if your files contains
+@samp{\input} commands with relative file names, then
+@code{tex-directory} @emph{must} be @code{"."} or you will get the
+wrong results.  Otherwise, it is safe to specify some other directory,
+such as @code{"/tmp"}.
 
 @vindex tex-run-command
 @vindex latex-run-command
-@vindex slitex-run-command
-@vindex tex-dvi-print-command
 @vindex tex-dvi-view-command
-@vindex tex-show-queue-command
-  If you want to specify which shell commands are used in the inferior @TeX{},
-you can do so by setting the values of the variables @code{tex-run-command},
-@code{latex-run-command}, @code{slitex-run-command},
-@code{tex-dvi-print-command}, @code{tex-dvi-view-command}, and
-@code{tex-show-queue-command}.  The default values may
-(or may not) be appropriate for your system.
-
-  Normally, the file name given to these commands comes at the end of
-the command string; for example, @samp{latex @var{filename}}.  In some
-cases, however, the file name needs to be embedded in the command; an
-example is when you need to provide the file name as an argument to one
-command whose output is piped to another.  You can specify where to put
-the file name with @samp{*} in the command string.  For example,
+@vindex tex-dvi-print-command
+  The buffer's @TeX{} variant determines what shell command @kbd{C-c
+C-b} actually runs.  In Plain @TeX{} mode, it is specified by the
+variable @code{tex-run-command}, which defaults to @code{"tex"}.  In
+La@TeX{} mode, it is specified by @code{latex-run-command}, which
+defaults to @code{"latex"}.  The shell command that @kbd{C-c C-v} runs
+to view the @file{.dvi} output is determined by the variable
+@code{tex-dvi-view-command}, regardless of the @TeX{} variant.  The
+shell command that @kbd{C-c C-p} runs to print the output is
+determined by the variable @code{tex-dvi-print-command}.
+
+  Normally, Emacs automatically appends the output file name to the
+shell command strings described in the preceding paragraph.  For
+example, if @code{tex-dvi-view-command} is @code{"xdvi"}, @kbd{C-c
+C-v} runs @command{xdvi @var{output-file-name}}.  In some cases,
+however, the file name needs to be embedded in the command, e.g.@: if
+you need to provide the file name as an argument to one command whose
+output is piped to another.  You can specify where to put the file
+name with @samp{*} in the command string.  For example,
 
 @example
 (setq tex-dvi-print-command "dvips -f * | lpr")
@@ -1521,12 +1534,12 @@ the file name with @samp{*} in the command string.  For example,
 @kindex C-c C-k @r{(@TeX{} mode)}
 @findex tex-recenter-output-buffer
 @kindex C-c C-l @r{(@TeX{} mode)}
-  The terminal output from @TeX{}, including any error messages, appears
-in a buffer called @samp{*tex-shell*}.  If @TeX{} gets an error, you can
-switch to this buffer and feed it input (this works as in Shell mode;
-@pxref{Interactive Shell}).  Without switching to this buffer you can
-scroll it so that its last line is visible by typing @kbd{C-c
-C-l}.
+  The terminal output from @TeX{}, including any error messages,
+appears in a buffer called @samp{*tex-shell*}.  If @TeX{} gets an
+error, you can switch to this buffer and feed it input (this works as
+in Shell mode; @pxref{Interactive Shell}).  Without switching to this
+buffer you can scroll it so that its last line is visible by typing
+@kbd{C-c C-l}.
 
   Type @kbd{C-c C-k} (@code{tex-kill-job}) to kill the @TeX{} process if
 you see that its output is no longer useful.  Using @kbd{C-c C-b} or
@@ -1534,14 +1547,14 @@ you see that its output is no longer useful.  Using @kbd{C-c C-b} or
 
 @findex tex-region
 @kindex C-c C-r @r{(@TeX{} mode)}
-  You can also pass an arbitrary region through an inferior @TeX{} by typing
-@kbd{C-c C-r} (@code{tex-region}).  This is tricky, however, because most files
-of @TeX{} input contain commands at the beginning to set parameters and
-define macros, without which no later part of the file will format
-correctly.  To solve this problem, @kbd{C-c C-r} allows you to designate a
-part of the file as containing essential commands; it is included before
-the specified region as part of the input to @TeX{}.  The designated part
-of the file is called the @dfn{header}.
+  You can also pass an arbitrary region through @TeX{} by typing
+@kbd{C-c C-r} (@code{tex-region}).  This is tricky, however, because
+most files of @TeX{} input contain commands at the beginning to set
+parameters and define macros, without which no later part of the file
+will format correctly.  To solve this problem, @kbd{C-c C-r} allows
+you to designate a part of the file as containing essential commands;
+it is included before the specified region as part of the input to
+@TeX{}.  The designated part of the file is called the @dfn{header}.
 
 @cindex header (@TeX{} mode)
   To indicate the bounds of the header in Plain @TeX{} mode, you insert two
@@ -1639,29 +1652,6 @@ keys (@pxref{Completion}).
   The commands @kbd{M-x iso-iso2tex}, @kbd{M-x iso-tex2iso}, @kbd{M-x
 iso-iso2gtex} and @kbd{M-x iso-gtex2iso} can be used to convert
 between Latin-1 encoded files and @TeX{}-encoded equivalents.
-@ignore
-@c Too cryptic to be useful, too cryptic for me to make it better -- rms.
-  They
-are included by default in the @code{format-alist} variable, so they
-can be used with @kbd{M-x format-find-file}, for instance.
-@end ignore
-
-@ignore  @c Not worth documenting if it is only for Czech -- rms.
-@findex tildify-buffer
-@findex tildify-region
-@cindex ties, @TeX{}, inserting
-@cindex hard spaces, @TeX{}, inserting
-  The commands @kbd{M-x tildify-buffer} and @kbd{M-x tildify-region}
-insert @samp{~} (@dfn{tie}) characters where they are conventionally
-required.  This is set up for Czech---customize the group
-@samp{tildify} for other languages or for other sorts of markup.
-@end ignore
-
-@cindex Ref@TeX{} package
-@cindex references, La@TeX{}
-@cindex La@TeX{} references
-  For managing all kinds of references for La@TeX{}, you can use
-Ref@TeX{}.  @inforef{Top,, reftex}.
 
 @node HTML Mode
 @section SGML and HTML Modes
@@ -1764,22 +1754,27 @@ used as a cheap preview (@code{sgml-tags-invisible}).
 @cindex mode, nXML
 @findex nxml-mode
 @cindex XML schema
-  The default mode for editing XML documents is called nXML mode
-(@code{xml-mode} or @code{nxml-mode}).  This is a powerful major mode
-that can recognize many existing XML schema and use them to provide
-completion of XML elements via @kbd{C-@key{RET}} or @kbd{M-@key{TAB}},
-as well as ``on-the-fly'' XML validation with error highlighting.  It
-is described in its own manual.  @xref{Top, nXML Mode,,nxml-mode, nXML
-Mode}.
+  The major mode for editing XML documents is called nXML mode.  This
+is a powerful major mode that can recognize many existing XML schema
+and use them to provide completion of XML elements via
+@kbd{C-@key{RET}} or @kbd{M-@key{TAB}}, as well as ``on-the-fly'' XML
+validation with error highlighting.  To enable nXML mode in an
+existing buffer, type @kbd{M-x nxml-mode}, or, equivalently, @kbd{M-x
+xml-mode}.  Emacs uses nXML mode for files which have the extension
+@file{.xml}.  For XHTML files, which have the extension @file{.xhtml},
+Emacs uses HTML mode by default; you can make it use nXML mode by
+customizing the variable @code{auto-mode-alist} (@pxref{Choosing
+Modes}).  nXML mode is described in its own manual: @xref{Top, nXML
+Mode,,nxml-mode, nXML Mode}.
 
 @vindex sgml-xml-mode
-  However, you can also use SGML mode to edit XML, since XML is a
-strict subset of SGML.  In XML, every opening tag must have an
-explicit closing tag.  When the variable @code{sgml-xml-mode} is
-non-@code{nil}, the tag insertion commands described above always
-insert explicit closing tags as well.  When you visit a file in SGML
-mode, Emacs determines whether it is XML by examining the file
-contents, and sets @code{sgml-xml-mode} accordingly.
+  You may choose to use the less powerful SGML mode for editing XML,
+since XML is a strict subset of SGML.  To enable SGML mode in an
+existing buffer, type @kbd{M-x sgml-mode}.  On enabling SGML mode,
+Emacs examines the buffer to determine whether it is XML; if so, it
+sets the variable @code{sgml-xml-mode} to a non-@code{nil} value.
+This causes SGML mode's tag insertion commands, described above, to
+always insert explicit closing tags as well.
 
 @node Nroff Mode
 @section Nroff Mode
@@ -1830,86 +1825,84 @@ header level).
   Entering Nroff mode runs the hook @code{text-mode-hook}, followed by
 the hook @code{nroff-mode-hook} (@pxref{Hooks}).
 
-@node Formatted Text
-@section Editing Formatted Text
-
+@node Enriched Text
+@section Enriched Text
 @cindex Enriched mode
 @cindex mode, Enriched
-@cindex formatted text
+@cindex enriched text
 @cindex WYSIWYG
 @cindex word processing
-  @dfn{Enriched mode} is a minor mode for editing files that contain
-formatted text in WYSIWYG fashion, as in a word processor.  Currently,
-formatted text in Enriched mode can specify fonts, colors, underlining,
-margins, and types of filling and justification.  In the future, we plan
-to implement other formatting features as well.
+@cindex text/enriched MIME format
 
-  Enriched mode is a minor mode (@pxref{Minor Modes}).  It is
-typically used in conjunction with Text mode (@pxref{Text Mode}), but
-you can also use it with other major modes such as Outline mode and
-Paragraph-Indent Text mode.
+  Enriched mode is a minor mode for editing formatted text files in a
+WYSIWYG (``what you see is what you get'') fashion.  When Enriched
+mode is enabled, you can apply various formatting properties to the
+text in the buffer, such as fonts and colors; upon saving the buffer,
+those properties are saved together with the text, using the MIME
+@samp{text/enriched} file format.
 
-@cindex text/enriched MIME format
-  Potentially, Emacs can store formatted text files in various file
-formats.  Currently, only one format is implemented: @dfn{text/enriched}
-format, which is defined by the MIME protocol.  @xref{Format
-Conversion,, Format Conversion, elisp, the Emacs Lisp Reference Manual},
-for details of how Emacs recognizes and converts file formats.
+  Enriched mode is typically used with Text mode (@pxref{Text Mode}).
+It is @emph{not} compatible with Font Lock mode, which is used by many
+major modes, including most programming language modes, for syntax
+highlighting (@pxref{Font Lock}).  Unlike Enriched mode, Font Lock
+mode assigns text properties automatically, based on the current
+buffer contents; those properties are not saved to disk.
 
-  The Emacs distribution contains a formatted text file that can serve as
-an example.  Its name is @file{etc/enriched.doc}.  It contains samples
-illustrating all the features described in this section.  It also
-contains a list of ideas for future enhancements.
+  The file @file{etc/enriched.doc} in the Emacs distribution serves as
+an example of the features of Enriched mode.
 
 @menu
-* Requesting Formatted Text::   Entering and exiting Enriched mode.
-* Hard and Soft Newlines::      There are two different kinds of newlines.
-* Editing Format Info::         How to edit text properties.
-* Faces: Format Faces.          Bold, italic, underline, etc.
-* Color: Format Colors.         Changing the color of text.
-* Indent: Format Indentation.   Changing the left and right margins.
-* Justification: Format Justification.
-                                Centering, setting text flush with the
-                                  left or right margin, etc.
-* Special: Format Properties.   The "special" text properties submenu.
-* Forcing Enriched Mode::       How to force use of Enriched mode.
+* Enriched Mode::           Entering and exiting Enriched mode.
+* Hard and Soft Newlines::  There are two different kinds of newlines.
+* Editing Format Info::     How to edit text properties.
+* Enriched Faces::          Bold, italic, underline, etc.
+* Enriched Indentation::    Changing the left and right margins.
+* Enriched Justification::  Centering, setting text flush with the
+                              left or right margin, etc.
+* Enriched Properties::     The "special" text properties submenu.
 @end menu
 
-@node Requesting Formatted Text
-@subsection Requesting to Edit Formatted Text
+@node Enriched Mode
+@subsection Enriched Mode
 
-  Whenever you visit a file that Emacs saved in the text/enriched
-format, Emacs automatically converts the formatting information in the
-file into Emacs's own internal format (known as @dfn{text
-properties}), and turns on Enriched mode.
+  Enriched mode is a buffer-local minor mode (@pxref{Minor Modes}).
+When you visit a file that has been saved in the @samp{text/enriched}
+format, Emacs automatically enables Enriched mode, and applies the
+formatting information in the file to the buffer text.  When you save
+a buffer with Enriched mode enabled, it is saved using the
+@samp{text/enriched} format, including the formatting information.
 
 @findex enriched-mode
-  To create a new file of formatted text, first visit the nonexistent
-file, then type @kbd{M-x enriched-mode} before you start inserting text.
-This command turns on Enriched mode.  Do this before you begin inserting
-text, to ensure that the text you insert is handled properly.
-
-  More generally, the command @code{enriched-mode} turns Enriched mode
-on if it was off, and off if it was on.  With a prefix argument, this
-command turns Enriched mode on if the argument is positive, and turns
-the mode off otherwise.
-
-  When you save a buffer while Enriched mode is enabled in it, Emacs
-automatically converts the text to text/enriched format while writing it
-into the file.  When you visit the file again, Emacs will automatically
-recognize the format, reconvert the text, and turn on Enriched mode
-again.
+  To create a new file of formatted text, visit the nonexistent file
+and type @kbd{M-x enriched-mode}.  This command actually toggles
+Enriched mode.  With a prefix argument, it enables Enriched mode if
+the argument is positive, and disables Enriched mode otherwise.  If
+you disable Enriched mode, Emacs no longer saves the buffer using the
+@samp{text/enriched} format; any formatting properties that have been
+added to the buffer remain in the buffer, but they are not saved to
+disk.
 
 @vindex enriched-translations
-  You can add annotations for saving additional text properties, which
-Emacs normally does not save, by adding to @code{enriched-translations}.
-Note that the text/enriched standard requires any non-standard
-annotations to have names starting with @samp{x-}, as in
-@samp{x-read-only}.  This ensures that they will not conflict with
-standard annotations that may be added later.
-
-  @xref{Text Properties,,, elisp, the Emacs Lisp Reference Manual},
-for more information about text properties.
+  Enriched mode does not save all Emacs text properties, only those
+specified in the variable @code{enriched-translations}.  These include
+properties for fonts, colors, indentation, and justification.
+
+@findex format-decode-buffer
+  If you visit a file and Emacs fails to recognize that it is in the
+@samp{text/enriched} format, type @kbd{M-x format-decode-buffer}.
+This command prompts for a file format, and re-reads the file in that
+format.  Specifying the @samp{text/enriched} format automatically
+enables Enriched mode.
+
+  To view a @samp{text/enriched} file in raw form (as plain text with
+markup tags rather than formatted text), use @kbd{M-x
+find-file-literally} (@pxref{Visiting}).
+
+  @xref{Format Conversion,, Format Conversion, elisp, the Emacs Lisp
+Reference Manual}, for details of how Emacs recognizes and converts
+file formats like @samp{text/enriched}.  @xref{Text Properties,,,
+elisp, the Emacs Lisp Reference Manual}, for more information about
+text properties.
 
 @node Hard and Soft Newlines
 @subsection Hard and Soft Newlines
@@ -1918,56 +1911,44 @@ for more information about text properties.
 @cindex newlines, hard and soft
 
 @cindex use-hard-newlines
-  In formatted text, Emacs distinguishes between two different kinds of
-newlines, @dfn{hard} newlines and @dfn{soft} newlines.  (You can enable
-or disable this feature separately in any  buffer with the command
-@code{use-hard-newlines}.)
-
-  Hard newlines are used to separate paragraphs, or items in a list, or
-anywhere that there should always be a line break regardless of the
-margins.  The @key{RET} command (@code{newline}) and @kbd{C-o}
-(@code{open-line}) insert hard newlines.
-
-  Soft newlines are used to make text fit between the margins.  All the
-fill commands, including Auto Fill, insert soft newlines---and they
-delete only soft newlines.
-
-  Although hard and soft newlines look the same, it is important to bear
-the difference in mind.  Do not use @key{RET} to break lines in the
-middle of filled paragraphs, or else you will get hard newlines that are
-barriers to further filling.  Instead, let Auto Fill mode break lines,
-so that if the text or the margins change, Emacs can refill the lines
-properly.  @xref{Auto Fill}.
-
-  On the other hand, in tables and lists, where the lines should always
-remain as you type them, you can use @key{RET} to end lines.  For these
-lines, you may also want to set the justification style to
-@code{unfilled}.  @xref{Format Justification}.
+  In Enriched mode, Emacs distinguishes between two different kinds of
+newlines, @dfn{hard} newlines and @dfn{soft} newlines.  You can also
+enable or disable this feature in other buffers, by typing @kbd{M-x
+use-hard-newlines}.
+
+  Hard newlines are used to separate paragraphs, or anywhere there
+needs to be a line break regardless of how the text is filled; soft
+newlines are used for filling.  The @key{RET} (@code{newline}) and
+@kbd{C-o} (@code{open-line}) commands insert hard newlines.  The fill
+commands, including Auto Fill (@pxref{Auto Fill}), insert only soft
+newlines and delete only soft newlines, leaving hard newlines alone.
+
+  Thus, when editing with Enriched mode, you should not use @key{RET}
+or @kbd{C-o} to break lines in the middle of filled paragraphs.  Use
+Auto Fill mode or explicit fill commands (@pxref{Fill Commands})
+instead.  Use @key{RET} or @kbd{C-o} where line breaks should always
+remain, such as in tables and lists.  For such lines, you may also
+want to set the justification style to @code{unfilled}
+(@pxref{Enriched Justification}).
 
 @node Editing Format Info
 @subsection Editing Format Information
 
-  There are two ways to alter the formatting information for a formatted
-text file: with keyboard commands, and with the mouse.
-
-  The easiest way to add properties to your document is with the Text
-Properties menu.  You can get to this menu in two ways: from the Edit
-menu in the menu bar (use @kbd{@key{F10} e t} if you have no mouse),
-or with @kbd{C-Mouse-2} (hold the @key{CTRL} key and press the middle
-mouse button).  There are also keyboard commands described in the
-following section.
-
-  These items in the Text Properties menu run commands directly:
+  The easiest way to alter properties is with the Text Properties
+menu.  You can get to this menu from the Edit menu in the menu bar
+(@pxref{Menu Bar}), or with @kbd{C-Mouse-2} (@pxref{Menu Mouse
+Clicks}).  Some of the commands in the Text Properties menu are listed
+below (you can also invoke them with @kbd{M-x}):
 
 @table @code
 @findex facemenu-remove-face-props
 @item Remove Face Properties
-Delete from the region all face and color text properties
+Remove face properties from the region
 (@code{facemenu-remove-face-props}).
 
 @findex facemenu-remove-all
 @item Remove Text Properties
-Delete @emph{all} text properties from the region
+Remove all text properties from the region, including face properties
 (@code{facemenu-remove-all}).
 
 @findex describe-text-properties
@@ -1976,168 +1957,98 @@ Delete @emph{all} text properties from the region
 @cindex widgets at buffer position
 @cindex buttons at buffer position
 @item Describe Properties
-List all the text properties, widgets, buttons, and overlays of the
-character following point (@code{describe-text-properties}).
+List all text properties and other information about the character
+following point (@code{describe-text-properties}).
 
 @item Display Faces
-Display a list of all the defined faces (@code{list-faces-display}).
+Display a list of defined faces (@code{list-faces-display}).
+@xref{Faces}.
 
 @item Display Colors
-Display a list of all the defined colors (@code{list-colors-display}).
+Display a list of defined colors (@code{list-colors-display}).
+@xref{Colors}.
 @end table
 
-@ifinfo
-  Other items in the Text Properties menu lead to submenus:
-
-@menu
-* Faces: Format Faces.          Bold, italic, underline, etc.
-* Color: Format Colors.         Changing the color of text.
-* Indent: Format Indentation.   Changing the left and right margins.
-* Justification: Format Justification.
-                                Centering, setting text flush with the
-                                  left or right margin, etc.
-* Special: Format Properties.   The "special" text properties submenu.
-@end menu
-@end ifinfo
-@ifnotinfo
-  The rest lead to submenus which are described in the following sections.
-@end ifnotinfo
-
-@node Format Faces
-@subsection Faces in Formatted Text
+@noindent
+The other menu entries are described in the following sections.
 
-  The Faces submenu under Text Properties lists various Emacs faces
-including @code{bold}, @code{italic}, and @code{underline}
-(@pxref{Faces}).  These menu items operate on the region if it is
-active and nonempty.  Otherwise, they specify to use that face for an
-immediately following self-inserting character.  There is also an item
-@samp{Other} with which you can enter a face name through the
-minibuffer (@pxref{Standard Faces}).
+@node Enriched Faces
+@subsection Faces in Enriched Text
 
-  Instead of the Faces submenu, you can use these keyboard commands:
+  The following commands can be used to add or remove faces
+(@pxref{Faces}).  Each applies to the text in the region if the mark
+is active, and to the next self-inserting character if the mark is
+inactive.  With a prefix argument, each command applies to the next
+self-inserting character even if the region is active.
 
 @table @kbd
 @kindex M-o d @r{(Enriched mode)}
 @findex facemenu-set-default
 @item M-o d
-Remove all @code{face} properties from the region (which includes
-specified colors), or force the following inserted character to have no
-@code{face} property (@code{facemenu-set-default}).
+Remove all @code{face} properties (@code{facemenu-set-default}).
+
 @kindex M-o b @r{(Enriched mode)}
 @findex facemenu-set-bold
 @item M-o b
-Add the face @code{bold} to the region or to the following inserted
-character (@code{facemenu-set-bold}).
+Apply the @code{bold} face (@code{facemenu-set-bold}).
+
 @kindex M-o i @r{(Enriched mode)}
 @findex facemenu-set-italic
 @item M-o i
-Add the face @code{italic} to the region or to the following inserted
-character (@code{facemenu-set-italic}).
+Apply the @code{italic} face (@code{facemenu-set-italic}).
+
 @kindex M-o l @r{(Enriched mode)}
 @findex facemenu-set-bold-italic
 @item M-o l
-Add the face @code{bold-italic} to the region or to the following
-inserted character (@code{facemenu-set-bold-italic}).
+Apply the @code{bold-italic} face (@code{facemenu-set-bold-italic}).
+
 @kindex M-o u @r{(Enriched mode)}
 @findex facemenu-set-underline
 @item M-o u
-Add the face @code{underline} to the region or to the following inserted
-character (@code{facemenu-set-underline}).
+Apply the @code{underline} face (@code{facemenu-set-underline}).
+
 @kindex M-o o @r{(Enriched mode)}
 @findex facemenu-set-face
 @item M-o o @var{face} @key{RET}
-Add the face @var{face} to the region or to the following inserted
-character (@code{facemenu-set-face}).
-@end table
+Apply the face @var{face} (@code{facemenu-set-face}).
 
-   With a prefix argument, all these commands apply to an immediately
-following self-inserting character, disregarding the region.
+@findex facemenu-set-foreground
+@item M-x facemenu-set-foreground
+Prompt for a color (@pxref{Colors}), and apply it as a foreground
+color.
 
-  A self-inserting character normally inherits the @code{face}
-property (and most other text properties) from the preceding character
-in the buffer.  If you use the above commands to specify face for the
-next self-inserting character, or the next section's commands to
-specify a foreground or background color for it, then it does not
-inherit the @code{face} property from the preceding character; instead
-it uses whatever you specified.  It will still inherit other text
-properties, though.
+@findex facemenu-set-background
+@item M-x facemenu-set-background
+Prompt for a color, and apply it as a background color.
+@end table
 
-  Strictly speaking, these commands apply only to the first following
-self-inserting character that you type.  But if you insert additional
-characters after it, they will inherit from the first one.  So it
-appears that these commands apply to all of them.
+@noindent
+These command are also available via the Text Properties menu.
 
-  Enriched mode defines two additional faces: @code{excerpt} and
-@code{fixed}.  These correspond to codes used in the text/enriched file
-format.
-
-  The @code{excerpt} face is intended for quotations.  This face is the
-same as @code{italic} unless you customize it (@pxref{Face Customization}).
-
-  The @code{fixed} face means, ``Use a fixed-width font for this part
-of the text.''  Applying the @code{fixed} face to a part of the text
-will cause that part of the text to appear in a fixed-width font, even
-if the default font is variable-width.  This applies to Emacs and to
-other systems that display text/enriched format.  So if you
-specifically want a certain part of the text to use a fixed-width
-font, you should specify the @code{fixed} face for that part.
-
-  By default, the @code{fixed} face looks the same as @code{bold}.
-This is an attempt to distinguish it from @code{default}.  You may
-wish to customize @code{fixed} to some other fixed-width medium font.
-@xref{Face Customization}.
-
-  If your terminal cannot display different faces, you will not be
-able to see them, but you can still edit documents containing faces,
-and even add faces and colors to documents.  The faces you specify
-will be visible when the file is viewed on a terminal that can display
-them.
-
-@node Format Colors
-@subsection Colors in Formatted Text
-
-  You can specify foreground and background colors for portions of the
-text.  Under Text Properties, there is a submenu for specifying the
-foreground color, and a submenu for specifying the background color.
-Each one lists all the colors that you have used in Enriched mode in
-the current Emacs session.
-
-  If the region is active, the command applies to the text in the
-region; otherwise, it applies to any immediately following
-self-inserting input.  When Transient Mark mode is off
-(@pxref{Disabled Transient Mark}), it always applies to the region
-unless a prefix argument is given, in which case it applies to the
-following input.
-
-  Each of the two color submenus contains one additional item:
-@samp{Other}.  You can use this item to specify a color that is not
-listed in the menu; it reads the color name with the minibuffer.  To
-display a list of available colors and their names, use the
-@samp{Display Colors} menu item in the Text Properties menu
-(@pxref{Editing Format Info}).
-
-  Any color that you specify in this way, or that is mentioned in a
-formatted text file that you read in, is added to the corresponding
-color menu for the duration of the Emacs session.
+  A self-inserting character normally inherits the face properties
+(and most other text properties) from the preceding character in the
+buffer.  If you use one of the above commands to specify the face for
+the next self-inserting character, that character will not inherit the
+faces properties from the preceding character, but it will still
+inherit other text properties.
 
-@findex facemenu-set-foreground
-@findex facemenu-set-background
-  There are no predefined key bindings for specifying colors, but you can do so
-with the extended commands @kbd{M-x facemenu-set-foreground} and
-@kbd{M-x facemenu-set-background}.  Both of these commands read the name
-of the color with the minibuffer.
+  Enriched mode defines two additional faces: @code{excerpt} and
+@code{fixed}.  These correspond to codes used in the text/enriched
+file format.  The @code{excerpt} face is intended for quotations; by
+default, it appears the same as @code{italic}.  The @code{fixed} face
+specifies fixed-width text; by default, it appears the same as
+@code{bold}.
 
-@node Format Indentation
-@subsection Indentation in Formatted Text
+@node Enriched Indentation
+@subsection Indentation in Enriched Text
 
-  When editing formatted text, you can specify different amounts of
-indentation for the right or left margin of an entire paragraph or a
-part of a paragraph.  The margins you specify automatically affect the
-Emacs fill commands (@pxref{Filling}) and line-breaking commands.
+  In Enriched mode, you can specify different amounts of indentation
+for the right or left margin of a paragraph or a part of a paragraph.
+These margins also affect fill commands such as @kbd{M-q}
+(@pxref{Filling}).
 
-  The Indentation submenu of Text Properties provides a convenient
-interface for specifying these properties.  The submenu contains four
-items:
+  The Indentation submenu of Text Properties provides four commands
+for specifying indentation:
 
 @table @code
 @kindex C-x TAB @r{(Enriched mode)}
@@ -2158,44 +2069,20 @@ Make the text narrower by indenting 4 columns at the right margin.
 Remove 4 columns of indentation from the right margin.
 @end table
 
-  You can use these commands repeatedly to increase or decrease the
-indentation.
-
-  The most common way to use them is to change the indentation of an
-entire paragraph.  For other uses, the effects of refilling can be
-hard to predict, except in some special cases like the one described
-next.
-
-  The most common other use is to format paragraphs with @dfn{hanging
-indents}, which means that the first line is indented less than
-subsequent lines.  To set up a hanging indent, increase the
-indentation of the region starting after the first word of the
-paragraph and running until the end of the paragraph.
-
-  Indenting the first line of a paragraph is easier.  Set the margin for
-the whole paragraph where you want it to be for the body of the
-paragraph, then indent the first line by inserting extra spaces or tabs.
-
 @vindex standard-indent
   The variable @code{standard-indent} specifies how many columns these
 commands should add to or subtract from the indentation.  The default
-value is 4.  The overall default right margin for Enriched mode is
-controlled by the variable @code{fill-column}, as usual.
+value is 4.  The default right margin for Enriched mode is controlled
+by the variable @code{fill-column}, as usual.
 
 @kindex C-c [ @r{(Enriched mode)}
 @kindex C-c ] @r{(Enriched mode)}
 @findex set-left-margin
 @findex set-right-margin
-  There are also two commands for setting the left or right margin of
-the region absolutely: @code{set-left-margin} and
-@code{set-right-margin}.  Enriched mode binds these commands to
-@kbd{C-c [} and @kbd{C-c ]}, respectively.  You can specify the
-margin width either with a numeric argument or in the minibuffer.
-
-  Sometimes, as a result of editing, the filling of a paragraph becomes
-messed up---parts of the paragraph may extend past the left or right
-margins.  When this happens, use @kbd{M-q} (@code{fill-paragraph}) to
-refill the paragraph.
+  You can also type @kbd{C-c [} (@code{set-left-margin}) and @kbd{C-c
+]} (@code{set-right-margin}) to set the left and right margins.  You
+can specify the margin width with a numeric argument; otherwise these
+commands prompt for a value via the minibuffer.
 
   The fill prefix, if any, works in addition to the specified paragraph
 indentation: @kbd{C-x .} does not include the specified indentation's
@@ -2203,148 +2090,76 @@ whitespace in the new value for the fill prefix, and the fill commands
 look for the fill prefix after the indentation on each line.  @xref{Fill
 Prefix}.
 
-@node Format Justification
-@subsection Justification in Formatted Text
-
-  When editing formatted text, you can specify various styles of
-justification for a paragraph.  The style you specify automatically
-affects the Emacs fill commands.
+@node Enriched Justification
+@subsection Justification in Enriched Text
 
-  The Justification submenu of Text Properties provides a convenient
-interface for specifying the style.  The submenu contains five items:
-
-@table @code
-@item Left
-This is the most common style of justification (at least for English).
-Lines are aligned at the left margin but left uneven at the right.
-
-@item Right
-This aligns each line with the right margin.  Spaces and tabs are added
-on the left, if necessary, to make lines line up on the right.
-
-@item Full
-This justifies the text, aligning both edges of each line.  Justified
-text looks very nice in a printed book, where the spaces can all be
-adjusted equally, but it does not look as nice with a fixed-width font
-on the screen.  Perhaps a future version of Emacs will be able to adjust
-the width of spaces in a line to achieve elegant justification.
-
-@item Center
-This centers every line between the current margins.
-
-@item Unfilled
-This turns off filling entirely.  Each line will remain as you wrote it;
-the fill and auto-fill functions will have no effect on text which has
-this setting.  You can, however, still indent the left margin.  In
-unfilled regions, all newlines are treated as hard newlines (@pxref{Hard
-and Soft Newlines}) .
-@end table
-
-  In Enriched mode, you can also specify justification from the keyboard
-using the @kbd{M-j} prefix character:
+  In Enriched mode, you can use the following commands to specify
+various @dfn{justification styles} for filling.  These commands apply
+to the paragraph containing point, or, if the region is active, to all
+paragraphs overlapping the region.
 
 @table @kbd
 @kindex M-j l @r{(Enriched mode)}
 @findex set-justification-left
 @item M-j l
-Make the region left-filled (@code{set-justification-left}).
+Align lines to the left margin (@code{set-justification-left}).
+
 @kindex M-j r @r{(Enriched mode)}
 @findex set-justification-right
 @item M-j r
-Make the region right-filled (@code{set-justification-right}).
+Align lines to the right margin (@code{set-justification-right}).
+
 @kindex M-j b @r{(Enriched mode)}
 @findex set-justification-full
 @item M-j b
-Make the region fully justified (@code{set-justification-full}).
+Align lines to both margins, inserting spaces in the middle of the
+line to achieve this (@code{set-justification-full}).
+
 @kindex M-j c @r{(Enriched mode)}
 @kindex M-S @r{(Enriched mode)}
 @findex set-justification-center
 @item M-j c
 @itemx M-S
-Make the region centered (@code{set-justification-center}).
+Center lines between the margins (@code{set-justification-center}).
+
 @kindex M-j u @r{(Enriched mode)}
 @findex set-justification-none
 @item M-j u
-Make the region unfilled (@code{set-justification-none}).
+Turn off filling entirely (@code{set-justification-none}).  The fill
+commands do nothing on text with this setting.  You can, however,
+still indent the left margin.
 @end table
 
-  Justification styles apply to entire paragraphs.  All the
-justification-changing commands operate on the paragraph containing
-point, or, if the region is active, on all paragraphs which overlap the
-region.
+  You can also specify justification styles using the Justification
+submenu in the Text Properties menu.
 
 @vindex default-justification
-  The default justification style is specified by the variable
-@code{default-justification}.  Its value should be one of the symbols
-@code{left}, @code{right}, @code{full}, @code{center}, or @code{none}.
-This is a per-buffer variable.  Setting the variable directly affects
-only the current buffer.  However, customizing it in a Custom buffer
-sets (as always) the default value for buffers that do not override it.
-@xref{Locals}, and @ref{Easy Customization}.
-
-@node Format Properties
-@subsection Setting Other Text Properties
-
-  The Special Properties submenu of Text Properties can add or remove
-three other useful text properties: @code{read-only}, @code{invisible}
-and @code{intangible}.  The @code{intangible} property disallows
-moving point within the text, the @code{invisible} text property hides
-text from display, and the @code{read-only} property disallows
-alteration of the text.
+  The default justification style is specified by the per-buffer
+variable @code{default-justification}.  Its value should be one of the
+symbols @code{left}, @code{right}, @code{full}, @code{center}, or
+@code{none}.
 
-  Each of these special properties has a menu item to add it to the
-region.  The last menu item, @samp{Remove Special}, removes all of these
-special properties from the text in the region.
-
-  Currently, the @code{invisible} and @code{intangible} properties are
-@emph{not} saved in the text/enriched format.  The @code{read-only}
-property is saved, but it is not a standard part of the text/enriched
-format, so other editors may not respect it.
-
-@node Forcing Enriched Mode
-@subsection Forcing Enriched Mode
-
-  Normally, Emacs knows when you are editing formatted text because it
-recognizes the special annotations used in the file that you visited.
-However, sometimes you must take special actions to convert file
-contents or turn on Enriched mode:
-
-@itemize @bullet
-@item
-When you visit a file that was created with some other editor, Emacs may
-not recognize the file as being in the text/enriched format.  In this
-case, when you visit the file you will see the formatting commands
-rather than the formatted text.  Type @kbd{M-x format-decode-buffer} to
-translate it.  This also automatically turns on Enriched mode.
+@node Enriched Properties
+@subsection Setting Other Text Properties
 
-@item
-When you @emph{insert} a file into a buffer, rather than visiting it,
-Emacs does the necessary conversions on the text which you insert, but
-it does not enable Enriched mode.  If you wish to do that, type @kbd{M-x
-enriched-mode}.
-@end itemize
+  The Special Properties submenu of Text Properties has entries for
+adding or removing three other text properties: @code{read-only},
+(which disallows alteration of the text), @code{invisible} (which
+hides text), and @code{intangible} (which disallows moving point
+within the text).  The @samp{Remove Special} menu item removes all of
+these special properties from the text in the region.
 
-  The command @code{format-decode-buffer} translates text in various
-formats into Emacs's internal format.  It asks you to specify the format
-to translate from; however, normally you can type just @key{RET}, which
-tells Emacs to guess the format.
-
-@findex format-find-file
-  If you wish to look at a text/enriched file in its raw form, as a
-sequence of characters rather than as formatted text, use the @kbd{M-x
-find-file-literally} command.  This visits a file, like
-@code{find-file}, but does not do format conversion.  It also inhibits
-character code conversion (@pxref{Coding Systems}) and automatic
-uncompression (@pxref{Compressed Files}).  To disable format conversion
-but allow character code conversion and/or automatic uncompression if
-appropriate, use @code{format-find-file} with suitable arguments.
+  The @code{invisible} and @code{intangible} properties are @emph{not}
+saved in the text/enriched format.  The @code{read-only} property is
+saved, but it is not a standard part of the text/enriched format, so
+other editors may not respect it.
 
 @node Text Based Tables
 @section Editing Text-based Tables
 @cindex table mode
 @cindex text-based tables
 
-  Table mode provides an easy and intuitive way to create and edit WYSIWYG
+  Table mode provides an easy and intuitive way to create and edit
 text-based tables.  Here is an example of such a table:
 
 @smallexample
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index c44b67454a2..6a6f7b1a4d7 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -193,6 +193,7 @@ Select buffer @var{bufname} in another window
 
 @findex display-buffer
 @item C-x 4 C-o @var{bufname} @key{RET}
+@kindex C-x 4 C-o
 Display buffer @var{bufname} in some window, without trying to select
 it (@code{display-buffer}).  @xref{Displaying Buffers}, for details
 about how the window is chosen.
@@ -385,7 +386,8 @@ change @code{pop-up-frames} (see below) to @code{t}.
 @item
 Otherwise, if you specified that the buffer should be displayed in a
 special frame by customizing @code{special-display-buffer-names} or
-@code{special-display-regexps}, do so.  @xref{Special Buffer Frames}.
+@code{special-display-regexps}, do so.  @xref{Choosing Window
+Options,,, elisp, The Emacs Lisp Reference Manual}.
 
 @vindex pop-up-frames
 @item
@@ -420,7 +422,7 @@ and display the buffer there.
 @end itemize
 
 @node Window Convenience
-@section Window Handling Convenience Features and Customization
+@section Convenience Features for Window Handling
 
 @findex winner-mode
 @cindex Winner mode
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index c2e65268d1b..b32b3d905e4 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -306,14 +306,14 @@ Name to display in the title bar of the initial Emacs frame.
 @item @code{toolBar} (class @code{ToolBar})
 @cindex tool bar
 Number of lines to reserve for the tool bar.  A zero value suppresses
-the tool bar.  For the Emacs tool bar (i.e. not Gtk+), if the value is 
-non-zero and @code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's
-size will be changed automatically so that all tool bar items are visible.
-  If the value of @code{auto-resize-tool-bars} is @code{grow-only},
-the tool bar expands automatically, but does not contract automatically.
-To contract the tool bar, you must redraw the frame by entering @kbd{C-l}.
-For the Gtk+ tool bar, any non-zero value means on and
-@code{auto-resize-tool-bars} has no effect.
+the tool bar.  For the Emacs tool bar (i.e.@: not Gtk+), if the value
+is non-zero and @code{auto-resize-tool-bars} is non-@code{nil}, the
+tool bar's size will be changed automatically so that all tool bar
+items are visible.  If the value of @code{auto-resize-tool-bars} is
+@code{grow-only}, the tool bar expands automatically, but does not
+contract automatically.  To contract the tool bar, you must redraw the
+frame by entering @kbd{C-l}.  For the Gtk+ tool bar, any non-zero
+value means on and @code{auto-resize-tool-bars} has no effect.
 
 @item @code{useXIM} (class @code{UseXIM})
 @cindex XIM
@@ -641,17 +641,18 @@ The color for the border shadow, on the top and the left.
 @node GTK resources
 @appendixsec GTK resources
 @iftex
-  The most common way to customize the GTK widgets Emacs uses (menus, dialogs
-tool bars and scroll bars) is by choosing an appropriate theme, for example
-with the GNOME theme selector.  
-
-You can also do Emacs specific customization
-by inserting GTK style directives in the file @file{~/.emacs.d/gtkrc},
-but only if you have a Gtk+ version earlier than 3 (i.e. 2).   Some GTK
-themes ignore customizations in @file{~/.emacs.d/gtkrc} so not everything
-works with all themes.  To customize Emacs font, background, faces, etc., use
-the normal X resources (@pxref{Resources}).  We will present some examples of
-customizations here, but for a more detailed description, see the online manual
+  The most common way to customize the GTK widgets Emacs uses (menus,
+dialogs tool bars and scroll bars) is by choosing an appropriate
+theme, for example with the GNOME theme selector.
+
+You can also do Emacs specific customization by inserting GTK style
+directives in the file @file{~/.emacs.d/gtkrc}, but only if you have a
+Gtk+ version earlier than 3 (i.e.@: 2).  Some GTK themes ignore
+customizations in @file{~/.emacs.d/gtkrc} so not everything works with
+all themes.  To customize Emacs font, background, faces, etc., use the
+normal X resources (@pxref{Resources}).  We will present some examples
+of customizations here, but for a more detailed description, see the
+online manual
 
   The first example is just one line.  It changes the font on all GTK widgets
 to courier with size 12:
@@ -1065,7 +1066,7 @@ possible states are:
 This is the default state for widgets.
 @item ACTIVE
 This is the state for a widget that is ready to do something.  It is
-also for the trough of a scroll bar, i.e.  @code{bg[ACTIVE] = "red"}
+also for the trough of a scroll bar, i.e.@: @code{bg[ACTIVE] = "red"}
 sets the scroll bar trough to red.  Buttons that have been pressed but
 not released yet (``armed'') are in this state.
 @item PRELIGHT
@@ -1109,7 +1110,7 @@ You can't specify the file by its absolute file name.  GTK looks for
 the pixmap file in directories specified in @code{pixmap_path}.
 @code{pixmap_path} is a colon-separated list of directories within
 double quotes, specified at the top level in a @file{gtkrc} file
-(i.e. not inside a style definition; see example above):
+(i.e.@: not inside a style definition; see example above):
 
 @smallexample
 pixmap_path "/usr/share/pixmaps:/usr/include/X11/pixmaps"
@@ -1131,19 +1132,18 @@ Bold 12}, @samp{Courier 14}, @samp{Times 18}.  See below for exact
 syntax.  The names are case insensitive.
 @end table
 
-  There are three ways to specify a color: by name, in hexadecimal
-form, and with an RGB triplet.
+  There are three ways to specify a color: a color name, an RGB
+triplet, or a GTK-style RGB triplet.  @xref{Colors}, for a description
+of color names and RGB triplets.  Color names should be enclosed with
+double quotes, e.g.@: @samp{"red"}.  RGB triplets should be written
+without double quotes, e.g.@: @samp{#ff0000}.  GTK-style RGB triplets
+have the form
 
-@noindent
-A color name is written within double quotes, for example @code{"red"}.
-
-@noindent
-Hexadecimal form is the same as in X:
-@code{#@var{rrrr}@var{gggg}@var{bbbb}}, where all three color specs
-must have the same number of hex digits (1, 2, 3 or 4).
+@smallexample
+@code{@{ @var{r}, @var{g}, @var{b} @}}
+@end smallexample
 
 @noindent
-An RGB triplet looks like @code{@{ @var{r}, @var{g}, @var{b} @}},
 where @var{r}, @var{g} and @var{b} are either integers in the range
 0-65535 or floats in the range 0.0-1.0.
 
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index bdcd9e9aea8..6cede6375f2 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Update dependencies.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs-lisp-intro.texi (etags): Fix typo.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 244d95d6937..23d0d5a8f34 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1401,7 +1401,7 @@ This is a harmless activity; and indeed, we will often try to generate
 error messages intentionally.  Once you understand the jargon, error
 messages can be informative.  Instead of being called ``error''
 messages, they should be called ``help'' messages.  They are like
-signposts to a traveller in a strange country; deciphering them can be
+signposts to a traveler in a strange country; deciphering them can be
 hard, but once understood, they can point the way.
 
 The error message is generated by a built-in GNU Emacs debugger.  We
@@ -2040,7 +2040,7 @@ the first argument.  This function takes three arguments.  Its first
 argument is the string of characters, the second and third arguments are
 numbers that indicate the beginning and end of the substring.  The
 numbers are a count of the number of characters (including spaces and
-punctuations) from the beginning of the string.
+punctuation) from the beginning of the string.
 
 @need 800
 For example, if you evaluate the following:
diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in
index 7294d46b693..06641cc2222 100644
--- a/doc/lispintro/makefile.w32-in
+++ b/doc/lispintro/makefile.w32-in
@@ -24,7 +24,7 @@ infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
-INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi
+INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(srcdir)/doclicense.texi
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing
 INFO_TARGETS = $(infodir)/eintr
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 293f253c545..37de62be976 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,26 @@
+2011-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Truncation):
+        * text.texi (Special Properties): Describe what a stretch-glyph is
+        instead of using that term without explanation.  Make the
+        cross-references more accurate.
+
+        * display.texi (Usual Display): Update the description,
+        cross-references, and indexing related to display of control
+        characters and raw bytes.
+
+2011-11-25  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Splitting Windows): Fix description of
+        window-combination-limit.  Suggested by Eli Zaretskii.
+
+2011-11-23  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Window Sizes): Move window-top-line,
+        window-left-column, and window-*-pixel-edges to Coordinates and
+        Windows node.
+        (Coordinates and Windows): Restore window-edges doc.
+
 2011-11-21  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Windows and Frames, Splitting Windows): Fix
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 9849420b1f5..a9921d7443d 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -193,10 +193,12 @@ a window, that forces truncation.
 @defvar wrap-prefix
 If this buffer-local variable is non-@code{nil}, it defines a
 ``prefix'' that is prepended to every continuation line at
-display-time.  (If lines are truncated, the wrap-prefix is never
-used.)  It may be a string, an image, or a stretch-glyph; the value is
-interpreted in the same way as a @code{display} text property.
-@xref{Display Property}.
+display time.  (If lines are truncated, the wrap-prefix is never
+used.)  It may be a string or an image (@pxref{Other Display Specs}),
+or a stretch of whitespace such as specified by the @code{:width} or
+@code{:align-to} display properties (@pxref{Specified Space}).  The
+value is interpreted in the same way as a @code{display} text
+property.  @xref{Display Property}.
 
 A wrap-prefix may also be specified for regions of text, using the
 @code{wrap-prefix} text or overlay property.  This takes precedence
@@ -206,9 +208,11 @@ over the @code{wrap-prefix} variable.  @xref{Special Properties}.
 @defvar line-prefix
 If this buffer-local variable is non-@code{nil}, it defines a
 ``prefix'' that is prepended to every non-continuation line at
-display-time.  It may be a string, an image, or a stretch-glyph; the
-value is interpreted in the same way as a @code{display} text
-property.  @xref{Display Property}.
+display time.  It may be a string or an image (@pxref{Other Display
+Specs}), or a stretch of whitespace such as specified by the
+@code{:width} or @code{:align-to} display properties (@pxref{Specified
+Space}).  The value is interpreted in the same way as a @code{display}
+text property.  @xref{Display Property}.
 
 A line-prefix may also be specified for regions of text using the
 @code{line-prefix} text or overlay property.  This takes precedence
@@ -5638,39 +5642,45 @@ code.  You can override these conventions by setting up a display table
 @itemize @bullet
 @item
 Character codes 32 through 126 map to glyph codes 32 through 126.
-Normally this means they display as themselves.
+Normally this means they display as themselves, but a display table
+can change that.
 
 @item
 Character code 9 is a horizontal tab.  It displays as whitespace
 up to a position determined by @code{tab-width}.
 
 @item
-Character code 10 is a newline.
+Character code 10 is a newline.  It is normally invisible on display,
+and has the effect of ending the preceding line and starting a new
+line.
 
 @item
-All other codes in the range 0 through 31, and code 127, display in one
-of two ways according to the value of @code{ctl-arrow}.  If it is
-non-@code{nil}, these codes map to sequences of two glyphs, where the
-first glyph is the @acronym{ASCII} code for @samp{^}.  (A display table can
-specify a glyph to use instead of @samp{^}.)  Otherwise, these codes map
-just like the codes in the range 128 to 255.
-
-On MS-DOS terminals, Emacs arranges by default for the character code
-127 to be mapped to the glyph code 127, which normally displays as an
-empty polygon.  This glyph is used to display non-@acronym{ASCII} characters
-that the MS-DOS terminal doesn't support.  @xref{MS-DOS and MULE,,,
-emacs, The GNU Emacs Manual}.
-
+All other codes in the range 0 through 31 display in one of two ways
+according to the value of @code{ctl-arrow}.  If it is non-@code{nil},
+these codes map to sequences of two glyphs, where the first glyph is
+the @acronym{ASCII} code for @samp{^}.  (A display table can specify a
+glyph to use instead of @samp{^}.)  Otherwise, these codes map just
+like the raw bytes in the range 128 to 255 (described below).
+
+@cindex octal escapes
 @item
-Character codes 128 through 255 map to sequences of four glyphs, where
-the first glyph is the @acronym{ASCII} code for @samp{\}, and the others are
-digit characters representing the character code in octal.  (A display
-table can specify a glyph to use instead of @samp{\}.)
+Raw bytes (@pxref{Text Representations}) with codes 128 through 255,
+and the @acronym{ASCII} control character with code 127, display as
+sequences of four glyphs, where the first glyph is the @acronym{ASCII}
+code for @samp{\}, and the others are digit characters representing
+the character code in octal.  (A display table can specify a glyph to
+use instead of @samp{\}.)  This is known as the @dfn{octal escape}
+display.
 
 @item
-Multibyte character codes above 256 are displayed as themselves, or as
-a question mark or a hex code or an empty box if the terminal cannot
-display that character.
+Non-@acronym{ASCII} character codes above 127 are displayed as
+themselves, if the terminal and the available fonts support them.
+Characters that are not supported by the terminal, or (on window
+systems) have no fonts available for them, are displayed as a question
+mark or a hex code or an empty box.  @xref{Glyphless Chars}, for how
+to control display of the characters not supported by the terminal or
+fonts.  Display tables can change how a character is displayed, even
+if it is supported.
 @end itemize
 
   The usual display conventions apply even when there is a display
@@ -5695,7 +5705,8 @@ mode line using the new values, call the function
 This buffer-local variable controls how control characters are
 displayed.  If it is non-@code{nil}, they are displayed as a caret
 followed by the character: @samp{^A}.  If it is @code{nil}, they are
-displayed as a backslash followed by three octal digits: @samp{\001}.
+displayed as octal escapes: a backslash followed by three octal
+digits, as in @samp{\001}.
 @end defopt
 
 @defopt tab-width
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile
index 5c0a6d0f5ea..e0d77ee0541 100644
--- a/doc/lispref/spellfile
+++ b/doc/lispref/spellfile
@@ -253,7 +253,6 @@ deletable
 deletion'
 delq
 depiction
-descendents
 deselecting
 destructive'
 destructively'
@@ -299,7 +298,6 @@ excess'
 exec
 exitcode
 expression'
-extendible
 extra'
 fails'
 fascist
@@ -660,7 +658,7 @@ the'
 tildes
 time's
 to'
-towars
+towards
 transportable
 txt
 types'
@@ -674,7 +672,6 @@ undefine
 undefines
 underfull
 undo's
-undodata
 unevaluated'
 unexec
 unexpand
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 3a081dddc61..fc12939bec5 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3191,10 +3191,12 @@ controls the total height of the display line ending in that newline.
 
 @item wrap-prefix
 If text has a @code{wrap-prefix} property, the prefix it defines will
-be added at display-time to the beginning of every continuation line
+be added at display time to the beginning of every continuation line
 due to text wrapping (so if lines are truncated, the wrap-prefix is
-never used).  It may be a string, an image, or a stretch-glyph such as
-used by the @code{display} text-property.  @xref{Display Property}.
+never used).  It may be a string or an image (@pxref{Other Display
+Specs}), or a stretch of whitespace such as specified by the
+@code{:width} or @code{:align-to} display properties (@pxref{Specified
+Space}).
 
 A wrap-prefix may also be specified for an entire buffer using the
 @code{wrap-prefix} buffer-local variable (however, a
@@ -3203,9 +3205,11 @@ the @code{wrap-prefix} variable).  @xref{Truncation}.
 
 @item line-prefix
 If text has a @code{line-prefix} property, the prefix it defines will
-be added at display-time to the beginning of every non-continuation
-line.  It may be a string, an image, or a stretch-glyph such as used
-by the @code{display} text-property.  @xref{Display Property}.
+be added at display time to the beginning of every non-continuation
+line.  It may be a string or an image (@pxref{Other Display
+Specs}), or a stretch of whitespace such as specified by the
+@code{:width} or @code{:align-to} display properties (@pxref{Specified
+Space}).
 
 A line-prefix may also be specified for an entire buffer using the
 @code{line-prefix} buffer-local variable (however, a
@@ -3762,7 +3766,7 @@ Additionally, if two fields are separated by another field with the
 special value @code{boundary}, then any point within this special
 field is also considered to be ``on the boundary.''
 
-Commands like @kbd{C-a} with no argumemt, that normally move backward
+Commands like @kbd{C-a} with no argument, that normally move backward
 to a specific kind of location and stay there once there, probably
 should specify @code{nil} for @var{escape-from-edge}.  Other motion
 commands that check fields should probably pass @code{t}.
@@ -4322,5 +4326,3 @@ If you do want modification hooks to be run in a particular piece of
 code that is itself run from a modification hook, then rebind locally
 @code{inhibit-modification-hooks} to @code{nil}.
 @end defvar
-
-
diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt
index 53a9f58cd01..6eb11a92f47 100644
--- a/doc/lispref/two-volume-cross-refs.txt
+++ b/doc/lispref/two-volume-cross-refs.txt
@@ -34,7 +34,7 @@ where each volume starts with a higher page number since I find it
 harder to go to the right place in the volume.)
 
 References to the same volume are just the page number; references to
-the other volume are a volumne number (in Roman numerals) preceding
+the other volume are a volume number (in Roman numerals) preceding
 the page number.
 
 For example, in Volume I:
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index bb1b0524689..437b6db8d58 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -376,7 +376,7 @@ Bars}).  At the top of the window is an optional header line
 line (@pxref{Mode Line Format}).
 
   Emacs provides several functions for finding the height and width of
-a window.  Except where noted, these heights and widths are reported
+a window.  Except where noted, Emacs reports window heights and widths
 as integer numbers of lines and columns respectively.  On a graphical
 display, each ``line'' and ``column'' actually corresponds to the
 height and width of a ``default'' character specified by the frame's
@@ -439,26 +439,6 @@ that of the root window on that frame.  If @var{window} is omitted or
 @code{nil}, it defaults to the selected window.
 @end defun
 
-@cindex window position
-  The following functions can be used to determine the position of a
-window relative to the window area of its frame:
-
-@defun window-top-line &optional window
-This function returns the distance, in lines, between the top of
-@var{window} and the top of the frame's window area.  For instance,
-the return value is 0 if there is no window above @var{window}.  If
-@var{window} is omitted or @code{nil}, it defaults to the selected
-window.
-@end defun
-
-@defun window-left-column &optional window
-This function returns the distance, in columns, between the left edge
-of @var{window} and the left edge of the frame's window area.  For
-instance, the return value is 0 if there is no window to the left of
-@var{window}.  If @var{window} is omitted or @code{nil}, it defaults
-to the selected window.
-@end defun
-
 @cindex window body height
 @cindex body height of a window
 @cindex window body width
@@ -535,45 +515,12 @@ can be resized in the desired direction.  To determine that, use the
 function @code{window-resizable}.  @xref{Resizing Windows}.
 @end defun
 
-  The following functions can be used to find a window's size and
-position in pixels.  Though mostly useful on graphical displays, they
-can also be called on text-only terminals, where the screen area of
-each text character is taken to be ``one pixel''.
-
-@defun window-pixel-edges &optional window
-This function return a list of pixel coordinates for the edges of
-@var{window}.  If @var{window} is omitted or @code{nil}, it defaults
-to the selected window.
-
-The return value has the form @code{(@var{left} @var{top} @var{right}
-@var{bottom})}.  The list elements are, respectively, the X coordinate
-of the left window edge, the Y coordinate of the top edge, one more
-than the X coordinate of the right edge, and one more than the Y
-coordinate of the bottom edge.  The origin coordinate @samp{(0,0)} is
-taken to be the top left corner of the frame's window area.
-
-These edge values include the space used by the window's scroll bar,
-margins, fringes, header line, and mode line, if any.
-@end defun
-
-@defun window-inside-pixel-edges &optional window
-This function is like @code{window-pixel-edges}, except that it
-returns the edge coordinates for the window's text area, rather than
-the edge coordinates for the window itself.  @var{window} must specify
-a live window.
-@end defun
-
-@defun window-absolute-pixel-edges &optional window
-This function is like @code{window-pixel-edges}, except that it
-returns the edge coordinates relative to the top left corner of the
-display screen.
-@end defun
-
-@defun window-inside-absolute-pixel-edges &optional window
-This function is like @code{window-inside-pixel-edges}, except that it
-returns the edge coordinates relative to the top left corner of the
-display screen.  @var{window} must specify a live window.
-@end defun
+  @xref{Coordinates and Windows}, for more functions that report the
+positions of various parts of a window relative to the frame, from
+which you can calculate its size.  In particular, you can use the
+functions @code{window-pixel-edges} and
+@code{window-inside-pixel-edges} to find the size in pixels, for
+graphical displays.
 
 @node Resizing Windows
 @section Resizing Windows
@@ -943,8 +890,9 @@ direction as the existing window combination (otherwise, a new
 internal window is created anyway).  The default is @code{nil}.  Other
 values are reserved for future use.
 
-Thus, if the value is always @code{t}, each window tree is a binary
-tree: each window except the root window has exactly one sibling.
+Thus, if the value of this variable is at all times @code{t}, then at
+all times every window tree is a binary tree (a tree where each window
+except the root window has exactly one sibling).
 
 Furthermore, @code{split-window} calls
 @code{set-window-combination-limit} on the newly-created internal
@@ -2976,32 +2924,90 @@ is off the screen due to horizontal scrolling:
 @end group
 @end example
 
-
 @node Coordinates and Windows
 @section Coordinates and Windows
+@cindex frame-relative coordinate
+@cindex coordinate, relative to frame
+@cindex window position
+
+  This section describes functions that report the position of a
+window.  Most of these functions report positions relative to the
+window's frame.  In this case, the coordinate origin @samp{(0,0)} lies
+near the upper left corner of the frame.  For technical reasons, on
+graphical displays the origin is not located at the exact corner of
+the graphical window as it appears on the screen.  If Emacs is built
+with the GTK+ toolkit, the origin is at the upper left corner of the
+frame area used for displaying Emacs windows, below the title-bar,
+GTK+ menu bar, and tool bar (since these are drawn by the window
+manager and/or GTK+, not by Emacs).  But if Emacs is not built with
+GTK+, the origin is at the upper left corner of the tool bar (since in
+this case Emacs itself draws the tool bar).  In both cases, the X and
+Y coordinates increase rightward and downward respectively.
+
+  Except where noted, X and Y coordinates are reported in integer
+character units, i.e. numbers of lines and columns respectively.  On a
+graphical display, each ``line'' and ``column'' corresponds to the
+height and width of a default character specified by the frame's
+default font.
+
+@defun window-edges &optional window
+This function returns a list of the edge coordinates of @var{window}.
+If @var{window} is omitted or @code{nil}, it defaults to the selected
+window.
 
-This section describes how to relate screen coordinates to windows.
+The return value has the form @code{(@var{left} @var{top} @var{right}
+@var{bottom})}.  These list elements are, respectively, the X
+coordinate of the leftmost column occupied by the window, the Y
+coordinate of the topmost row, the X coordinate one column to the
+right of the rightmost column, and the Y coordinate one row down from
+the bottommost row.
 
-@defun window-at x y &optional frame
-This function returns the window containing the specified cursor
-position in the frame @var{frame}.  The coordinates @var{x} and @var{y}
-are measured in characters and count from the top left corner of the
-frame.  If they are out of range, @code{window-at} returns @code{nil}.
+Note that these are the actual outer edges of the window, including
+any header line, mode line, scroll bar, fringes, and display margins.
+On a text-only terminal, if the window has a neighbor on its right,
+its right edge includes the separator line between the window and its
+neighbor.
+@end defun
 
-If you omit @var{frame}, the selected frame is used.
+@defun window-inside-edges &optional window
+This function is similar to @code{window-edges}, but the returned edge
+values are for the text area of the window.  They exclude any header
+line, mode line, scroll bar, fringes, display margins, and vertical
+separator.
 @end defun
 
-@defun coordinates-in-window-p coordinates window
-This function checks whether a particular frame position falls within
-the window @var{window}.
+@defun window-top-line &optional window
+This function returns the Y coordinate of the topmost row of
+@var{window}, equivalent to the @var{top} entry in the list returned
+by @code{window-edges}.
+@end defun
+
+@defun window-left-column &optional window
+This function returns the X coordinate of the leftmost column of
+@var{window}, equivalent to the @var{left} entry in the list returned
+by @code{window-edges}.
+@end defun
 
-The argument @var{coordinates} is a cons cell of the form @code{(@var{x}
-. @var{y})}.  The coordinates @var{x} and @var{y} are measured in
-characters, and count from the top left corner of the screen or frame.
+  The following functions can be used to relate a set of
+frame-relative coordinates to a window:
 
-The value returned by @code{coordinates-in-window-p} is non-@code{nil}
-if the coordinates are inside @var{window}.  The value also indicates
-what part of the window the position is in, as follows:
+@defun window-at x y &optional frame
+This function returns the live window at the frame-relative
+coordinates @var{x} and @var{y}, on frame @var{frame}.  If there is no
+window at that position, the return value is @code{nil}.  If
+@var{frame} is omitted or @code{nil}, it defaults to the selected
+frame.
+@end defun
+
+@defun coordinates-in-window-p coordinates window
+This function checks whether a window @var{window} occupies the
+frame-relative coordinates @var{coordinates}, and if so which part of
+the window that is.  @var{window} should be a live window.
+@var{coordinates} should be a cons cell of the form @code{(@var{x}
+. @var{y})}, where @var{x} and @var{y} are frame-relative coordinates.
+
+If there is no window at the specified position, the return value is
+@code{nil} .  Otherwise, the return value is one of the following:
 
 @table @code
 @item (@var{relx} . @var{rely})
@@ -3038,6 +3044,44 @@ The function @code{coordinates-in-window-p} does not require a frame as
 argument because it always uses the frame that @var{window} is on.
 @end defun
 
+  The following functions return window positions in pixels, rather
+than character units.  Though mostly useful on graphical displays,
+they can also be called on text-only terminals, where the screen area
+of each text character is taken to be ``one pixel''.
+
+@defun window-pixel-edges &optional window
+This function returns a list of pixel coordinates for the edges of
+@var{window}.  If @var{window} is omitted or @code{nil}, it defaults
+to the selected window.
+
+The return value has the form @code{(@var{left} @var{top} @var{right}
+@var{bottom})}.  The list elements are, respectively, the X pixel
+coordinate of the left window edge, the Y pixel coordinate of the top
+edge, one more than the X pixel coordinate of the right edge, and one
+more than the Y pixel coordinate of the bottom edge.
+@end defun
+
+@defun window-inside-pixel-edges &optional window
+This function is like @code{window-pixel-edges}, except that it
+returns the pixel coordinates for the edges of the window's text area,
+rather than the pixel coordinates for the edges of the window itself.
+@var{window} must specify a live window.
+@end defun
+
+  The following functions return window positions in pixels, relative
+to the display screen rather than the frame:
+
+@defun window-absolute-pixel-edges &optional window
+This function is like @code{window-pixel-edges}, except that it
+returns the edge pixel coordinates relative to the top left corner of
+the display screen.
+@end defun
+
+@defun window-inside-absolute-pixel-edges &optional window
+This function is like @code{window-inside-pixel-edges}, except that it
+returns the edge pixel coordinates relative to the top left corner of
+the display screen.  @var{window} must specify a live window.
+@end defun
 
 @node Window Configurations
 @section Window Configurations
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 91ef4189b79..1acdcf5ebd2 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.91"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.92"
 .
 .
 .SH NAME
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 43d9ba1b1e6..f94153479a8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * gnus.texi, smtpmail.texi: Fix case of "GnuTLS".
+
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in: Update dependencies.
+
 2011-11-20  Glenn Morris  <rgm@gnu.org>
 
         * gnus.texi (Group Information):
@@ -2987,7 +2995,7 @@
         * org.texi (Activation, Exporting, ASCII export, HTML export)
         (HTML Export commands, LaTeX/PDF export commands):
         Improve documentation about transient-mark-mode.
-        (References): DOcuemtn the use of special names like $LR1 to reference
+        (References): Document the use of special names like $LR1 to reference
         to fields in the last table row.
 
 2008-12-19  Juri Linkov  <juri@jurta.org>
@@ -7974,7 +7982,7 @@
 2003-02-01  Michael Albinus  <Michael.Albinus@alcatel.de>
 
         * tramp.texi (Frequently Asked Questions): Explain a workaround if
-        another package loads accidently Ange-FTP.
+        another package loads accidentally Ange-FTP.
 
 2003-01-24  Michael Albinus  <Michael.Albinus@alcatel.de>
 
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index ecf4c7e47b2..289c08eb00e 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -419,7 +419,7 @@ inserting something.  When this is @code{nil}, inserting is only done with
 @kbd{M-x auto-insert}.  When this is @code{function}, you are queried
 whenever @code{auto-insert} is called as a function, such as when Emacs
 visits an empty file and you have set the above-mentioned hook.  Otherwise
-you are alway queried.
+you are always queried.
 
 @vindex auto-insert-prompt
   When querying, the variable @code{auto-insert-prompt}'s value is used as a
@@ -510,7 +510,7 @@ inserting or updating the magic number.  When this is @code{nil} updating
 is only done with @kbd{M-x executable-set-magic}.  When this is
 @code{function} you are queried whenever @code{executable-set-magic} is
 called as a function, such as when Emacs puts a buffer in Shell script
-mode.  Otherwise you are alway queried.
+mode.  Otherwise you are always queried.
 
 @findex executable-self-display
   @kbd{M-x executable-self-display} adds a magic number to the buffer, which
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 290b120ea80..32311ff5c3e 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -25644,7 +25644,7 @@ equivalent expression involving intervals: @samp{b in [a .. c)}.
 of @samp{<} and @samp{<=} are allowed, or any of the four combinations
 of @samp{>} and @samp{>=}.  Four-argument constructions like
 @samp{a < b < c < d}, and mixtures like @w{@samp{a < b = c}} that
-involve both equalities and inequalities, are not allowed.
+involve both equations and inequalities, are not allowed.
 
 @kindex a .
 @pindex calc-remove-equal
@@ -34631,7 +34631,7 @@ the derivative is evaluated at the value of @var{var}; otherwise, the
 derivative is left in terms of @var{var}.  If the expression contains
 functions for which no derivative formula is known, new derivative
 functions are invented by adding primes to the names; @pxref{Calculus}.
-However, if @var{symb} is non-@code{nil}, the presence of undifferentiable
+However, if @var{symb} is non-@code{nil}, the presence of nondifferentiable
 functions in @var{expr} instead cancels the whole differentiation, and
 @code{deriv} returns @code{nil} instead.
 
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index f8d757c2d87..cc566086f44 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -268,7 +268,7 @@ projects.
 
 Some project modes do not have a project file, but directly read a
 Makefile or other existing file.  Instead of directly editing the
-object, you can edit the file by typine @kbd{C-c . e}
+object, you can edit the file by typing @kbd{C-c . e}
 (@code{ede-edit-file-target}).  You should ``rescan'' the project
 afterwards (@pxref{Miscellaneous commands}).
 
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 7b4945027d3..d65c7a15f7b 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1458,7 +1458,7 @@ Useful methods to define for your new class include:
 
 @defmethod eieio-speedbar eieio-speedbar-derive-line-path obj depth
 Return a string representing a directory associated with an instance
-of @var{obj}.  @var{depth} can be used to indice how many levels of
+of @var{obj}.  @var{depth} can be used to index how many levels of
 indentation have been opened by the user where @var{obj} is shown.
 @end defmethod
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index f099dfd36d0..69b17a94d68 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -13761,7 +13761,7 @@ The same as the above, but don't do automatic @acronym{STARTTLS} upgrades.
 @findex nntp-open-tls-stream
 @item nntp-open-tls-stream
 Opens a connection to a server over a @dfn{secure} channel.  To use
-this you must have @uref{http://www.gnu.org/software/gnutls/, GNUTLS}
+this you must have @uref{http://www.gnu.org/software/gnutls/, GnuTLS}
 installed.  You then define a server as follows:
 
 @lisp
@@ -21279,7 +21279,7 @@ name (or part of a name) to match.
 @node The swish++ Engine
 @subsubsection The swish++ Engine
 
-FIXEM: Say something more here.
+FIXME: Say something more here.
 
 Documentation for swish++ may be found at the swish++ sourceforge page:
 @uref{http://swishplusplus.sourceforge.net}
@@ -21302,7 +21302,7 @@ to get a group name. By default this is @code{$HOME/Mail}.
 @node The swish-e Engine
 @subsubsection The swish-e Engine
 
-FIXEM: Say something more here.
+FIXME: Say something more here.
 
 Documentation for swish-e may be found at the swish-e homepage
 @uref{http://swish-e.org}
@@ -21895,7 +21895,7 @@ Clearly, the easiest way would be if marks could somehow be
 automatically set for the original article. This is exactly what
 @emph{marks propagation} is about.
 
-Marks propagation is deactivated by default. You can activate it for a
+Marks propagation is inactive by default. You can activate it for a
 certain @code{nnmairix} group with
 @code{nnmairix-group-toggle-propmarks-this-group} (bound to @kbd{G b
 p}). This function will warn you if you try to use it with your default
@@ -22047,7 +22047,7 @@ an example server definition:
 (nnml "mairix" (nnml-directory "mairix") (nnml-get-new-mail nil))
 @end lisp
 
-(The @code{nnmaildir} back end also has a server variabe
+(The @code{nnmaildir} back end also has a server variable
 @code{get-new-mail}, but its default value is @code{nil}, so you don't
 have to explicitly set it if you use a @code{nnmaildir} server just for
 mairix.)
@@ -27408,7 +27408,7 @@ considered home score and adapt files (@pxref{Home Score File}) have
 been added.
 
 @item
-@code{nndoc} was rewritten to be easily extendable (@pxref{Document
+@code{nndoc} was rewritten to be easily extensible (@pxref{Document
 Server Internals}).
 
 @item
@@ -27801,7 +27801,7 @@ The revised Gnus @acronym{FAQ} is included in the manual,
 @acronym{TLS} wrapper shipped with Gnus
 
 @acronym{TLS}/@acronym{SSL} is now supported in @acronym{IMAP} and
-@acronym{NNTP} via @file{tls.el} and GNUTLS.
+@acronym{NNTP} via @file{tls.el} and GnuTLS.
 
 @item
 Improved anti-spam features.
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 8e172301915..3e13dbb0f23 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -62,7 +62,7 @@ developing GNU and promoting software freedom.''
 IDLWAVE is a package which supports editing source code written in the
 Interactive Data Language (IDL), and running IDL as an inferior shell.
 
-@insertcopying 
+@insertcopying
 @end ifnottex
 
 @menu
@@ -72,8 +72,8 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
 * The IDLWAVE Major Mode::      The mode for editing IDL programs
 * The IDLWAVE Shell::           The mode for running IDL as an inferior program
 * Acknowledgements::            Who did what
-* Sources of Routine Info::     How does IDLWAVE know about routine XYZ     
-* HTML Help Browser Tips::      
+* Sources of Routine Info::     How does IDLWAVE know about routine XYZ
+* HTML Help Browser Tips::
 * Configuration Examples::      The user is king
 * Windows and MacOS::           What still works, and how
 * Troubleshooting::             When good computers turn bad
@@ -85,9 +85,9 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
 
 Getting Started (Tutorial)
 
-* Lesson I -- Development Cycle::  
-* Lesson II -- Customization::  
-* Lesson III -- User Catalog::  
+* Lesson I -- Development Cycle::
+* Lesson II -- Customization::
+* Lesson III -- User Catalog::
 
 The IDLWAVE Major Mode
 
@@ -107,7 +107,7 @@ The IDLWAVE Major Mode
 Code Formatting
 
 * Code Indentation::            Reflecting the logical structure
-* Continued Statement Indentation::  
+* Continued Statement Indentation::
 * Comment Indentation::         Special indentation for comment lines
 * Continuation Lines::          Splitting statements over lines
 * Syntax Highlighting::         Font-lock support
@@ -115,14 +115,14 @@ Code Formatting
 
 Online Help
 
-* Help with HTML Documentation::  
-* Help with Source::            
+* Help with HTML Documentation::
+* Help with Source::
 
 Completion
 
 * Case of Completed Words::     CaseOFcomPletedWords
 * Object Method Completion and Class Ambiguity::  obj->Method, what?
-* Object Method Completion in the Shell::  
+* Object Method Completion in the Shell::
 * Class and Keyword Inheritance::  obj->Method, _EXTRA=e
 * Structure Tag Completion::    Completing state.Tag
 
@@ -136,32 +136,32 @@ The IDLWAVE Shell
 
 * Starting the Shell::          How to launch IDL as a subprocess
 * Using the Shell::             Interactively working with the Shell
-* Commands Sent to the Shell::  
-* Debugging IDL Programs::      
-* Examining Variables::         
-* Custom Expression Examination::  
+* Commands Sent to the Shell::
+* Debugging IDL Programs::
+* Examining Variables::
+* Custom Expression Examination::
 
 Debugging IDL Programs
 
-* A Tale of Two Modes::         
-* Debug Key Bindings::          
-* Breakpoints and Stepping::    
-* Compiling Programs::          
-* Walking the Calling Stack::   
-* Electric Debug Mode::         
+* A Tale of Two Modes::
+* Debug Key Bindings::
+* Breakpoints and Stepping::
+* Compiling Programs::
+* Walking the Calling Stack::
+* Electric Debug Mode::
 
 Sources of Routine Info
 
 * Routine Definitions::         Where IDL Routines are defined.
 * Routine Information Sources::  So how does IDLWAVE know about...
-* Catalogs::                    
+* Catalogs::
 * Load-Path Shadows::           Routines defined in several places
 * Documentation Scan::          Scanning the IDL Manuals
 
 Catalogs
 
-* Library Catalogs::            
-* User Catalog::                
+* Library Catalogs::
+* User Catalog::
 
 @end detailmenu
 @end menu
@@ -193,13 +193,13 @@ form a complete development environment. Here is a brief summary of
 what IDLWAVE does:
 
 @itemize @bullet
-@item 
+@item
 Smart code indentation and automatic-formatting.
 @item
 Three level syntax highlighting support.
-@item 
+@item
 Context-sensitive display of calling sequences and keywords for more
-than 1000 native IDL routines, extendible to any additional number of
+than 1000 native IDL routines, extensible to any additional number of
 local routines, and already available with many pre-scanned libraries.
 @item
 Fast, context-sensitive online HTML help, or source-header help for
@@ -373,9 +373,9 @@ at point.
 @cindex Getting Started
 
 @menu
-* Lesson I -- Development Cycle::  
-* Lesson II -- Customization::  
-* Lesson III -- User Catalog::  
+* Lesson I -- Development Cycle::
+* Lesson II -- Customization::
+* Lesson III -- User Catalog::
 @end menu
 
 @node  Lesson I -- Development Cycle, Lesson II -- Customization, Getting Started, Getting Started
@@ -418,13 +418,13 @@ function daynr,d,m,y
   y1 = y * delta
   return, d + floor(m1*30.6)+floor(y1*365.25)+5
 end
-     
+
 function weekday,day,month,year
   ;; compute weekday number for date
   nr = daynr(day,month,year)
   return, nr mod 7
 end
-     
+
 pro plot_wday,day,month
   ;; Plot the weekday of a date in the first 10 years of this century.
   years = 2000,+indgen(10)
@@ -753,7 +753,7 @@ them.
 
 @menu
 * Code Indentation::            Reflecting the logical structure
-* Continued Statement Indentation::  
+* Continued Statement Indentation::
 * Comment Indentation::         Special indentation for comment lines
 * Continuation Lines::          Splitting statements over lines
 * Syntax Highlighting::         Font-lock support
@@ -797,7 +797,7 @@ subprogram).  The command @kbd{C-M-q} reindents the entire current
 routine.  @xref{Actions}, for information how to impose additional
 formatting conventions on foreign code.
 
-@defopt idlwave-main-block-indent (@code{2}) 
+@defopt idlwave-main-block-indent (@code{2})
 Extra indentation for the main block of code.  That is the block between
 the FUNCTION/PRO statement and the END statement for that program
 unit.
@@ -998,7 +998,7 @@ in the first line of a comment paragraph.
 
 @defopt idlwave-use-last-hang-indent (@code{nil})
 Non-@code{nil} means use last match on line for
-@code{idlwave-indent-regexp}. 
+@code{idlwave-indent-regexp}.
 @end defopt
 
 @node Syntax Highlighting, Octals and Highlighting, Continuation Lines, Code Formatting
@@ -1026,7 +1026,7 @@ for highlighting using the variable
 
 @defopt idlwave-default-font-lock-items
 Items which should be fontified on the default fontification level
-2. 
+2.
 @end defopt
 
 @node Octals and Highlighting,  , Syntax Highlighting, Code Formatting
@@ -1104,7 +1104,7 @@ plot,x,alog(x+5*sin(x) + 2),
 On positions 1,2 and 8, information about the @samp{plot} procedure will
 be shown.  On positions 3,4, and 7, the @samp{alog} function will be
 described, while positions 5 and 6 will investigate the @samp{sin}
-function.  
+function.
 
 When you ask for routine information about an object method, and the
 method exists in several classes, IDLWAVE queries for the class of the
@@ -1162,7 +1162,7 @@ will automatically split into the next two.
 @item @i{Other}
 @tab Any other routine with a file not known to be on the search path.
 @item @i{Unresolved}
-@tab An otherwise unknown routine the shell lists as unresolved 
+@tab An otherwise unknown routine the shell lists as unresolved
 (referenced, but not compiled).
 @end multitable
 
@@ -1198,7 +1198,7 @@ with the middle mouse button inserts keywords or visits files:
 @item @i{Usage}
 @tab If online help is installed, a click with the @emph{right} mouse
 button on the @i{Usage:} line will access the help for the
-routine (@pxref{Online Help}).  
+routine (@pxref{Online Help}).
 @item @i{Keyword}
 @tab Online help about keywords is also available with the
 @emph{right} mouse button.  Clicking on a keyword with the @emph{middle}
@@ -1340,8 +1340,8 @@ directly in the originating source file.
 
 
 @menu
-* Help with HTML Documentation::  
-* Help with Source::            
+* Help with HTML Documentation::
+* Help with Source::
 @end menu
 
 @node Help with HTML Documentation, Help with Source, Online Help, Online Help
@@ -1393,7 +1393,7 @@ configuring a browser for use with IDL's HTML help system.
 Relative directory of the system-supplied HTML help directory,
 considered with respect to @code{idlwave-system-directory}.  Relevant
 for IDL 6.2 and greater.  Should not change.
-@end defopt     
+@end defopt
 
 @defopt idlwave-html-help-location @file{/usr/local/etc/}
 The directory where the @file{idl_html_help} HTML directory live.
@@ -1613,7 +1613,7 @@ available.
 @menu
 * Case of Completed Words::     CaseOFcomPletedWords
 * Object Method Completion and Class Ambiguity::  obj->Method, what?
-* Object Method Completion in the Shell::  
+* Object Method Completion in the Shell::
 * Class and Keyword Inheritance::  obj->Method, _EXTRA=e
 * Structure Tag Completion::    Completing state.Tag
 @end menu
@@ -1681,7 +1681,7 @@ narrow down the number of possible completions.  The variable
 @code{idlwave-query-class} can be configured to make such prompting the
 default for all methods (not recommended), or selectively for very
 common methods for which the number of completing keywords would be too
-large (e.g. @code{Init,SetProperty,GetProperty}).  
+large (e.g. @code{Init,SetProperty,GetProperty}).
 
 @cindex Saving object class on @code{->}
 @cindex @code{->}
@@ -1729,7 +1729,7 @@ routine info, or online help within a method routine, a query is sent to
 determine the class of the object.  If this query is successful, the
 class found will be used to select appropriate completions, routine
 info, or help.  If unsuccessful, information from all known classes will
-be used (as in the buffer). 
+be used (as in the buffer).
 
 @node   Class and Keyword Inheritance, Structure Tag Completion, Object Method Completion in the Shell, Completion
 @subsection Class and Keyword Inheritance
@@ -1772,7 +1772,7 @@ keywords based on their originating class.
 Non-@code{nil} means consider inheritance during completion, online help etc.
 @end defopt
 
-@defopt idlwave-keyword-class-inheritance 
+@defopt idlwave-keyword-class-inheritance
 A list of regular expressions to match methods for which simple
 class-driven keyword inheritance will be used for Completion.
 @end defopt
@@ -1802,7 +1802,7 @@ Structure tag completion is not enabled by default.  To enable it,
 simply add the following to your @file{.emacs}:
 
 @lisp
-   (add-hook 'idlwave-load-hook 
+   (add-hook 'idlwave-load-hook
              (lambda () (require 'idlw-complete-structtag)))
 @end lisp
 
@@ -2226,7 +2226,7 @@ your @file{.emacs} file:
      (idlwave-action-and-binding "\\<\\(pro\\|function\\)\\>[ \t]*\\<"
                                  '(capitalize-word 1) t)
      ;;  Capitalize common block name
-     (idlwave-action-and-binding "\\<common\\>[ \t]+\\<" 
+     (idlwave-action-and-binding "\\<common\\>[ \t]+\\<"
                                  '(capitalize-word 1) t)))
 @end lisp
 
@@ -2384,10 +2384,10 @@ currently only works under Unix and MacOSX.
 @menu
 * Starting the Shell::          How to launch IDL as a subprocess
 * Using the Shell::             Interactively working with the Shell
-* Commands Sent to the Shell::  
-* Debugging IDL Programs::      
-* Examining Variables::         
-* Custom Expression Examination::  
+* Commands Sent to the Shell::
+* Debugging IDL Programs::
+* Examining Variables::
+* Custom Expression Examination::
 @end menu
 
 @node Starting the Shell, Using the Shell, The IDLWAVE Shell, The IDLWAVE Shell
@@ -2414,7 +2414,7 @@ In order to create a separate frame for the IDLWAVE shell buffer, call
 @code{idlwave-shell} with a prefix argument: @kbd{C-u C-c C-s} or
 @kbd{C-u C-c C-l}.  If you always want a dedicated frame for the shell
 window, configure the variable
-@code{idlwave-shell-use-dedicated-frame}. 
+@code{idlwave-shell-use-dedicated-frame}.
 
 To launch a quick IDLWAVE shell directly from a shell prompt without
 an IDLWAVE buffer (e.g., as a replacement for running inside an
@@ -2471,7 +2471,7 @@ The file in which the command history of the idlwave shell is saved.
 Unless it's an absolute path, it goes in
 @code{idlwave-config-directory}.
 @end defopt
-  
+
 @defopt idlwave-shell-use-dedicated-frame (@code{nil})
 Non-@code{nil} means IDLWAVE should use a special frame to display the
 shell buffer.
@@ -2574,7 +2574,7 @@ keywords, system variables, system variable tags etc.
 @item @kbd{C-c C-v}
 @tab Find the source file of a routine (@code{idlwave-find-module})
 @item @kbd{C-c C-t}
-@tab Find the source file of a routine in the currently visited file 
+@tab Find the source file of a routine in the currently visited file
 (@code{idlwave-find-module-this-file}).
 @item @kbd{C-c =}
 @tab Compile a library routine (@code{idlwave-resolve})
@@ -2697,12 +2697,12 @@ buffers.
 @end defopt
 
 @menu
-* A Tale of Two Modes::         
-* Debug Key Bindings::          
-* Breakpoints and Stepping::    
-* Compiling Programs::          
-* Walking the Calling Stack::   
-* Electric Debug Mode::         
+* A Tale of Two Modes::
+* Debug Key Bindings::
+* Breakpoints and Stepping::
+* Compiling Programs::
+* Walking the Calling Stack::
+* Electric Debug Mode::
 @end menu
 
 
@@ -2795,7 +2795,7 @@ executed from the shell window, the breakpoint where IDL is currently
 stopped will be deleted.  To clear all breakpoints, use @kbd{C-c C-d
 C-a} (@code{idlwave-clear-all-bp}).  Breakpoints can also be disabled
 and re-enabled: @kbd{C-c C-d C-\}
-(@code{idlwave-shell-toggle-enable-current-bp}).  
+(@code{idlwave-shell-toggle-enable-current-bp}).
 
 Breakpoint lines are highlighted or indicated with an icon in the source
 code (different icons for conditional, after, and other break types).
@@ -2804,7 +2804,7 @@ places breakpoints as close as possible on or after the line you
 specify.  IDLWAVE queries the shell for the actual breakpoint location
 which was set, so the exact line you specify may not be marked.  You can
 re-sync the breakpoint list and update the display at any time (e.g., if
-you add or remove some on the command line) using @kbd{C-c C-d C-l}.  
+you add or remove some on the command line) using @kbd{C-c C-d C-l}.
 
 In recent IDLWAVE versions, the breakpoint line is highlighted when the
 mouse is moved over it, and a tooltip pops up describing the break
@@ -2914,8 +2914,8 @@ configured in @code{idlwave-shell-mark-stop-line}.
 @kindex C-c C-d C-c
 In order to compile the current buffer under the IDLWAVE shell, press
 @kbd{C-c C-d C-c} (@code{idlwave-save-and-run}).  This first saves the
-current buffer and then sends the command @samp{.run path/to/file} to the 
-shell.  You can also execute @kbd{C-c C-d C-c} from the shell buffer, in 
+current buffer and then sends the command @samp{.run path/to/file} to the
+shell.  You can also execute @kbd{C-c C-d C-c} from the shell buffer, in
 which case the most recently compiled buffer will be saved and
 re-compiled.
 
@@ -3080,9 +3080,9 @@ halts.
 
 @defopt idlwave-shell-electric-stop-color (Violet)
 Default color of the stopped line overlay when in electric debug mode.
-@end defopt        
+@end defopt
 
-@defopt idlwave-shell-electric-stop-line-face 
+@defopt idlwave-shell-electric-stop-line-face
 The face to use for the stopped line.  Defaults to a face similar to the
 modeline, with color @code{idlwave-shell-electric-stop-color}.
 @end defopt
@@ -3188,14 +3188,14 @@ the expression printed by IDL.
 @end defopt
 
 @defopt idlwave-shell-output-face
-The face for @code{idlwave-shell-output-overlay}.  
+The face for @code{idlwave-shell-output-overlay}.
 Allows to choose the font, color and other properties for the most
 recent output of IDL when examining an expression."
 @end defopt
 
 @defopt idlwave-shell-separate-examine-output (@code{t})
 If non-@code{nil}, re-direct the output of examine commands to a special
-@file{*Examine*} buffer, instead of in the shell itself. 
+@file{*Examine*} buffer, instead of in the shell itself.
 @end defopt
 
 @defopt idlwave-shell-max-print-length (200)
@@ -3249,17 +3249,17 @@ Both functions take a single string argument sharing the syntax of the
 @lisp
 (add-hook 'idlwave-shell-mode-hook
           (lambda ()
-            (idlwave-shell-define-key-both [s-down-mouse-2] 
-                                 (idlwave-shell-mouse-examine 
+            (idlwave-shell-define-key-both [s-down-mouse-2]
+                                 (idlwave-shell-mouse-examine
                                   "print, size(___,/DIMENSIONS)"))
             (idlwave-shell-define-key-both [f9] (idlwave-shell-examine
                                        "print, size(___,/DIMENSIONS)"))
-            (idlwave-shell-define-key-both [f10] (idlwave-shell-examine 
+            (idlwave-shell-define-key-both [f10] (idlwave-shell-examine
                                         "print,size(___,/TNAME)"))
             (idlwave-shell-define-key-both [f11] (idlwave-shell-examine
                                         "help,___,/STRUCTURE"))))
-@end lisp                                        
-            
+@end lisp
+
 @noindent Now pressing @key{f9}, or middle-mouse dragging with the
 @key{SUPER} key depressed, will print the dimensions of the nearby or
 highlighted expression.  Pressing @key{f10} will give the type string,
@@ -3297,7 +3297,7 @@ of the package from version 3.0, during which time he overhauled almost
 everything, modernized IDLWAVE with many new features, and developed the
 manual.
 
-@item 
+@item
 @uref{mailto:jdsmith@@as.arizona.edu, @b{J.D. Smith}}, the current
 maintainer, as of version 4.10, helped shape object method completion
 and most new features introduced in versions 4.x, and introduced many
@@ -3364,7 +3364,7 @@ know about the accessible routines.
 @menu
 * Routine Definitions::         Where IDL Routines are defined.
 * Routine Information Sources::  So how does IDLWAVE know about...
-* Catalogs::                    
+* Catalogs::
 * Load-Path Shadows::           Routines defined in several places
 * Documentation Scan::          Scanning the IDL Manuals
 @end menu
@@ -3382,7 +3382,7 @@ know about the accessible routines.
 several places:
 
 @enumerate
-@item 
+@item
 @emph{Builtin routines} are defined inside IDL itself.  The source code
 of such routines is not available, but instead are learned about through
 the IDL documentation.
@@ -3390,7 +3390,7 @@ the IDL documentation.
 Routines which are @emph{part of the current program}, are defined in a
 file explicitly compiled by the user.  This file may or may not be
 located on the IDL search path.
-@item 
+@item
 @emph{Library routines} are defined in files located on IDL's search
 path.  When a library routine is called for the first time, IDL will
 find the source file and compile it dynamically.  A special sub-category
@@ -3428,7 +3428,7 @@ directly with IDL in the form of an XML catalog which IDLWAVE scans.
 Formerly, this list was created by scanning the IDL manuals to produce
 the file @file{idlw-rinfo.el}.
 
-@item 
+@item
 IDLWAVE @emph{scans} all its @emph{buffers} in the current Emacs session
 for routine definitions.  This is done automatically when routine
 information or completion is first requested by the user.  Each new
@@ -3547,8 +3547,8 @@ later).
 @end defopt
 
 @menu
-* Library Catalogs::            
-* User Catalog::                
+* Library Catalogs::
+* User Catalog::
 @end menu
 
 @html
@@ -3636,7 +3636,7 @@ instead, including:
 @itemize @bullet
 @item The scan is internal to Emacs, so you don't need a working Perl
 installation, as you do for library catalogs.
-@item Can be used to scan directories for which the user has no write 
+@item Can be used to scan directories for which the user has no write
 privileges.
 @item Easy widget-based path selection.
 @end itemize
@@ -3752,7 +3752,7 @@ Another way to find out if a specific routine has multiple definitions
 on the load path is routine info display (@pxref{Routine Info}).
 
 @node Documentation Scan,  , Load-Path Shadows, Sources of Routine Info
-@appendixsec Documentation Scan 
+@appendixsec Documentation Scan
 @cindex @file{get_html_rinfo}
 @cindex @file{idlw-rinfo.el}
 @cindex Scanning the documentation
@@ -3920,7 +3920,7 @@ user is King!
 (setq idlwave-main-block-indent 3)
 (setq idlwave-end-offset -3)
 (setq idlwave-continuation-indent 1)
-(setq idlwave-begin-line-comment "^;[^;]")  ; Leave ";" but not ";;" 
+(setq idlwave-begin-line-comment "^;[^;]")  ; Leave ";" but not ";;"
                                             ; anchored at start of line.
 (setq idlwave-surround-by-blank t)      ; Turn on padding ops =,<,>
 (setq idlwave-pad-keyword nil)          ; Remove spaces for keyword '='
@@ -3987,10 +3987,10 @@ user is King!
     ;; (local-set-key "\C-j" 'idlwave-newline) ; My preference.
 
     ;; Some personal abbreviations
-    (define-abbrev idlwave-mode-abbrev-table  
+    (define-abbrev idlwave-mode-abbrev-table
       (concat idlwave-abbrev-start-char "wb") "widget_base()"
       (idlwave-keyword-abbrev 1))
-    (define-abbrev idlwave-mode-abbrev-table  
+    (define-abbrev idlwave-mode-abbrev-table
       (concat idlwave-abbrev-start-char "on") "obj_new()"
       (idlwave-keyword-abbrev 1))
     ))
@@ -4008,12 +4008,12 @@ user is King!
 (add-hook 'idlwave-shell-mode-hook
           (lambda ()
             ;; Set up some custom key and mouse examine commands
-            (idlwave-shell-define-key-both [s-down-mouse-2] 
-                                 (idlwave-shell-mouse-examine 
+            (idlwave-shell-define-key-both [s-down-mouse-2]
+                                 (idlwave-shell-mouse-examine
                                   "print, size(___,/DIMENSIONS)"))
             (idlwave-shell-define-key-both [f9] (idlwave-shell-examine
                                        "print, size(___,/DIMENSIONS)"))
-            (idlwave-shell-define-key-both [f10] (idlwave-shell-examine 
+            (idlwave-shell-define-key-both [f10] (idlwave-shell-examine
                                         "print,size(___,/TNAME)"))
             (idlwave-shell-define-key-both [f11] (idlwave-shell-examine
                                         "help,___,/STRUCTURE"))))
@@ -4066,7 +4066,7 @@ system.  I am assuming that IDLWAVE has been installed in
 sure you check the following things:
 
 @itemize @bullet
-@item When you download the IDLWAVE distribution, make sure you save the 
+@item When you download the IDLWAVE distribution, make sure you save the
 file under the names @file{idlwave.tar.gz}.
 @item M-TAB switches among running programs --- use Esc-TAB
 instead.
@@ -4102,7 +4102,7 @@ customize the variable @code{idlwave-shell-automatic-electric-debug}
 if you prefer not to enter electric debug on breakpoints@dots{} but
 you really should try it before you disable it!  You can also
 customize this variable to enter debug mode when errors are
-encountered.  
+encountered.
 
 @item @strong{I get errors like @samp{Searching for program: no such
 file or directory, idl} when attempting to start the IDL shell.}
@@ -4141,7 +4141,7 @@ in compiled lisp files.  Presumably, you kept the original .elc files in
 place, and this is the source of the error.  If you recompile (or just
 "make; make install") from source, it should resolve this problem.
 Another option is to recompile the @file{idlw*.el} files by hand using
-@kbd{M-x byte-compile-file}.  
+@kbd{M-x byte-compile-file}.
 
 @item @strong{@kbd{M-@key{TAB}} doesn't complete words, it switches
 windows on my desktop.}
@@ -4266,7 +4266,7 @@ You have a mismatch between your help index and the HTML help package
 you downloaded.  You need to ensure you download a ``downgrade kit'' if
 you are using anything older than the latest HTML help package.  A new
 help package appears with each IDL release (assuming the documentation
-is updated).  
+is updated).
 Starting with IDL 6.2, the HTML help and its catalog are
 distributed with IDL, and so should never be inconsistent.
 
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 1e497fe309f..0edaf3db3d6 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -100,123 +100,127 @@ info.dvi: $(INFOSOURCES)
         $(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
 
 
-$(infodir)/ccmode: cc-mode.texi
+$(infodir)/ccmode: cc-mode.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi
-cc-mode.dvi: cc-mode.texi
+cc-mode.dvi: cc-mode.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi
 
-$(infodir)/ada-mode: ada-mode.texi
+$(infodir)/ada-mode: ada-mode.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi
-ada-mode.dvi: ada-mode.texi
+ada-mode.dvi: ada-mode.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi
 
-$(infodir)/pcl-cvs: pcl-cvs.texi
+$(infodir)/pcl-cvs: pcl-cvs.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi
-pcl-cvs.dvi: pcl-cvs.texi
+pcl-cvs.dvi: pcl-cvs.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi
 
-$(infodir)/eshell: eshell.texi
+$(infodir)/eshell: eshell.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi
-eshell.dvi: eshell.texi
+eshell.dvi: eshell.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi
 
-$(infodir)/cl: cl.texi
+$(infodir)/cl: cl.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi
-cl.dvi: cl.texi
+cl.dvi: cl.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi
 
-$(infodir)/dbus: dbus.texi
+$(infodir)/dbus: dbus.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi
-dbus.dvi: dbus.texi
+dbus.dvi: dbus.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/dbus.texi
 
-$(infodir)/dired-x: dired-x.texi
+$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi
-dired-x.dvi: dired-x.texi
+dired-x.dvi: dired-x.texi $(emacsdir)/emacsver.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi
 
-$(infodir)/ediff: ediff.texi
+$(infodir)/ediff: ediff.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi
-ediff.dvi: ediff.texi
+ediff.dvi: ediff.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi
 
-$(infodir)/flymake: flymake.texi
+$(infodir)/flymake: flymake.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi
-flymake.dvi: flymake.texi
+flymake.dvi: flymake.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/flymake.texi
 
-$(infodir)/forms: forms.texi
+$(infodir)/forms: forms.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi
-forms.dvi: forms.texi
+forms.dvi: forms.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi
 
 # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
-$(infodir)/gnus: gnus.texi
+$(infodir)/gnus: gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \
+                 sieve.texi pgg.texi sasl.texi gnus-news.texi gnus-faq.texi \
+                 doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi
-gnus.dvi: gnus.texi
+gnus.dvi: gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \
+          sieve.texi pgg.texi sasl.texi gnus-news.texi gnus-faq.texi \
+          doclicense.texi
         sed -e "/@iflatex/,/@end iflatex/d" $(srcdir)/gnus.texi > gnustmp.texi
         $(ENVADD) $(TEXI2DVI) gnustmp.texi
         cp gnustmp.dvi $*.dvi
         rm gnustmp.*
 #
-$(infodir)/message: message.texi
+$(infodir)/message: message.texi gnus-overrides.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) message.texi
-message.dvi: message.texi
+message.dvi: message.texi gnus-overrides.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi
 #
-$(infodir)/emacs-mime: emacs-mime.texi
+$(infodir)/emacs-mime: emacs-mime.texi gnus-overrides.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi
-emacs-mime.dvi: emacs-mime.texi
+emacs-mime.dvi: emacs-mime.texi gnus-overrides.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
 #
-$(infodir)/sieve: sieve.texi
+$(infodir)/sieve: sieve.texi gnus-overrides.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi
-sieve.dvi: sieve.texi
+sieve.dvi: sieve.texi gnus-overrides.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/sieve.texi
 #
-$(infodir)/pgg: pgg.texi
+$(infodir)/pgg: pgg.texi gnus-overrides.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi
-pgg.dvi: pgg.texi
+pgg.dvi: pgg.texi gnus-overrides.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/pgg.texi
 
-$(infodir)/mh-e: mh-e.texi
+$(infodir)/mh-e: mh-e.texi doclicense.texi gpl.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi
-mh-e.dvi: mh-e.texi
+mh-e.dvi: mh-e.texi doclicense.texi gpl.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi
 
-$(infodir)/reftex: reftex.texi
+$(infodir)/reftex: reftex.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi
-reftex.dvi: reftex.texi
+reftex.dvi: reftex.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi
 
-$(infodir)/remember: remember.texi
+$(infodir)/remember: remember.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi
-remember.dvi: remember.texi
+remember.dvi: remember.texi doclicense.texix
         $(ENVADD) $(TEXI2DVI) $(srcdir)/remember.texi
 
-$(infodir)/sasl: sasl.texi
+$(infodir)/sasl: sasl.texi gnus-overrides.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi
-sasl.dvi: sasl.texi
+sasl.dvi: sasl.texi gnus-overrides.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/sasl.texi
 
-$(infodir)/sc: sc.texi
+$(infodir)/sc: sc.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi
-sc.dvi: sc.texi
+sc.dvi: sc.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi
 
-$(infodir)/vip: vip.texi
+$(infodir)/vip: vip.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi
-vip.dvi: vip.texi
+vip.dvi: vip.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi
 
-$(infodir)/viper: viper.texi
+$(infodir)/viper: viper.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi
-viper.dvi: viper.texi
+viper.dvi: viper.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi
 
-$(infodir)/widget: widget.texi
+$(infodir)/widget: widget.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi
-widget.dvi: widget.texi
+widget.dvi: widget.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
 
 $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
@@ -224,57 +228,56 @@ $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
 faq.dvi: faq.texi $(emacsdir)/emacsver.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
 
-$(infodir)/autotype: autotype.texi
+$(infodir)/autotype: autotype.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi
-autotype.dvi: autotype.texi
+autotype.dvi: autotype.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
 
-$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
+$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi gpl.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi
-
-calc.dvi: calc.texi $(emacsdir)/emacsver.texi
+calc.dvi: calc.texi $(emacsdir)/emacsver.texi gpl.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
 
 # This is produced with --no-split to avoid making files whose
 # names clash on DOS 8+3 filesystems
-$(infodir)/idlwave: idlwave.texi
+$(infodir)/idlwave: idlwave.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi
-idlwave.dvi: idlwave.texi
+idlwave.dvi: idlwave.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi
 
-$(infodir)/eudc: eudc.texi
+$(infodir)/eudc: eudc.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi
-eudc.dvi: eudc.texi
+eudc.dvi: eudc.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi
 
-$(infodir)/ebrowse: ebrowse.texi
+$(infodir)/ebrowse: ebrowse.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi
-ebrowse.dvi: ebrowse.texi
+ebrowse.dvi: ebrowse.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi
 
-$(infodir)/woman: woman.texi
+$(infodir)/woman: woman.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi
-woman.dvi: woman.texi
+woman.dvi: woman.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi
 
-$(infodir)/speedbar: speedbar.texi
+$(infodir)/speedbar: speedbar.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi
-speedbar.dvi: speedbar.texi
+speedbar.dvi: speedbar.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi
 
-$(infodir)/tramp: tramp.texi
+$(infodir)/tramp: tramp.texi trampver.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) tramp.texi
-tramp.dvi: tramp.texi
+tramp.dvi: tramp.texi trampver.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi
 
-$(infodir)/ses: ses.texi
+$(infodir)/ses: ses.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi
-ses.dvi: ses.texi
+ses.dvi: ses.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi
 
-$(infodir)/smtpmail: smtpmail.texi
+$(infodir)/smtpmail: smtpmail.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi
-smtpmail.dvi: smtpmail.texi
+smtpmail.dvi: smtpmail.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/smtpmail.texi
 
 $(infodir)/org: org.texi
@@ -282,14 +285,14 @@ $(infodir)/org: org.texi
 org.dvi: org.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/org.texi
 
-$(infodir)/url: url.texi
+$(infodir)/url: url.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) url.texi
-url.dvi: url.texi
+url.dvi: url.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/url.texi
 
-$(infodir)/newsticker: newsticker.texi
+$(infodir)/newsticker: newsticker.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi
-newsticker.dvi: newsticker.texi
+newsticker.dvi: newsticker.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/newsticker.texi
 
 $(infodir)/nxml-mode: nxml-mode.texi
@@ -297,14 +300,14 @@ $(infodir)/nxml-mode: nxml-mode.texi
 nxml-mod.dvi: nxml-mode.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/nxml-mode.texi
 
-$(infodir)/rcirc: rcirc.texi
+$(infodir)/rcirc: rcirc.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi
-rcirc.dvi: rcirc.texi
+rcirc.dvi: rcirc.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/rcirc.texi
 
-$(infodir)/erc: erc.texi
+$(infodir)/erc: erc.texi gpl.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi
-erc.dvi: erc.texi
+erc.dvi: erc.texi gpl.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/erc.texi
 
 $(infodir)/ert: ert.texi
@@ -322,9 +325,9 @@ $(infodir)/mairix-el: mairix-el.texi
 mairix-el.dvi: mairix-el.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/mairix-el.texi
 
-$(infodir)/auth: auth.texi
+$(infodir)/auth: auth.texi gnus-overrides.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi
-auth.dvi: auth.texi
+auth.dvi: auth.texi gnus-overrides.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/auth.texi
 
 $(infodir)/eieio: eieio.texi
@@ -337,14 +340,14 @@ $(infodir)/ede: ede.texi
 ede.dvi: ede.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/ede.texi
 
-$(infodir)/semantic: semantic.texi
+$(infodir)/semantic: semantic.texi sem-user.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi
-semantic.dvi: semantic.texi
+semantic.dvi: semantic.texi sem-user.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/semantic.texi
 
-$(infodir)/edt: edt.texi
+$(infodir)/edt: edt.texi doclicense.texi
         $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi
-edt.dvi: edt.texi
+edt.dvi: edt.texi doclicense.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/edt.texi
 
 mostlyclean:
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 4d828f69bbd..d9062a32572 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -904,7 +904,7 @@ happen---Message will encode non-@acronym{ASCII} domain names in @code{From},
 Until @acronym{IDNA} becomes more well known, Message queries you
 whether @acronym{IDNA} encoding of the domain name really should
 occur.  Some users might not be aware that domain names can contain
-non-@acronym{ASCII} now, so this gives them a safety net if they accidently
+non-@acronym{ASCII} now, so this gives them a safety net if they accidentally
 typed a non-@acronym{ASCII} domain name.
 
 @vindex message-use-idna
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 34a4ba4f8f3..181e00f8e02 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -7219,7 +7219,7 @@ will be made in the agenda:
 #+CATEGORY: Holiday
 %%(org-calendar-holiday)   ; special function for holiday names
 #+CATEGORY: Ann
-%%(org-anniversary 1956  5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is allways according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old
+%%(org-anniversary 1956  5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is always according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old
 %%(org-anniversary 1869 10  2) Mahatma Gandhi would be %d years old
 @end example
 
@@ -7797,8 +7797,8 @@ Interactively select another agenda view and append it to the current view.
 @item o
 Delete other windows.
 @c
-@orgcmdkskc{v d,d,org-aganda-day-view}
-@xorgcmdkskc{v w,w,org-aganda-day-view}
+@orgcmdkskc{v d,d,org-agenda-day-view}
+@xorgcmdkskc{v w,w,org-agenda-day-view}
 @xorgcmd{v m,org-agenda-month-view}
 @xorgcmd{v y,org-agenda-month-year}
 @xorgcmd{v SPC,org-agenda-reset-view}
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index f12942da2d3..d4f82b6b3a7 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -70,7 +70,7 @@ customize-group RET pcl-cvs @key{RET}} and to look at the documentation strings
 of the various commands and major modes for further information.
 @c This manual is updated to release 2.5 of PCL-CVS.
 
-@insertcopying 
+@insertcopying
 
 @end ifnottex
 
@@ -1275,7 +1275,7 @@ will be called as @samp{cvs -d @var{cvs-cvsroot}@dots{}}.  This can be
 useful if your site has several repositories.
 
 @item log-edit-require-final-newline
-@c wordy to avoid unhderfull hbox
+@c wordy to avoid underfull hbox
 When you enter a log message by typing into the
 @samp{*cvs-commit-message*} buffer, PCL-CVS normally automatically
 inserts a trailing newline, unless there already is one.  This behavior
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index 28d1cdb6eb8..e1631bcacc8 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -547,7 +547,7 @@ reparsed regardless of their size.
 @end deffn
 
 @deffn Option semantic-idle-scheduler-no-working-message
-If non-@code{nil}, disable display of working messages whie reparsing.
+If non-@code{nil}, disable display of working messages while reparsing.
 @end deffn
 
 @deffn Option semantic-idle-scheduler-working-in-modeline-flag
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 55b60937fb6..dcfff1fcb96 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -613,7 +613,7 @@ Emacs Lisp.  It is an LALR parser suitable for complex languages.
 @c LocalWords: multitable NAvigaTOR noindent nomedian nonterm noselect
 @c LocalWords: nosnarf obarray OLE OO outputfile paren parsetable POINT's
 @c LocalWords: popup positionalonly positiononly positionormarker pre
-@c LocalWords: printf printindex Programmatically pt punctuations quotemode
+@c LocalWords: printf printindex Programmatically pt quotemode
 @c LocalWords: ref regex regexp Regexps reparse resetfile samp sb
 @c LocalWords: scopestart SEmantic semanticdb setfilename setq
 @c LocalWords: settitle setupfunction sexp sp SPC speedbar speedbar's
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index d9739b93925..8300e6511a6 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -446,7 +446,7 @@ list.
 execute when starting SES mode for a buffer).
 
 The variable @code{safe-functions} is a list of possibly-unsafe
-functions to be treated as safe when analysing formulas and printers.
+functions to be treated as safe when analyzing formulas and printers.
 @xref{Virus protection}.  Before customizing @code{safe-functions},
 think about how much you trust the person who's suggesting this
 change.  The value @code{t} turns off all anti-virus protection.  A
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 1d4bbbff4ac..854be0d0012 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -233,7 +233,7 @@ least one of the following external tools are installed:
 
 @enumerate
 @item
-The GNUTLS command line tool @samp{gnutls-cli}, you can get it from
+The GnuTLS command line tool @samp{gnutls-cli}, you can get it from
 @url{http://www.gnu.org/software/gnutls/}.  This is the recommended
 tool, mainly because it can verify the server certificates.
 
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index e6b0f4fa235..f7f340074a2 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3573,7 +3573,7 @@ The verbosity levels are
 
 When @code{tramp-verbose} is greater than or equal to 4, the messages
 are also written into a @value{tramp} debug buffer.  This debug buffer
-is useful for analysing problems; sending a @value{tramp} bug report
+is useful for analyzing problems; sending a @value{tramp} bug report
 should be done with @code{tramp-verbose} set to a verbosity level of at
 least 6 (@pxref{Bug Reports}).
 
diff --git a/etc/AUTHORS b/etc/AUTHORS
index f8ab274e136..b7929dbf453 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -31,6 +31,8 @@ Adam Sjøgren: changed spam.el blink.xpm braindamaged.xpm cry.xpm dead.xpm
   reverse-smile.xpm sad.xpm smile.xpm wry.xpm xterm.c gnus-html.el
   gnus-start.el gnus-sum.el gnus.el gtkutil.c shr.el xterm.h
 
+Adam W: changed mail-source.el
+
 Aditya Siram: changed ob.el
 
 Adrian Aichner: changed erc-log.el erc.el erc-autojoin.el erc-backend.el
@@ -193,9 +195,9 @@ Andreas Politz: changed editfns.c elp.el ido.el term.el
 Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el
 
 Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c alloc.c
-  process.c coding.c files.el xterm.c editfns.c fns.c keyboard.c print.c
+  process.c coding.c files.el xterm.c editfns.c keyboard.c fns.c print.c
   emacs.c eval.c fileio.c lread.c sysdep.c dired.el xfns.c buffer.c
-  and 568 other files
+  and 571 other files
 
 Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus-sum.el
   gnus.el nnslashdot.el gnus-srvr.el gnus-util.el mm-url.el mm-uu.el
@@ -497,8 +499,8 @@ Chong Yidong: wrote compile-tests.el dichromacy-theme.el
 and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed xdisp.c simple.el files.el display.texi frames.texi
   cus-edit.el files.texi keyboard.c startup.el package.el custom.el
-  emacs.texi xterm.c subr.el faces.el image.c mouse.el misc.texi
-  text.texi progmodes/compile.el xfns.c and 826 other files
+  emacs.texi xterm.c subr.el text.texi faces.el image.c mouse.el
+  misc.texi progmodes/compile.el xfns.c and 830 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -561,10 +563,11 @@ Christoph Bauer: changed configure.in
 Christoph Conrad: changed gnus-agent.el gnus-score.el makefile.w32-in
   qp.el
 
-Christoph Scholtes: changed makefile.w32-in progmodes/python.el INSTALL
-  README.W32 maintaining.texi zipdist.bat admin.el bookmark.el
-  configure.bat cua-base.el help-mode.el help.el ido.el makedist.bat
-  menu.c minibuf.c process.c progmodes/grep.el stdint.h vc.el window.c
+Christoph Scholtes: changed makefile.w32-in progmodes/python.el stdint.h
+  INSTALL README.W32 maintaining.texi zipdist.bat admin.el bookmark.el
+  config.nt configure.bat control.texi cua-base.el help-mode.el help.el
+  ido.el makedist.bat menu.c minibuf.c process.c progmodes/grep.el
+  and 3 other files
 
 Christoph Wedler: wrote antlr-mode.el
 and changed format.el gnus-art.el gnus-picon.el message.el register.el
@@ -759,9 +762,11 @@ David Edmondson: changed message.el gnus-cite.el imap.el mm-view.el
   mml2015.el nnfolder.el nnimap.el nnml.el
 
 David Engster: wrote mairix.el nnmairix.el
-and changed gnus.texi registry.el gnus-msg.el bovine-grammar.el
-  display.texi files.el gnus-registry.el gnus-sum.el hideshow.el
-  mairix-el.texi mm-view.el mml-smime.el nnimap.el
+and changed gnus.texi registry.el gnus-msg.el insert.el
+  analyze/complete.el base.el bovine-grammar.el cedet/srecode.el
+  cpp-root.el custom.el db-find.el db-typecache.el db.el dictionary.el
+  display.texi document.el ede-grammar.el files.el generic.el
+  gnus-registry.el gnus-sum.el and 21 other files
 
 David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el
   calc-comb.el calc-cplx.el calc-embed.el calc-ext.el calc-fin.el
@@ -908,7 +913,7 @@ Derek Upham: changed nxml-mode.el
 
 Detlev Zundel: wrote re-builder.el
 
-Devon Sean McCullough: changed comint.el
+Devon Sean Mccullough: changed comint.el
 
 Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c
   sound.c w32proc.c
@@ -940,8 +945,8 @@ Dirk-Jan C. Binnema: changed org-agenda.el
 Dmitri Paduchikh: changed advice.el
 
 Dmitry Antipov: changed alloc.c keyboard.c buffer.c ccl.c editfns.c
-  emacs.c fontset.c lisp.h lread.c lwlib-Xaw.c lwlib-Xm.c lwlib-utils.c
-  lwlib.c macmenu.c w32menu.c xlwmenu.c xmenu.c
+  emacs.c fontset.c keymap.c lisp.h lread.c lwlib-Xaw.c lwlib-Xm.c
+  lwlib-utils.c lwlib.c macmenu.c w32menu.c xdisp.c xlwmenu.c xmenu.c
 
 Dmitry Bolshakov: changed hideshow.el
 
@@ -1018,8 +1023,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c] bidi.c rxvt.el
   tty-colors.el
 and changed makefile.w32-in msdos.c xdisp.c Makefile.in files.el
   config.bat fileio.c msdos.h simple.el mainmake.v2 sed1v2.inp info.el
-  rmail.el w32.c display.texi process.c pc-win.el startup.el dired.c
-  dispextern.h emacs.c and 695 other files
+  display.texi rmail.el w32.c process.c pc-win.el startup.el dispextern.h
+  dispnew.c dired.c and 697 other files
 
 Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el
   gnus.el
@@ -1162,7 +1167,8 @@ Fabian Ezequiel Gallina: changed progmodes/python.el
 
 Fabrice Bauzac: changed dired-aux.el
 
-Fabrice Popineau: changed etags.c fileio.c gnus-cache.el
+Fabrice Popineau: changed config.nt etags.c fileio.c gnus-cache.el
+  inttypes.h lisp.h ms-w32.h nmake.defs regex.c stdint.h w32.c
 
 Fan Kai: changed esh-arg.el
 
@@ -1320,8 +1326,8 @@ Giuseppe Scrivano: changed browse-url.el buffer.c configure.in sysdep.c
 Glenn Morris: wrote check-declare.el f90.el vc-bzr.el
 and changed Makefile.in configure.in calendar.el diary-lib.el rmail.el
   files.el cal-menu.el appt.el cal-hebrew.el fortran.el bytecomp.el
-  holidays.el make-dist calendar.texi emacs.texi sed1v2.inp simple.el
-  cal-islam.el cal-bahai.el startup.el ack.texi and 1202 other files
+  holidays.el make-dist calendar.texi emacs.texi simple.el sed1v2.inp
+  cal-islam.el cal-bahai.el startup.el ack.texi and 1208 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -1552,7 +1558,7 @@ Jan Djärv: wrote dnd.el dynamic-setting.el x-dnd.el
 and changed gtkutil.c xterm.c xfns.c configure.in xmenu.c xterm.h
   gtkutil.h x-win.el keyboard.c Makefile.in nsterm.m frames.texi
   xsettings.c frame.c emacs.c xselect.c process.c xlwmenu.c config.in
-  cus-start.el xresources.texi and 302 other files
+  cus-start.el nsfns.m and 302 other files
 
 Jan Moringen: co-wrote srecode/cpp.el tango-dark-theme.el tango-theme.el
 and changed dbus.el dbus.texi dbusbind.c eieio.el log-edit.el zeroconf.el
@@ -1734,10 +1740,10 @@ Joel Ray Holveck: changed gnus-sum.el info.el
 Joev Dubach: changed nntp.el
 
 Johan Bockgård: changed erc.el cl-macs.el erc-backend.el erc-button.el
-  erc-match.el browse-url.el bytecomp.el custom.el display.texi
+  erc-match.el xdisp.c browse-url.el bytecomp.el custom.el display.texi
   erc-compat.el erc-nickserv.el erc-ring.el erc-speak.el erc-track.el
-  help-fns.el icomplete.el mouse-sel.el simple.el subr.el xdisp.c
-  xterm.el and 48 other files
+  help-fns.el icomplete.el mouse-sel.el simple.el subr.el xterm.el
+  and 48 other files
 
 Johan Euphrosine: changed ibuf-ext.el
 
@@ -1863,8 +1869,8 @@ and changed ob-octave.el
 Juanma Barranquero: wrote emacs-lock.el
 and changed makefile.w32-in subr.el w32fns.c files.el server.el bs.el
   emacsclient.c help-fns.el faces.el org.el simple.el buffer.c xdisp.c
-  keyboard.c process.c w32term.c desktop.el ido.el eval.c mule-cmds.el
-  w32.c and 1036 other files
+  keyboard.c process.c w32term.c window.c desktop.el ido.el allout.el
+  eval.c and 1084 other files
 
 Juergen Kreileder: changed imap.el nnimap.el
 
@@ -1895,7 +1901,7 @@ and changed info.el isearch.el simple.el replace.el progmodes/grep.el
   dired-aux.el progmodes/compile.el dired.el startup.el faces.el files.el
   display.texi menu-bar.el descr-text.el bindings.el cus-edit.el
   image-mode.el ispell.el man.el dired-x.el log-view.el
-  and 334 other files
+  and 335 other files
 
 Justin Bogner: changed fortune.el
 
@@ -2001,7 +2007,7 @@ Keith Gabryelski: wrote hexl.c hexl.el
 Keith Packard: changed font.c
 
 Ken Brown: changed configure.in cygwin.h sheap.c browse-url.el gmalloc.c
-  vm-limit.c dired.c emacs.c loadup.el mem-limits.h unexcw.c
+  vm-limit.c dired.c emacs.c gdb-mi.el loadup.el mem-limits.h unexcw.c
 
 Ken Brush: changed emacsclient.c
 
@@ -2169,7 +2175,8 @@ and co-wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus-score.el
 and changed gnus.texi gnus-cite.el pop3.el gnus-xmas.el smtpmail.el
   proto-stream.el auth-source.el xml.c dired.el editfns.c nnultimate.el
   subr.el gnus-nocem.el gnutls.c imap.el nnkiboze.el nnrss.el
-  nnslashdot.el spam-report.el gnus-cus.el simple.el and 205 other files
+  nnslashdot.el spam-report.el url-http.el gnus-cus.el
+  and 206 other files
 
 Lars Rasmusson: changed ebrowse.c
 
@@ -2323,7 +2330,7 @@ Mark Hood: changed gnus-uu.el
 
 Mark Lambert: changed process.c process.h
 
-Mark Lillibridge: changed mail-utils.el rmail.el
+Mark Lillibridge: changed rmail.el mail-utils.el unrmail.el
 
 Mark Mitchell: changed font-lock.el
 
@@ -2390,7 +2397,7 @@ Martin Neitzel: changed supercite.el
 Martin Pohlack: changed iimage.el pc-select.el
 
 Martin Rudalics: changed window.el window.c windows.texi frame.c buffer.c
-  frame.el help.el cus-edit.el cus-start.el files.el window.h
+  help.el window.h cus-start.el frame.el cus-edit.el files.el
   buffers.texi dired.el subr.el add-log.el xdisp.c font-lock.el
   help-fns.el lisp.h mouse.el wid-edit.el and 135 other files
 
@@ -2479,7 +2486,7 @@ and changed tramp.texi dbusbind.c trampver.texi dbus.texi trampver.el
   ange-ftp.el tramp-fish.el files.el tramp-imap.el files.texi Makefile.in
   tramp-vc.el tramp-util.el tramp-uu.el simple.el auth-source.el
   dired-aux.el configure.in em-unix.el fileio.c keyboard.c
-  and 64 other files
+  and 65 other files
 
 Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
   unexec.c
@@ -2581,6 +2588,8 @@ Mikael Fornius: changed org.el org-habit.el
 
 Mike Haertel: changed 7300.h
 
+Mike Kazantsev: changed erc-dcc.el
+
 Mike Kupfer: changed mh-e.el mh-utils.el
 
 Mike Long: changed b2m.c make-dist make-mode.el netbsd.h view.el vms.h
@@ -2804,9 +2813,9 @@ and changed imenu.el make-mode.el
 Paul Eggert: wrote rcs2log vcdiff
 and co-wrote cal-dst.el
 and changed lisp.h Makefile.in editfns.c alloc.c xdisp.c configure.in
-  image.c fileio.c process.c fns.c xterm.c keyboard.c data.c dispextern.h
+  fileio.c image.c process.c fns.c xterm.c dispextern.h keyboard.c data.c
   lread.c sysdep.c xfns.c eval.c emacs.c config.in print.c
-  and 563 other files
+  and 564 other files
 
 Paul Fisher: changed fns.c
 
@@ -3356,9 +3365,9 @@ Stefan Monnier: wrote bibtex-style.el bzrmerge.el css-mode.el
   pcvs-util.el reveal.el smerge-mode.el smie.el vc-mtn.el
 and co-wrote font-lock.el
 and changed vc.el subr.el simple.el lisp.h keyboard.c files.el
-  Makefile.in bytecomp.el keymap.c xdisp.c pcvs.el alloc.c
-  progmodes/compile.el newcomment.el vc-hooks.el tex-mode.el buffer.c
-  sh-script.el eval.c fileio.c fill.el and 1030 other files
+  bytecomp.el Makefile.in keymap.c progmodes/compile.el xdisp.c pcvs.el
+  alloc.c newcomment.el vc-hooks.el tex-mode.el buffer.c fileio.c
+  sh-script.el eval.c fill.el and 1032 other files
 
 Stefan Reichör: changed gnus-agent.el
 
@@ -3508,7 +3517,7 @@ and changed subword.el image-mode.el Makefile.in cc-cmds.el emacsbug.el
   gnus-art.el gnus.texi nnimap.el files.el gnus-sum.el info.el
   org-footnote.el org.el reftex-ref.el simple.el tsdh-dark-theme.el
   tsdh-light-theme.el ack.texi bindings.el bookmark.el cc-mode.el
-  and 21 other files
+  and 22 other files
 
 Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el
 
@@ -3520,10 +3529,10 @@ Teemu Likonen: changed dired.el gnus-agent.el message.el
 
 Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el
   gnus-tests.el gnutls.el registry.el spam-report.el url-future.el
-and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el auth.texi
-  gnus-util.el netrc.el gnus-start.el gnutls.c message.el spam-stat.el
-  encrypt.el nnmail.el imap.el mail-source.el Makefile.in gnus-encrypt.el
-  gnus-html.el gnus-int.el gnutls.h and 97 other files
+and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el gnus-util.el
+  auth.texi netrc.el gnus-start.el gnutls.c message.el spam-stat.el
+  encrypt.el nnir.el nnmail.el imap.el mail-source.el nnmairix.el
+  Makefile.in gnus-encrypt.el gnus-html.el and 97 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
@@ -3839,8 +3848,8 @@ Yann Dirson: changed imenu.el
 
 Yann Hodique: changed rcirc.el
 
-Yavor Doganov: changed configure.in Info-gnustep.plist emacs.1 etags.1
-  make-dist nsfont.m
+Yavor Doganov: changed configure.in Info-gnustep.plist Makefile.in
+  emacs.1 etags.1 make-dist nsfont.m
 
 Yoichi Nakayama: changed browse-url.el finder.el man.el rfc2368.el
 
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 4ab75dcfc45..f02b795a6b9 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -1584,7 +1584,7 @@ message (closes SF #701756).
 MH-E now supports several spam filters including Bogofilter,
 SpamProbe, and SpamAssassin. Spam that is mistakenly considered to be
 good mail can be reclassified as spam with "J b (mh-junk-blacklist)".
-Conversely, good mail that is accidently considered to be spam can be
+Conversely, good mail that is accidentally considered to be spam can be
 reclassified with "J w (mh-junk-whitelist)" (closes SF #669518).
 
 If a message is blacklisted, and `mh-junk-mail-folder' is a string,
diff --git a/etc/NEWS b/etc/NEWS
index b9192c72b5e..fe481c4ed8f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -253,6 +253,7 @@ off by customizing x-gtk-use-system-tooltips.
 ** New basic faces `error', `warning', `success' are available to
 highlight strings that indicate failure, caution or successful operation.
 
+---
 ** Lucid menus and dialogs can display antialiased fonts if Emacs is built
 with Xft.  To change font, use the X resource font, for example:
 Emacs.pane.menubar.font:  Courier-12
@@ -379,7 +380,7 @@ The elisp implementation sha1.el is removed. Feature sha1 is provided
 by default.
 
 ** Menu-bar changes
-
+---
 *** `menu-bar-select-buffer-function' lets you choose another operation
 instead of `switch-to-buffer' when selecting an item in the Buffers menu.
 
@@ -550,6 +551,13 @@ at high rate, e.g. if you lean on some key, because stopping redisplay
 in the middle (when this variable is nil) forces more expensive
 updates later on, and Emacs appears to be unable to keep up.
 
++++
+** The behavior of <TAB> for active regions in Text mode has changed.
+In Text and related modes, typing <TAB> (`indent-for-tab-command')
+when the region is active causes Emacs to indent all the lines in the
+region, aligning them with the line previous to the first line in the
+region (or with the left margin if there is no previous line).
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.1
 
@@ -725,6 +733,11 @@ more variants, including Mercury, and a lot more.
 *** The command `rmail-epa-decrypt' decrypts OpenPGP data
 in the Rmail incoming message.
 
+---
+*** The variable `rmail-message-filter' no longer has any effect.
+This change was made in Emacs 23.1 but was not advertised at the time.
+Try using `rmail-show-message-hook' instead.
+
 ** Shell mode
 
 *** Shell mode uses pcomplete rules, with the standard completion UI.
@@ -1327,6 +1340,8 @@ as well as those in the -*- line.
 
 ** keymaps can inherit from multiple parents.
 
+** `debug-on-event' lets you debug Emacs when stuck because of inhibit-quit.
+
 +++
 ** New reader macro ## which stands for the empty symbol.
 This means that the empty symbol can now be read back.  Also, #: by itself
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index dc9922ed989..8b861cca875 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1198,7 +1198,7 @@ them with `\='.  For example, "\\=\\= is the way to quote \\=\\["
 will come out as `\= is the way to quote \['.
 
 The new function `substitute-command-keys' takes a string possibly
-contaning \[...] constructs and replaces those constructs with
+containing \[...] constructs and replaces those constructs with
 the key sequences they currently stand for.
 
 * Primitives `find-line-comment' and `find-line-comment-body' flushed.
@@ -1630,7 +1630,7 @@ Changes in Emacs 1.12
  read-char now returns a value in the range 128-255 if
  a Meta character is typed.  When interpreted as command
  input, a Meta character is equivalent to a two character
- sequence, the meta prefix character followed by the un-metized
+ sequence, the meta prefix character followed by the unmetized
  character (Meta-G unmetized is G).
 
  The meta prefix character
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 5e95e40b04c..87d77cf52fc 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -163,7 +163,7 @@ delimiters will appear to be fontified (in the new face
 customize `font-lock-comment-face'. Another alternative is to use a
 newer terminal emulator that supports more colors (256 is now common).
 For example, for xterm compatible emulators that support 256 colors,
-you can run emacs like this: 
+you can run emacs like this:
 env TERM=xterm-256color emacs -nw
 (This was new in Emacs 22.1, but was not described.  In Emacs 22.1
 this also happened for terminals with a light background, that is not
@@ -280,13 +280,13 @@ the files mac/README and mac/INSTALL for build instructions.
 ** Support for FreeBSD/Alpha has been added.
 
 ** New translations of the Emacs Tutorial are available in the
-following languages: Brasilian Portuguese, Bulgarian, Chinese (both
+following languages: Brazilian Portuguese, Bulgarian, Chinese (both
 with simplified and traditional characters), French, Russian, and
 Italian.  Type `C-u C-h t' to choose one of them in case your language
 setup doesn't automatically select the right one.
 
 ** New translations of the Emacs reference card are available in the
-Brasilian Portuguese and Russian.  The corresponding PostScript files
+Brazilian Portuguese and Russian.  The corresponding PostScript files
 are also included.
 
 ** A French translation of the `Emacs Survival Guide' is available.
@@ -1026,7 +1026,7 @@ parts of the mode line.
 
 *** `shadow' face defines the appearance of the "shadowed" text, i.e.
 the text which should be less noticeable than the surrounding text.
-This can be achieved by using shades of grey in contrast with either
+This can be achieved by using shades of gray in contrast with either
 black or white default foreground color.  This generic shadow face
 allows customization of the appearance of shadowed text in one place,
 so package-specific faces can inherit from it.
@@ -2558,10 +2558,10 @@ is nil).
 
 *** Minor Improvements
 
-**** The STARTTLS wrapper (starttls.el) can now use GNUTLS
+**** The STARTTLS wrapper (starttls.el) can now use GnuTLS
 instead of the OpenSSL based `starttls' tool.  For backwards
 compatibility, it prefers `starttls', but you can toggle
-`starttls-use-gnutls' to switch to GNUTLS (or simply remove the
+`starttls-use-gnutls' to switch to GnuTLS (or simply remove the
 `starttls' tool).
 
 **** Do not allow debugger output history variable to grow without bounds.
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 9b8909d794a..4e541c0deb3 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -793,7 +793,7 @@ starts the server.  Clients can connect and create graphical or
 terminal frames using emacsclient.
 
 **** emacsclient starts emacs in daemon mode and connects to it when
---alternate-editor="" is used (or when the evironment variable
+--alternate-editor="" is used (or when the environment variable
 ALTERNATE_EDITOR is set to "") and emacsclient cannot connect to an
 emacs server.
 
@@ -1027,8 +1027,8 @@ motion keys (e.g. S-left and S-down) activate and extend a temporary
 region, similar to mouse-selection.
 
 *** Temporarily active regions, created using shift-selection or
-mouse-selection, are not necessarily deactivated in the next command.
-They are only deactivated after point motion commands that are not
+mouse-selection, are not necessarily deactivated after the next command.
+They are deactivated only after point motion commands that are not
 shift-translated, or after commands that would ordinarily deactivate
 the mark in Transient Mark mode (e.g., any command that modifies the
 buffer).
diff --git a/etc/TODO b/etc/TODO
index f9d37c4b965..5acd8734ad0 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -841,7 +841,7 @@ more detailed diagnosis.
 
 **** Provide an Error Summary buffer showing all the validation errors.
 
-**** Pop-up menu.  What is useful?  Tag a region (should be greyed out if
+**** Pop-up menu.  What is useful?  Tag a region (should be grayed out if
 the region is not balanced).  Suggestions based on error messages.
 
 **** Have configurable list of namespace URIs so that we can provide
diff --git a/etc/e/eterm-color.ti b/etc/e/eterm-color.ti
index 0ddb7ec5408..a6ef8149900 100644
--- a/etc/e/eterm-color.ti
+++ b/etc/e/eterm-color.ti
@@ -7,7 +7,7 @@ eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
 # When updating this file, etc/e/eterm-color should be regenerated by 
 # running "make e/eterm-color" in the etc directory.
 # Any change to this file should be done at the same time with a
-# corresponding change to the TERMCAP evironment variable in term.el.
+# corresponding change to the TERMCAP environment variable in term.el.
 # Comments in term.el specify where each of these capabilities is implemented.
         colors#8,
         cols#80,
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index b164a28842e..9f13974584d 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -13,7 +13,7 @@
 %
 %   latex gnus-refcard.tex &&
 %   dvips -t letter -f gnus-refcard.dvi > gnus-refcard.ps
-%   
+%
 %   latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' &&
 %   mv gnus-refcard.dvi gnus-booklet.dvi &&
 %   dvips -t letter -f gnus-booklet.dvi > gnus-booklet.ps
@@ -35,16 +35,16 @@
 
 \ifthenelse{\isundefined{\booklettrue}}{% ifcard %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   % Reference Card
-  
+
   \def\Guide{Card}\def\guide{card}
   \def\logoscale{0.25}
-  
+
   % Page setup for the refcard:
-  
+
   % \setlength{\textwidth}{7.26in} \setlength{\textheight}{10in}
   % \setlength{\topmargin}{-1.0in}
   % % the same settings work for A4, although there is a bit of space at the
-  % % top and bottom of the page. 
+  % % top and bottom of the page.
   % \setlength{\oddsidemargin}{-0.5in} \setlength{\evensidemargin}{-0.5in}
 
   \ifthenelse{\isundefined{\letterpapertrue}}{
@@ -52,19 +52,19 @@
   }{
     \geometry{hmargin=20mm,tmargin=10mm,bmargin=12mm}
   }
-  
+
 }{ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   % Reference Booklet
-  
+
   \def\Guide{Booklet}\def\guide{booklet}
   \def\logoscale{0.5}% FIXME: too large for 2up printing?  --rsteib
-  
+
   \ifthenelse{\isundefined{\letterpapertrue}}{
     \geometry{a5paper,hmargin=10mm,tmargin=10mm,bmargin=4mm}
   }{
     \geometry{a5paper,hmargin=20mm,tmargin=10mm,bmargin=4mm}
   }
-  
+
   \def\sec{\section}
   \def\subsec{\subsection}
   \def\subsubsec{\subsubsection}
@@ -73,7 +73,7 @@
   \par\vspace*{\fill}\pagebreak}
 }%ifbooklet% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% \input{gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %  
+% \input{gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %
 %% include file for the Gnus refcard and booklet
 
 \def\progver{5.11} % program version
@@ -218,7 +218,7 @@
       \hline
       \multicolumn{2}{|p{\markdblcolwidth}|}{{\bf ``Read'' Marks.}
         All these marks appear in the first column of the summary line, and so
-        are mutually exclusive.}\\ 
+        are mutually exclusive.}\\
       \hline
       ` ' & (M-u, M SPC, M c) Not read.\\
       !   & (!, M !, M t) Ticked (interesting).\\
@@ -284,7 +284,7 @@
               [Prefix: use group under point to find posting-style].\\
     b       & Find {\bf bogus} groups and delete them.\\
     c       & Mark all unticked articles in group as read ({\bf catch-up}).
-    [p/p]\\ 
+    [p/p]\\
     g       & Check the server for new articles ({\bf get}). [level]\\
     M-g     & Check the server for new articles in this group ({\bf get}). [p/p]\\
     j       & {\bf Jump} to a group.\\
@@ -292,14 +292,14 @@
               [Prefix: use group under point to find posting-style].\\
     n       & Go to the {\bf next} group with unread articles. [distance]\\
     M-n     & Go to the {\bf next} group on the same or lower level.
-    [distance]\\ 
+    [distance]\\
     p       & (DEL) Go to the {\bf previous} group with unread articles.
-    [distance]\\ 
-    M-p     & Go to the {\bf previous} group on the same or lower level. [distance]\\ 
+    [distance]\\
+    M-p     & Go to the {\bf previous} group on the same or lower level. [distance]\\
     q       & {\bf Quit} Gnus.\\
     r       & Re-read the init file ({\bf reset}).\\
     s       & {\bf Save} `.newsrc.eld' file (and `.newsrc' if
-    `gnus-save-newsrc-file').\\ 
+    `gnus-save-newsrc-file').\\
     z       & Suspend (kill all buffers of) Gnus.\\
     B       & {\bf Browse} a foreign server.\\
     C       & Mark all articles in this group as read ({\bf Catch-up}). [p/p]\\
@@ -312,7 +312,7 @@
     M-c     & Clear data from group (marks and list of read articles). \\
     C-c C-s & {\bf Sort} the groups by name, number of unread articles, or level
     (depending on `gnus-group-sort-function').\\
-    C-c C-x & Run all expirable articles in group through the {\bf expiry} 
+    C-c C-x & Run all expirable articles in group through the {\bf expiry}
     process.\\
     C-c M-C-x & Run all articles in all groups through the {\bf expiry} process.\\
     C-c M-g & Activate all {\bf groups}.\\
@@ -324,7 +324,7 @@
     ange-ftp). [Prefix: query for group]\\
     H v     & (V) Display the Gnus {\bf version} number.\\
     H d     & (C-c C-d) Show the {\bf description} of this group
-    [Prefix: re-read from server].\\ 
+    [Prefix: re-read from server].\\
     M-d     & {\bf Describe} all groups. [Prefix: re-read from server]\\
     D g     & Regenerate a Sieve script from group parameters.\\
     D u     & Regenerate Sieve script and {\bf upload} to server.\\
@@ -334,17 +334,17 @@
 \newcommand{\ListGroups}{%
   {\esamepage
     \begin{keys}{A M}
-      A d     & (C-c C-M-a) List all groups whose names or {\bf descriptions} match a regexp.\\ 
+      A d     & (C-c C-M-a) List all groups whose names or {\bf descriptions} match a regexp.\\
       A k     & (C-c C-l) List all {\bf killed} groups.
       [Prefix: look at active-file from server]\\
       A l     & List all groups on a specific level.
       [Prefix: also list groups with no unread articles]\\
       A a     & (C-c C-a) List all groups whose names match a regexp
-      ({\bf apropos}).\\ 
+      ({\bf apropos}).\\
       A A     & List the server's active-file.\\
       A M     & List groups that {\bf match} a regexp.\\
-      A m     & List groups that {\bf match} a regexp and have unread articles. 
-      [level]\\ 
+      A m     & List groups that {\bf match} a regexp and have unread articles.
+      [level]\\
       A s     & (l) List all {\bf subscribed} groups with unread articles.
       [level; 5 and lower is the default]\\
       A u     & (L) List all groups (including read and {\bf unsubscribed}).
@@ -354,7 +354,7 @@
       A ?     & List all groups with dormant articles. [level]\\
     \end{keys}
   }
-  
+
   \newcommand{\CreateEditGroups}{%
     {\esamepage
       The select methods are indicated in parentheses.\\*
@@ -404,8 +404,8 @@
       M m     & (\#) Set the process {\bf mark} on this group. [scope]\\
       M r     & Mark all groups matching regular expression.\\
       M u     & (M-\#) Remove process mark from this group ({\bf unmark}).
-      [scope]\\ 
-      M U     & Remove the process mark from all groups (\textbf{umark all}).\\
+      [scope]\\
+      M U     & Remove the process mark from all groups (\textbf{unmark all}).\\
       M w     & Mark all groups in the current region. [prefix: unmark]\\
       M b     & Mark all groups in the {\bf buffer}. [prefix: unmark]\\
     \end{keys}}
@@ -427,7 +427,7 @@
         T DEL   & Delete an empty topic.\\
         T \#    & Mark all groups in the current topic with the process-mark.\\
         T M-\#  & Remove the process-mark from all groups in the current topic.\\
-        T TAB   & (TAB) Indent current topic [Prefix: unindent].\\ 
+        T TAB   & (TAB) Indent current topic [Prefix: unindent].\\
         M-TAB   & Unindent the current topic.\\
         RET     & (SPC) Either unfold topic or enter group [level].\\
         T s     & {\bf Show} the current topic. [Prefix: show permanently]\\
@@ -478,7 +478,7 @@
     {\esamepage
       \begin{keys}{M-RET}
         SPC     & (A SPC, A n) Select an article, scroll it one page, move to the
-        next one.\\ 
+        next one.\\
         DEL     & (A DEL, A p, b) Scroll this article one page back. [distance]\\
         RET     & (A RET) Scroll this article one line forward. [distance]\\
         M-RET   & (A M-RET) Scroll this article one line backward. [distance]\\
@@ -490,9 +490,9 @@
         M-\&    & Execute a command on all articles having the process mark.\\
                                 %
         M-n     & (G M-n) Go to {\bf next} summary line of unread article.
-        [distance]\\ 
-        M-p     & (G M-p) Go to {\bf previous} summary line of an unread article. 
-        [distance]\\ 
+        [distance]\\
+        M-p     & (G M-p) Go to {\bf previous} summary line of an unread article.
+        [distance]\\
         M-s     & {\bf Search} through all subsequent articles for a regexp.\\
         M-r     & Search through all previous articles for a regexp.\\
                                 %
@@ -519,7 +519,7 @@
         M-C-d   & Like C-d, but open several documents in nndoc-groups, wrapped
         in an nnvirtual group [p/p]\\
                                 %
-        A g     & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\ 
+        A g     & (g) (Re)fetch this article ({\bf get}). [Prefix: get raw version]\\
         A r     & (\^{}, A \^{}) Fetch the parent(s) of this article.
         [Prefix: if positive fetch \textit{n} ancestors;
         negative: fetch only the \textit{n}th ancestor]\\
@@ -541,7 +541,7 @@
       prefix selects which part to operate on. If the point is placed over a
       MIME button in the article buffer, use the corresponding bindings for the
       article buffer instead.
-      
+
       \begin{keys}{W M w}
         K v      & (b, W M b) {\bf View} the MIME-part.\\
         K o      & {\bf Save} the MIME part.\\
@@ -597,7 +597,7 @@
         B t     & {\bf Trace} the fancy splitting patterns applied to this article.\\
         B w     & (e) Edit this article.\\
         B M-C-e & {\bf Expunge} (delete from disk) all expirable articles in this group
-        (!). [p/p]\\ 
+        (!). [p/p]\\
         K E     & {\bf Encrypt} article body. [p/p]\\
       \end{keys}
       }
@@ -665,7 +665,7 @@
         W 6     & Translate a base64 article.\\
         W a     & Strip certain {\bf headers} from body.\\
         W b     & Make Message-IDs and URLs in the article mouse-clickable
-        {\bf buttons}.\\  
+        {\bf buttons}.\\
         W c     & Translate CRLF-pairs to LF and then remaining CR's to LF's.\\
         W d     & Treat {\bf dumbquotes}.\\
         W e     & Treat {\bf emphasized} text.\\
@@ -698,7 +698,7 @@
       }
     }
 
-  \newcommand{\BlankAndWhitespace}{% 
+  \newcommand{\BlankAndWhitespace}{%
     {\esamepage
       \begin{keys}{W E w}
         W E l   & Strip blank {\bf lines} from the beginning of the article.\\
@@ -715,7 +715,7 @@
       }
     }
 
-  \newcommand{\Picons}{% 
+  \newcommand{\Picons}{%
     {\esamepage
       \begin{keys}{W D D}
         W D s   & (W g) Display {\bf smilies}.\\
@@ -729,7 +729,7 @@
       }
     }
 
-  \newcommand{\TimeAndDate}{% 
+  \newcommand{\TimeAndDate}{%
     {\esamepage
       \begin{keys}{W T u}
         W T u   & (W T z) Display the article timestamp in GMT ({\bf UT, ZULU}).\\
@@ -739,7 +739,7 @@
         W T e   & Display the time {\bf elapsed} since it was sent.\\
         W T o   & Display the {\bf original} timestamp.\\
         W T p   & Display the date in format that's {\bf
-          pronounceable} in English.\\        
+          pronounceable} in English.\\
       \end{keys}
       }
     }
@@ -793,26 +793,26 @@
     {\esamepage
       \begin{keys}{M M-C-r}
         d       & (M d, M r) Mark this article as read and move to the next one.
-        [scope]\\ 
+        [scope]\\
         D       & Mark this article as read and move to previous one. [scope]\\
         !       & (u, M !, M t) Tick this article (mark it as interesting) and move
         to the next one. [scope]\\
-        U       & Tick this article and move to the previous one. [scope]\\ 
+        U       & Tick this article and move to the previous one. [scope]\\
         M ?     & (?) Mark this article as dormant (only followups are
-        interesting). [scope]\\ 
+        interesting). [scope]\\
         M D     & Show all {\bf dormant} articles (normally they are hidden unless they
         have any followups).\\
         M M-D   & Hide all {\bf dormant} articles.\\
         C-w     & Mark all articles between point and mark as read.\\
         M-u     & (M SPC, M c) Clear all marks from this article and move to the next
-        one. [scope]\\ 
+        one. [scope]\\
         M-U     & Clear all marks from this article and move to the previous one.
         [scope]\\
                                 %
         M e     & (E, M x) Mark this article as {\bf expirable}. [scope]\\
                                 %
         M k     & (k) {\bf Kill} all articles with same subject, select
-        next unread one.\\ 
+        next unread one.\\
         M K     & (C-k) {\bf Kill} all articles with the same subject as this one.\\
                                 %
         M C     & {\bf Catch-up} the articles that are not ticked and not dormant.\\
@@ -842,7 +842,7 @@
   }
 
 \newcommand{\ProcessMark}{%
-  {\esamepage 
+  {\esamepage
     These commands set and remove the process mark (\#). You only need to use
     it if the set of articles you want to operate on is non-contiguous. Else
     use a numeric prefix.\\*
@@ -929,7 +929,7 @@
                                 %After
                                 %editing the article, send it by pressing C-c C-c.  If you are in a
                                 %foreign group and want to post the article using the foreign server, give
-                                %a prefix to C-c C-c.\\* 
+                                %a prefix to C-c C-c.\\*
     \begin{keys}{S O m}
       S p     & (a) {\bf Post} an article to this group.\\
       S f     & (f) Post a {\bf followup} to this article.\\
@@ -965,7 +965,7 @@
                                 %
       S O m   & Digest these series and forward by {\bf mail}. [p/p]\\
       S O p   & Digest these series and forward as a {\bf post} to a newsgroup.
-      [p/p]\\ 
+      [p/p]\\
                                 %
       S u     & {\bf Uuencode} a file and post it as a series.\\
     \end{keys}
@@ -1036,8 +1036,8 @@
     \quad \B{l}ifetime: t)emporary, p)ermanent, i)mmediate.
 
     If you type the second letter in uppercase, the remaining two are assumed
-    to be s)ubstring and t)emporary. 
-    If you type the third letter in uppercase, the last one is assumed to be 
+    to be s)ubstring and t)emporary.
+    If you type the third letter in uppercase, the last one is assumed to be
     t)emporary.
 
     \quad Extra keys for manual editing of a score file:\\*
@@ -1057,7 +1057,7 @@
     archives, they are expanded and gathered in a new group.\\*
     \begin{keys}{X p}
       X b     & Un-{\bf binhex} these series. [p/p]\\
-      X o     & Simply {\bf output} these series (no decoding). [p/p]\\ 
+      X o     & Simply {\bf output} these series (no decoding). [p/p]\\
       X p     & Unpack these {\bf postscript} series. [p/p]\\
       X s     & Un-{\bf shar} these series. [p/p]\\
       X u     & {\bf Uudecode} these series. [p/p]\\
@@ -1259,7 +1259,7 @@
     }
   }
 
-% end   {gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %  
+% end   {gnusref} % % % % % % % % % % % % % % % % % % % % % % % % % %
 
 
 % o some things might not be updated: scoring and server modes, maybe more
@@ -1333,7 +1333,7 @@
     \SortSummary
     \subsection*{Score (Value) Commands}
     \Scoring
-    
+
 \ifthenelse{\isundefined{\booklettrue}}{% ifcard %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \subsection*{Output Articles}
   \OutputArticles
@@ -1343,7 +1343,7 @@
 
     \subsection*{MIME operations from the Summary-Buffer}
     \MIMESummary
-    
+
 \ifthenelse{\isundefined{\booklettrue}}{}{% ifbooklet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   \subsection*{Extract Series (Uudecode etc)}
   \ExtractSeries
@@ -1354,7 +1354,7 @@
 %
     \subsection*{Post, Followup, Reply, Forward, Cancel}
     \PostReplyetc
-    
+
 \ifthenelse{\isundefined{\booklettrue}}{\newpage}{}% newpage ifcard
 
       \subsection*{Message Composition}
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index 0fbd9496969..1a4ca82f438 100644
--- a/etc/themes/deeper-blue-theme.el
+++ b/etc/themes/deeper-blue-theme.el
@@ -22,7 +22,7 @@
 ;;; Code:
 
 (deftheme deeper-blue
-  "Face colors using a deep blue backgound.")
+  "Face colors using a deep blue background.")
 
 (let ((class '((class color) (min-colors 89))))
   (custom-theme-set-faces
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el
index 98c74b268af..cf6ae543575 100644
--- a/etc/themes/light-blue-theme.el
+++ b/etc/themes/light-blue-theme.el
@@ -26,7 +26,7 @@
 ;;; Code:
 
 (deftheme light-blue
-  "Face colors utilizing a light blue backgound.")
+  "Face colors utilizing a light blue background.")
 
 (let ((class '((class color) (min-colors 89))))
   (custom-theme-set-faces
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index eb5a0a00ade..b1ee78a393e 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -27,7 +27,7 @@
 ;;; Commentary:
 
 ;; These methods use a mixture of 8859-5 and Unicode.  Quail, used
-;; with ucs-tables provides suport for translating on the fly to
+;; with ucs-tables provides support for translating on the fly to
 ;; what's appropriate for aa buffer's file coding system, so the
 ;; encoding shouldn't matter too much provided it supports the
 ;; necessary characters.
diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index 210aeea7e62..7e108a71a60 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -53,7 +53,7 @@ C-F9 or `M-x ethio-toggle-space'
   punctuation followed by zero or more ASCII spaces'.
 
 S-F5 or `M-x ethio-toggle-punctuation'
-  Toggles ASCII punctuations and Ethiopic punctuations for keyboard input.
+  Toggles ASCII punctuation and Ethiopic punctuation for keyboard input.
   The current mode is indicated by `.' (ASCII) or `$(3$i(B' (Ethiopic).
 
 S-SPC or `M-x ethio-insert-ethio-space'
diff --git a/leim/quail/py-punct.el b/leim/quail/py-punct.el
index 86919128011..947f54c76fa 100644
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -8,7 +8,7 @@
 
 ;; Author: Ken'ichi HANDA <handa@etl.go.jp>
 
-;; Keywords: multilingual, input method, Chienese
+;; Keywords: multilingual, input method, Chinese
 
 ;; This file is part of GNU Emacs.
 
diff --git a/leim/quail/pypunct-b5.el b/leim/quail/pypunct-b5.el
index cc1f4f535e6..37c12659cc3 100644
--- a/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@ -7,7 +7,7 @@
 
 ;; Author: Ken'ichi HANDA <handa@etl.go.jp>
 
-;; Keywords: multilingual, input method, Chienese
+;; Keywords: multilingual, input method, Chinese
 
 ;; This file is part of GNU Emacs.
 
diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el
index c5c7061663e..ba47155524f 100644
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -28,7 +28,7 @@
 ;; Created: Feb. 17. 1997
 
 ;; History:
-;; 1997.03.13 Support for inputting special signs and punctuations added.
+;; 1997.03.13 Support for inputting special signs and punctuation added.
 ;;            (Only Ext. Wylie input)
 
 ;;; Commentary:
@@ -56,7 +56,7 @@
     (if (string-match "^-[dy]" quail-current-key)
         (setq quail-current-key (substring quail-current-key 1)))
     (let ((str (tibetan-transcription-to-tibetan quail-current-key)))
-      ;; If quail-current-key is for punctuations, it can't be
+      ;; If quail-current-key is for punctuation, it can't be
       ;; transcribed by tibetan-transcription-to-tibetan, thus STR
       ;; contains ASCII string now.  In that case, use the current
       ;; characters set in quail-current-str.
@@ -80,7 +80,7 @@
   '(("-d" . "$(7"2(B")
     ("-y" . "$(7"B(B")))
 
-;; Punctuations are not transcribed.
+;; Punctuation characters are not transcribed.
 
 (defconst tibetan-wylie-punctuation-alist
    '(("."  . " ")
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 983754eb1c3..1eb67eb6c71 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,19 @@
+2011-11-30  Chong Yidong  <cyd@gnu.org>
+
+        * emacsclient.c (main): Condition last change on WINDOWSNT
+        (Bug#10155).
+
+2011-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS).
+
+        * emacsclient.c (main) <environ>: Remove declaration, already
+        pulled in by unistd.h on Posix hosts and stdlib.h on MS-Windows.
+
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * make-docfile.c (scan_lisp_file): Treat defcustom like defvar.
+
 2011-11-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * Makefile.in (all): Make sure "all" is the first target.
@@ -4267,7 +4283,7 @@
 
 1998-12-08  Geoff Voelker  <voelker@cs.washington.edu>
 
-        * makefile.nt: Do string comparision of _NMAKE_VER.
+        * makefile.nt: Do string comparison of _NMAKE_VER.
 
 1998-11-03  Theodore Jump  <tjump@cais.com>
 
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 56e17c100be..0ae1f0bddea 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1635,7 +1635,11 @@ main (int argc, char **argv)
   /* Send over our environment and current directory. */
   if (!current_frame)
     {
+#ifndef WINDOWSNT
+      /* This is defined in stdlib.h on MS-Windows.  It's defined in
+         unistd.h on some POSIX hosts, but not all (Bug#10155).  */
       extern char **environ;
+#endif
       int i;
       for (i = 0; environ[i]; i++)
         {
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index ba54202954b..1ec365f3446 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1149,8 +1149,10 @@ scan_lisp_file (const char *filename, const char *mode)
             }
         }
 
+      /* defcustom can only occur in uncompiled Lisp files.  */
       else if (! strcmp (buffer, "defvar")
-               || ! strcmp (buffer, "defconst"))
+               || ! strcmp (buffer, "defconst")
+               || ! strcmp (buffer, "defcustom"))
         {
           char c1 = 0, c2 = 0;
           type = 'V';
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 28f913a4df6..be7f4d0b6db 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -23,7 +23,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse emacsclient
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
                   -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \
-                  -I../nt/inc -I../src
+                  -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS            = $(BASE_LIBS) $(ADVAPI32)
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37ecd3e6852..c77ace6d483 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,381 @@
+2011-12-03  Glenn Morris  <rgm@gnu.org>
+
+        * textmodes/texinfmt.el (batch-texinfo-format): Doc fix.  (Bug#10207)
+
+2011-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el: Streamline electric-indent's hook.
+        (electric-indent-chars): Revert to simple list.
+        (electric-indent-functions): New var.
+        (electric-indent-post-self-insert-function): Use it.
+
+        * progmodes/prolog.el (prolog-find-value-by-system): Avoid error when
+        there's no inferior buffer (bug#10196).
+        (prolog-consult-compile): Don't use toggle-read-only.
+
+2011-12-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-maybe-open-connection): Handle user
+        interrupt.  (Bug#10187)
+
+2011-12-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcmpl-gnu.el (pcomplete/tar): large-file-warn-threshold can be nil
+        (bug#9160).
+
+        * dired-aux.el (dired-query): Don't assume help-char is modifier-free
+        (bug#10191).
+
+2011-12-02  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-search): Display "end of manual" when Isearch
+        reaches the end of single-file Info manual.  (Bug#9918)
+
+2011-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * isearch.el (isearch-message-prefix): Run the input method part
+        of the prompt through bidi-string-mark-left-to-right.  (Bug#10183)
+
+2011-12-02  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-occur): Use `word-search-regexp' for
+        `isearch-word'.
+        (isearch-search-and-update): Add condition for `isearch-word' and
+        call `word-search-regexp'.  (Bug#10145)
+
+2011-12-01  Glenn Morris  <rgm@gnu.org>
+
+        * eshell/em-hist.el (eshell-hist-initialize):
+        Handle eshell-history-size nil and HISTSIZE set or unset.
+        (eshell-history-file-name, eshell-history-size): Fix custom type.
+
+2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * man.el (Man-completion-table): Fix the lambda case (bug#10168).
+
+2011-12-01  Michael McNamara  <mac@mail.brushroad.com>
+
+        * progmodes/verilog-mode.el (verilog-pretty-expr):
+        Rework verilog-pretty-expr to handle new assignment operators in system
+        verilog, such as += *= and the like.
+        (verilog-assignment-operator-re): Regular expression to find the
+        assigment operator in a verilog assignment.
+        (verilog-assignment-operation-re): Regular expression to find an
+        assignment statement for pretty-expr.
+        (verilog-in-attribute-p): Query returns true if point is in an
+        attribute context; used to skip these for expression line up from
+        pretty-expr.
+        (verilog-in-parameter-p): Query returns true if point is in an
+        parameter definition context; used to skip these for expression
+        line up from pretty-expr.
+        (verilog-in-parenthesis-p): Query returns true if point is in a
+        parenthetical expression, specifically ( ) but not [ ] or { };
+        used by pretty-expr.
+        (verilog-just-one-space): If there is no space, don't add one.
+        (verilog-get-lineup-indent-2): Specifically skip just attribute
+        contexts for expression lineup, rather than skipping all
+        parenthetical expressions.
+        (verilog-calculate-indent): Fix comment, and fix indent.
+        (verilog-do-indent): Indent declarations in lists (suggested by
+        Joachim Lechner).
+        (verilog-mode-abbrev-table): Populate abbrev mode with the various
+        skeleton items.
+        (verilog-sk-ovm-class): Add skeleton for OVM classes (reported
+        by Alain Mellan).
+
+2011-12-01  Wilson Snyder  <wsnyder@wsnyder.org>
+
+        * progmodes/verilog-mode.el (verilog-read-defines): Fix reading
+        parameters with embedded comments.  Reported by Ray Stevens.
+        (verilog-calc-1, verilog-fork-wait-re) (verilog-forward-sexp,
+        verilog-wait-fork-re): Fix indentation of "wait fork", bug407.
+        Reported by Tim Holt.
+        (verilog-auto): Fix AUTOing a upper module then AUTOing module
+        instantiated by upper module causing wrong expansion until AUTOed a
+        second time.  Reported by K C Buckenmaier.
+        (verilog-diff-auto): Fix showing .* as a difference when
+        `verilog-auto-star-save' off.  Reported by Dan Dever.
+        (verilog-auto-reset, verilog-read-always-signals)
+        (verilog-auto-reset-blocking-in-non): Fix AUTORESET including
+        temporary signals in reset list if
+        verilog-auto-reset-blocking-in-non is nil, and match assignment
+        style to each signal's assignment type, bug381.
+        Reported by Thomas Esposito.
+        (verilog-sk-uvm-class, verilog-uvm-begin-re, verilog-uvm-end-re)
+        (verilog-uvm-statement-re): Support UVM indentation and
+        highlighting, with old OVM keywords only.
+        (verilog-auto-tieoff, verilog-auto-tieoff-declaration):
+        Support AUTOTIEOFF creating non-wire data types.  Suggested by Jonathan
+        Greenlaw.
+        (verilog-auto-insert-lisp, verilog-delete-to-paren)
+        (verilog-forward-sexp-cmt, verilog-forward-sexp-ign-cmt)
+        (verilog-inject-sense, verilog-read-inst-pins)
+        (verilog-read-sub-decls, verilog-read-sub-decls-line):
+        Fix mismatching parenthesis inside commented out code when deleting
+        AUTOINST, bug383. Reported by Jonathan Greenlaw.
+        (verilog-auto-ascii-enum): Fix AUTOASCIIENUM one-hot with
+        non-numeric vector width.  Reported by Alex Reed.
+        (verilog-auto-ascii-enum): Add "onehot" option to work around not
+        detecting signals with parameter widths. Reported by Alex Reed.
+        (verilog-auto-delete-trailing-whitespace):
+        With `verilog-auto-delete-trailing-whitespace' remove trailing
+        whitespace in auto expansion, bug371.  Reported by Brad Dobbie.
+        (verilog-run-hooks, verilog-scan-cache-flush, verilog-syntax-ppss):
+        Fix verilog-scan-cache corruption when running user AUTO expansion
+        hooks that call indentation routines.
+        (verilog-simplify-range-expression): Fix typo ignoring lower case
+        identifiers.
+        (verilog-delete-auto): Fix delete-autos to also remove user created
+        automatics, as long as they start with AUTO.
+        (verilog-batch-diff-auto, verilog-diff-auto)
+        (verilog-diff-function): Add `verilog-diff-auto' and bind to
+        "C-c?"  to report differences in AUTO expansion, ignoring spaces.
+        (verilog-backward-syntactic-ws-quick, verilog-beg-of-defun-quick)
+        (verilog-in-paren-quick, verilog-re-search-backward-quick)
+        (verilog-re-search-forward-quick, verilog-syntax-ppss):
+        Fix calling `syntax-ppss' when inside auto expansions as the ppss hook
+        is disabled and its cache will get corrupt, causing AUTOS not to
+        expand.  Instead use only -quick functions.
+        (verilog-scan-region): Fix scanning over escaped quotes.
+        (verilog-inside-comment-or-string-p, verilog-inside-comment-p)
+        (verilog-re-search-backward-quick)
+        (verilog-re-search-forward-quick, verilog-scan): verilog-scan and
+        related functions now ignore strings, to fix misparsing of strings
+        with magic comments embedded in them.
+        (verilog-read-auto-template):
+        Fix 'verilog-auto-inst-template-numbers' with extra newline before (.
+        Reported by Brad Dobbie.
+        (verilog-read-auto-template):
+        Fix 'verilog-auto-inst-template-numbers' with comments.
+        Reported by Brad Dobbie.
+        (verilog-auto-inst, verilog-auto-inst-param)
+        (verilog-auto-inst-sort): Add 'verilog-auto-inst-sort' to reduce
+        merge conflicts with AUTOINST, bug358.  Reported by Brad Dobbie.
+        (verilog-auto-inst-template-numbers): Add 'lhs' policy for
+        debugging templates without merge conflicts, bug357.
+        Reported by Brad Dobbie.
+        (verilog-read-auto-template):
+        Fix verilog-auto-inst-template-numbers with multiple templates.
+        Reported by Brad Dobbie.
+        (verilog-define-abbrev): Fix verilog-mode abbrevs to be system
+        abbrevs so user won't be asked to save.
+        (verilog-read-auto-lisp-present): Fix to start at beginning of
+        buffer in case called outside of verilog-auto.
+        (verilog-simplify-range-expression): Fix AUTOWIRE expanding "X-1+1"
+        to "X-2".  Reported by Matthew Myers.
+        (verilog-auto, verilog-auto-inout-in): Add AUTOINOUTIN for creating
+        all inputs from module templates.  Reported by Leith Johnson.
+        (verilog-module-inside-filename-p): Fix locating programs as with
+        modules.
+        (verilog-auto-inst-port): Fix vl-width expressions when using
+        verilog-auto-inst-param-value, bug331.  Reported by Julian Gorfajn.
+        (verilog-decls-get-regs, verilog-decls-get-signals,
+        verilog-decls-get-vars, verilog-decls-get-wires, verilog-decls-new,
+        verilog-modi-cache-add-vars, verilog-modi-cache-add-wires,
+        verilog-read-decls): Combine reg and wire structures into one var
+        structure to represent SystemVerilog concepts.
+        (verilog-auto-ascii-enum, verilog-auto-logic, verilog-auto-reg)
+        (verilog-auto-reg-input, verilog-auto-tieoff, verilog-auto-wire)
+        (verilog-auto-wire-type, verilog-insert-definition):
+        Add verilog-auto-wire-type and AUTOLOGIC to support using
+        SystemVerilog "logic" keyword instead of "wire"/"reg".
+        (verilog-auto-reg-input, verilog-decls-get-signals): Fix AUTOWIRE
+        to declares outputs that also have assignments (presumably in an
+        ifdef or generate if so there's not a driver conflict).
+        Reported by Matthew Myers.
+        (verilog-auto-declare-nettype, verilog-insert-definition):
+        Add verilog-auto-declare-nettype to fix declarations using
+        `default_nettype none.  Reported by Julian Gorfajn.
+        (verilog-read-always-signals-recurse, verilog-read-decls)
+        (verilog-read-sub-decls-gate): Fix infinite loop with (*) and
+        malformed end statement, bug325.  Reported by Joshua Wise and
+        Andrew Drake.
+        (verilog-auto-star-safe, verilog-delete-auto-star-implicit)
+        (verilog-inst-comment-re): Fix not deleting Interfaced comment
+        when expanding .* in interfaces, bug320.  Reported by Pierre-David
+        Pfister.
+        (verilog-read-module-name): Fix import statements between module
+        name and open parenthesis, bug317.  Reported by Pierre-David
+        Pfister.
+        (verilog-simplify-range-expression): Fix simplification of
+        multiplications inside AUTOWIRE connections, bug303.
+        (verilog-auto-inst-port): Support parameter expansion in
+        multidimensional arrays.
+        (verilog-read-decls): Fix AUTOREG etc looking for "endproperty"
+        after "assert property".  Reported by Julian Gorfajn.
+        (verilog-simplify-range-expression): Fix "couldn't merge" errors
+        with multiplication, bug303.
+        (verilog-read-decls): Fix parsing of unsigned data types, bug302.
+        Reported by Jan Frode Lonnum.
+
+2011-11-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * htmlfontify.el (hfy-page-header, hfy-post-html-hooks)
+        (hfy-shell-file-name, hfy-shell):
+        * international/fontset.el (x-decompose-font-name): Fix typos.
+
+2011-11-29  Ken Brown  <kbrown@cornell.edu>
+
+        * progmodes/gdb-mi.el: Fix bug#9853, bug#9858, and bug#9878.
+        (gdb-version): Remove defvar.
+        (gdb-supports-non-stop): New defvar, replacing `gdb-version'.
+        (gdb-gud-context-command, gdb-non-stop-handler)
+        (gdb-current-context-command, gdb-stopped): Use it.
+        (gdb-init-1): Enable pretty printing here.
+        (gdb-non-stop-handler): Don't enable pretty-printing here.
+        Check to see if the target supports non-stop mode; if not, turn off
+        non-stop mode.  Use the following.
+        (gdb-check-target-async): New defun.
+        (gud-watch, gdb-stopped): Fix whitespace.
+        (gdb-get-source-file): Don't try to display the source file if
+        `gdb-main-file' is nil.
+
+2011-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * align.el: Try to generate fewer markers (bug#10047).
+        (align--set-marker): New macro.
+        (align-region): Use it.
+
+2011-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * isearch.el (isearch-yank-x-selection): Deactivate mark (bug#10022).
+
+2011-11-29  Chong Yidong  <cyd@gnu.org>
+
+        * indent.el (indent-for-tab-command, indent-according-to-mode):
+        Doc fix.
+        (indent-region): Doc fix.  Switch nested ifs to equivalent cond.
+
+2011-11-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * vc/diff-mode.el (diff-find-file-name): Make `read-file-name'
+        aware of remote file names.  (Bug#10124)
+
+2011-11-29  Chong Yidong  <cyd@gnu.org>
+
+        * frame.el (auto-raise-mode, auto-lower-mode): Doc fix.
+
+2011-11-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (find-file): Don't use force-same-window (bug#10144).
+        * window.el (switch-to-buffer): Better match Emacs-23 behavior and only
+        use pop-to-buffer if the selected window can't be used.
+        (pop-to-buffer-same-window): Use display-buffer--same-window-action.
+
+2011-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * vc/diff-mode.el (diff-mode-map): Don't inherit 'z' => 'M-z' from
+        special-mode-map.
+
+2011-11-28  Chong Yidong  <cyd@gnu.org>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Fix default doc.
+
+2011-11-27  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-mi.el (gdb-init-1): Condition execution of
+          gdb-get-source-file-list on gdb-create-source-file-list.
+
+2011-11-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * whitespace.el (whitespace-newline): Use a different foreground
+        color for 16-color light-background displays.
+
+2011-11-24  Chong Yidong  <cyd@gnu.org>
+
+        * window.el (display-buffer--special-action): Doc fix.
+
+2011-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/avl-tree.el (avl-tree--do-copy, avl-tree-create)
+        (avl-tree-compare-function, avl-tree-empty, avl-tree-enter)
+        (avl-tree-delete, avl-tree-member, avl-tree-member-p, avl-tree-map)
+        (avl-tree-mapc, avl-tree-mapf, avl-tree-mapcar, avl-tree-copy)
+        (avl-tree-clear, avl-tree-stack, avl-tree-stack-pop)
+        (avl-tree-stack-first):
+        * emacs-lisp/cconv.el (cconv--analyse-use):
+        * net/gnutls.el (gnutls-negotiate): Fix typos.
+
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * lpr.el (lpr-windows-system, lpr-lp-system):
+        * mail/binhex.el (binhex-begin-line):
+        * progmodes/grep.el (grep-history, grep-find-history):
+        * textmodes/flyspell.el:
+        * vc/pcvs-defs.el (cvs-global-menu):
+        * vc/vc-bzr.el (vc-bzr-admin-checkout-format-file):
+        * vc/vc-mtn.el (vc-mtn-admin-dir, vc-mtn-admin-format):
+        * vc/vc-cvs.el (vc-cvs-registered): Give them basic doc-strings.
+
+        * net/tls.el: Fix case of "GnuTLS".
+
+        * paths.el (rmail-file-name): Format doc-string for make-docfile.
+
+        * version.el (emacs-build-system): Give it a doc-string.
+
+2011-11-24  Juri Linkov  <juri@jurta.org>
+
+        * view.el (view-buffer): Revert 2011-07-19T15:01:49Z!larsi@gnus.org from 2011-07-19 (bug#8615).
+
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime): When rmail-enable-mime is non-nil,
+        if called on a non-mime message just toggle the headers.  (Bug#8006)
+
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * allout.el (allout-setup, allout-auto-save-temporarily-disabled)
+        (allout-lead-with-comment-string, allout-structure-deleted-hook)
+        (allout-mode, allout-chart-subtree, allout-hotspot-key-handler)
+        (allout-rebullet-heading, allout-open-sibtopic)
+        (allout-toggle-current-subtree-encryption)
+        (allout-toggle-subtree-encryption, allout-encrypt-string)
+        (allout-next-topic-pending-encryption, allout-adjust-file-variable)
+        (allout-distinctive-bullets-string, allout-auto-activation):
+        * window.el (window-normalize-buffer-to-display):
+        * progmodes/verilog-mode.el (verilog-batch-indent):
+        * textmodes/bibtex.el (bibtex-field-braces-opt)
+        (bibtex-field-strings-opt):
+        * vc/cvs-status.el (cvs-tree-merge):
+        Fix typos.
+
+2011-11-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * rfn-eshadow.el (rfn-eshadow-update-overlay): Let-bind
+        `non-essential' to t, in order to avoid remote connections.
+
+2011-11-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs-lisp/autoload.el (autoload-generate-file-autoloads):
+        On MS-DOS and MS-Windows, compare with loaddefs.el
+        case-insensitively.
+
+2011-11-23  Mark Lillibridge  <mark.lillibridge@hp.com>  (tiny change)
+
+        * mail/unrmail.el (unrmail): Always add blank line.  (Bug#7743)
+
+2011-11-23  Glenn Morris  <rgm@gnu.org>
+
+        * paths.el (rmail-file-name): Reformat the doc-string so that it
+        is picked up.
+
+        * mail/rmail.el (rmail-message-filter, rmail-auto-file): Doc fixes.
+        (rmail-auto-file): Ignore case in the "special" field names,
+        as mail-fetch-field does for all others.
+
+        * mail/rmail.el (rmail-forward):
+        * mail/rmailkwd.el (rmail-set-label):
+        * mail/rmailout.el (rmail-output, rmail-output-as-seen)
+        (rmail-output-body-to-file): Give error if no message.  (Bug#10082)
+
+        * mail/rmail.el (rmail-current-message): Doc fix.
+
+        * mail/rmail.el (rmail-message-filter): Mark as obsolete.  (Bug#2624)
+
+2011-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * server.el (server-eval-and-print): Allow C-g (bug#6585).
+
 2011-11-22  Glenn Morris  <rgm@gnu.org>
 
         * mail/rmailmm.el (test-rmail-mime-handler)
@@ -208,12 +586,12 @@
 
 2011-11-16  Michael Albinus  <michael.albinus@gmx.de>
 
-        * net/tramp.el (tramp-handle-file-truename): Cache only the local
-        file name.
-
         * net/tramp-cache.el (tramp-flush-file-property): Flush also
         properties of linked files.  (Bug#9879)
 
+        * net/tramp-sh.el (tramp-sh-handle-file-truename): Cache only the
+        local file name.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * menu-bar.el (menu-bar-file-menu):
@@ -1964,7 +2342,7 @@
 
         * window.el (window-auto-delete): Remove.
         (window-deletable-p): Remove argument FORCE.  Don't deal with
-        dedicatedness and previous buffers.
+        dedication and previous buffers.
         (switch-to-prev-buffer): Don't delete window.
         (delete-windows-on): Delete a window's frame if and only if the
         window is dedicated.
@@ -3752,7 +4130,7 @@
 
         * cus-edit.el (custom-show): Mark as obsolete.
 
-        * net/network-stream.el (network-stream-open-starttls): If gnutls
+        * net/network-stream.el (network-stream-open-starttls): If GnuTLS
         negotiation fails, then possibly try again with a non-encrypted
         connection (bug#9017).
 
@@ -7938,7 +8316,7 @@
 2011-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/network-stream.el (network-stream-open-starttls): Only do
-        opportunistic STARTTLS upgrades if we have built-in gnutls support.
+        opportunistic STARTTLS upgrades if we have built-in GnuTLS support.
         Upgrades via gnutls-cli are too slow to be done opportunistically.
 
 2011-04-12  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index cb1d1af577b..a1cfaee6eaf 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -1837,7 +1837,7 @@
 2003-05-31  Stefan Monnier  <monnier@cs.yale.edu>
 
         * view.el (view-file, view-file-other-window, view-file-other-frame):
-        Signal an error when trying to visit an inexistent file.
+        Signal an error when trying to visit a nonexistent file.
 
         * vc-hooks.el (vc-call-backend): Give better error message
         when a backend function is missing.
@@ -5904,7 +5904,7 @@
         (mis-)use tramp-current-user as indication, assuming it is set in
         `tramp-completion-handle-file-name-all-completions'.
         (tramp-send-region): Handle the case `tramp-chunksize' is equal 0.
-        I did it accidently.  Infinite loop ...
+        I did it accidentally.  Infinite loop ...
         (tramp-get-device): `tramp-make-tramp-file-name' must not be
         called with NIL path.  It fails in case of multi-method.
         (tramp-file-name-for-operation): Apply `expand-file-name' for
@@ -8053,7 +8053,7 @@
         (gdb-quit): Reset some variables including tool-bar-map.
 
         * gud.el (gdb-running): New variable.
-        (gud-menu-map): Use gdb-running to grey out toolbar buttons
+        (gud-menu-map): Use gdb-running to gray out toolbar buttons
         with gdba in gdb-ui.el.
         (gud-tool-bar-map): Move to avoid byte compiler warning.
 
@@ -9746,8 +9746,8 @@
 
 2002-09-28  Simon Josefsson  <jas@extundo.com>
 
-        * mail/smtpmail.el (smtpmail-via-smtp): Only negotiate starttls on
-        streams that were opened using starttls.
+        * mail/smtpmail.el (smtpmail-via-smtp): Only negotiate STARTTLS on
+        streams that were opened using STARTTLS.
 
 2002-09-28  Paul Reilly  <pmr@pajato.com>
 
@@ -22790,7 +22790,7 @@
 2001-11-04  Miles Bader  <miles@gnu.org>
 
         * startup.el (fancy-splash-head): Reapply Gerd's hack to make the
-        shadow of the splash image grey on a dark background instead of black.
+        shadow of the splash image gray on a dark background instead of black.
 
 2001-11-03  Stefan Monnier  <monnier@cs.yale.edu>
 
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index c80091e4657..38a5530fbfc 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -6728,11 +6728,11 @@
 2004-05-28  Simon Josefsson  <jas@extundo.com>
 
         * mail/smtpmail.el (smtpmail-open-stream):
-        Bind starttls-extra-arguments too, if starttls.el uses GNUTLS.
+        Bind starttls-extra-arguments too, if starttls.el uses GnuTLS.
 
 2004-05-26  Simon Josefsson  <jas@extundo.com>
 
-        * starttls.el: Merge with my GNUTLS based starttls.el.
+        * starttls.el: Merge with my GnuTLS based starttls.el.
         (starttls-gnutls-program, starttls-use-gnutls)
         (starttls-extra-arguments, starttls-process-connection-type)
         (starttls-connect, starttls-failure, starttls-success): New variables.
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 1660009aba7..8721130ec50 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -10695,7 +10695,7 @@
 
         * net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for
         the prompt.  If it returns earlier (when detecting an error
-        message), the rest of the output will merge accidently with the
+        message), the rest of the output will merge accidentally with the
         output of the next command.  Reported by M Jared Finder
         <jared@hpalace.com>.
 
@@ -15100,7 +15100,7 @@
 2005-12-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/lisp.el (lisp-complete-symbol): Don't call
-        delete-windows-on with an inexistent buffer.
+        delete-windows-on with a nonexistent buffer.
 
 2005-12-22  Nick Roberts  <nickrob@snap.net.nz>
 
@@ -16181,7 +16181,7 @@
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the
+        * progmodes/cc-awk.el: Move regexps for analyzing AWK code to near the
         start of the file.  ^L now separate sections of the file.
         (c-awk-non-eol-esc-pair-re, c-awk-blank-or-comment-line-re)
         (c-awk-one-line-possibly-open-string-re)
@@ -31734,7 +31734,7 @@
 2005-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/debug.el (debug): Hide the buffer if it's not killed.
-        Remove unused and inexistent var `inhibit-trace'.
+        Remove unused and nonexistent var `inhibit-trace'.
         (debugger-mode): Use run-mode-hooks.
         (debugger-list-functions): Add buttons; setup xref stack.
 
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index bfe0f4a7a51..12eadc6aadf 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -4275,7 +4275,7 @@
         stops with an error and Emacs does not compile with those things in.
         Besides, declare-function is not defined in XEmacs.
 
-        * ediff-util.el (eqiff-quit): Autoraise minibuffer.
+        * ediff-util.el (ediff-quit): Autoraise minibuffer.
 
         * ediff-diff.el (ediff-convert-fine-diffs-to-overlays): Make it a defun.
 
@@ -7393,7 +7393,7 @@
 
         * help-mode.el (help-mode): Set view-exit-action to bury the
         buffer instead of fiddling with windows.  Simplify code.
-        (help-mode-finish): When help-window eqs t set it to the selected
+        (help-mode-finish): When help-window equals t set it to the selected
         window and have with-help-window set up view-return-to-alist.
         (help-buffer): Add autoload cookie.
 
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 04133f17364..e0c244d5725 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -2809,7 +2809,7 @@
         Consolidate layout provisions coce directly into the activation
         condition branch, now that we've removed those provisions.
         (allout-unload-function): Explicitly activate the mode before
-        deactivating, if it's initially deactivated.
+        deactivating, if it's initially inactive.
         (allout-set-buffer-multibyte): Properly prevent byte-compiler
         warnings for version of function used only where
         set-buffer-multibyte is unavailable.
@@ -2818,7 +2818,7 @@
 
         * tool-bar.el (tool-bar-setup): Remove :enable conditions, which
         are handled by the menu-bar entries.  As before, don't use
-        :visibile to avoid changing the tool-bar.
+        :visible to avoid changing the tool-bar.
 
 2010-12-27  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -6065,7 +6065,7 @@
 
 2010-10-03  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * net/gnutls.el: Improve docs.  Remove starttls and ssl emulation.
+        * net/gnutls.el: Improve docs.  Remove STARTTLS and SSL emulation.
         Provide only `open-gnutls-stream' (formerly `open-ssl-stream') and
         `gnutls-negotiate' (formerly `starttls-negotiate').
         Remove trivial wrapper `starttls-open-stream'.
@@ -6217,7 +6217,7 @@
 
 2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * net/tls.el (tls-starttls-switches): Give up on using starttls with
+        * net/tls.el (tls-starttls-switches): Give up on using STARTTLS with
         gnutls-cli.
         (tls-program): Add --insecure to be consistent with the defaults from
         openssl s_client.  Now all three commands are insecure.
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 2b384d79169..cb39ca5997f 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -9536,7 +9536,7 @@
         it@top level.
 
         * texnfo-upd.el (texinfo-incorporate-descriptions): Don't
-        accidently find a string in the description that is confused for
+        accidentally find a string in the description that is confused for
         a menu item.
 
 1990-06-01  Robert J. Chassell  (bob@wheat-chex)
@@ -11362,7 +11362,7 @@
         * blackbox.el (bb-init-board): Use (random 8) to get # in [0,7].
         * dissociate.el: Likewise.
         * fill.el (justify-current-line): Likewise.
-        * flame.el (define-element, psychoanalize-flamer): Likewise.
+        * flame.el (define-element, psychoanalyze-flamer): Likewise.
         * yow.el (yow): Likewise.
         * doctor.el: Use (random N), not (random-range N).
         (random-range): Function deleted.
@@ -12454,4 +12454,3 @@ See ChangeLog.2 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index b2cdc634f84..51e2661d89e 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -914,7 +914,7 @@
         (desktop-locals-to-save): Add line-number-mode to be saved when
         local.
         (desktop-remove): In case the desktop file cannot be deleted
-        make sure that the desktop system is still inactivated.
+        make sure that the desktop system is still inactive.
         (desktop-kill): In case an error occurs when saving the desktop,
         offer to quit regardless.
         (desktop-save-buffer-p): Disregard case when testing file and
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index b536f7f1b66..b3e92b1a50a 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -2579,7 +2579,7 @@
 1995-03-13  Karl Fogel  <kfogel@floss>
 
         * bookmark.el: Removed C-v bindings; they were inconsistent.
-        Defvarred some variables to nil, solely to avoid compilation warnings.
+        Defvared some variables to nil, solely to avoid compilation warnings.
         Use "Author's Update Number:" instead of "Version:".
         (bookmark-history): New var.
         (bookmark-completing-read): Use `bookmark-history'.
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 42c9df84876..fb6090b3583 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -5716,7 +5716,7 @@
         (vip-read-string-with-history, vip-search): Won't pause inside
         macros any more.
         * viper-mous.el (vip-surrounding-word): Modified to understand
-        tripple clicks.
+        triple clicks.
         * viper-util.el (vip-leave-region-active): New function.
         * viper-ex.el (ex-write): Uses better defaults.
         * viper-macs.el (vip-record-kbd-macro): Correctly escapes `.' and
@@ -6689,7 +6689,7 @@
         Harnessed view-minor-mode.
         Added (vip-leave-region-active) to all simple movement commands.
         * viper-mous.el (vip-surrounding-word): Modified to understand
-        tripple clicks.
+        triple clicks.
         * viper-util.el (vip-leave-region-active): New function.
 
 1995-08-19  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index cb606cd0847..934258ade67 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1012,7 +1012,7 @@
         bindings for quail-execute-non-quail-command deleted.
         (quail-conversion-keymap): Likewise.  Add key bindings for
         quail-self-insert-command.
-        (quail-delete-overlays): Chekc overlay-start for overlays before
+        (quail-delete-overlays): Check overlay-start for overlays before
         deleting them.
         (quail-mode): This function deleted.
         (quail-inactivate, quail-activate): New functions.
@@ -1230,7 +1230,7 @@
         indicator regex, Fix line positioning.
         (speedbar-add-indicator): Handles obj indicators now.
         (speedbar-check-objects, speedbar-check-obj-this-line): New functions.
-        (speedbar-double-click): Fix tripple click error.
+        (speedbar-double-click): Fix triple click error.
         (speedbar-line-file, speedbar-goto-this-file): Handle indicator regex.
         (speedbar-line-path): Only try to get a file when in "files" display.
         (speedbar-line-depth): Handle indicator regex.
@@ -2018,7 +2018,7 @@
 1998-06-19  Karl Heuer  <kwzh@gnu.org>
 
         * emacs-lisp/checkdoc.el (checkdoc-eval-defun): Doc fix.
-        (checkdoc-continue, checkdoc-tripple-semi-comment-check-flag): Ditto.
+        (checkdoc-continue, checkdoc-triple-semi-comment-check-flag): Ditto.
         (checkdoc-common-verbs-wrong-voice): Use dotted pairs.
 
 1998-06-19  Richard Stallman  <rms@gnu.org>
@@ -15185,7 +15185,7 @@
 1997-06-16  Dan Nicolaescu  <done@ece.arizona.edu>
 
         * icon.el (icon-indent-line): A comment ends at the end of the
-        line, delete call to inexistent function.
+        line, delete call to nonexistent function.
 
         * icon.el (icon-font-lock-keywords-1): Improved regexp.
         (icon-font-lock-keywords-2): Likewise.
@@ -18065,7 +18065,7 @@
         have KEY.
         (current-input-method-title): Doc-string modified.
         (select-input-method): Set current-input-method to nil even if
-        inactivation of the current input method failed.
+        deactivation of the current input method failed.
         (set-language-environment): Doc-string modified.
         (describe-language-support): Doc-string modified.  Calls an
         appropriate function for each language.
@@ -19394,7 +19394,7 @@
         * loadup.el: Load language/english and language/tibetan.
 
         * mule-cmds.el: Prefix for Mule related commands is changed.
-        (view-hello-file): Allways does correct decoding of HELLO file.
+        (view-hello-file): Always does correct decoding of HELLO file.
 
         * mule-conf.el: Change descriptions for Arabic, Indian, and
         Vietnamese character sets.  Define Tibetan character sets.
@@ -19552,7 +19552,7 @@
         * term.el: Added a lot of new faces, they all start with
         term- and follow a simple lexicographical convention.  Note that
         each change is commented: just search for -mm in the source.
-        (term-char-mode): Added all the "grey-keys" to term-raw-map.
+        (term-char-mode): Added all the "gray-keys" to term-raw-map.
         (term-send-up): Similar, decided to go for the more xterm-like
         \eOA bindings in place of the previous \e[A.
         (term-buffer-maximum-size): New variable.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 7aca1b521a2..cd685204766 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -530,7 +530,7 @@
         composition-function-table.
         (tibetan-composable-pattern): New variable.
         (tibetan-subjoined-transcription-alist): Change key "R" to "+R".
-        (tibetan-precomposition-rule-alist): Move punctuations to
+        (tibetan-precomposition-rule-alist): Move punctuation to
         tibetan-punctuation-transcription-alist and
         tibetan-obsolete-glyphs.
         (tibetan-punctuation-transcription-alist): New variable.
@@ -4294,7 +4294,7 @@
 
 1999-07-21  Gerd Moellmann  <gerd@gnu.org>
 
-        * faces.el (toolbar): Grey default background.
+        * faces.el (toolbar): Gray default background.
         (modeline): Ditto.
 
         * image.el (image-type-regexps): New.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 538f3f1d401..1c38b4d9ac6 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -2021,7 +2021,7 @@
         newbuffile out of the loop, in the newbuffile-nd local var.
         Use dolist (cosmetic change).  Compute the proposed name for the most
         common case and cache it in the fourth place in the item.
-        (uniquify-rationalize-file-buffer-names): Used to return a a list
+        (uniquify-rationalize-file-buffer-names): Used to return a list
         of buffer whose name was changed, but that return value was never used.
         (uniquify-item-lessp): Replaces uniquify-filename-lessp, works on
         the cached proposed name, does much less consing and is quicker.
@@ -8319,7 +8319,7 @@
         * frame.el (show-cursor-in-non-selected-windows): Doc fix.
 
         * hi-lock.el (hi-lock-refontify): Don't call non-existent
-        jit-lock-fontify-buffer; it should anyway be unneccessary to
+        jit-lock-fontify-buffer; it should anyway be unnecessary to
         do anything special when jit-lock is active.
         (hi-yellow, hi-pink, hi-green, hi-blue): Fix defface specs.
 
diff --git a/lisp/align.el b/lisp/align.el
index 8767b6ff306..0d9f351b9da 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1246,6 +1246,11 @@ have been aligned.  No changes will be made to the buffer."
                                          (car props) (cdr props)))))))))))
         (setq areas (cdr areas))))))
 
+(defmacro align--set-marker (marker-var pos &optional type)
+  `(if ,marker-var
+       (move-marker ,marker-var ,pos)
+     (setq ,marker-var (copy-marker ,pos ,type))))
+
 (defun align-region (beg end separate rules exclude-rules
                          &optional func)
   "Align a region based on a given set of alignment rules.
@@ -1370,8 +1375,8 @@ aligner would have dealt with are."
                   (if (not here)
                       (goto-char end))
                   (forward-line)
-                  (setq end (point)
-                        end-mark (copy-marker end t))
+                  (setq end (point))
+                  (align--set-marker end-mark end t)
                   (goto-char beg)))
 
               ;; If we have a region to align, and `func' is set and
@@ -1467,10 +1472,9 @@ aligner would have dealt with are."
                         ;; test whether we have found a match on the same
                         ;; line as a previous match
                         (if (> (point) eol)
-                            (setq same nil
-                                  eol (save-excursion
-                                        (end-of-line)
-                                        (point-marker))))
+                            (progn
+                              (setq same nil)
+                              (align--set-marker eol (line-end-position))))
 
                         ;; lookup the `repeat' attribute the first time
                         (or repeat-c
@@ -1504,10 +1508,9 @@ aligner would have dealt with are."
                               (progn
                                 (align-regions regions align-props
                                                rule func)
-                                (setq last-point (copy-marker b t)
-                                      regions nil
-                                      align-props nil))
-                            (setq last-point (copy-marker b t)))
+                                (setq regions nil)
+                                (setq align-props nil)))
+                          (align--set-marker last-point b t)
 
                           ;; restore the match data
                           (set-match-data save-match-data)
diff --git a/lisp/allout.el b/lisp/allout.el
index e701d9685a1..68330aa538b 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -279,7 +279,7 @@ Intended to be used as the `allout-auto-activation' :set function."
 ;;;_  > allout-setup ()
 ;;;###autoload
 (defun allout-setup ()
-  "Do fundamental emacs session for allout auto-activation.
+  "Do fundamental Emacs session for allout auto-activation.
 
 Establishes allout processing as part of visiting a file if
 `allout-auto-activation' is non-nil, or removes it otherwise.
@@ -298,7 +298,7 @@ Control whether and how allout outline mode is automatically
 activated when files are visited with non-nil buffer-specific
 file variable `allout-layout'.
 
-When allout-auto-activation is \"On\" \(t), allout mode is
+When allout-auto-activation is \"On\" (t), allout mode is
 activated in buffers with non-nil `allout-layout', and the
 specified layout is applied.
 
@@ -560,7 +560,7 @@ of this var to take effect."
 These bullets are distinguish topics with particular character.
 They are not used by default in the topic creation routines, but
 are offered as options when you modify topic creation with a
-universal argument \(\\[universal-argument]), or during rebulleting \(\\[allout-rebullet-current-heading]).
+universal argument (\\[universal-argument]), or during rebulleting (\\[allout-rebullet-current-heading]).
 
 Distinctive bullets are not cycled when topics are shifted or
 otherwise automatically rebulleted, so their marking is
@@ -844,7 +844,7 @@ such topics are encrypted.)"
 (defvar allout-auto-save-temporarily-disabled nil
   "True while topic encryption is pending and auto-saving was active.
 
-The value of buffer-saved-size at the time of decryption is used,
+The value of `buffer-saved-size' at the time of decryption is used,
 for restoring when all encryptions are established.")
 (defvar allout-just-did-undo nil
   "True just after undo commands, until allout-post-command-business.")
@@ -910,7 +910,7 @@ For details, see `allout-toggle-current-subtree-encryption's docstring."
 (defvar allout-layout nil            ; LEAVE GLOBAL VALUE NIL -- see docstring.
   "Buffer-specific setting for allout layout.
 
-In buffers where this is non-nil \(and if `allout-auto-activation'
+In buffers where this is non-nil (and if `allout-auto-activation'
 has been customized to enable this behavior), `allout-mode' will be
 automatically activated.  The layout dictated by the value will be used to
 set the initial exposure when `allout-mode' is activated.
@@ -1037,7 +1037,7 @@ suitably economical.")
 (defun allout-lead-with-comment-string (&optional header-lead)
   "Set the topic-header leading string to specified string.
 
-Useful when for encapsulating outline structure in programming
+Useful for encapsulating outline structure in programming
 language comments.  Returns the leading string."
 
   (interactive "P")
@@ -1440,7 +1440,7 @@ Functions on the hook must take two arguments:
  - DEPTH -- integer indicating the depth of the subtree that was deleted.
  - REMOVED-FROM -- integer indicating the point where the subtree was removed.
 
-Some edits that remove or invalidate items may missed by this hook:
+Some edits that remove or invalidate items may be missed by this hook:
 specifically edits that native allout routines do not control.
 
 This hook might be invoked multiple times by a single command.")
@@ -1472,10 +1472,10 @@ that was affected by the undo.
 Functions on the hook should not require any arguments.")
 ;;;_   = allout-outside-normal-auto-fill-function
 (defvar allout-outside-normal-auto-fill-function nil
-  "Value of normal-auto-fill-function outside of allout mode.
+  "Value of `normal-auto-fill-function' outside of allout mode.
 
-Used by allout-auto-fill to do the mandated normal-auto-fill-function
-wrapped within allout's automatic fill-prefix setting.")
+Used by `allout-auto-fill' to do the mandated `normal-auto-fill-function'
+wrapped within allout's automatic `fill-prefix' setting.")
 (make-variable-buffer-local 'allout-outside-normal-auto-fill-function)
 ;;;_   = prevent redundant activation by desktop mode:
 (add-to-list 'desktop-minor-mode-handlers '(allout-mode . nil))
@@ -1576,7 +1576,7 @@ message if an error is encountered.  The message will serve as a
 non-nil return on `write-contents-functions' to prevent saving of
 the buffer while it has decrypted content.
 
-This behavior depends on emacs versions that implement the
+This behavior depends on Emacs versions that implement the
 `write-contents-functions' hook."
 
   (if (or (not (allout-mode-p))
@@ -1627,7 +1627,7 @@ and the place for the cursor after the decryption is done."
   )
 ;;;_   > allout-called-interactively-p ()
 (defmacro allout-called-interactively-p ()
-  "A version of called-interactively-p independent of emacs version."
+  "A version of `called-interactively-p' independent of Emacs version."
   ;; ... to ease maintenance of allout without betraying deprecation.
   (if (equal (subr-arity (symbol-function 'called-interactively-p))
              '(0 . 0))
@@ -1712,7 +1712,7 @@ Allout outline mode is a minor mode that provides extensive
 outline oriented formatting and manipulation.  It enables
 structural editing of outlines, as well as navigation and
 exposure.  It also is specifically aimed at accommodating
-syntax-sensitive text like programming languages.  \(For example,
+syntax-sensitive text like programming languages.  (For example,
 see the allout code itself, which is organized as an allout
 outline.)
 
@@ -1733,7 +1733,7 @@ Below is a description of the key bindings, and then description
 of special `allout-mode' features and terminology.  See also the
 outline menubar additions for quick reference to many of the
 features.  Customize `allout-auto-activation' to prepare your
-emacs session for automatic activation of `allout-mode'.
+Emacs session for automatic activation of `allout-mode'.
 
 The bindings are those listed in `allout-prefixed-keybindings'
 and `allout-unprefixed-keybindings'.  We recommend customizing
@@ -1781,7 +1781,7 @@ the HOT-SPOT Operation section.
 \\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for
             current topic
 \\[allout-rebullet-topic] `allout-rebullet-topic'   Reconcile bullets of topic and
-            its' offspring -- distinctive bullets are not changed, others
+            its offspring -- distinctive bullets are not changed, others
             are alternated according to nesting depth.
 \\[allout-number-siblings] `allout-number-siblings'  Number bullets of topic and siblings --
            the offspring are not affected.
@@ -1791,12 +1791,12 @@ the HOT-SPOT Operation section.
         ----------------------------------
 \\[allout-kill-topic] `allout-kill-topic'   Kill current topic, including offspring.
 \\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring.
-\\[allout-kill-line]     `allout-kill-line'    kill-line, attending to outline structure.
+\\[allout-kill-line]     `allout-kill-line'    Kill line, attending to outline structure.
 \\[allout-copy-line-as-kill]     `allout-copy-line-as-kill' Copy line but don't delete it.
 \\[allout-yank] `allout-yank'        Yank, adjusting depth of yanked topic to
                              depth of heading if yanking into bare topic
                              heading (ie, prefix sans text).
-\\[allout-yank-pop]     `allout-yank-pop'       Is to allout-yank as yank-pop is to yank
+\\[allout-yank-pop]     `allout-yank-pop'       Is to `allout-yank' as `yank-pop' is to `yank'.
 
         Topic-oriented Encryption:
         -------------------------
@@ -1836,7 +1836,7 @@ for a save, it is automatically decrypted for continued editing.
 NOTE: A few GnuPG v2 versions improperly preserve incorrect
 symmetric decryption keys, preventing entry of the correct key on
 subsequent decryption attempts until the cache times-out.  That
-can take several minutes.  \(Decryption of other entries is not
+can take several minutes.  (Decryption of other entries is not
 affected.)  Upgrade your EasyPG version, if you can, and you can
 deliberately clear your gpg-agent's cache by sending it a '-HUP'
 signal.
@@ -1877,7 +1877,7 @@ hooks, by which independent code can cooperate with allout
 without changes to the allout core.  Here are key ones:
 
 `allout-mode-hook'
-`allout-mode-deactivate-hook' \(deprecated)
+`allout-mode-deactivate-hook' (deprecated)
 `allout-mode-off-hook'
 `allout-exposure-change-hook'
 `allout-structure-added-hook'
@@ -1939,7 +1939,7 @@ PREFIX-LEAD:
         When the PREFIX-LEAD is set to the comment-string of a
         programming language, outline structuring can be embedded in
         program code without interfering with processing of the text
-        (by emacs or the language processor) as program code.  This
+        (by Emacs or the language processor) as program code.  This
         setting happens automatically when allout mode is used in
         programming-mode buffers.  See `allout-use-mode-specific-leader'
         docstring for more detail.
@@ -1951,8 +1951,8 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
         `allout-distinctive-bullets-string'.  When creating a TOPIC,
         plain BULLETs are by default used, according to the DEPTH of the
         TOPIC.  Choice among the distinctive BULLETs is offered when you
-        provide a universal argugment \(\\[universal-argument]) to the
-        TOPIC creation command, or when explictly rebulleting a TOPIC.  The
+        provide a universal argument (\\[universal-argument]) to the
+        TOPIC creation command, or when explicitly rebulleting a TOPIC.  The
         significance of the various distinctive bullets is purely by
         convention.  See the documentation for the above bullet strings for
         more details.
@@ -2250,7 +2250,7 @@ to return the current prefix."
                                   allout-recent-prefix-end))
 ;;;_  > allout-recent-bullet ()
 (defmacro allout-recent-bullet ()
-  "Like allout-recent-prefix, but returns bullet of last encountered prefix.
+  "Like `allout-recent-prefix', but returns bullet of last encountered prefix.
 
 All outline functions which directly do string matches to assess
 headings set the variables `allout-recent-prefix-beginning' and
@@ -2625,13 +2625,13 @@ The remaining optional args are for internal use by the function.
 Point is left at the end of the subtree.
 
 Charts are used to capture outline structure, so that outline-altering
-routines need assess the structure only once, and then use the chart
+routines need to assess the structure only once, and then use the chart
 for their elaborate manipulations.
 
 The chart entries for the topics are in reverse order, so the
 last topic is listed first.  The entry for each topic consists of
 an integer indicating the point at the beginning of the topic
-prefix.  Charts for offspring consists of a list containing,
+prefix.  Charts for offspring consist of a list containing,
 recursively, the charts for the respective subtopics.  The chart
 for a topics' offspring precedes the entry for the topic itself.
 
@@ -3100,7 +3100,7 @@ Return the start point of the new topic if successful, nil otherwise.
 
 Costs more than regular `allout-next-sibling' for short traversals:
 
- - we have to check the prior (next, if travelling backwards)
+ - we have to check the prior (next, if traveling backwards)
    item to confirm connectivity with the prior topic, and
  - if confirmed, we have to reestablish the allout-recent-* settings with
    some extra navigation
@@ -3186,7 +3186,7 @@ Presumes point is at the start of a topic prefix."
       (if (allout-called-interactively-p) (allout-end-of-prefix)))))
 ;;;_   > allout-next-visible-heading (arg)
 (defun allout-next-visible-heading (arg)
-  "Move to the next ARG'th visible heading line, backward if arg is negative.
+  "Move to the next ARGth visible heading line, backward if ARG is negative.
 
 Move to buffer limit in indicated direction if headings are exhausted."
 
@@ -3388,8 +3388,8 @@ return to regular interpretation of self-insert characters."
   "Catchall handling of key bindings in hot-spots.
 
 Translates unmodified keystrokes to corresponding allout commands, when
-they would qualify if prefixed with the allout-command-prefix, and sets
-this-command accordingly.
+they would qualify if prefixed with the `allout-command-prefix', and sets
+`this-command' accordingly.
 
 Returns the qualifying command, if any, else nil."
   (interactive)
@@ -3533,7 +3533,7 @@ the current topics' depth.
 If INSTEAD is:
 
 - nil, then the bullet char for the context is used, per distinction or depth
-- a \(numeric) character, then character's string representation is used
+- a (numeric) character, then character's string representation is used
 - a string, then the user is asked for bullet with the first char as default
 - anything else, the user is solicited with bullet char per context as default
 
@@ -3849,7 +3849,7 @@ Nuances:
 (defun allout-open-subtopic (arg)
   "Open new topic header at deeper level than the current one.
 
-Negative universal arg means to open deeper, but place the new topic
+Negative universal ARG means to open deeper, but place the new topic
 prior to the current one."
   (interactive "p")
   (allout-open-topic 1 (> 0 arg) (< 1 arg)))
@@ -3857,9 +3857,9 @@ prior to the current one."
 (defun allout-open-sibtopic (arg)
   "Open new topic header at same level as the current one.
 
-Positive universal arg means to use the bullet of the prior sibling.
+Positive universal ARG means to use the bullet of the prior sibling.
 
-Negative universal arg means to place the new topic prior to the current
+Negative universal ARG means to place the new topic prior to the current
 one."
   (interactive "p")
   (allout-open-topic 0 (> 0 arg) (not (= 1 arg))))
@@ -3867,7 +3867,7 @@ one."
 (defun allout-open-supertopic (arg)
   "Open new topic header at shallower level than the current one.
 
-Negative universal arg means to open shallower, but place the new
+Negative universal ARG means to open shallower, but place the new
 topic prior to the current one."
 
   (interactive "p")
@@ -3992,7 +3992,7 @@ All args are optional.
 
 If INSTEAD is:
 - nil, then the bullet char for the context is used, per distinction or depth
-- a \(numeric) character, then character's string representation is used
+- a (numeric) character, then character's string representation is used
 - a string, then the user is asked for bullet with the first char as default
 - anything else, the user is solicited with bullet char per context as default
 
@@ -4033,7 +4033,7 @@ this function."
                                                 number-control
                                                 index)))
 
-    ;; Is new one is identical to old?
+    ;; Is new one identical to old?
     (if (and (= current-depth new-depth)
              (string= current-bullet
                       (substring new-prefix (1- (length new-prefix)))))
@@ -4407,7 +4407,7 @@ subtopics into siblings of the item."
         (run-hook-with-args 'allout-structure-deleted-hook depth (point))))))
 ;;;_    > allout-copy-line-as-kill ()
 (defun allout-copy-line-as-kill ()
-  "Like allout-kill-topic, but save to kill ring instead of deleting."
+  "Like `allout-kill-topic', but save to kill ring instead of deleting."
   (interactive)
   (let ((buffer-read-only t))
     (condition-case nil
@@ -5854,12 +5854,12 @@ With repeat count, copy the exposed portions of entire buffer."
 (defun allout-toggle-current-subtree-encryption (&optional keymode-cue)
   "Encrypt clear or decrypt encoded topic text.
 
-Allout uses emacs 'epg' libary to perform encryption.  Symmetric
+Allout uses Emacs 'epg' library to perform encryption.  Symmetric
 and keypair encryption are supported.  All encryption is ascii
 armored.
 
 Entry encryption defaults to symmetric key mode unless keypair
-recipients are associated with the file \(see
+recipients are associated with the file (see
 `epa-file-encrypt-to') or the function is invoked with a
 \(KEYMODE-CUE) universal argument greater than 1.
 
@@ -5881,7 +5881,7 @@ pending encryption or encrypted.  `*' asterisk immediately after
 the bullet signals that the body is encrypted, its absence means
 the topic is meant to be encrypted but is not currently.  When a
 file with topics pending encryption is saved, topics pending
-encryption are encrypted.  See allout-encrypt-unencrypted-on-saves
+encryption are encrypted.  See `allout-encrypt-unencrypted-on-saves'
 for auto-encryption specifics.
 
 \*NOTE WELL* that automatic encryption that happens during saves will
@@ -5900,7 +5900,7 @@ encrypted.  If you want to encrypt the contents of a top-level topic, use
   "Encrypt clear text or decrypt encoded topic contents (body and subtopics.)
 
 Entry encryption defaults to symmetric key mode unless keypair
-recipients are associated with the file \(see
+recipients are associated with the file (see
 `epa-file-encrypt-to') or the function is invoked with a
 \(KEYMODE-CUE) universal argument greater than 1.
 
@@ -5916,7 +5916,7 @@ associated with it.  This can be used to deassociate any
 recipients with the file, by selecting no recipients in the
 dialog.
 
-Encryption and decryption uses the emacs epg library.
+Encryption and decryption uses the Emacs 'epg' library.
 
 Encrypted text will be ascii-armored.
 
@@ -6033,7 +6033,7 @@ If DECRYPT is true (default false), then decrypt instead of encrypt.
 ALLOUT-BUFFER identifies the buffer containing the text.
 
 Entry encryption defaults to symmetric key mode unless keypair
-recipients are associated with the file \(see
+recipients are associated with the file (see
 `epa-file-encrypt-to') or the function is invoked with a
 \(KEYMODE-CUE) universal argument greater than 1.
 
@@ -6057,7 +6057,7 @@ rejections due to matches against
 NOTE: A few GnuPG v2 versions improperly preserve incorrect
 symmetric decryption keys, preventing entry of the correct key on
 subsequent decryption attempts until the cache times-out.  That
-can take several minutes.  \(Decryption of other entries is not
+can take several minutes.  (Decryption of other entries is not
 affected.)  Upgrade your EasyPG version, if you can, and you can
 deliberately clear your gpg-agent's cache by sending it a '-HUP'
 signal."
@@ -6196,7 +6196,7 @@ signal."
 (defun allout-inhibit-auto-save-info-for-decryption (was-buffer-saved-size)
   "Temporarily prevent auto-saves in this buffer when an item is decrypted.
 
-WAS-BUFFER-SAVED-SIZE is the value of buffer-saved-size *before*
+WAS-BUFFER-SAVED-SIZE is the value of `buffer-saved-size' *before*
 the decryption."
   (when (not (or (= buffer-saved-size -1) (= was-buffer-saved-size -1)))
     (setq allout-auto-save-temporarily-disabled was-buffer-saved-size
@@ -6229,8 +6229,8 @@ the decryption."
   "Return the point of the next topic pending encryption, or nil if none.
 
 Such a topic has the `allout-topic-encryption-bullet' without an
-immediately following '*' that would mark the topic as being encrypted.  It
-must also have content."
+immediately following '*' that would mark the topic as being encrypted.
+It must also have content."
   (let (done got content-beg)
     (save-match-data
       (while (not done)
@@ -6332,7 +6332,7 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
   "Activate outline mode and establish file var so it is started subsequently.
 
 See `allout-layout' and customization of `allout-auto-activation'
-for details on preparing emacs for automatic allout activation."
+for details on preparing Emacs for automatic allout activation."
 
   (interactive "P")
 
@@ -6380,7 +6380,7 @@ Returns a list of the form (BEGINNING-POINT PREFIX-STRING SUFFIX-STRING)."
 (defun allout-adjust-file-variable (varname value)
   "Adjust the setting of an Emacs file variable named VARNAME to VALUE.
 
-This activity is inhibited if either `enable-local-variables'
+This activity is inhibited if either `enable-local-variables' or
 `allout-enable-file-variable-adjustment' are nil.
 
 When enabled, an entry for the variable is created if not already present,
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 51e869e3a21..4d93e01fb2e 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -83,7 +83,7 @@ To specify the file in which to save them, modify the variable
   "The `.emacs.bmk' file used to be called this name.")
 
 
-;; defvarred to avoid a compilation warning:
+;; defvared to avoid a compilation warning:
 (defvar bookmark-file nil
   "Old name for `bookmark-default-file'.")
 
diff --git a/lisp/calc/calc-nlfit.el b/lisp/calc/calc-nlfit.el
index 37e6f66c1b1..bd162866c31 100644
--- a/lisp/calc/calc-nlfit.el
+++ b/lisp/calc/calc-nlfit.el
@@ -22,7 +22,7 @@
 ;;; Commentary:
 
 ;; This code uses the Levenberg-Marquardt method, as described in
-;; _Numerical Analysis_ by H. R. Schwarz, to fit data to 
+;; _Numerical Analysis_ by H. R. Schwarz, to fit data to
 ;; nonlinear curves.  Currently, the only the following curves are
 ;; supported:
 ;; The logistic S curve, y=a/(1+exp(b*(t-c)))
@@ -33,14 +33,14 @@
 
 ;; The logistic bell curve, y=A*exp(B*(t-C))/(1+exp(B*(t-C)))^2
 ;;   Note that this is the derivative of the formula for the S curve.
-;;   We get A=-a*b, B=b and C=c.  Here, y is interpreted as the rate 
-;;   of growth of a population at time t.  So we will think of the 
-;;   data as consisting of rates p0, p1, ..., pn and their 
+;;   We get A=-a*b, B=b and C=c.  Here, y is interpreted as the rate
+;;   of growth of a population at time t.  So we will think of the
+;;   data as consisting of rates p0, p1, ..., pn and their
 ;;   respective times t0, t1, ..., tn.
 
 ;; The Hubbert Linearization, y/x=A*(1-x/B)
 ;;   Here, y is thought of as the rate of growth of a population
-;;   and x represents the actual population.  This is essentially 
+;;   and x represents the actual population.  This is essentially
 ;;   the differential equation describing the actual population.
 
 ;; The Levenberg-Marquardt method is an iterative process: it takes
@@ -53,7 +53,7 @@
 ;; approximations for b and c are found using least squares on the
 ;; linearization log((a/y)-1) = log(bb) + cc*t of
 ;; y=a/(1+bb*exp(cc*t)), which is equivalent to the above s curve
-;; formula, and then tranlating it to b and c.  From this, we can
+;; formula, and then translating it to b and c.  From this, we can
 ;; also get approximations for the bell curve parameters.
 
 ;;; Code:
@@ -68,7 +68,7 @@
 (defun math-nlfit-least-squares (xdata ydata &optional sdata sigmas)
   "Return the parameters A and B for the best least squares fit y=a+bx."
   (let* ((n (length xdata))
-         (s2data (if sdata 
+         (s2data (if sdata
                      (mapcar 'calcFunc-sqr sdata)
                   (make-list n 1)))
          (S (if sdata 0 n))
@@ -109,11 +109,11 @@
 ;;; The methods described by de Sousa require the cumulative data qdata
 ;;; and the rates pdata.  We will assume that we are given either
 ;;; qdata and the corresponding times tdata, or pdata and the corresponding
-;;; tdata.  The following two functions will find pdata or qdata, 
+;;; tdata.  The following two functions will find pdata or qdata,
 ;;; given the other..
 
-;;; First, given two lists; one of values q0, q1, ..., qn and one of 
-;;; corresponding times t0, t1, ..., tn; return a list 
+;;; First, given two lists; one of values q0, q1, ..., qn and one of
+;;; corresponding times t0, t1, ..., tn; return a list
 ;;; p0, p1, ..., pn of the rates of  change of the qi with respect to t.
 ;;; p0 is the right hand derivative (q1 - q0)/(t1 - t0).
 ;;; pn is the left hand derivative (qn - q(n-1))/(tn - t(n-1)).
@@ -122,7 +122,7 @@
 
 (defun math-nlfit-get-rates-from-cumul (tdata qdata)
   (let ((pdata (list
-                (math-div 
+                (math-div
                  (math-sub (nth 1 qdata)
                            (nth 0 qdata))
                  (math-sub (nth 1 tdata)
@@ -155,7 +155,7 @@
            pdata))
     (reverse pdata)))
 
-;;; Next, given two lists -- one of rates p0, p1, ..., pn and one of 
+;;; Next, given two lists -- one of rates p0, p1, ..., pn and one of
 ;;; corresponding times t0, t1, ..., tn -- and an initial values q0,
 ;;;  return a list q0, q1, ..., qn of the cumulative values.
 ;;; q0 is the initial value given.
@@ -169,7 +169,7 @@
             (cons
              (math-add (car qdata)
                        (math-mul
-                        (math-mul 
+                        (math-mul
                          '(float 5 -1)
                          (math-add (nth 1 pdata) (nth 0 pdata)))
                         (math-sub (nth 1 tdata)
@@ -181,13 +181,13 @@
 
 ;;; Given the qdata, pdata and tdata, find the parameters
 ;;; a, b and c that fit q = a/(1+b*exp(c*t)).
-;;; a is found using the method described by de Sousa.  
+;;; a is found using the method described by de Sousa.
 ;;; b and c are found using least squares on the linearization
 ;;; log((a/q)-1) = log(b) + c*t
 ;;; In some cases (where the logistic curve may well be the wrong
 ;;; model), the computed a will be less than or equal to the maximum
 ;;; value of q in qdata; in which case the above linearization won't work.
-;;; In this case, a will be replaced by a number slightly above 
+;;; In this case, a will be replaced by a number slightly above
 ;;; the maximum value of q.
 
 (defun math-nlfit-find-qmax (qdata pdata tdata)
@@ -224,7 +224,7 @@
       (setq qmh
             (math-add qmh
                       (math-mul
-                       (math-mul 
+                       (math-mul
                         '(float 5 -1)
                         (math-add (nth 1 pdata) (nth 0 pdata)))
                        (math-sub (nth 1 tdata)
@@ -239,7 +239,7 @@
   (let* ((qhalf (math-nlfit-find-qmaxhalf pdata tdata))
          (q0 (math-mul 2 qhalf))
          (qdata (math-nlfit-get-cumul-from-rates tdata pdata q0)))
-    (while (math-lessp (math-nlfit-find-qmax 
+    (while (math-lessp (math-nlfit-find-qmax
                         (mapcar
                          (lambda (q) (math-add q0 q))
                          qdata)
@@ -260,7 +260,7 @@
            (i 0))
       (while (< i 10)
         (setq q0 (math-mul '(float 5 -1) (math-add qmin qmax)))
-        (if (math-lessp 
+        (if (math-lessp
              (math-nlfit-find-qmax
               (mapcar
                (lambda (q) (math-add q0 q))
@@ -272,7 +272,7 @@
         (setq i (1+ i)))
       (math-mul '(float 5 -1) (math-add qmin qmax)))))
 
-;;; To improve the approximations to the parameters, we can use 
+;;; To improve the approximations to the parameters, we can use
 ;;; Marquardt method as described in Schwarz's book.
 
 ;;; Small numbers used in the Givens algorithm
@@ -329,7 +329,7 @@
           (let ((cij (math-nlfit-get-matx-elt C i j))
                 (cjj (math-nlfit-get-matx-elt C j j)))
             (when (not (math-equal 0 cij))
-                (if (math-lessp (calcFunc-abs cjj) 
+                (if (math-lessp (calcFunc-abs cjj)
                                 (math-mul math-nlfit-delta (calcFunc-abs cij)))
                     (setq w (math-neg cij)
                           gamma 0
@@ -337,7 +337,7 @@
                           rho 1)
                   (setq w (math-mul
                            (calcFunc-sign cjj)
-                           (calcFunc-sqrt 
+                           (calcFunc-sqrt
                             (math-add
                              (math-mul cjj cjj)
                              (math-mul cij cij))))
@@ -351,10 +351,10 @@
               (math-nlfit-set-matx-elt C j j w)
               (math-nlfit-set-matx-elt C i j rho)
               (let ((k (1+ j)))
-                (while (<= k n)       
+                (while (<= k n)
                   (let* ((cjk (math-nlfit-get-matx-elt C j k))
                          (cik (math-nlfit-get-matx-elt C i k))
-                         (h (math-sub 
+                         (h (math-sub
                              (math-mul gamma cjk) (math-mul sigma cik))))
                     (setq cik (math-add
                                (math-mul sigma cjk)
@@ -386,9 +386,9 @@
             (setq s (math-add s (math-mul (math-nlfit-get-matx-elt C i k)
                             (math-nlfit-get-elt x k))))
             (setq k (1+ k))))
-        (math-nlfit-set-elt x i 
-                            (math-neg 
-                             (math-div s 
+        (math-nlfit-set-elt x i
+                            (math-neg
+                             (math-div s
                                        (math-nlfit-get-matx-elt C i i))))
         (setq i (1- i))))
     (let ((i (1+ n)))
@@ -405,7 +405,7 @@
                       sigma 1)
               (if (math-lessp (calcFunc-abs rho) 1)
                   (setq sigma rho
-                        gamma (calcFunc-sqrt 
+                        gamma (calcFunc-sqrt
                                (math-sub 1 (math-mul sigma sigma))))
                 (setq gamma (math-div 1 (calcFunc-abs rho))
                       sigma (math-mul (calcFunc-sign rho)
@@ -429,7 +429,7 @@
 
 (defun math-nlfit-jacobian (grad xlist parms &optional slist)
   (let ((j nil))
-    (while xlist 
+    (while xlist
       (let ((row (apply grad (car xlist) parms)))
         (setq j
               (cons
@@ -495,7 +495,7 @@
       (setq ydata (cdr ydata))
       (setq sdata (cdr sdata)))
     (reverse d)))
-    
+
 (defun math-nlfit-make-dtilda (d n)
   (append d (make-list n 0)))
 
@@ -520,8 +520,8 @@
                  (newchisq (math-nlfit-chi-sq xlist ylist newparms fn slist)))
             (if (math-lessp newchisq chisq)
                 (progn
-                  (if (math-lessp 
-                       (math-div 
+                  (if (math-lessp
+                       (math-div
                         (math-sub chisq newchisq) newchisq) math-nlfit-epsilon)
                       (setq really-done t))
                   (setq lambda (math-div lambda 10))
@@ -551,7 +551,7 @@
   (let ((ex (calcFunc-exp (math-mul c (math-sub x d)))))
     (math-div
      (math-mul a ex)
-     (math-sqr 
+     (math-sqr
       (math-add
        1 ex)))))
 
@@ -582,7 +582,7 @@
 
 (defun math-nlfit-find-covar (grad xlist pparms)
   (let ((j nil))
-    (while xlist 
+    (while xlist
       (setq j (cons (cons 'vec (apply grad (car xlist) pparms)) j))
       (setq xlist (cdr xlist)))
     (setq j (cons 'vec (reverse j)))
@@ -603,7 +603,7 @@
         (setq i (1+ i)))
       (setq sgs (reverse sgs)))
     (list sgs covar)))
-   
+
 ;;; Now the Calc functions
 
 (defun math-nlfit-s-logistic-params (xdata ydata)
@@ -687,15 +687,15 @@
            (funcall initparms xdata ydata))
           (fit (math-nlfit-fit xdata ydata parmguess fn grad sdata))
           (finalparms (nth 1 fit))
-          (sigmacovar 
+          (sigmacovar
            (if sdevv
                (math-nlfit-get-sigmas grad xdata finalparms (nth 0 fit))))
-          (sigmas 
+          (sigmas
            (if sdevv
                (nth 0 sigmacovar)))
-          (finalparms 
+          (finalparms
            (if sigmas
-               (math-map-binop 
+               (math-map-binop
                 (lambda (x y) (list 'sdev x y)) finalparms sigmas)
              finalparms))
           (soln (funcall solnexpr finalparms var)))
@@ -712,8 +712,8 @@
              ((eq sdv 'calcFunc-xfit)
               (let (sln)
                 (setq sln
-                      (list 'vec 
-                            soln 
+                      (list 'vec
+                            soln
                             traillist
                             (nth 1 sigmacovar)
                             '(vec)
@@ -721,7 +721,7 @@
                             (let ((n (length xdata))
                                   (m (length finalparms)))
                               (if (and sdata (> n m))
-                                  (calcFunc-utpc (nth 0 fit) 
+                                  (calcFunc-utpc (nth 0 fit)
                                                  (- n m))
                                 '(var nan var-nan)))))
                 (math-nlfit-enter-result 1 "xfit" sln)))
@@ -787,14 +787,14 @@
                       (list (nth 1 (nth 0 finalparms))
                             (nth 1 (nth 1 finalparms)))
                       (lambda (x a b)
-                        (math-mul a 
+                        (math-mul a
                                   (math-sub
                                    1
                                    (math-div x b))))
                       sdata)))
                 (setq sln
-                      (list 'vec 
-                            soln 
+                      (list 'vec
+                            soln
                             traillist
                             (nth 2 parmvals)
                             (list
@@ -807,7 +807,7 @@
                             chisq
                             (let ((n (length qdata)))
                               (if (and sdata (> n 2))
-                                  (calcFunc-utpc 
+                                  (calcFunc-utpc
                                    chisq
                                    (- n 2))
                                 '(var nan var-nan)))))
@@ -817,4 +817,3 @@
        (calc-record traillist "parm")))))
 
 (provide 'calc-nlfit)
-
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 626d2462b4f..23f955afe7c 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1003,7 +1003,7 @@ Used by `calc-user-invocation'.")
 (defvar calc-quick-prev-results nil
   "Previous results from Quick Calc.")
 (defvar calc-said-hello nil
-  "Non-nil if the welcomd message has been displayed.")
+  "Non-nil if the welcome message has been displayed.")
 (defvar calc-executing-macro nil
   "Non-nil if a keyboard macro is executing from the \"K\" key.")
 (defvar calc-any-selections nil
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 788bf71845f..f3ff89ddd7f 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-26  Chong Yidong  <cyd@gnu.org>
+
+        * semantic/wisent/python-wy.el:
+        * semantic/wisent/js-wy.el:
+        * semantic/wisent/javat-wy.el:
+        * semantic/bovine/c-by.el:
+        * semantic/grammar-wy.el: Regenerate.
+
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic/lex-spp.el (semantic-lex-spp-first-token-arg-list): Fix typo.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * cedet-cscope.el (cedet-cscope-version-check):
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index bd4a5a627a9..c6545dd9015 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -191,7 +191,7 @@ This is to make it compatible with `autoconf-find-last-macro'.
 Assume that MACRO doesn't appear in the buffer yet, so search
 the ordering list `autoconf-preferred-macro-order'."
   ;; Search this list backwards.. heh heh heh
-  ;; This lets us do a reverse search easilly.
+  ;; This lets us do a reverse search easily.
   (let ((ml (member macro (reverse autoconf-preferred-macro-order))))
     (if (not ml) (error "Don't know how to position for %s yet" macro))
     (setq ml (cdr ml))
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 6179d304464..f17dfd85fdf 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -249,7 +249,7 @@ Do this whenever a new project is created, as opposed to loaded."
   "Return a project description object if DIR has a project.
 Optional argument FORCE means to ignore a hash-hit of 'nomatch.
 This depends on an up to date `ede-project-class-files' variable.
-Any directory that contains the file .ede-ignore will allways
+Any directory that contains the file .ede-ignore will always
 return nil."
   (when (not (file-exists-p (expand-file-name ".ede-ignore" dir)))
     (let* ((dirtest (expand-file-name dir))
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index ec514194e33..4e233f56a12 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -61,7 +61,7 @@ Use ldlibs to add addition libraries.")
 ;                          "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^")
 ;                         )
 ;        :commands '("$(C_SHARED_LINK) %s")
-         ;; @TODO - addative modification of autoconf.
+         ;; @TODO - additive modification of autoconf.
          :autoconf '("AC_PROG_LIBTOOL")
          )
   "Compiler for C sourcecode.")
@@ -108,7 +108,7 @@ Use ldlibs to add addition libraries.")
          :variables '(("CXX_SHARED" . "g++")
                       ("CXX_SHARED_COMPILE" .
                        "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
-         ;; @TODO - addative modification of autoconf.
+         ;; @TODO - additive modification of autoconf.
          :autoconf '("AC_PROG_LIBTOOL")
          )
   "Compiler for C sourcecode.")
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 79022be6a5f..a77bb02218b 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -546,7 +546,7 @@ You may need to add support for this type of file."
                        (file-name-extension (car sources))
                      "")))
           ))
-      ;; Return the disovered compilers
+      ;; Return the discovered compilers.
       comp)))
 
 (defmethod ede-proj-linkers ((obj ede-proj-target))
@@ -580,7 +580,7 @@ Converts all symbols into the objects to be used."
             (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
               (setq avail (cdr avail)))
             (setq link (cdr avail)))))
-      ;; Return the disovered linkers
+      ;; Return the discovered linkers.
       link)))
 
 
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 3ffb6baee9f..3355ed83a91 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -437,7 +437,7 @@ RETURNONERROR specifies that parsing should stop on the first
 unmatched syntax encountered.  When nil, parsing skips the syntax,
 adding it to the unmatched syntax cache.
 
-Must return a list of semantic tags wich have been cooked
+Must return a list of semantic tags which have been cooked
 \(repositioned properly) but which DO NOT HAVE OVERLAYS associated
 with them.  When overloading this function, use `semantic--tag-expand'
 to cook raw tags.")
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index ae199703c80..ef09ea13b42 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -57,7 +57,7 @@
 ;;
 ;; context - A semantic datatype representing a point in a buffer.
 ;;
-;; constriant - If a context specifies a specific datatype is needed,
+;; constraint - If a context specifies a specific datatype is needed,
 ;;       that is a constraint.
 ;; constants - Some datatypes define elements of themselves as a
 ;;       constant.  These need to be returned as there would be no
@@ -254,7 +254,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error
         (fname nil)
         (miniscope (when scope (clone scope)))
         )
-    ;; First order check.  Is this wholely contained in the typecache?
+    ;; First order check.  Is this wholly contained in the typecache?
     (setq tmp (semanticdb-typecache-find sequence))
 
     (if tmp
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index eae6d013400..967e5c59cda 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -157,7 +157,7 @@ Almost all searches use the same arguments."
 ;;
 
 (define-overloadable-function semantic-analyze-dereference-metatype (type scope &optional type-declaration)
-  ;; todo - move into typecahe!!
+  ;; todo - move into typecache!!
   "Return a concrete type tag based on input TYPE tag.
 A concrete type is an actual declaration of a memory description,
 such as a structure, or class.  A meta type is an alias,
diff --git a/lisp/cedet/semantic/bovine/c-by.el b/lisp/cedet/semantic/bovine/c-by.el
index 31489a4f625..99429f01acd 100644
--- a/lisp/cedet/semantic/bovine/c-by.el
+++ b/lisp/cedet/semantic/bovine/c-by.el
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/c-by.el --- Generated parser support file
 
-;;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 686113c23e2..fe659d118e1 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -298,7 +298,7 @@ Moves completely over balanced #if blocks."
         ;; @TODO - can we use the new c-scan-conditionals
         (c-forward-conditional 1))
        ((looking-at "^\\s-*#\\s-*elif")
-        ;; We need to let the preprocessor analize this one.
+        ;; We need to let the preprocessor analyze this one.
         (beginning-of-line)
         (setq done t)
         )
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index aaec4cb30ff..7e01b88f60b 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1023,7 +1023,7 @@ Output must be in semanticdb Find result format."
 
 (defmethod semantic-collector-try-completion-whitespace
   ((obj semantic-collector-abstract) prefix)
-  "For OBJ, do whatepsace completion based on PREFIX.
+  "For OBJ, do whitespace completion based on PREFIX.
 This implies that if there are two completions, one matching
 the test \"prefix\\>\", and one not, the one matching the full
 word version of PREFIX will be chosen, and that text returned.
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index acaad49f6af..879fdd92331 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -22,8 +22,7 @@
 
 ;;; Commentary:
 ;;
-;; This file is generated from the grammar file semantic-grammar.wy in
-;; the upstream CEDET repository.
+;; This file was generated from admin/grammars/grammar.wy.
 
 ;;; Code:
 
@@ -113,296 +112,296 @@
      '((DEFAULT-PREC NO-DEFAULT-PREC KEYWORD LANGUAGEMODE LEFT NONASSOC PACKAGE PREC PUT QUOTEMODE RIGHT SCOPESTART START TOKEN TYPE USE-MACROS STRING SYMBOL PERCENT_PERCENT CHARACTER PREFIXED_LIST SEXP PROLOGUE EPILOGUE PAREN_BLOCK BRACE_BLOCK LPAREN RPAREN LBRACE RBRACE COLON SEMI OR LT GT)
        nil
        (grammar
-        ((prologue))
-        ((epilogue))
-        ((declaration))
-        ((nonterminal))
-        ((PERCENT_PERCENT)))
+        ((prologue))
+        ((epilogue))
+        ((declaration))
+        ((nonterminal))
+        ((PERCENT_PERCENT)))
        (prologue
-        ((PROLOGUE)
-         (wisent-raw-tag
-          (semantic-tag-new-code "prologue" nil))))
+        ((PROLOGUE)
+         (wisent-raw-tag
+          (semantic-tag-new-code "prologue" nil))))
        (epilogue
-        ((EPILOGUE)
-         (wisent-raw-tag
-          (semantic-tag-new-code "epilogue" nil))))
+        ((EPILOGUE)
+         (wisent-raw-tag
+          (semantic-tag-new-code "epilogue" nil))))
        (declaration
-        ((decl)
-         (eval $1)))
+        ((decl)
+         (eval $1)))
        (decl
-        ((default_prec_decl))
-        ((no_default_prec_decl))
-        ((languagemode_decl))
-        ((package_decl))
-        ((precedence_decl))
-        ((put_decl))
-        ((quotemode_decl))
-        ((scopestart_decl))
-        ((start_decl))
-        ((keyword_decl))
-        ((token_decl))
-        ((type_decl))
-        ((use_macros_decl)))
+        ((default_prec_decl))
+        ((no_default_prec_decl))
+        ((languagemode_decl))
+        ((package_decl))
+        ((precedence_decl))
+        ((put_decl))
+        ((quotemode_decl))
+        ((scopestart_decl))
+        ((start_decl))
+        ((keyword_decl))
+        ((token_decl))
+        ((type_decl))
+        ((use_macros_decl)))
        (default_prec_decl
-         ((DEFAULT-PREC)
-          `(wisent-raw-tag
-            (semantic-tag "default-prec" 'assoc :value
-                          '("t")))))
+         ((DEFAULT-PREC)
+          `(wisent-raw-tag
+            (semantic-tag "default-prec" 'assoc :value
+                          '("t")))))
        (no_default_prec_decl
-        ((NO-DEFAULT-PREC)
-         `(wisent-raw-tag
-           (semantic-tag "default-prec" 'assoc :value
-                         '("nil")))))
+        ((NO-DEFAULT-PREC)
+         `(wisent-raw-tag
+           (semantic-tag "default-prec" 'assoc :value
+                         '("nil")))))
        (languagemode_decl
-        ((LANGUAGEMODE symbols)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'languagemode :rest ',(cdr $2)))))
+        ((LANGUAGEMODE symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'languagemode :rest ',(cdr $2)))))
        (package_decl
-        ((PACKAGE SYMBOL)
-         `(wisent-raw-tag
-           (semantic-tag-new-package ',$2 nil))))
+        ((PACKAGE SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag-new-package ',$2 nil))))
        (precedence_decl
-        ((associativity token_type_opt items)
-         `(wisent-raw-tag
-           (semantic-tag ',$1 'assoc :type ',$2 :value ',$3))))
+        ((associativity token_type_opt items)
+         `(wisent-raw-tag
+           (semantic-tag ',$1 'assoc :type ',$2 :value ',$3))))
        (associativity
-        ((LEFT)
-         (progn "left"))
-        ((RIGHT)
-         (progn "right"))
-        ((NONASSOC)
-         (progn "nonassoc")))
+        ((LEFT)
+         (progn "left"))
+        ((RIGHT)
+         (progn "right"))
+        ((NONASSOC)
+         (progn "nonassoc")))
        (put_decl
-        ((PUT put_name put_value)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'put :value ',(list $3))))
-        ((PUT put_name put_value_list)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'put :value ',$3)))
-        ((PUT put_name_list put_value)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'put :rest ',(cdr $2)
-                         :value ',(list $3))))
-        ((PUT put_name_list put_value_list)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'put :rest ',(cdr $2)
-                         :value ',$3))))
+        ((PUT put_name put_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'put :value ',(list $3))))
+        ((PUT put_name put_value_list)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'put :value ',$3)))
+        ((PUT put_name_list put_value)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'put :rest ',(cdr $2)
+                         :value ',(list $3))))
+        ((PUT put_name_list put_value_list)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'put :rest ',(cdr $2)
+                         :value ',$3))))
        (put_name_list
-        ((BRACE_BLOCK)
-         (mapcar 'semantic-tag-name
-                 (semantic-parse-region
-                  (car $region1)
-                  (cdr $region1)
-                  'put_names 1))))
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-name
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'put_names 1))))
        (put_names
-        ((LBRACE)
-         nil)
-        ((RBRACE)
-         nil)
-        ((put_name)
-         (wisent-raw-tag
-          (semantic-tag $1 'put-name))))
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((put_name)
+         (wisent-raw-tag
+          (semantic-tag $1 'put-name))))
        (put_name
-        ((SYMBOL))
-        ((token_type)))
+        ((SYMBOL))
+        ((token_type)))
        (put_value_list
-        ((BRACE_BLOCK)
-         (mapcar 'semantic-tag-code-detail
-                 (semantic-parse-region
-                  (car $region1)
-                  (cdr $region1)
-                  'put_values 1))))
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-code-detail
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'put_values 1))))
        (put_values
-        ((LBRACE)
-         nil)
-        ((RBRACE)
-         nil)
-        ((put_value)
-         (wisent-raw-tag
-          (semantic-tag-new-code "put-value" $1))))
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((put_value)
+         (wisent-raw-tag
+          (semantic-tag-new-code "put-value" $1))))
        (put_value
-        ((SYMBOL any_value)
-         (cons $1 $2)))
+        ((SYMBOL any_value)
+         (cons $1 $2)))
        (scopestart_decl
-        ((SCOPESTART SYMBOL)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'scopestart))))
+        ((SCOPESTART SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'scopestart))))
        (quotemode_decl
-        ((QUOTEMODE SYMBOL)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'quotemode))))
+        ((QUOTEMODE SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'quotemode))))
        (start_decl
-        ((START symbols)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'start :rest ',(cdr $2)))))
+        ((START symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'start :rest ',(cdr $2)))))
        (keyword_decl
-        ((KEYWORD SYMBOL string_value)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'keyword :value ',$3))))
+        ((KEYWORD SYMBOL string_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'keyword :value ',$3))))
        (token_decl
-        ((TOKEN token_type_opt SYMBOL string_value)
-         `(wisent-raw-tag
-           (semantic-tag ',$3 ',(if $2 'token 'keyword)
-                         :type ',$2 :value ',$4)))
-        ((TOKEN token_type_opt symbols)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $3)
-                         'token :type ',$2 :rest ',(cdr $3)))))
+        ((TOKEN token_type_opt SYMBOL string_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$3 ',(if $2 'token 'keyword)
+                         :type ',$2 :value ',$4)))
+        ((TOKEN token_type_opt symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $3)
+                         'token :type ',$2 :rest ',(cdr $3)))))
        (token_type_opt
-        (nil)
-        ((token_type)))
+        (nil)
+        ((token_type)))
        (token_type
-        ((LT SYMBOL GT)
-         (progn $2)))
+        ((LT SYMBOL GT)
+         (progn $2)))
        (type_decl
-        ((TYPE token_type plist_opt)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'type :value ',$3))))
+        ((TYPE token_type plist_opt)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'type :value ',$3))))
        (plist_opt
-        (nil)
-        ((plist)))
+        (nil)
+        ((plist)))
        (plist
-        ((plist put_value)
-         (append
-          (list $2)
-          $1))
-        ((put_value)
-         (list $1)))
+        ((plist put_value)
+         (append
+          (list $2)
+          $1))
+        ((put_value)
+         (list $1)))
        (use_name_list
-        ((BRACE_BLOCK)
-         (mapcar 'semantic-tag-name
-                 (semantic-parse-region
-                  (car $region1)
-                  (cdr $region1)
-                  'use_names 1))))
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-name
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'use_names 1))))
        (use_names
-        ((LBRACE)
-         nil)
-        ((RBRACE)
-         nil)
-        ((SYMBOL)
-         (wisent-raw-tag
-          (semantic-tag $1 'use-name))))
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((SYMBOL)
+         (wisent-raw-tag
+          (semantic-tag $1 'use-name))))
        (use_macros_decl
-        ((USE-MACROS SYMBOL use_name_list)
-         `(wisent-raw-tag
-           (semantic-tag "macro" 'macro :type ',$2 :value ',$3))))
+        ((USE-MACROS SYMBOL use_name_list)
+         `(wisent-raw-tag
+           (semantic-tag "macro" 'macro :type ',$2 :value ',$3))))
        (string_value
-        ((STRING)
-         (read $1)))
+        ((STRING)
+         (read $1)))
        (any_value
-        ((SYMBOL))
-        ((STRING))
-        ((PAREN_BLOCK))
-        ((PREFIXED_LIST))
-        ((SEXP)))
+        ((SYMBOL))
+        ((STRING))
+        ((PAREN_BLOCK))
+        ((PREFIXED_LIST))
+        ((SEXP)))
        (symbols
-        ((lifo_symbols)
-         (nreverse $1)))
+        ((lifo_symbols)
+         (nreverse $1)))
        (lifo_symbols
-        ((lifo_symbols SYMBOL)
-         (cons $2 $1))
-        ((SYMBOL)
-         (list $1)))
+        ((lifo_symbols SYMBOL)
+         (cons $2 $1))
+        ((SYMBOL)
+         (list $1)))
        (nonterminal
-        ((SYMBOL
-          (setq semantic-grammar-wy--nterm $1 semantic-grammar-wy--rindx 0)
-          COLON rules SEMI)
-         (wisent-raw-tag
-          (semantic-tag $1 'nonterminal :children $4))))
+        ((SYMBOL
+          (setq semantic-grammar-wy--nterm $1 semantic-grammar-wy--rindx 0)
+          COLON rules SEMI)
+         (wisent-raw-tag
+          (semantic-tag $1 'nonterminal :children $4))))
        (rules
-        ((lifo_rules)
-         (apply 'nconc
-                (nreverse $1))))
+        ((lifo_rules)
+         (apply 'nconc
+                (nreverse $1))))
        (lifo_rules
-        ((lifo_rules OR rule)
-         (cons $3 $1))
-        ((rule)
-         (list $1)))
+        ((lifo_rules OR rule)
+         (cons $3 $1))
+        ((rule)
+         (list $1)))
        (rule
-        ((rhs)
-         (let*
-             ((nterm semantic-grammar-wy--nterm)
-              (rindx semantic-grammar-wy--rindx)
-              (rhs $1)
-              comps prec action elt)
-           (setq semantic-grammar-wy--rindx
-                 (1+ semantic-grammar-wy--rindx))
-           (while rhs
-             (setq elt
-                   (car rhs)
-                   rhs
-                   (cdr rhs))
-             (cond
-              ((vectorp elt)
-               (if prec
-                   (error "Duplicate %%prec in `%s:%d' rule" nterm rindx))
-               (setq prec
-                     (aref elt 0)))
-              ((consp elt)
-               (if
-                   (or action comps)
-                   (setq comps
-                         (cons elt comps)
-                         semantic-grammar-wy--rindx
-                         (1+ semantic-grammar-wy--rindx))
-                 (setq action
-                       (car elt))))
-              (t
-               (setq comps
-                     (cons elt comps)))))
-           (wisent-cook-tag
-            (wisent-raw-tag
-             (semantic-tag
-              (format "%s:%d" nterm rindx)
-              'rule :type
-              (if comps "group" "empty")
-              :value comps :prec prec :expr action))))))
+        ((rhs)
+         (let*
+             ((nterm semantic-grammar-wy--nterm)
+              (rindx semantic-grammar-wy--rindx)
+              (rhs $1)
+              comps prec action elt)
+           (setq semantic-grammar-wy--rindx
+                 (1+ semantic-grammar-wy--rindx))
+           (while rhs
+             (setq elt
+                   (car rhs)
+                   rhs
+                   (cdr rhs))
+             (cond
+              ((vectorp elt)
+               (if prec
+                   (error "Duplicate %%prec in `%s:%d' rule" nterm rindx))
+               (setq prec
+                     (aref elt 0)))
+              ((consp elt)
+               (if
+                   (or action comps)
+                   (setq comps
+                         (cons elt comps)
+                         semantic-grammar-wy--rindx
+                         (1+ semantic-grammar-wy--rindx))
+                 (setq action
+                       (car elt))))
+              (t
+               (setq comps
+                     (cons elt comps)))))
+           (wisent-cook-tag
+            (wisent-raw-tag
+             (semantic-tag
+              (format "%s:%d" nterm rindx)
+              'rule :type
+              (if comps "group" "empty")
+              :value comps :prec prec :expr action))))))
        (rhs
-        (nil)
-        ((rhs item)
-         (cons $2 $1))
-        ((rhs action)
-         (cons
-          (list $2)
-          $1))
-        ((rhs PREC item)
-         (cons
-          (vector $3)
-          $1)))
+        (nil)
+        ((rhs item)
+         (cons $2 $1))
+        ((rhs action)
+         (cons
+          (list $2)
+          $1))
+        ((rhs PREC item)
+         (cons
+          (vector $3)
+          $1)))
        (action
-        ((PAREN_BLOCK))
-        ((PREFIXED_LIST))
-        ((BRACE_BLOCK)
-         (format "(progn\n%s)"
-                 (let
-                     ((s $1))
-                   (if
-                       (string-match "^{[
\n     ]*" s)
-                       (setq s
-                             (substring s
-                                        (match-end 0))))
-                   (if
-                       (string-match "[
\n       ]*}$" s)
-                       (setq s
-                             (substring s 0
-                                        (match-beginning 0))))
-                   s))))
+        ((PAREN_BLOCK))
+        ((PREFIXED_LIST))
+        ((BRACE_BLOCK)
+         (format "(progn\n%s)"
+                 (let
+                     ((s $1))
+                   (if
+                       (string-match "^{[
\n     ]*" s)
+                       (setq s
+                             (substring s
+                                        (match-end 0))))
+                   (if
+                       (string-match "[
\n       ]*}$" s)
+                       (setq s
+                             (substring s 0
+                                        (match-beginning 0))))
+                   s))))
        (items
-        ((lifo_items)
-         (nreverse $1)))
+        ((lifo_items)
+         (nreverse $1)))
        (lifo_items
-        ((lifo_items item)
-         (cons $2 $1))
-        ((item)
-         (list $1)))
+        ((lifo_items item)
+         (cons $2 $1))
+        ((item)
+         (list $1)))
        (item
-        ((SYMBOL))
-        ((CHARACTER))))
+        ((SYMBOL))
+        ((CHARACTER))))
      '(grammar prologue epilogue declaration nonterminal rule put_names put_values use_names)))
   "Parser table.")
 
@@ -411,10 +410,10 @@
   (semantic-install-function-overrides
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
-        semantic--parse-table semantic-grammar-wy--parse-table
-        semantic-debug-parser-source "semantic-grammar.wy"
-        semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table
-        semantic-lex-types-obarray semantic-grammar-wy--token-table)
+        semantic--parse-table semantic-grammar-wy--parse-table
+        semantic-debug-parser-source "semantic-grammar.wy"
+        semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table
+        semantic-lex-types-obarray semantic-grammar-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
   (semantic-make-local-hook 'wisent-discarding-token-functions)
   (add-hook 'wisent-discarding-token-functions
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 1d1184e534f..98b1ab55c32 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -104,10 +104,10 @@ It ignores whitespaces, newlines and comments."
   ;; regexp match semicolons inside strings!
   semantic-lex-ignore-comments
   ;; Must detect prefixed list before punctuation because prefix chars
-  ;; are also punctuations!
+  ;; are also punctuation!
   semantic-grammar-wy--<qlist>-sexp-analyzer
-  ;; Must detect punctuations after comments because the semicolon can
-  ;; be a punctuation or a comment start!
+  ;; Must detect punctuation after comments because the semicolon can
+  ;; be punctuation or a comment start!
   semantic-grammar-wy--<punctuation>-string-analyzer
   semantic-grammar-wy--<block>-block-analyzer
   semantic-grammar-wy--<sexp>-sexp-analyzer)
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 95a68673b8c..edd62cc5ca5 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -348,7 +348,7 @@ TEXT TAG and INDENT are the details."
           (insert (semantic-tag-name tag))
           (if movepoint (setq movepoint (point)))
           ;; I'd like to use this to add fancy () or what not at the end
-          ;; but we need the parent file whih requires an upgrade to the
+          ;; but we need the parent file which requires an upgrade to the
           ;; analysis tool.
           ;;(semantic-insert-foreign-tag tag ??))
           )
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index 03a3f1b0cb1..cf82da303ce 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -452,7 +452,7 @@ continue processing recursively."
          ;; If val is nil, that's probably wrong.
          ;; Found a system header case where this was true.
          ((null val) "")
-         ;; Debug wierd stuff.
+         ;; Debug weird stuff.
          (t (debug)))
         ))
      ((stringp txt)
@@ -821,7 +821,7 @@ STR occurs in the current buffer between BEG and END."
 ;; a macro.
 
 (defun semantic-lex-spp-first-token-arg-list (token)
-  "If TOKEN is a semantic-list, turn it into a an SPP ARG LIST."
+  "If TOKEN is a semantic-list, turn it into an SPP ARG LIST."
   (when (and (consp token)
              (symbolp (car token))
              (eq 'semantic-list (car token)))
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index fca367ecb8c..ba43ba657a1 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -165,7 +165,7 @@
 ;;
 ;; %type  <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
 ;;
-;; ;; Some punctuations based on the type defines above
+;; ;; Some punctuation based on the type defines above
 ;;
 ;; %token <punctuation> NOT         "!"
 ;; %token <punctuation> NOTEQ       "!="
@@ -1313,7 +1313,7 @@ and number formats."
 
 (define-lex-analyzer semantic-lex-punctuation-type
   "Detect and create a punctuation type token.
-Recognized punctuations are defined in the current table of lexical
+Recognized punctuation is defined in the current table of lexical
 types, as the value of the `punctuation' token type."
   (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+")
        (let* ((key (match-string 0))
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 5399d4d5649..b4618d1c18f 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -179,8 +179,8 @@ source."
     (goto-char (semantic-tag-start tag))
     (when (re-search-forward (concat
                               ;; The tag name is expected to be
-                              ;; between word delimiters, whitespaces,
-                              ;; or punctuations.
+                              ;; between word delimiters, whitespace,
+                              ;; or punctuation.
                               "\\(\\<\\|\\s-+\\|\\s.\\)"
                               (regexp-quote name)
                               "\\(\\>\\|\\s-+\\|\\s.\\)")
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index c3d8b26810c..a4126e1384b 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -229,7 +229,7 @@ unmodified as components of their parent tags."
     (mapc (lambda (tag)
             (let ((components (semantic-tag-components tag)))
               (if (and components
-                       ;; unpositined tags can be hazardous to
+                       ;; unpositioned tags can be hazardous to
                        ;; completion.  Do we need any type of tag
                        ;; here?  - EL
                        (semantic-tag-with-position-p (car components)))
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 61006802c0d..cbae9f85573 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -324,7 +324,7 @@ Use the  `semantic-symref-hit-tags' method to get this list.")
       (setq ans (list (car files))
             files (cdr files))
       (dolist (F files)
-        ;; This algorithm for uniqing the file list depends on the
+        ;; This algorithm for uniquifying the file list depends on the
         ;; tool in question providing all the hits in the same file
         ;; grouped together.
         (when (not (string= F (car ans)))
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index ce3500f83e1..53422541c47 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -401,7 +401,7 @@ BUTTON is the button that was clicked."
 
 ;;; UTILS
 ;;
-;; List mode utils for understadning the current line
+;; List mode utils for understanding the current line
 
 (defun semantic-symref-list-on-hit-p ()
   "Return the line number if the cursor is on a buffer line with a hit.
diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index 4470b87a1f1..562b0da6caa 100644
--- a/lisp/cedet/semantic/wisent/javat-wy.el
+++ b/lisp/cedet/semantic/wisent/javat-wy.el
@@ -19,12 +19,11 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from etc/java-tags.wy.
+;; This file was generated from admin/grammars/java-tags.wy.
 
 ;;; Code:
 
 (require 'semantic/lex)
-
 
 ;;; Prologue
 ;;
@@ -396,7 +395,7 @@
         ((SEMICOLON))
         ((block)))
        (block
-           ((BRACE_BLOCK)))
+        ((BRACE_BLOCK)))
        (formal_parameter_list
         ((PAREN_BLOCK)
          (semantic-parse-region
@@ -557,7 +556,7 @@
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table wisent-java-tags-wy--parse-table
-        semantic-debug-parser-source "wisent-java-tags.wy"
+        semantic-debug-parser-source "java-tags.wy"
         semantic-flex-keywords-obarray wisent-java-tags-wy--keyword-table
         semantic-lex-types-obarray wisent-java-tags-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
@@ -567,10 +566,6 @@
 
 
 ;;; Analyzers
-;;
-(define-lex-keyword-type-analyzer wisent-java-tags-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
 
 (define-lex-block-type-analyzer wisent-java-tags-wy--<block>-block-analyzer
   "block analyzer for <block> tokens."
@@ -583,23 +578,6 @@
     ("]" RBRACK))
   )
 
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'IDENTIFIER)
-
-(define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
-  "sexp analyzer for <string> tokens."
-  "\\s\""
-  'STRING_LITERAL)
-
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER_LITERAL)
-
 (define-lex-string-type-analyzer wisent-java-tags-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
   "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -645,12 +623,33 @@
     (NOT . "!"))
   'punctuation)
 
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'IDENTIFIER)
+
 (define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer
   "regexp analyzer for <unicode> tokens."
   "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
   nil
   'unicodecharacter)
 
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
+(define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'STRING_LITERAL)
+
+(define-lex-keyword-type-analyzer wisent-java-tags-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
 
 ;;; Epilogue
 ;;
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index b523db8771b..c8dded08d1f 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -1,7 +1,7 @@
 ;;; semantic/wisent/js-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2005, 2009-2011  Free Software Foundation, Inc.
-;; Copyright (C) Ecma International.
+;; Copyright (C) 1998-2011 Ecma International
 
 ;; This file is part of GNU Emacs.
 
@@ -20,9 +20,45 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from etc/grammars/javascript-jv.wy.
+;; This file was generated from admin/grammars/js.wy.
+
+;; It is derived from the grammar in the ECMAScript Language
+;; Specification published at
+;;
+;; http://www.ecma-international.org/publications/standards/Ecma-262.htm
+;;
+;; and redistributed under the following license:
+;;
+;; Redistribution and use in source and binary forms, with or without
+;; modification, are permitted provided that the following conditions
+;; are met:
+;;
+;; 1. Redistributions of source code must retain the above copyright
+;; notice, this list of conditions and the following disclaimer.
+;;
+;; 2. Redistributions in binary form must reproduce the above
+;; copyright notice, this list of conditions and the following
+;; disclaimer in the documentation and/or other materials provided
+;; with the distribution.
+;;
+;; 3. Neither the name of the authors nor Ecma International may be
+;; used to endorse or promote products derived from this software
+;; without specific prior written permission.  THIS SOFTWARE IS
+;; PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR
+;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR
+;; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+;; DAMAGE.
 
 ;;; Code:
+
 (require 'semantic/lex)
 
 ;;; Prologue
@@ -370,7 +406,7 @@
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table wisent-javascript-jv-wy--parse-table
-        semantic-debug-parser-source "wisent-javascript-jv.wy"
+        semantic-debug-parser-source "js.wy"
         semantic-flex-keywords-obarray wisent-javascript-jv-wy--keyword-table
         semantic-lex-types-obarray wisent-javascript-jv-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
@@ -380,38 +416,6 @@
 
 
 ;;; Analyzers
-;;
-(define-lex-keyword-type-analyzer wisent-javascript-jv-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
-
-(define-lex-block-type-analyzer wisent-javascript-jv-wy--<block>-block-analyzer
-  "block analyzer for <block> tokens."
-  "\\s(\\|\\s)"
-  '((("(" OPEN_PARENTHESIS PAREN_BLOCK)
-     ("{" START_BLOCK BRACE_BLOCK)
-     ("[" OPEN_SQ_BRACKETS BRACK_BLOCK))
-    (")" CLOSE_PARENTHESIS)
-    ("}" END_BLOCK)
-    ("]" CLOSE_SQ_BRACKETS))
-  )
-
-(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'VARIABLE)
-
-(define-lex-sexp-type-analyzer wisent-javascript-jv-wy--<string>-sexp-analyzer
-  "sexp analyzer for <string> tokens."
-  "\\s\""
-  'STRING)
-
-(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER)
 
 (define-lex-string-type-analyzer wisent-javascript-jv-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
@@ -458,6 +462,38 @@
     (ASSIGN_SYMBOL . "="))
   'punctuation)
 
+(define-lex-block-type-analyzer wisent-javascript-jv-wy--<block>-block-analyzer
+  "block analyzer for <block> tokens."
+  "\\s(\\|\\s)"
+  '((("(" OPEN_PARENTHESIS PAREN_BLOCK)
+     ("{" START_BLOCK BRACE_BLOCK)
+     ("[" OPEN_SQ_BRACKETS BRACK_BLOCK))
+    (")" CLOSE_PARENTHESIS)
+    ("}" END_BLOCK)
+    ("]" CLOSE_SQ_BRACKETS))
+  )
+
+(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'VARIABLE)
+
+(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER)
+
+(define-lex-sexp-type-analyzer wisent-javascript-jv-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'STRING)
+
+(define-lex-keyword-type-analyzer wisent-javascript-jv-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
 
 ;;; Epilogue
 ;;
diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el
index 36965757a14..2445d7162a7 100644
--- a/lisp/cedet/semantic/wisent/python-wy.el
+++ b/lisp/cedet/semantic/wisent/python-wy.el
@@ -20,7 +20,58 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from etc/grammars/python.wy.
+;; This file was generated from admin/grammars/python.wy.
+;; It is derived in part from the Python grammar, used under the
+;; following license:
+;;
+;; PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+;; --------------------------------------------
+;; 1. This LICENSE AGREEMENT is between the Python Software Foundation
+;; ("PSF"), and the Individual or Organization ("Licensee") accessing
+;; and otherwise using this software ("Python") in source or binary
+;; form and its associated documentation.
+;;
+;; 2. Subject to the terms and conditions of this License Agreement,
+;; PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide
+;; license to reproduce, analyze, test, perform and/or display
+;; publicly, prepare derivative works, distribute, and otherwise use
+;; Python alone or in any derivative version, provided, however, that
+;; PSF's License Agreement and PSF's notice of copyright, i.e.,
+;; "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Python Software Foundation; All Rights Reserved" are
+;; retained in Python alone or in any derivative version prepared by
+;; Licensee.
+;;
+;; 3. In the event Licensee prepares a derivative work that is based
+;; on or incorporates Python or any part thereof, and wants to make
+;; the derivative work available to others as provided herein, then
+;; Licensee hereby agrees to include in any such work a brief summary
+;; of the changes made to Python.
+;;
+;; 4. PSF is making Python available to Licensee on an "AS IS"
+;; basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+;; IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+;; DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+;; FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+;; INFRINGE ANY THIRD PARTY RIGHTS.
+;;
+;; 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+;; FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+;; RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR
+;; ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+;;
+;; 6. This License Agreement will automatically terminate upon a
+;; material breach of its terms and conditions.
+;;
+;; 7. Nothing in this License Agreement shall be deemed to create any
+;; relationship of agency, partnership, or joint venture between PSF
+;; and Licensee.  This License Agreement does not grant permission to
+;; use PSF trademarks or trade name in a trademark sense to endorse or
+;; promote products or services of Licensee, or any third party.
+;;
+;; 8. By copying, installing or otherwise using Python, Licensee
+;; agrees to be bound by the terms and conditions of this License
+;; Agreement.
 
 ;;; Code:
 
@@ -664,7 +715,7 @@
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table wisent-python-wy--parse-table
-        semantic-debug-parser-source "wisent-python.wy"
+        semantic-debug-parser-source "python.wy"
         semantic-flex-keywords-obarray wisent-python-wy--keyword-table
         semantic-lex-types-obarray wisent-python-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
@@ -675,10 +726,6 @@
 
 ;;; Analyzers
 
-(define-lex-keyword-type-analyzer wisent-python-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
-
 (define-lex-block-type-analyzer wisent-python-wy--<block>-block-analyzer
   "block analyzer for <block> tokens."
   "\\s(\\|\\s)"
@@ -690,18 +737,6 @@
     ("]" RBRACK))
   )
 
-(define-lex-regex-type-analyzer wisent-python-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'NAME)
-
-(define-lex-regex-type-analyzer wisent-python-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER_LITERAL)
-
 (define-lex-string-type-analyzer wisent-python-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
   "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -745,6 +780,22 @@
     (LTLTEQ . "<<="))
   'punctuation)
 
+(define-lex-regex-type-analyzer wisent-python-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'NAME)
+
+(define-lex-regex-type-analyzer wisent-python-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
+(define-lex-keyword-type-analyzer wisent-python-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
 
 ;;; Epilogue
 ;;
diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el
index 2fb8e7665e9..5bd202093e9 100644
--- a/lisp/cedet/srecode/srt-wy.el
+++ b/lisp/cedet/srecode/srt-wy.el
@@ -18,13 +18,12 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-
-;; Generated from srecode-template.wy in the CEDET repository.
+;;
+;; This file was generated from admin/grammars/srecode-template.wy.
 
 ;;; Code:
 
 (require 'semantic/lex)
-
 
 ;;; Prologue
 ;;
@@ -206,10 +205,12 @@
 
 
 ;;; Analyzers
-;;
-(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-string-type-analyzer srecode-template-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\s.+"
+  nil
+  'punctuation)
 
 (define-lex-regex-type-analyzer srecode-template-wy--<symbol>-regexp-analyzer
   "regexp analyzer for <symbol> tokens."
@@ -217,22 +218,20 @@
   nil
   'symbol)
 
-(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
-  "sexp analyzer for <string> tokens."
-  "\\s\""
-  'string)
-
 (define-lex-regex-type-analyzer srecode-template-wy--<number>-regexp-analyzer
   "regexp analyzer for <number> tokens."
   semantic-lex-number-expression
   nil
   'number)
 
-(define-lex-string-type-analyzer srecode-template-wy--<punctuation>-string-analyzer
-  "string analyzer for <punctuation> tokens."
-  "\\s.+"
-  nil
-  'punctuation)
+(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'string)
+
+(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
 
 
 ;;; Epilogue
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index acfc2486711..df90f6c464f 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -244,7 +244,7 @@ that class.
  `function' => @dfn{function}
  `variable' => @code{variable}
  `class'    => @code{class} @xref{class}
- `unknown'  => @code{unknonwn}
+ `unknown'  => @code{unknown}
  \"text\"     => ``text''
  'quoteme   => @code{quoteme}
  non-nil    => non-@code{nil}
diff --git a/lisp/color.el b/lisp/color.el
index 487e280dd59..96b79a4ace2 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -128,8 +128,8 @@ inclusive."
 RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0,
 inclusive.
 
-Return a list (HUE, SATURATION, LUMINENCE), where HUE is in radians
-and both SATURATION and LUMINENCE are between 0.0 and 1.0,
+Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
+and both SATURATION and LUMINANCE are between 0.0 and 1.0,
 inclusive."
   (let* ((r red)
          (g green)
diff --git a/lisp/composite.el b/lisp/composite.el
index 487962ee07c..72317ac470e 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -656,7 +656,7 @@ prepending a space before it."
       (if (not (char-charset (lglyph-char glyph) coding))
           (progn
             ;; As the terminal doesn't support this glyph, return a
-            ;; gstring in which each glyph is its own graphme-cluster
+            ;; gstring in which each glyph is its own grapheme-cluster
             ;; of width 1..
             (setq i 0)
             (while (and (< i nglyphs)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 07944a6c16f..3d5ae69fe3d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3225,7 +3225,7 @@ Also change :reverse-video to :inverse-video."
     (if (not inactive)
         ;; Widget is alive, we don't have to do anything special
         (widget-default-delete widget)
-      ;; WIDGET is already deleted because we did so to inactivate it;
+      ;; WIDGET is already deleted because we did so to deactivate it;
       ;; now just get rid of the label we put in its place.
       (delete-region (car (cdr inactive))
                      (+ (car (cdr inactive)) (cdr (cdr inactive))))
diff --git a/lisp/dframe.el b/lisp/dframe.el
index b1eb2d636b9..b4f44e1a308 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -718,7 +718,7 @@ Argument PROMPT is the prompt to use."
 
 (defun dframe-set-timer (timeout fn &optional _null-on-error)
   "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil.
-TIMEOUT is the number of seconds until the dframe controled program
+TIMEOUT is the number of seconds until the dframe controlled program
 timer is called again.  When TIMEOUT is nil, turn off all timeouts.
 This function must be called from the buffer belonging to the program
 who requested the timer.  NULL-ON-ERROR is ignored."
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b63940cec2d..757e814dba1 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -927,8 +927,7 @@ return t; if SYM is q or ESC, return nil."
                  (concat (apply 'format prompt args)
                          (if help-form
                              (format " [Type yn!q or %s] "
-                                     (key-description
-                                      (char-to-string help-char)))
+                                     (key-description (vector help-char)))
                            " [Type y, n, q or !] ")))
            (set sym (setq char (read-char-choice prompt char-choices)))
            (if (memq char '(?y ?\s ?!)) t)))))
diff --git a/lisp/dired.el b/lisp/dired.el
index 32a7f749681..1d503a14810 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3667,7 +3667,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" "2026ac587f0d9e893bae7662ff9d9318")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "2301de52aab0488c60d2b4841b6f597f")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index d16d8c6f62d..7e4329234e3 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -124,7 +124,7 @@
 ;; (except the tooltip) if the next match is on the same page.
 
 ;; And it's much slower than the current search facility, because
-;; isearch really searches for each step forward or backward wheras
+;; isearch really searches for each step forward or backward whereas
 ;; the current approach searches once and then it knows to which
 ;; pages to jump.
 
diff --git a/lisp/electric.el b/lisp/electric.el
index 657b577bb1e..1a8bf9f89ed 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -197,11 +197,13 @@ Returns nil when we can't find this char."
 ;; value, which only works well if the variable is preloaded.
 ;;;###autoload
 (defvar electric-indent-chars '(?\n)
-  "Characters that should cause automatic reindentation.
-Each entry of the list can be either a character or a cons of the
-form (CHAR . PREDICATE) which means that CHAR should cause reindentation
-only if PREDICATE returns non-nil.  PREDICATE is called with no arguments
-and with point before the inserted char.")
+  "Characters that should cause automatic reindentation.")
+
+(defvar electric-indent-functions nil
+  "Special hook run to decide whether to auto-indent.
+Each function is called with one argument (the inserted char), with
+point right after that char, and it should return t to cause indentation,
+`no-indent' to prevent indentation or nil to let other functions decide.")
 
 (defun electric-indent-post-self-insert-function ()
   ;; FIXME: This reindents the current line, but what we really want instead is
@@ -212,18 +214,21 @@ and with point before the inserted char.")
   ;; There might be a way to get it working by analyzing buffer-undo-list, but
   ;; it looks challenging.
   (let (pos)
-    (when (and (or (memq last-command-event electric-indent-chars)
-                   (let ((cp (assq last-command-event electric-indent-chars)))
-                     (and cp (setq pos (electric--after-char-pos))
-                          (save-excursion
-                            (goto-char (1- pos))
-                            (funcall (cdr cp))))))
-               ;; Don't reindent while inserting spaces at beginning of line.
-               (or (not (memq last-command-event '(?\s ?\t)))
-                   (save-excursion (skip-chars-backward " \t") (not (bolp))))
-               (setq pos (electric--after-char-pos))
-               ;; Not in a string or comment.
-               (not (nth 8 (save-excursion (syntax-ppss pos)))))
+    (when (and
+           ;; Don't reindent while inserting spaces at beginning of line.
+           (or (not (memq last-command-event '(?\s ?\t)))
+               (save-excursion (skip-chars-backward " \t") (not (bolp))))
+           (setq pos (electric--after-char-pos))
+           (save-excursion
+             (goto-char pos)
+             (let ((act (or (run-hook-with-args-until-success
+                             'electric-indent-functions
+                             last-command-event)
+                            (memq last-command-event electric-indent-chars))))
+               (not
+                (or (memq act '(nil no-indent))
+                    ;; In a string or comment.
+                    (unless (eq act 'do-indent) (nth 8 (syntax-ppss))))))))
       ;; For newline, we want to reindent both lines and basically behave like
       ;; reindent-then-newline-and-indent (whose code we hence copied).
       (when (< (1- pos) (line-beginning-position))
@@ -231,7 +236,7 @@ and with point before the inserted char.")
           (save-excursion
             (unless (memq indent-line-function
                           '(indent-relative indent-to-left-margin
-                            indent-relative-maybe))
+                                            indent-relative-maybe))
               ;; Don't reindent the previous line if the indentation function
               ;; is not a real one.
               (goto-char before)
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 976848e155d..ae2900775ac 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -625,12 +625,12 @@
 ;;
 ;;    (ad-activate-regexp "^ange-ftp-")
 ;;
-;; A saver way would have been to use
+;; A safer way would have been to use
 ;;
 ;;    (ad-update-regexp "^ange-ftp-")
 ;;
 ;; instead which would have only reactivated currently actively advised
-;; functions, but not functions that were currently deactivated. All these
+;; functions, but not functions that were currently inactive. All these
 ;; functions can also be called interactively.
 
 ;; A certain piece of advice is considered a match if its name contains a
@@ -833,7 +833,7 @@
 ;;     Reactivate an advised function but only if its advice is currently
 ;;     active. This can be used to bring all currently advised function up
 ;;     to date with the current state of advice without also activating
-;;     currently deactivated functions.
+;;     currently inactive functions.
 ;; - Caching:
 ;;     Is the saving of an advised definition and an identifying cache-id so
 ;;     it can be reused, for example, for activation after deactivation.
@@ -853,7 +853,7 @@
 ;; - ad-activate to activate the advice of a FUNCTION
 ;; - ad-deactivate to deactivate the advice of a FUNCTION
 ;; - ad-update   to activate the advice of a FUNCTION unless it was not
-;;               yet activated or is currently deactivated.
+;;               yet activated or is currently inactive.
 ;; - ad-unadvise deactivates a FUNCTION and removes all of its advice
 ;;               information, hence, it cannot be activated again
 ;; - ad-recover  tries to redefine a FUNCTION to its original definition and
@@ -1261,7 +1261,7 @@
 ;; contain some advice matched by the regular expression. This is a save
 ;; way to update the activation of advised functions whose advice changed
 ;; in some way or other without accidentally also activating currently
-;; deactivated functions:
+;; inactive functions:
 ;;
 ;; (ad-update-regexp "^fg-")
 ;; nil
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index df98271832a..19a4d44273d 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -446,7 +446,11 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
                     generated-autoload-load-name
                   (autoload-file-load-name absfile)))
           (when (and outfile
-                     (not (equal outfile (autoload-generated-file))))
+                     (not
+                      (if (memq system-type '(ms-dos windows-nt))
+                          (equal (downcase outfile)
+                                 (downcase (autoload-generated-file)))
+                        (equal outfile (autoload-generated-file)))))
             (setq otherbuf t))
           (save-excursion
             (save-restriction
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index 9ecd4e12020..bc1efc118ef 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -74,7 +74,7 @@
   cmpfun)
 
 (defmacro avl-tree--root (tree)
-  ;; Return the root node for an avl-tree.  INTERNAL USE ONLY.
+  ;; Return the root node for an AVL tree.  INTERNAL USE ONLY.
   `(avl-tree--node-left (avl-tree--dummyroot ,tree)))
 
 (defsetf avl-tree--root (tree) (node)
@@ -372,7 +372,7 @@ itself."
 
 ;;; INTERNAL USE ONLY
 (defun avl-tree--do-copy (root)
-  "Copy the avl tree with ROOT as root. Highly recursive."
+  "Copy the AVL tree with ROOT as root.  Highly recursive."
   (if (null root)
       nil
     (avl-tree--node-create
@@ -401,7 +401,7 @@ itself."
   ;; front of the STACK, until a leaf is reached.
   (let ((node (car (avl-tree--stack-store stack)))
         (dir (if (avl-tree--stack-reverse stack) 1 0)))
-    (when node  ; check for emtpy stack
+    (when node  ; check for empty stack
       (while (setq node (avl-tree--node-branch node dir))
         (push node (avl-tree--stack-store stack))))))
 
@@ -411,21 +411,21 @@ itself."
 
 ;; define public alias for constructors so that we can set docstring
 (defalias 'avl-tree-create 'avl-tree--create
-  "Create an empty avl tree.
+  "Create an empty AVL tree.
 COMPARE-FUNCTION is a function which takes two arguments, A and B,
 and returns non-nil if A is less than B, and nil otherwise.")
 
 (defalias 'avl-tree-compare-function 'avl-tree--cmpfun
-  "Return the comparison function for the avl tree TREE.
+  "Return the comparison function for the AVL tree TREE.
 
 \(fn TREE)")
 
 (defun avl-tree-empty (tree)
-  "Return t if avl tree TREE is emtpy, otherwise return nil."
+  "Return t if AVL tree TREE is empty, otherwise return nil."
   (null (avl-tree--root tree)))
 
 (defun avl-tree-enter (tree data &optional updatefun)
-  "Insert DATA into the avl tree TREE.
+  "Insert DATA into the AVL tree TREE.
 
 If an element that matches DATA (according to the tree's
 comparison function, see `avl-tree-create') already exists in
@@ -433,8 +433,8 @@ TREE, it will be replaced by DATA by default.
 
 If UPDATEFUN is supplied and an element matching DATA already
 exists in TREE, UPDATEFUN is called with two arguments: DATA, and
-the matching element. Its return value replaces the existing
-element. This value *must* itself match DATA (and hence the
+the matching element.  Its return value replaces the existing
+element.  This value *must* itself match DATA (and hence the
 pre-existing data), or an error will occur.
 
 Returns the new data."
@@ -443,7 +443,7 @@ Returns the new data."
                            0 data updatefun)))
 
 (defun avl-tree-delete (tree data &optional test nilflag)
-  "Delete the element matching DATA from the avl tree TREE.
+  "Delete the element matching DATA from the AVL tree TREE.
 Matching uses the comparison function previously specified in
 `avl-tree-create' when TREE was created.
 
@@ -456,7 +456,7 @@ distinguished from the case of a successfully deleted null
 element.
 
 If supplied, TEST specifies a test that a matching element must
-pass before it is deleted. If a matching element is found, it is
+pass before it is deleted.  If a matching element is found, it is
 passed as an argument to TEST, and is deleted only if the return
 value is non-nil."
   (cdr (avl-tree--do-delete (avl-tree--cmpfun tree)
@@ -465,14 +465,14 @@ value is non-nil."
 
 
 (defun avl-tree-member (tree data &optional nilflag)
-  "Return the element in the avl tree TREE which matches DATA.
+  "Return the element in the AVL tree TREE which matches DATA.
 Matching uses the comparison function previously specified in
 `avl-tree-create' when TREE was created.
 
 If there is no such element in the tree, nil is
-returned. Optional argument NILFLAG specifies a value to return
-instead of nil in this case. This allows non-existent elements to
-be distinguished from a null element. (See also
+returned.  Optional argument NILFLAG specifies a value to return
+instead of nil in this case.  This allows non-existent elements to
+be distinguished from a null element.  (See also
 `avl-tree-member-p', which does this for you.)"
   (let ((node (avl-tree--root tree))
         (compare-function (avl-tree--cmpfun tree)))
@@ -488,15 +488,15 @@ be distinguished from a null element. (See also
 
 
 (defun avl-tree-member-p (tree data)
-  "Return t if an element matching DATA exists in the avl tree TREE,
-otherwise return nil. Matching uses the comparison function
+  "Return t if an element matching DATA exists in the AVL tree TREE.
+Otherwise return nil.  Matching uses the comparison function
 previously specified in `avl-tree-create' when TREE was created."
   (let ((flag '(nil)))
     (not (eq (avl-tree-member tree data flag) flag))))
 
 
 (defun avl-tree-map (__map-function__ tree &optional reverse)
-  "Modify all elements in the avl tree TREE by applying FUNCTION.
+  "Modify all elements in the AVL tree TREE by applying FUNCTION.
 
 Each element is replaced by the return value of FUNCTION applied
 to that element.
@@ -512,7 +512,7 @@ descending order if REVERSE is non-nil."
 
 
 (defun avl-tree-mapc (__map-function__ tree &optional reverse)
-  "Apply FUNCTION to all elements in avl tree TREE,
+  "Apply FUNCTION to all elements in AVL tree TREE,
 for side-effect only.
 
 FUNCTION is applied to the elements in ascending order, or
@@ -526,7 +526,7 @@ descending order if REVERSE is non-nil."
 
 (defun avl-tree-mapf
   (__map-function__ combinator tree &optional reverse)
-  "Apply FUNCTION to all elements in avl tree TREE,
+  "Apply FUNCTION to all elements in AVL tree TREE,
 and combine the results using COMBINATOR.
 
 The FUNCTION is applied and the results are combined in ascending
@@ -545,7 +545,7 @@ order, or descending order if REVERSE is non-nil."
 
 
 (defun avl-tree-mapcar (__map-function__ tree &optional reverse)
-  "Apply FUNCTION to all elements in avl tree TREE,
+  "Apply FUNCTION to all elements in AVL tree TREE,
 and make a list of the results.
 
 The FUNCTION is applied and the list constructed in ascending
@@ -578,7 +578,7 @@ is more efficient."
       (avl-tree--node-data node))))
 
 (defun avl-tree-copy (tree)
-  "Return a copy of the avl tree TREE."
+  "Return a copy of the AVL tree TREE."
   (let ((new-tree (avl-tree-create (avl-tree--cmpfun tree))))
     (setf (avl-tree--root new-tree) (avl-tree--do-copy (avl-tree--root tree)))
     new-tree))
@@ -600,7 +600,7 @@ is more efficient."
     treesize))
 
 (defun avl-tree-clear (tree)
-  "Clear the avl tree TREE."
+  "Clear the AVL tree TREE."
   (setf (avl-tree--root tree) nil))
 
 
@@ -617,8 +617,8 @@ calling `avl-tree-stack-pop' will give unpredictable results).
 
 Operations on these objects are significantly more efficient than
 constructing a real stack with `avl-tree-flatten' and using
-standard stack functions. As such, they can be useful in
-implementing efficient algorithms of AVL trees. However, in cases
+standard stack functions.  As such, they can be useful in
+implementing efficient algorithms of AVL trees.  However, in cases
 where mapping functions `avl-tree-mapc', `avl-tree-mapcar' or
 `avl-tree-mapf' would be sufficient, it is better to use one of
 those instead."
@@ -629,11 +629,11 @@ those instead."
 
 (defun avl-tree-stack-pop (avl-tree-stack &optional nilflag)
   "Pop the first element from AVL-TREE-STACK.
-\(See also `avl-tree-stack'\).
+\(See also `avl-tree-stack').
 
-Returns nil if the stack is empty, or NILFLAG if specified. (The
-latter allows an empty stack to be distinguished from a null
-element stored in the AVL tree.)"
+Returns nil if the stack is empty, or NILFLAG if specified.
+\(The latter allows an empty stack to be distinguished from
+a null element stored in the AVL tree.)"
   (let (node next)
     (if (not (setq node (pop (avl-tree--stack-store avl-tree-stack))))
         nilflag
@@ -650,9 +650,9 @@ element stored in the AVL tree.)"
   "Return the first element of AVL-TREE-STACK, without removing it
 from the stack.
 
-Returns nil if the stack is empty, or NILFLAG if specified. (The
-latter allows an empty stack to be distinguished from a null
-element stored in the AVL tree.)"
+Returns nil if the stack is empty, or NILFLAG if specified.
+\(The latter allows an empty stack to be distinguished from
+a null element stored in the AVL tree.)"
   (or (car (avl-tree--stack-store avl-tree-stack))
       nilflag))
 
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 0630f5f4e4e..c9027fb663d 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -135,7 +135,7 @@
 ;; We'd have to notice defvars and defconsts, since those variables should
 ;; always be dynamic, and attempting to do a lexical binding of them
 ;; should simply do a dynamic binding instead.
-;; But!  We need to know about variables that were not necessarily defvarred
+;; But!  We need to know about variables that were not necessarily defvared
 ;; in the file being compiled (doing a boundp check isn't good enough.)
 ;; Fdefvar() would have to be modified to add something to the plist.
 ;;
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 3d593570c4e..9aa230cfe9b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -178,9 +178,9 @@ adds `c' to it; otherwise adds `.elc'."
 ;; This can be the 'byte-compile property of any symbol.
 (autoload 'byte-compile-inline-expand "byte-opt")
 
-;; This is the entrypoint to the lapcode optimizer pass1.
+;; This is the entry point to the lapcode optimizer pass1.
 (autoload 'byte-optimize-form "byte-opt")
-;; This is the entrypoint to the lapcode optimizer pass2.
+;; This is the entry point to the lapcode optimizer pass2.
 (autoload 'byte-optimize-lapcode "byte-opt")
 (autoload 'byte-compile-unfold-lambda "byte-opt")
 
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index c6e157be776..daafd2226ec 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -67,7 +67,7 @@
 
 ;; TODO: (not just for cconv but also for the lexbind changes in general)
 ;; - let (e)debug find the value of lexical variables from the stack.
-;; - make eval-region do the eval-sexp-add-defvars danse.
+;; - make eval-region do the eval-sexp-add-defvars dance.
 ;; - byte-optimize-form should be applied before cconv.
 ;;   OTOH, the warnings emitted by cconv-analyze need to come before optimize
 ;;   since afterwards they can because obnoxious (warnings about an "unused
@@ -507,7 +507,7 @@ places where they originally did not directly appear."
   (defalias 'byte-compile-not-lexical-var-p 'boundp))
 
 (defun cconv--analyse-use (vardata form varkind)
-  "Analyse the use of a variable.
+  "Analyze the use of a variable.
 VARDATA should be (BINDER READ MUTATED CAPTURED CALLED).
 VARKIND is the name of the kind of variable.
 FORM is the parent form that binds this var."
@@ -559,7 +559,7 @@ FORM is the parent form that binds this var."
        (t (let ((varstruct (list arg nil nil nil nil)))
             (push (cons (list arg) (cdr varstruct)) newvars)
             (push varstruct newenv)))))
-    (dolist (form body)                   ;Analyse body forms.
+    (dolist (form body)                   ;Analyze body forms.
       (cconv-analyse-form form newenv))
     ;; Summarize resulting data about arguments.
     (dolist (vardata newvars)
@@ -612,7 +612,7 @@ and updates the data stored in ENV."
              (push (cons binder (cdr varstruct)) newvars)
              (push varstruct env))))
 
-       (dolist (form body-forms)          ; Analyse body forms.
+       (dolist (form body-forms)          ; Analyze body forms.
          (cconv-analyse-form form env))
 
        (dolist (vardata newvars)
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index bf9f2c9d6ed..fae4d9adc38 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -233,10 +233,10 @@ or call the function `%s'."))))
        (defun ,modefun (&optional arg ,@extra-args)
          ,(or doc
               (format (concat "Toggle %s on or off.
-Interactively, with no prefix argument, toggle the mode.
-With universal prefix ARG turn mode on.
-With zero or negative ARG turn mode off.
-\\{%s}") pretty-name keymap-sym))
+With a prefix argument ARG, enable %s if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
+\\{%s}") pretty-name pretty-name keymap-sym))
          ;; Use `toggle' rather than (if ,mode 0 1) so that using
          ;; repeat-command still does the toggling correctly.
          (interactive (list (or current-prefix-arg 'toggle)))
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 5e29a85d386..db3236afc1a 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -992,7 +992,7 @@ if default value is nil."
               ;; EML - Note: the only reason to override a class bound slot
               ;;       is to change the default, so allow unbound in.
 
-              ;; If we have a repeat, only update the vlaue...
+              ;; If we have a repeat, only update the value...
               (eieio-perform-slot-validation-for-default a tp value skipnil)
               (setcar dp value))
 
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index ba04a27021e..ce6f8348a6b 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -1098,7 +1098,7 @@ optional prefix argument REINIT is non-nil."
 ;; This includes all the built-in and dumped things with documentation.
 (defun elint-scan-doc-file ()
   "Scan the DOC file for function and variables.
-Marks the function wih their arguments, and returns a list of variables."
+Marks the function with their arguments, and returns a list of variables."
   ;; Cribbed from help-fns.el.
   (let ((docbuf " *DOC*")
         vars sym args)
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index d43ba6c0d3e..afc8c7faa47 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -579,7 +579,7 @@ PREC2 is a table as returned by `smie-precs->prec2' or
                    (smie-debug--describe-cycle
                     table (smie-debug--prec2-cycle csts)))))
         (incf i 10))
-      ;; Propagate equalities back to their source.
+      ;; Propagate equality constraints back to their sources.
       (dolist (eq (nreverse eqs))
         (when (null (cadr eq))
           ;; There's an equality constraint, but we still haven't given
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 8f991575eda..a5a6f71d79e 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -220,7 +220,7 @@ non-nil, byte-compiles each function after instrumenting."
 (defun testcover-reinstrument (form)
   "Reinstruments FORM to use testcover instead of edebug.  This
 function modifies the list that FORM points to.  Result is nil if
-FORM should return multiple vlues, t if should always return same
+FORM should return multiple values, t if should always return same
 value, 'maybe if either is acceptable."
   (let ((fun (car-safe form))
         id val)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index df37157f7a9..ce3cc3c9a22 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -3715,7 +3715,7 @@ Although this function is bound to \\[viper-toggle-search-style], the most
 convenient way to use it is to bind `//' to the macro
 `1 M-x viper-toggle-search-style' and `///' to
 `2 M-x viper-toggle-search-style'.  In this way, hitting `//' quickly will
-toggle case-fold-search and hitting `/' three times witth toggle regexp
+toggle case-fold-search and hitting `/' three times with toggle regexp
 search.  Macros are more convenient in this case because they don't affect
 the Emacs binding of `/'."
   (interactive "P")
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index b0c37ed28e4..2d221d5fa05 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -593,7 +593,7 @@ to a new place after repeating previous Vi command."
 ;; The reason this is needed is because dabbrev-expand (and possibly
 ;; others) may jump to before the insertion point, delete something and
 ;; then reinsert a bigger piece.  For instance:  bla^blo
-;; If dabbrev-expand is called after `blo' and ^ undicates viper-insert-point,
+;; If dabbrev-expand is called after `blo' and ^ indicates viper-insert-point,
 ;; then point jumps to the beginning of `blo'.  If expansion is found, `blablo'
 ;; is deleted, and we have |^, where | denotes point.  Next, dabbrev-expand
 ;; will insert the expansion, and we get: blablo^
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 00153c1ff0e..e978823a49c 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -319,7 +319,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
 
 ;; Accepts as macro names: strings and vectors.
 ;; strings must be strings of characters; vectors must be vectors of keys
-;; in canonic form.  The canonic form is essentially the form used in XEmacs
+;; in canonical form, which is essentially the form used in XEmacs.
 ;; More general definitions are inherited by more specific scopes:
 ;; global->major mode->buffer. More specific definitions override more general
 (defun viper-record-kbd-macro (macro-name state macro-body &optional scope)
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index a2e289df5e8..a99ffdea558 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -66,7 +66,7 @@
   "*Function that determines what constitutes a word for clicking events.
 Takes two parameters: a COUNT, indicating how many words to return,
 and CLICK-COUNT, telling whether this is the first click, a double-click,
-or a tripple-click."
+or a triple-click."
   :type 'symbol
   :group 'viper-mouse)
 
diff --git a/lisp/epg.el b/lisp/epg.el
index 00c00f9c9d3..133e76da96c 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -82,7 +82,7 @@
 (defconst epg-invalid-recipients-reason-alist
   '((0 . "No specific reason given")
     (1 . "Not Found")
-    (2 . "Ambigious specification")
+    (2 . "Ambiguous specification")
     (3 . "Wrong key usage")
     (4 . "Key revoked")
     (5 . "Key expired")
@@ -95,7 +95,7 @@
 (defconst epg-delete-problem-reason-alist
   '((1 . "No such key")
     (2 . "Must delete secret key first")
-    (3 . "Ambigious specification")))
+    (3 . "Ambiguous specification")))
 
 (defconst epg-import-ok-reason-alist
   '((0 . "Not actually changed")
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3fd2c87d59c..1b67835cb07 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-28  Mike Kazantsev  <mk.fraggod@gmail.com>  (tiny change)
+
+        * erc-dcc.el (erc-dcc-ctcp-query-send-regexp): Updated regexp to
+        match quoted filenames with spaces inside.
+        (erc-dcc-handle-ctcp-send): Updated regexp match group numbers,
+        added processing of escaped quotes and backslashes if filename
+        itself was in quotes.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc-log.el (erc-logging-enabled): Fix typo.
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 279a336f15f..3364af531f5 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -979,7 +979,7 @@
 
 2002-11-16  Alex Schroeder  <alex@gnu.org>
 
-        * erc-autoaway.el, erc-button.el, erc-fill.el, erc-match.el, 
+        * erc-autoaway.el, erc-button.el, erc-fill.el, erc-match.el,
           erc-menu.el, erc-ring.el, erc-track.el:
         Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
 
@@ -1447,7 +1447,7 @@
         * erc-match.el: fixed spelling error
 
         * erc-track.el, erc-match.el: * erc-match.el:
-          highlight current nickname in its own face (deactivated by default):
+          highlight current nickname in its own face (inactive by default):
           - added erc-current-nick-highlight-type, erc-current-nick-face,
             erc-current-nick-p
 
@@ -1564,7 +1564,7 @@
           (require 'erc-nickserv) is now necessary for this to work
 
         * erc.el:
-        * results of /COUNTRY now formatted as notice; errors are ignored, 
+        * results of /COUNTRY now formatted as notice; errors are ignored,
           fixing
           bug which made prompt disappear
 
@@ -1959,9 +1959,9 @@
 
         * erc.el: remove trailing \n from any sent text
 
-        * servers.pl, erc-bbdb.el, erc-button.el, erc-chess.el, 
-          erc-complete.el, erc-fill.el, erc-ibuffer.el, erc-list.el, 
-          erc-match.el, erc-menu.el, erc-nets.el, erc-replace.el, 
+        * servers.pl, erc-bbdb.el, erc-button.el, erc-chess.el,
+          erc-complete.el, erc-fill.el, erc-ibuffer.el, erc-list.el,
+          erc-match.el, erc-menu.el, erc-nets.el, erc-replace.el,
           erc-speak.el, erc-speedbar.el, erc-track.el, erc.el:
         clean whitespace
 
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 19e1801e03c..fce22aadcc4 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -649,7 +649,16 @@ that subcommand."
        ?q query ?n nick ?u login ?h host))))
 
 (defconst erc-dcc-ctcp-query-send-regexp
-  "^DCC SEND \\([^ ]+\\) \\([0-9]+\\) \\([0-9]+\\) *\\([0-9]*\\)")
+  (concat "^DCC SEND \\("
+          ;; Following part matches either filename without spaces
+          ;; or filename enclosed in double quotes with any number
+          ;; of escaped double quotes inside.
+          "\"\\(\\(.*?\\(\\\\\"\\)?\\)+?\\)\"\\|\\([^ ]+\\)"
+          "\\) \\([0-9]+\\) \\([0-9]+\\) *\\([0-9]*\\)"))
+
+(defsubst erc-dcc-unquote-filename (filename)
+  (erc-replace-regexp-in-string "\\\\\\\\" "\\"
+                                (erc-replace-regexp-in-string "\\\\\"" "\"" filename t t) t t))
 
 (defun erc-dcc-handle-ctcp-send (proc query nick login host to)
   "This is called if a CTCP DCC SEND subcommand is sent to the client.
@@ -664,10 +673,12 @@ It extracts the information about the dcc request and adds it to
        'dcc-request-bogus
        ?r "SEND" ?n nick ?u login ?h host))
      ((string-match erc-dcc-ctcp-query-send-regexp query)
-      (let ((filename (match-string 1 query))
-            (ip       (erc-decimal-to-ip (match-string 2 query)))
-            (port     (match-string 3 query))
-            (size     (match-string 4 query)))
+      (let ((filename
+             (or (match-string 3 query)
+                 (erc-dcc-unquote-filename (match-string 2 query))))
+            (ip       (erc-decimal-to-ip (match-string 6 query)))
+            (port     (match-string 7 query))
+            (size     (match-string 8 query)))
         ;; FIXME: a warning really should also be sent
         ;; if the ip address != the host the dcc sender is on.
         (erc-display-message
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index a218dd12555..0eff33f1e75 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2626,7 +2626,7 @@ VALUE is computed by evaluating the rest of LINE in Lisp."
 (defun erc-cmd-default (line)
   "Fallback command.
 
-Commands for which no erc-cmd-xxx exists, are tunnelled through
+Commands for which no erc-cmd-xxx exists, are tunneled through
 this function.  LINE is sent to the server verbatim, and
 therefore has to contain the command itself as well."
   (erc-log (format "cmd: DEFAULT: %s" line))
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index db5e98062a9..5e44e541526 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -90,12 +90,14 @@
   "If non-nil, name of the file to read/write input history.
 See also `eshell-read-history' and `eshell-write-history'.
 If it is nil, Eshell will use the value of HISTFILE."
-  :type 'file
+  :type '(choice (const :tag "Use HISTFILE" nil)
+                 file)
   :group 'eshell-hist)
 
 (defcustom eshell-history-size 128
   "Size of the input history ring.  If nil, use envvar HISTSIZE."
-  :type 'integer
+  :type '(choice (const :tag "Use HISTSIZE" nil)
+                 integer)
   :group 'eshell-hist)
 
 (defcustom eshell-hist-ignoredups nil
@@ -261,7 +263,13 @@ element, regardless of any text on the command line.  In that case,
 
   (make-local-variable 'eshell-history-size)
   (or eshell-history-size
-      (setq eshell-history-size (getenv "HISTSIZE")))
+      (let ((hsize (getenv "HISTSIZE")))
+        (setq eshell-history-size
+              (if (and (stringp hsize)
+                       (integerp (setq hsize (string-to-number hsize)))
+                       (> hsize 0))
+                  hsize
+                128))))
 
   (make-local-variable 'eshell-history-file-name)
   (or eshell-history-file-name
diff --git a/lisp/files.el b/lisp/files.el
index 0f167ce3ffa..f903d2919a6 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1343,7 +1343,7 @@ automatically choosing a major mode, use \\[find-file-literally]."
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
         (mapcar 'switch-to-buffer (nreverse value))
-      (switch-to-buffer value nil 'force-same-window))))
+      (switch-to-buffer value))))
 
 (defun find-file-other-window (filename &optional wildcards)
   "Edit file FILENAME, in another window.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 269ee331fb2..680a107adfe 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -267,12 +267,12 @@ SYM to VAL and return t.  If INIT-FLAG is non-nil, set with
     (not ignore-flag)))
 
 (defun filesets-set-default! (sym val)
-  "Call `filestes-set-default' and reset cached data (i.e. rebuild menu)."
+  "Call `filesets-set-default' and reset cached data (i.e. rebuild menu)."
   (when (filesets-set-default sym val)
     (filesets-reset-fileset)))
 
 (defun filesets-set-default+ (sym val)
-  "Call `filestes-set-default' and reset filesets' standard menu."
+  "Call `filesets-set-default' and reset filesets' standard menu."
   (when (filesets-set-default sym val)
     (setq filesets-has-changed-flag t)))
 ;    (filesets-reset-fileset nil t)))
diff --git a/lisp/follow.el b/lisp/follow.el
index 72a091e8ce2..2273e8920fd 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -98,7 +98,7 @@
 ;; (global-set-key [f7] 'follow-delete-other-windows-and-split)
 
 
-;; There exist two system variables that control the appearence of
+;; There exist two system variables that control the appearance of
 ;; lines wider than the window containing them.  The default is to
 ;; truncate long lines whenever a window isn't as wide as the frame.
 ;;
@@ -351,7 +351,7 @@ After that, changing the prefix key requires manipulating keymaps."
 ;; global map.
 (easy-menu-add-item nil '("Tools")
   '("Follow"
-    ;; The Emacs code used to just grey out operations when follow-mode was
+    ;; The Emacs code used to just gray out operations when follow-mode was
     ;; not enabled, whereas the XEmacs code used to remove it altogether.
     ;; Not sure which is preferable, but clearly the preference should not
     ;; depend on the flavor.
diff --git a/lisp/frame.el b/lisp/frame.el
index f63179de1f1..af668f80961 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1133,15 +1133,21 @@ To get the frame's current border color, use `frame-parameters'."
                            (list (cons 'border-color color-name))))
 
 (define-minor-mode auto-raise-mode
-  "Toggle whether or not the selected frame should auto-raise.
+  "Toggle whether or not selected frames should auto-raise.
 With a prefix argument ARG, enable Auto Raise mode if ARG is
 positive, and disable it otherwise.  If called from Lisp, enable
 the mode if ARG is omitted or nil.
 
-Note that this controls Emacs's own auto-raise feature.
-Some window managers allow you to enable auto-raise for certain windows.
-You can use that for Emacs windows if you wish, but if you do,
-that is beyond the control of Emacs and this command has no effect on it."
+Auto Raise mode does nothing under most window managers, which
+switch focus on mouse clicks.  It only has an effect if your
+window manager switches focus on mouse movement (in which case
+you should also change `focus-follows-mouse' to t).  Then,
+enabling Auto Raise mode causes any graphical Emacs frame which
+acquires focus to be automatically raised.
+
+Note that this minor mode controls Emacs's own auto-raise
+feature.  Window managers that switch focus on mouse movement
+often have their own auto-raise feature."
   :variable (frame-parameter nil 'auto-raise)
   (if (frame-parameter nil 'auto-raise)
       (raise-frame)))
@@ -1152,10 +1158,16 @@ With a prefix argument ARG, enable Auto Lower mode if ARG is
 positive, and disable it otherwise.  If called from Lisp, enable
 the mode if ARG is omitted or nil.
 
-Note that this controls Emacs's own auto-lower feature.
-Some window managers allow you to enable auto-lower for certain windows.
-You can use that for Emacs windows if you wish, but if you do,
-that is beyond the control of Emacs and this command has no effect on it."
+Auto Lower mode does nothing under most window managers, which
+switch focus on mouse clicks.  It only has an effect if your
+window manager switches focus on mouse movement (in which case
+you should also change `focus-follows-mouse' to t).  Then,
+enabling Auto Lower Mode causes any graphical Emacs frame which
+loses focus to be automatically lowered.
+
+Note that this minor mode controls Emacs's own auto-lower
+feature.  Window managers that switch focus on mouse movement
+often have their own features for raising or lowering frames."
   :variable (frame-parameter nil 'auto-lower))
 
 (defun set-frame-name (name)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 889a5230d15..fbfcda57b53 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,45 @@
+2011-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * compface.el (uncompface):
+        * gnus-art.el (gnus-article-x-face-command): Update the header format
+        of icon data for the most recent icontopbm program.
+
+2011-12-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-msg.el (gnus-inews-do-gcc):
+        * message.el (message-send-mail):
+        * mml.el (mml-generate-mime): Share the value of the buffer-local
+        `message-options' variable between a draft buffer and temprary working
+        buffers.
+
+2011-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * message.el (message-pop-to-buffer): Revert 2011-09-11 change.
+
+2011-11-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-article-browse-html-parts): Convert link file names
+        for Cygwin.
+
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * starttls.el: Fix case of "GnuTLS".
+
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus-group.el (gnus-group-highlight): Fix typo.
+
+2011-11-24  Adam W  <adam_w67@yahoo.com>  (tiny change)
+
+        * mail-source.el (mail-source-fetch-maildir): Don't expect the return
+        value of `delete-file', that returns nil for a local file but returns t
+        for a remote file using ssh.
+
+2011-11-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-table-horizontal-line): Use "?\s" instead of "? " to
+        avoid later breakage.
+
 2011-11-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-article-setup-buffer): Decode group name used for
@@ -2266,7 +2308,7 @@
         * gnus-art.el (gnus-article-next-page-1): Because customized mode-line
         face with line-width greater than zero will cause RET in gnus summary
         buffer to scroll down article page-wise because auto vscroll happens,
-        it should be temporalily disabled when doing a scroll-up.
+        it should be temporally disabled when doing a scroll-up.
 
 2011-02-19  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -2759,7 +2801,7 @@
 2011-01-28  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active
-        data if the group is unactivated.
+        data if the group is inactive.
 
 2011-01-28  Julien Danjou  <julien@danjou.info>
 
@@ -2850,7 +2892,7 @@
         we're using an encrypted connection.
 
         * proto-stream.el: Alter the interface functions to also return the
-        actual stream type used: network or tls.
+        actual stream type used: network or TLS.
 
 2011-01-25  Julien Danjou  <julien@danjou.info>
 
@@ -3579,7 +3621,7 @@
 
 2010-11-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * proto-stream.el (open-protocol-stream): All starttls connections are
+        * proto-stream.el (open-protocol-stream): All STARTTLS connections are
         handled by the network handler.
 
 2010-11-30  Julien Danjou  <julien@danjou.info>
@@ -3668,9 +3710,9 @@
         (nnimap-open-connection): Be more backwards-compatible.
 
         * proto-stream.el (proto-stream-always-use-starttls): New variable.
-        (proto-stream-open-starttls): De-duplicate the starttls code.
+        (proto-stream-open-starttls): De-duplicate the STARTTLS code.
         (proto-stream-open-starttls): Folded back into the main function.
-        (proto-stream-open-network): Fix typo in the gnutls path.
+        (proto-stream-open-network): Fix typo in the GnuTLS path.
         (proto-stream-command): Refactor out.
 
         * nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
@@ -3682,7 +3724,7 @@
 
         * proto-stream.el (proto-stream-open-tls): Delete output from openssl
         if we're using tls.el.
-        (proto-stream-open-network): If we don't have gnutls-cli or gnutls
+        (proto-stream-open-network): If we don't have gnutls-cli or GnuTLS
         built in, then don't try to establish a STARTTLS connection.
 
         * nntp.el (nntp-open-connection): Switch on STARTTLS on supported
@@ -5082,7 +5124,7 @@
         * gnus-sum.el (gnus-summary-set-local-parameters): Ignore the `active'
         non-variable, too.
 
-        * nnimap.el (nnimap-open-connection): Use gnutls STARTTLS, if
+        * nnimap.el (nnimap-open-connection): Use GnuTLS STARTTLS, if
         available.
         (nnimap-update-info): Rely more on the current active than the param
         active to avoid marking articles as read too much.
@@ -5131,8 +5173,8 @@
         group is the "last", so that the backends like nnfolder actually save
         their folders.
 
-        * nnimap.el (nnimap-open-connection): If we have gnutls loaded, then
-        try to use that for the tls stream.
+        * nnimap.el (nnimap-open-connection): If we have GnuTLS loaded, then
+        try to use that for the TLS stream.
         (nnimap-retrieve-group-data-early): Rework the marks code to heed
         UIDVALIDITY and find out which groups are read-only and not.
         (nnimap-get-flags): Use the same marks parsing code as the rest of
@@ -6351,8 +6393,8 @@
         * gnus-int.el (gnus-request-update-info): Protect against backends not
         having the function.
 
-        * nnimap.el (nnimap-stream): Mention starttls.
-        (nnimap-open-connection): Add starttls support.
+        * nnimap.el (nnimap-stream): Mention STARTTLS.
+        (nnimap-open-connection): Add STARTTLS support.
 
 2010-09-23  Andrew Cohen  <cohen@andy.bu.edu>
 
@@ -10942,7 +10984,7 @@
 2007-11-14  Denys Duchier  <denys.duchier@univ-orleans.fr>  (tiny change)
 
         * pop3.el (pop3-open-server): Accept and process data more robustly at
-        connexion start to avoid spurious "POP SSL connexion failed" errors.
+        connection start to avoid spurious "POP SSL connection failed" errors.
 
 2007-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -11689,7 +11731,7 @@
         (nntp-open-marks): Decode group names when bootstrapping marks.
 
         * rfc2047.el (rfc2047-encode-message-header): Make XEmacs decode
-        Newsgroups and Folowup-To headers.
+        Newsgroups and Followup-To headers.
 
 2007-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -16497,7 +16539,7 @@
 2005-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (article-display-face): Improve the efficiency.
-        (article-display-x-face): Ditto; remove grey x-face stuff.
+        (article-display-x-face): Ditto; remove gray x-face stuff.
 
 2005-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -18632,7 +18674,7 @@
 2004-09-28  Kevin Greiner  <kgreiner@compsol.cc>
 
         * gnus-agent.el (gnus-agent-synchronize-group-flags): Replace
-        gnus-requst-update-info with explicit code to sync the in-memory
+        gnus-request-update-info with explicit code to sync the in-memory
         info read flags with the marks being sync'd to the backend.
 
         * gnus-util.el (gnus-pp): Add optional stream to match pp API.
@@ -19746,7 +19788,7 @@
 
 2004-05-26  Simon Josefsson  <jas@extundo.com>
 
-        * starttls.el: Merge with my GNUTLS based starttls.el.
+        * starttls.el: Merge with my GnuTLS based starttls.el.
         (starttls-gnutls-program, starttls-use-gnutls)
         (starttls-extra-arguments, starttls-process-connection-type)
         (starttls-connect, starttls-failure, starttls-success):
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 86c4eea59ab..a2d6d61efd4 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -2346,7 +2346,7 @@
 
         * nnmh.el: Don't call nnmail-activate.
 
-        * gnus.el: User-variabelize all custom vars.
+        * gnus.el: User-variablize all custom vars.
 
 1998-02-13  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
@@ -3471,7 +3471,7 @@
         * pop3.el (pop3-md5): `with-temp-buffer' doesn't exist in Emacs
         19.34.
 
-        * nneething.el (nneething-directory): Defvarred.
+        * nneething.el (nneething-directory): Defvared.
 
         * message.el: Autoloaded nndraft things.
         (message-set-auto-save-file-name): Use it.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index e519ce340c2..6b11a956a99 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -1396,7 +1396,7 @@
         * tls.el (tls-process-connection-type): Doc fix.
 
         * imap.el (imap-starttls-open): Rewrite, should support both old
-        starttls.el and new starttls.el that uses GNUTLS.
+        starttls.el and new starttls.el that uses GnuTLS.
 
 2003-09-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -5120,7 +5120,7 @@
         * gnus-util.el (gnus-prin1-to-string): Bind print-length and
         print-level.
 
-        * gnus-art.el (article-display-x-face): Removed grey x-face stuff.
+        * gnus-art.el (article-display-x-face): Removed gray x-face stuff.
         (gnus-treat-display-grey-xface): Removed.
 
         * gnus-fun.el (gnus-grab-cam-face): New.
@@ -9836,7 +9836,7 @@
 2002-02-08  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * gnus-art.el (gnus-treat-display-grey-xface): New variable.
-        (article-display-x-face): Use it.  Disable grey xface, if
+        (article-display-x-face): Use it.  Disable gray xface, if
         uncompface is not found.
 
         * message.el (message-mode): Don't enable multibyte on an indirect
@@ -11350,7 +11350,7 @@
         * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed.
 
         * gnus-art.el (gnus-ignored-headers): Hide all X-Faces.
-        (article-display-x-face): Display grey X-Faces.
+        (article-display-x-face): Display gray X-Faces.
 
         * gnus-fun.el (gnus-convert-gray-x-face-region): New function.
         (gnus-convert-gray-x-face-to-ppm): Ditto.
diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el
index 2a2383777cb..e132f736269 100644
--- a/lisp/gnus/compface.el
+++ b/lisp/gnus/compface.el
@@ -42,7 +42,8 @@ or `faces-xface' and `netpbm' or `libgr-progs', for instance."
                         'delete '(t nil) nil))
            (progn
              (goto-char (point-min))
-             (insert "/* Width=48, Height=48 */\n")
+             (insert "/* Format_version=1, Width=48, Height=48, Depth=1,\
+ Valid_bits_per_item=16 */\n")
              ;; I just can't get "icontopbm" to work correctly on its
              ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
              ;; files.
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index f913ddb5378..3ee72bc5fc6 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -217,7 +217,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
                                  'static-color 'pseudo-color)))))
       'gnome
     'retro)
-  "Prefered tool bar style."
+  "Preferred tool bar style."
   :type '(choice (const :tag "GNOME style" gnome)
                  (const :tag "Retro look"  retro))
   :group 'gmm)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 0abc802f558..555c715bc2f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -268,11 +268,14 @@ This can also be a list of the above values."
       (if (or (gnus-image-type-available-p 'xface)
               (gnus-image-type-available-p 'pbm))
           'gnus-display-x-face-in-from
-        "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")
+        "{ echo \
+'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
+; uncompface; } | icontopbm | ee -")
     (if (gnus-image-type-available-p 'pbm)
         'gnus-display-x-face-in-from
-      "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
-display -"))
+      "{ echo \
+'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
+; uncompface; } | icontopbm | display -"))
   "*String or function to be executed to display an X-Face header.
 If it is a string, the command will be executed in a sub-shell
 asynchronously.  The compressed face will be piped to this command."
@@ -2879,6 +2882,14 @@ message header will be added to the bodies of the \"text/html\" parts."
                                 (with-current-buffer gnus-article-buffer
                                   gnus-article-mime-handles)
                                 cid-dir))
+                     (when (eq system-type 'cygwin)
+                       (setq cid-file
+                             (concat "/" (substring
+                                          (with-output-to-string
+                                            (call-process "cygpath" nil
+                                                          standard-output
+                                                          nil "-m" cid-file))
+                                          0 -1))))
                      (replace-match (concat "file://" cid-file)
                                     nil nil nil 1))))
                (unless content (setq content (buffer-string))))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 6f146644115..694b4d7e8b4 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -362,7 +362,7 @@ If you want to modify the group buffer, you can use this hook."
      gnus-group-news-low))
   "*Controls the highlighting of group buffer lines.
 
-Below is a list of `Form'/`Face' pairs.  When deciding how a a
+Below is a list of `Form'/`Face' pairs.  When deciding how a
 particular group line should be displayed, each form is
 evaluated.  The content of the face field after the first true form is
 used.  You can change how those group lines are displayed by
@@ -1354,9 +1354,9 @@ if it is a string, only list groups matching REGEXP."
                      (predicate t)      ; We list all groups?
                      (t
                       (or
-                       (if (eq unread t) ; Unactivated?
+                       (if (eq unread t) ; Inactive?
                            gnus-group-list-inactive-groups
-                                        ; We list unactivated
+                                        ; We list inactive
                          (and (numberp unread) (> unread 0)))
                                         ; We list groups with unread articles
                        (and gnus-list-groups-with-ticked-articles
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e6a06a0500d..e06d475ed6c 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1549,7 +1549,7 @@ this is a reply."
       (message-narrow-to-headers)
       (let ((gcc (or gcc (mail-fetch-field "gcc" nil t)))
             (cur (current-buffer))
-            groups group method group-art
+            groups group method group-art options
             mml-externalize-attachments)
         (when gcc
           (message-remove-header "gcc")
@@ -1573,6 +1573,7 @@ this is a reply."
                     gnus-gcc-externalize-attachments))
             (save-excursion
               (nnheader-set-temp-buffer " *acc*")
+              (setq message-options (with-current-buffer cur message-options))
               (insert-buffer-substring cur)
               (message-encode-message-body)
               (save-restriction
@@ -1629,6 +1630,8 @@ this is a reply."
                               (boundp 'gnus-inews-mark-gcc-as-read)
                               (symbol-value 'gnus-inews-mark-gcc-as-read))))
                 (gnus-group-mark-article-read group (cdr group-art)))
+              (setq options message-options)
+              (with-current-buffer cur (setq message-options options))
               (kill-buffer (current-buffer)))))))))
 
 (defun gnus-inews-insert-gcc (&optional group)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index b18b78df063..3a9294d58d6 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2533,7 +2533,7 @@ If FORCE is non-nil, the .newsrc file is read."
        ((or (eq symbol options-symbol)
             (eq symbol Options-symbol))
         (setq gnus-newsrc-options
-              ;; This concating is quite inefficient, but since our
+              ;; This concatting is quite inefficient, but since our
               ;; thorough studies show that approx 99.37% of all
               ;; .newsrc files only contain a single options line, we
               ;; don't give a damn, frankly, my dear.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 7cea88e7f54..b3f85cf9366 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -11913,7 +11913,7 @@ will not be marked as saved."
           ;; This is a pseudo-article.
           (if (assq 'name header)
               (gnus-copy-file (cdr (assq 'name header)))
-            (gnus-message 1 "Article %d is unsaveable" article))
+            (gnus-message 1 "Article %d is unsavable" article))
         ;; This is a real article.
         (save-window-excursion
           (gnus-summary-select-article decode decode nil article)
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 17af1a38333..87ca27adcf4 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -582,7 +582,7 @@ articles in the topic and its subtopics."
                (or gnus-topic-display-empty-topics ;We want empty topics
                    (not (zerop unread)) ;Non-empty
                    tick                 ;Ticked articles
-                   (/= point-max (point-max)))) ;Unactivated groups
+                   (/= point-max (point-max)))) ;Inactive groups
       (gnus-extent-start-open (point))
       (gnus-topic-insert-topic-line
        (car type) visiblep
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 6e6ef76c0c1..2315cff6261 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -1017,6 +1017,7 @@ This only works when `display-time' is enabled."
           (dolist (file (directory-files (concat path subdir) t))
             (when (and (not (file-directory-p file))
                        (not (if function
+                                ;; `function' should return nil if successful.
                                 (funcall function file mail-source-crash-box)
                               (let ((coding-system-for-write
                                      mm-text-coding-system)
@@ -1035,7 +1036,8 @@ This only works when `display-time' is enabled."
 ;;;                               (insert "\n\n")
                                   ;; MMDF mail format
                                   (insert "\001\001\001\001\n"))
-                                (delete-file file)))))
+                                (delete-file file)
+                                nil))))
               (incf found (mail-source-callback callback file))
               (mail-source-delete-crash-box)))))
       found)))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5d82faee20d..ee9d4992158 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4507,7 +4507,8 @@ This function could be useful in `message-setup-hook'."
                    (boundp 'gnus-group-posting-charset-alist))
               (gnus-setup-posting-charset nil)
             message-posting-charset))
-         (headers message-required-mail-headers))
+         (headers message-required-mail-headers)
+         options)
     (when (and message-generate-hashcash
                (not (eq message-generate-hashcash 'opportunistic)))
       (message "Generating hashcash...")
@@ -4546,9 +4547,11 @@ This function could be useful in `message-setup-hook'."
               (error "Failed to send the message")))))
       ;; Let the user do all of the above.
       (run-hooks 'message-header-hook))
+    (setq options message-options)
     (unwind-protect
         (with-current-buffer tembuf
           (erase-buffer)
+          (setq message-options options)
           ;; Avoid copying text props (except hard newlines).
           (insert (with-current-buffer mailbuf
                     (mml-buffer-substring-no-properties-except-hard-newlines
@@ -4630,9 +4633,11 @@ If you always want Gnus to send messages in one piece, set
                 (message "Sending via mail...")
                 (funcall (or message-send-mail-real-function
                              message-send-mail-function)))
-            (message-send-mail-partially)))
+            (message-send-mail-partially))
+          (setq options message-options))
       (kill-buffer tembuf))
     (set-buffer mailbuf)
+    (setq message-options options)
     (push 'mail message-sent-message-via)))
 
 (defvar sendmail-program)
@@ -6322,6 +6327,7 @@ between beginning of field and beginning of line."
 
 (defun message-pop-to-buffer (name &optional switch-function)
   "Pop to buffer NAME, and warn if it already exists and is modified."
+  (unless switch-function (setq switch-function #'pop-to-buffer))
   (let ((buffer (get-buffer name)))
     (if (and buffer
              (buffer-name buffer))
@@ -6331,7 +6337,7 @@ between beginning of field and beginning of line."
               (progn
                 (gnus-select-frame-set-input-focus (window-frame window))
                 (select-window window))
-            (funcall (or switch-function 'switch-to-buffer) buffer)
+            (funcall switch-function buffer)
             (set-buffer buffer))
           (when (and (buffer-modified-p)
                      (not (prog1
@@ -6339,7 +6345,7 @@ between beginning of field and beginning of line."
                                "Message already being composed; erase? ")
                             (message nil))))
             (error "Message being composed")))
-      (funcall (or switch-function 'switch-to-buffer) name)
+      (funcall switch-function name)
       (set-buffer name))
     (erase-buffer)
     (message-mode)))
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 695451ddc45..ee7ba1c193b 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -87,9 +87,9 @@ If no encoding was done, nil is returned."
             (goto-char (point-min))
             (if (re-search-forward "[^\x0-\x7f]" nil t)
                 (or mail-parse-charset
-                    (message-options-get 'mm-encody-body-charset)
+                    (message-options-get 'mm-body-charset-encoding-alist)
                     (message-options-set
-                     'mm-encody-body-charset
+                     'mm-body-charset-encoding-alist
                      (mm-read-coding-system "Charset used in the article: ")))
               ;; The logic in `mml-generate-mime-1' confirms that it's OK
               ;; to return nil here.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 36c56e0921b..44e2af5b904 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -360,7 +360,7 @@ to:
  (\"text/html\" \"text/richtext\")
 
 Adding \"image/.*\" might also be useful.  Spammers use it as the
-prefered part of multipart/alternative messages.  See also
+preferred part of multipart/alternative messages.  See also
 `gnus-buttonized-mime-types', to which adding \"multipart/alternative\"
 enables you to choose manually one of two types those mails include."
   :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'.
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 352fa329e3e..867c3be4b60 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -466,16 +466,21 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 (defun mml-generate-mime ()
   "Generate a MIME message based on the current MML document."
   (let ((cont (mml-parse))
-        (mml-multipart-number mml-multipart-number))
+        (mml-multipart-number mml-multipart-number)
+        (options message-options))
     (if (not cont)
         nil
-      (mm-with-multibyte-buffer
-        (if (and (consp (car cont))
-                 (= (length cont) 1))
-            (mml-generate-mime-1 (car cont))
-          (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed"))
-                                      cont)))
-        (buffer-string)))))
+      (prog1
+          (mm-with-multibyte-buffer
+            (setq message-options options)
+            (if (and (consp (car cont))
+                     (= (length cont) 1))
+                (mml-generate-mime-1 (car cont))
+              (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed"))
+                                          cont)))
+            (setq options message-options)
+            (buffer-string))
+        (setq message-options options)))))
 
 (defun mml-generate-mime-1 (cont)
   (let ((mm-use-ultra-safe-encoding
@@ -1454,7 +1459,7 @@ Should be adopted if code in `message-send-mail' is changed."
   "Display current buffer with Gnus, in a new buffer.
 If RAW, display a raw encoded MIME message.
 
-The window layout for the preview buffer is controled by the variables
+The window layout for the preview buffer is controlled by the variables
 `special-display-buffer-names', `special-display-regexps', or
 `gnus-buffer-configuration' (the first match made will be used),
 or the `pop-to-buffer' function."
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 399008cec1b..59e06364f42 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1213,7 +1213,7 @@ Use the nov database for the current group if available."
                 ;; #### already belongs to a range, whereas the corresponding
                 ;; #### article doesn't exist (for example, if you delete an
                 ;; #### article). For that reason, it is important to update
-                ;; #### the ranges (meaning remove inexistent articles) before
+                ;; #### the ranges (meaning remove nonexistent articles) before
                 ;; #### doing anything on them.
                 ;; 2 a/ read articles:
                 (let ((read (gnus-info-read info)))
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index ee3e6582e80..0f7a450b30c 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -270,11 +270,11 @@ Use streaming commands."
     message-count))
 
 (defcustom pop3-stream-type nil
-  "*Transport security type for POP3 connexions.
-This may be either nil (plain connexion), `ssl' (use an
+  "*Transport security type for POP3 connections.
+This may be either nil (plain connection), `ssl' (use an
 SSL/TSL-secured stream) or `starttls' (use the starttls mechanism
 to turn on TLS security after opening the stream).  However, if
-this is nil, `ssl' is assumed for connexions to port
+this is nil, `ssl' is assumed for connections to port
 995 (pop3s)."
   :version "23.1" ;; No Gnus
   :group 'pop3
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index feed078034c..f1cb1f69e56 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -586,7 +586,7 @@ should not change this value.")
         ((>= column rfc2047-encode-max-chars)
          (when eword
            (cond ((string-match "\n[ \t]+\\'" eword)
-                  ;; Reomove a superfluous empty line.
+                  ;; Remove a superfluous empty line.
                   (setq eword (substring eword 0 (match-beginning 0))))
                  ((string-match "(+\\'" eword)
                   ;; Break the line before the open parenthesis.
@@ -639,7 +639,7 @@ should not change this value.")
                (setq crest " "
                      eword (concat eword next)))
              (when (string-match "\n[ \t]+\\'" eword)
-               ;; Reomove a superfluous empty line.
+               ;; Remove a superfluous empty line.
                (setq eword (substring eword 0 (match-beginning 0))))
              (rfc2047-encode-1 (length crest) (substring string index)
                                cs encoder start " " tail
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 119d8e0a7f3..f2d8f843564 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -53,17 +53,17 @@ fit these criteria."
   :group 'shr
   :type 'regexp)
 
-(defcustom shr-table-horizontal-line ?  ; space
+(defcustom shr-table-horizontal-line ?\s
   "Character used to draw horizontal table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-vertical-line ?    ; space
+(defcustom shr-table-vertical-line ?\s
   "Character used to draw vertical table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-table-corner ?           ; space
+(defcustom shr-table-corner ?\s
   "Character used to draw table corners."
   :group 'shr
   :type 'character)
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index b995f7478ce..af9fd42c127 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -5,7 +5,7 @@
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Created: 1999/11/20
-;; Keywords: TLS, SSL, OpenSSL, GNUTLS, mail, news
+;; Keywords: TLS, SSL, OpenSSL, GnuTLS, mail, news
 
 ;; This file is part of GNU Emacs.
 
@@ -33,15 +33,15 @@
 ;; implementations both called "starttls.el".  The first one is Daiki
 ;; Ueno's starttls.el which uses his own "starttls" command line tool,
 ;; and the second one is Simon Josefsson's starttls.el which uses
-;; "gnutls-cli" from GNUTLS.
+;; "gnutls-cli" from GnuTLS.
 ;;
-;; If "starttls" is available, it is prefered by the code over
+;; If "starttls" is available, it is preferred by the code over
 ;; "gnutls-cli", for backwards compatibility.  Use
 ;; `starttls-use-gnutls' to toggle between implementations if you have
-;; both tools installed.  It is recommended to use GNUTLS, though, as
+;; both tools installed.  It is recommended to use GnuTLS, though, as
 ;; it performs more verification of the certificates.
 
-;; The GNUTLS support requires GNUTLS 0.9.90 (released 2003-10-08) or
+;; The GnuTLS support requires GnuTLS 0.9.90 (released 2003-10-08) or
 ;; later, from <http://www.gnu.org/software/gnutls/>, or "starttls"
 ;; from <ftp://ftp.opaopa.org/pub/elisp/>.
 
@@ -121,8 +121,8 @@
   :group 'mail)
 
 (defcustom starttls-gnutls-program "gnutls-cli"
-  "Name of GNUTLS command line tool.
-This program is used when GNUTLS is used, i.e. when
+  "Name of GnuTLS command line tool.
+This program is used when GnuTLS is used, i.e. when
 `starttls-use-gnutls' is non-nil."
   :version "22.1"
   :type 'string
@@ -136,7 +136,7 @@ i.e. when `starttls-use-gnutls' is nil."
   :group 'starttls)
 
 (defcustom starttls-use-gnutls (not (executable-find starttls-program))
-  "*Whether to use GNUTLS instead of the `starttls' command."
+  "*Whether to use GnuTLS instead of the `starttls' command."
   :version "22.1"
   :type 'boolean
   :group 'starttls)
@@ -150,7 +150,7 @@ These apply when the `starttls' command is used, i.e. when
 
 (defcustom starttls-extra-arguments nil
   "Extra arguments to `starttls-program'.
-These apply when GNUTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
+These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
 
 For example, non-TLS compliant servers may require
 '(\"--protocols\" \"ssl3\").  Invoke \"gnutls-cli --help\" to
@@ -167,8 +167,8 @@ find out which parameters are available."
 
 (defcustom starttls-connect "- Simple Client Mode:\n\n"
   "*Regular expression indicating successful connection.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
-  ;; GNUTLS cli.c:main() prints this string when it is starting to run
+The default is what GnuTLS's \"gnutls-cli\" outputs."
+  ;; GnuTLS cli.c:main() prints this string when it is starting to run
   ;; in the application read/write phase.  If the logic, or the string
   ;; itself, is modified, this must be updated.
   :version "22.1"
@@ -177,8 +177,8 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
 
 (defcustom starttls-failure "\\*\\*\\* Handshake has failed"
   "*Regular expression indicating failed TLS handshake.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
-  ;; GNUTLS cli.c:do_handshake() prints this string on failure.  If the
+The default is what GnuTLS's \"gnutls-cli\" outputs."
+  ;; GnuTLS cli.c:do_handshake() prints this string on failure.  If the
   ;; logic, or the string itself, is modified, this must be updated.
   :version "22.1"
   :type 'regexp
@@ -186,8 +186,8 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
 
 (defcustom starttls-success "- Compression: "
   "*Regular expression indicating completed TLS handshakes.
-The default is what GNUTLS's \"gnutls-cli\" outputs."
-  ;; GNUTLS cli.c:do_handshake() calls, on success,
+The default is what GnuTLS's \"gnutls-cli\" outputs."
+  ;; GnuTLS cli.c:do_handshake() calls, on success,
   ;; common.c:print_info(), that unconditionally print this string
   ;; last.  If that logic, or the string itself, is modified, this
   ;; must be updated.
@@ -283,7 +283,7 @@ BUFFER is the buffer (or `buffer-name') to associate with the process.
 Third arg is name of the host to connect to, or its IP address.
 Fourth arg PORT is an integer specifying a port to connect to.
 If `starttls-use-gnutls' is nil, this may also be a service name, but
-GNUTLS requires a port number."
+GnuTLS requires a port number."
   (if starttls-use-gnutls
       (starttls-open-stream-gnutls name buffer host port)
     (message "Opening STARTTLS connection to `%s:%s'" host (format "%s" port))
diff --git a/lisp/help.el b/lisp/help.el
index 506889c210e..36d49aae9b3 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -969,7 +969,7 @@ This is effective only when Temp Buffer Resize mode is enabled.
 The value is the maximum height (in lines) which
 `resize-temp-buffer-window' will give to a window displaying a
 temporary buffer.  It can also be a function to be called to
-choose the height for such a buffer.  It gets one argumemt, the
+choose the height for such a buffer.  It gets one argument, the
 buffer, and should return a positive integer.  At the time the
 function is called, the window to be resized is selected."
   :type '(choice integer function)
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 056115f57b7..126b616a644 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -150,11 +150,11 @@ main-content <=MAIN_CONTENT;\\n\" rtfm-section file style rtfm-section file))
   :prefix "hfy-")
 
 (defcustom hfy-page-header 'hfy-default-header
-  "Function called to build the header of the html source.
+  "Function called to build the header of the HTML source.
 This is called with two arguments (the filename relative to the top
 level source directory being etag'd and fontified), and a string containing
 the <style>...</style> text to embed in the document.
-It should return the string returned will be used as the header for the
+It should return a string that will be used as the header for the
 htmlfontified version of the source file.\n
 See also `hfy-page-footer'."
   :group 'htmlfontify
@@ -166,8 +166,8 @@ See also `hfy-page-footer'."
 (defcustom hfy-split-index nil
   "Whether or not to split the index `hfy-index-file' alphabetically.
 If non-nil, the index is split on the first letter of each tag.
-Useful when the index would otherwise
-be large and take a long time to render or be difficult to navigate."
+Useful when the index would otherwise be large and take
+a long time to render or be difficult to navigate."
   :group 'htmlfontify
   :tag   "split-index"
   :type  '(boolean))
@@ -179,7 +179,7 @@ It takes only one argument, the filename."
   :tag   "page-footer"
   :type  '(function))
 
-(defcustom hfy-extn        ".html"
+(defcustom hfy-extn ".html"
   "File extension used for output files."
   :group 'htmlfontify
   :tag   "extension"
@@ -251,7 +251,7 @@ when not running under a window system."
 
 (defcustom hfy-post-html-hooks nil
   "List of functions to call after creating and filling the HTML buffer.
-These functions will be called with the html buffer as the current buffer."
+These functions will be called with the HTML buffer as the current buffer."
   :group   'htmlfontify
   :tag     "post-html-hooks"
   :options '(set-auto-mode)
@@ -342,7 +342,7 @@ commands in `hfy-etags-cmd-alist'."
   :type  '(file))
 
 (defcustom hfy-shell-file-name "/bin/sh"
-  "Shell (bourne or compatible) to invoke for complex shell operations."
+  "Shell (Bourne or compatible) to invoke for complex shell operations."
   :group 'htmlfontify
   :tag   "shell-file-name"
   :type  '(file))
@@ -595,7 +595,8 @@ in a windowing system - try to trick it..."
                    (setq cperl-syntaxify-by-font-lock t)))
              (setq hfy-cperl-mode-kludged-p t))) )
 
-(defun hfy-opt (symbol) "Is option SYMBOL set."
+(defun hfy-opt (symbol)
+  "Is option SYMBOL set."
   (memq symbol hfy-optimisations))
 
 (defun hfy-default-header (file style)
@@ -1066,7 +1067,7 @@ See also `hfy-face-to-style-i', `hfy-flatten-style'."
                      ;; text-decoration is not inherited.
                      ;; but it's not wrong and if this ever changes it will
                      ;; be needed, so I think it's better to leave it in? -- v
-                     (nconc final-style '(("text-decoration"."none"))))))
+                     (nconc final-style '(("text-decoration" . "none"))))))
     final-style))
 
 ;; strip redundant bits from a name. Technically, this could result in
@@ -1992,7 +1993,7 @@ FILE is the specific file we are rendering."
          tags-list) )))
 
 (defun hfy-shell ()
-  "Return `shell-file-name', or \"/bin/sh\" if it is a non-bourne shell."
+  "Return `shell-file-name', or \"/bin/sh\" if it is a non-Bourne shell."
   (if (string-match "\\<bash\\>\\|\\<sh\\>\\|\\<dash\\>" shell-file-name)
       shell-file-name
     (or hfy-shell-file-name "/bin/sh")))
diff --git a/lisp/ido.el b/lisp/ido.el
index f425fd5fc63..f2dcba614a9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1692,7 +1692,7 @@ This function also adds a hook to the minibuffer."
 (defun ido-nonreadable-directory-p (dir)
   ;; Return t if dir is a directory, but not readable
   ;; Do not check for non-readable directories via tramp, as this causes a premature
-  ;; connect on incomplete tramp paths (after entring just method:).
+  ;; connect on incomplete tramp paths (after entering just method:).
   (let ((ido-enable-tramp-completion nil))
     (and (ido-final-slash dir)
          (not (ido-is-unc-host dir))
@@ -1702,7 +1702,7 @@ This function also adds a hook to the minibuffer."
 (defun ido-directory-too-big-p (dir)
   ;; Return t if dir is a directory, but too big to show
   ;; Do not check for non-readable directories via tramp, as this causes a premature
-  ;; connect on incomplete tramp paths (after entring just method:).
+  ;; connect on incomplete tramp paths (after entering just method:).
   (let ((ido-enable-tramp-completion nil))
     (and (numberp ido-max-directory-size)
          (ido-final-slash dir)
diff --git a/lisp/indent.el b/lisp/indent.el
index 93218032700..f5850de8b8f 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -63,9 +63,11 @@ e.g., `c-tab-always-indent', and do not respect this variable."
 
 (defun indent-according-to-mode ()
   "Indent line in proper way for current major mode.
-The buffer-local variable `indent-line-function' determines how to do this,
-but the functions `indent-relative' and `indent-relative-maybe' are
-special; we don't actually use them here."
+Normally, this is done by calling the function specified by the
+variable `indent-line-function'.  However, if the value of that
+variable is `indent-relative' or `indent-relative-maybe', handle
+it specially (since those functions are used for tabbing); in
+that case, indent by aligning to the previous non-blank line."
   (interactive)
   (syntax-propertize (line-end-position))
   (if (memq indent-line-function
@@ -84,22 +86,25 @@ special; we don't actually use them here."
     (funcall indent-line-function)))
 
 (defun indent-for-tab-command (&optional arg)
-  "Indent line or region in proper way for current major mode or insert a tab.
-Depending on `tab-always-indent', either insert a tab or indent.
-
-In most major modes, if point was in the current line's indentation,
-it is moved to the first non-whitespace character after indenting;
-otherwise it stays at the same position in the text.
-
-If a prefix argument is given, also rigidly indent the entire
+  "Indent the current line or region, or insert a tab, as appropriate.
+This function either inserts a tab, or indents the current line,
+or performs symbol completion, depending on `tab-always-indent'.
+The function called to actually indent the line or insert a tab
+is given by the variable `indent-line-function'.
+
+If a prefix argument is given, after this function indents the
+current line or inserts a tab, it also rigidly indents the entire
 balanced expression which starts at the beginning of the current
-line to reflect the current line's change in indentation.
+line, to reflect the current line's indentation.
 
-If `transient-mark-mode' is turned on and the region is active,
-indent the region (in this case, any prefix argument is ignored).
+In most major modes, if point was in the current line's
+indentation, it is moved to the first non-whitespace character
+after indenting; otherwise it stays at the same position relative
+to the text.
 
-The function actually called to indent the line is determined by the value of
-`indent-line-function'."
+If `transient-mark-mode' is turned on and the region is active,
+this function instead calls `indent-region'.  In this case, any
+prefix argument is ignored."
   (interactive "P")
   (cond
    ;; The region is active, indent it.
@@ -393,34 +398,14 @@ indents all the lines with it:
      with it.
   2) If `indent-region-function' is non-nil, call that function
      to indent the region.
-  3) Indent each line as specified by the variable `indent-line-function'.
+  3) Indent each line via `indent-according-to-mode'.
 
 Called from a program, START and END specify the region to indent.
 If the third argument COLUMN is an integer, it specifies the
 column to indent to; if it is nil, use one of the three methods above."
   (interactive "r\nP")
-  (if (null column)
-      (if fill-prefix
-          (save-excursion
-            (goto-char end)
-            (setq end (point-marker))
-            (goto-char start)
-            (let ((regexp (regexp-quote fill-prefix)))
-              (while (< (point) end)
-                (or (looking-at regexp)
-                    (and (bolp) (eolp))
-                    (insert fill-prefix))
-                (forward-line 1))))
-        (if indent-region-function
-            (funcall indent-region-function start end)
-          (save-excursion
-            (setq end (copy-marker end))
-            (goto-char start)
-            (while (< (point) end)
-              (or (and (bolp) (eolp))
-                  (indent-according-to-mode))
-              (forward-line 1))
-            (move-marker end nil))))
+  (cond
+   (column
     (setq column (prefix-numeric-value column))
     (save-excursion
       (goto-char end)
@@ -433,6 +418,28 @@ column to indent to; if it is nil, use one of the three methods above."
             (indent-to column 0))
         (forward-line 1))
       (move-marker end nil)))
+   (fill-prefix
+    (save-excursion
+      (goto-char end)
+      (setq end (point-marker))
+      (goto-char start)
+      (let ((regexp (regexp-quote fill-prefix)))
+        (while (< (point) end)
+          (or (looking-at regexp)
+              (and (bolp) (eolp))
+              (insert fill-prefix))
+          (forward-line 1)))))
+   (indent-region-function
+    (funcall indent-region-function start end))
+   (t
+    (save-excursion
+      (setq end (copy-marker end))
+      (goto-char start)
+      (while (< (point) end)
+        (or (and (bolp) (eolp))
+            (indent-according-to-mode))
+        (forward-line 1))
+      (move-marker end nil))))
   ;; In most cases, reindenting modifies the buffer, but it may also
   ;; leave it unmodified, in which case we have to deactivate the mark
   ;; by hand.
diff --git a/lisp/info.el b/lisp/info.el
index 4f2f33d017c..c1dae66bea2 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1769,12 +1769,14 @@ If DIRECTION is `backward', search in the reverse direction."
       ;; If no subfiles, give error now.
       (if give-up
           (if (null Info-current-subfile)
-              (let ((search-spaces-regexp
-                     (if (or (not isearch-mode) isearch-regexp)
-                         Info-search-whitespace-regexp)))
-                (if backward
-                    (re-search-backward regexp)
-                  (re-search-forward regexp)))
+              (if isearch-mode
+                  (signal 'search-failed (list regexp "end of manual"))
+                (let ((search-spaces-regexp
+                       (if (or (not isearch-mode) isearch-regexp)
+                           Info-search-whitespace-regexp)))
+                  (if backward
+                      (re-search-backward regexp)
+                    (re-search-forward regexp))))
             (setq found nil)))
 
       (if (and bound (not found))
@@ -1845,7 +1847,7 @@ If DIRECTION is `backward', search in the reverse direction."
               (if found
                   (message "")
                 (signal 'search-failed (if isearch-mode
-                                           (list regexp "end of the manual")
+                                           (list regexp "end of manual")
                                          (list regexp)))))
           (if (not found)
               (progn (Info-read-subfile osubfile)
@@ -3240,7 +3242,7 @@ search results."
         (Info-index topic)
         (push (cons (cons Info-current-file topic) Info-index-alternatives)
               Info-virtual-index-nodes)
-        ;; Clean up unneccessary side-effects of `Info-index'.
+        ;; Clean up unnecessary side-effects of `Info-index'.
         (setq Info-history-list ohist-list)
         (Info-goto-node orignode)
         (message "")))
diff --git a/lisp/international/cp51932.el b/lisp/international/cp51932.el
index d4a347d43aa..a6489268578 100644
--- a/lisp/international/cp51932.el
+++ b/lisp/international/cp51932.el
@@ -1,5 +1,5 @@
 ;;; cp51932.el -- translation table for CP51932. -*- no-byte-compile: t -*-
-;;; Automatically genrated from CP932-2BYTE.map
+;;; Automatically generated from CP932-2BYTE.map
 (let ((map
        '(;JISEXT<->UNICODE
          (#x2D21 . #x2460)
@@ -468,4 +468,3 @@
               (setcar x (cdr x)) (setcdr x tmp)))
         map)
   (define-translation-table 'cp51932-encode map))
-
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 9f6520c7238..2425ee46eea 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -858,9 +858,9 @@ Internal use only.  Should be called at startup time."
 (defun x-decompose-font-name (pattern)
   "Decompose PATTERN into XLFD fields and return a vector of the fields.
 The length of the vector is 12.
-The FOUNDRY and FAMILY fields are concatinated and stored in the first
+The FOUNDRY and FAMILY fields are concatenated and stored in the first
 element of the vector.
-The REGISTRY and ENCODING fields are concatinated and stored in the last
+The REGISTRY and ENCODING fields are concatenated and stored in the last
 element of the vector.
 
 Return nil if PATTERN doesn't conform to XLFD."
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 58a08f4506f..d078d98a480 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -703,13 +703,13 @@ If the value is nil, on decoding, don't treat the first two-byte as
 BOM, and on encoding, don't produce BOM bytes.
 
 If the value is t, on decoding, skip the first two-byte as BOM, and on
-encoding, produce BOM bytes accoding to the value of `:endian'.
+encoding, produce BOM bytes according to the value of `:endian'.
 
 If the value is cons, on decoding, check the first two-byte.  If they
 are 0xFE 0xFF, use the car part coding system of the value.  If they
 are 0xFF 0xFE, use the cdr part coding system of the value.
 Otherwise, treat them as bytes for a normal character.  On encoding,
-produce BOM bytes accoding to the value of `:endian'.
+produce BOM bytes according to the value of `:endian'.
 
 This attribute has a meaning only when `:coding-type' is `utf-16' or
 `utf-8'.
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 0ba0b9085b9..6614ac8b416 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -128,11 +128,11 @@ SPC, 1, 2, 3, or 4 specifing a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N
 \\<quail-translation-docstring>")
 
     ("chinese-punct-b5" "$(0O:(BB"
-     "Input method for Chinese punctuations and symbols of Big5
+     "Input method for Chinese punctuation and symbols of Big5
 \(`chinese-big5-1' and `chinese-big5-2').")
 
     ("chinese-punct" "$A1j(BG"
-     "Input method for Chinese punctuations and symbols of GB2312
+     "Input method for Chinese punctuation and symbols of GB2312
 \(`chinese-gb2312').")
 
     ("chinese-py-b5" "$(03<(BB"
@@ -801,36 +801,36 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
     (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y))))))
     (dolist (elt dic)
       (insert (format "(%S\t%S)\n" (car elt) (cdr elt))))
-    (let ((punctuations '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B")
-                          (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B")
-                          ("'" "$(0!e!d(B" "$(G!e!d(B")
-                          ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B")
-                          ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B")
-                          ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B")
-                          ("/" "$(0"_"a#L(B" "$(G"_"a#L(B")
-                          ("?" "$(0!)!4(B" "$(G!)!4(B")
-                          ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B")
-                          (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B")
-                          ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B")
-                          ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B")
-                          ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ")
-                          ("}" "$(0!C!a!E(B" "$(G!C!a!E(B")
-                          ("`" "$(0!j!k(B" "$(G!j!k(B")
-                          ("~" "$(0"D"+",!<!=(B" "$(G"D"+",!<!=(B")
-                          ("!" "$(0!*!5(B" "$(G!*!5(B")
-                          ("@" "$(0"i"n(B" "$(G"i"n(B")
-                          ("#" "$(0!l"-(B" "$(G!l"-(B")
-                          ("$" "$(0"c"l(B" "$(G"c"l(B")
-                          ("%" "$(0"h"m(B" "$(G"h"m(B")
-                          ("&" "$(0!m".(B" "$(G!m".(B")
-                          ("*" "$(0!n"/!o!w!x(B" "$(G!n"/!o!w!x(B")
-                          ("(" "$(0!>!^!@(B" "$(G!>!^!@(B")
-                          (")" "$(0!?!_!A(B" "$(G!?!_!A(B")
-                          ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B")
-                          ("_" "$(0"%"&(B" "$(G"%"&(B")
-                          ("=" "$(0"8"C(B" "$(G"8"C(B")
-                          ("+" "$(0"0"?(B" "$(G"0"?(B"))))
-    (dolist (elt punctuations)
+    (let ((punctuation '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B")
+                         (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B")
+                         ("'" "$(0!e!d(B" "$(G!e!d(B")
+                         ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B")
+                         ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B")
+                         ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B")
+                         ("/" "$(0"_"a#L(B" "$(G"_"a#L(B")
+                         ("?" "$(0!)!4(B" "$(G!)!4(B")
+                         ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B")
+                         (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B")
+                         ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B")
+                         ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B")
+                         ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ")
+                         ("}" "$(0!C!a!E(B" "$(G!C!a!E(B")
+                         ("`" "$(0!j!k(B" "$(G!j!k(B")
+                         ("~" "$(0"D"+",!<!=(B" "$(G"D"+",!<!=(B")
+                         ("!" "$(0!*!5(B" "$(G!*!5(B")
+                         ("@" "$(0"i"n(B" "$(G"i"n(B")
+                         ("#" "$(0!l"-(B" "$(G!l"-(B")
+                         ("$" "$(0"c"l(B" "$(G"c"l(B")
+                         ("%" "$(0"h"m(B" "$(G"h"m(B")
+                         ("&" "$(0!m".(B" "$(G!m".(B")
+                         ("*" "$(0!n"/!o!w!x(B" "$(G!n"/!o!w!x(B")
+                         ("(" "$(0!>!^!@(B" "$(G!>!^!@(B")
+                         (")" "$(0!?!_!A(B" "$(G!?!_!A(B")
+                         ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B")
+                         ("_" "$(0"%"&(B" "$(G"%"&(B")
+                         ("=" "$(0"8"C(B" "$(G"8"C(B")
+                         ("+" "$(0"0"?(B" "$(G"0"?(B"))))
+    (dolist (elt punctuation)
       (insert (format "(%S %S)\n" (concat "z" (car elt))
                       (if big5-p (nth 1 elt) (nth 2 elt))))))
     (insert ")\n")))
@@ -1017,7 +1017,7 @@ To input words of more than three letters, you type 4 keys, initials
 of the first three letters and the last letter.  For instance,
 \"bjdt\" inputs $A11>)5gJSL((B.
 
-To input symbols and punctuations, type `/' followed by one of `a' to
+To input symbols and punctuation, type `/' followed by one of `a' to
 `z', then select one of the candidates."))
     (insert "  '((\"\C-?\" . quail-delete-last-char)
    (\".\" . quail-next-translation)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 39ed7adc9c4..01dff91a1ff 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1438,12 +1438,7 @@ string.  NLINES has the same meaning as in `occur'."
   (interactive
    (list
     (cond
-     (isearch-word (concat "\\b" (replace-regexp-in-string
-                                  "\\W+" "\\W+"
-                                  (replace-regexp-in-string
-                                   "^\\W+\\|\\W+$" "" isearch-string)
-                                  nil t)
-                           "\\b"))
+     (isearch-word (word-search-regexp isearch-string))
      (isearch-regexp isearch-string)
      (t (regexp-quote isearch-string)))
     (if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
@@ -1548,7 +1543,10 @@ If search string is empty, just beep."
 (defun isearch-yank-x-selection ()
   "Pull current X selection into search string."
   (interactive)
-  (isearch-yank-string (x-get-selection)))
+  (isearch-yank-string (x-get-selection))
+  ;; If `x-get-selection' returned the text from the active region,
+  ;; then it "used" the mark which we should hence deactivate.
+  (when select-active-regions (deactivate-mark)))
 
 
 (defun isearch-mouse-2 (click)
@@ -1639,8 +1637,10 @@ Subword is used when `subword-mode' is activated. "
                    (if (and (eq case-fold-search t) search-upper-case)
                        (setq case-fold-search
                              (isearch-no-upper-case-p isearch-string isearch-regexp)))
-                   (looking-at (if isearch-regexp isearch-string
-                                 (regexp-quote isearch-string))))
+                   (looking-at (cond
+                                (isearch-word (word-search-regexp isearch-string t))
+                                (isearch-regexp isearch-string)
+                                (t (regexp-quote isearch-string)))))
                (error nil))
              (or isearch-yank-flag
                  (<= (match-end 0)
@@ -1872,7 +1872,7 @@ the bottom."
   (goto-char isearch-point))
 
 (defun isearch-reread-key-sequence-naturally (keylist)
-  "Reread key sequence KEYLIST with Isearch mode's keymap deactivated.
+  "Reread key sequence KEYLIST with an inactive Isearch-mode keymap.
 Return the key sequence as a string/vector."
   (isearch-unread-key-sequence keylist)
   (let (overriding-terminal-local-map)
@@ -2225,7 +2225,11 @@ If there is no completion possible, say so and continue searching."
                    (if nonincremental "search" "I-search")
                    (if isearch-forward "" " backward")
                    (if current-input-method
-                       (concat " [" current-input-method-title "]: ")
+                       ;; Input methods for RTL languages use RTL
+                       ;; characters for their title, and that messes
+                       ;; up the display of search text after the prompt.
+                       (bidi-string-mark-left-to-right
+                        (concat " [" current-input-method-title "]: "))
                      ": ")
                    )))
     (propertize (concat (upcase (substring m 0 1)) (substring m 1))
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 444f4d519da..1d93d981f8e 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -802,7 +802,7 @@ The 2nd and 3rd arguments BEGIN and END specify the region."
         (forward-char 1)
         (insert "}")))
 
-    ;; Special Ethiopic punctuations.
+    ;; Special Ethiopic punctuation.
     (goto-char (point-min))
     (while (re-search-forward "\\ce[»\\.\\?]\\|«\\ce" nil t)
       (cond
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 8458974e753..fd23bbb6d54 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -27,7 +27,7 @@
 
 ;;; History:
 ;; 1997.03.13 Modification in treatment of text properties;
-;;            Support for some special signs and punctuations.
+;;            Support for some special signs and punctuation.
 ;; 1999.10.25 Modification for a new composition way by K.Handa.
 
 ;;; Commentary:
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index a23645bae1f..1607868dea5 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -30,7 +30,7 @@
 
 ;;; History:
 
-;; 1997.03.13 Modification for special signs and punctuations.
+;; 1997.03.13 Modification for special signs and punctuation.
 
 ;;; Commentary:
 
@@ -44,7 +44,7 @@
 ;;;
 ;;;     00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
 ;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ; obsolete glyphs (2123-5)
-;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuations,
+;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuation,
 ;;;2140 $(7!@(B $(7!A(B $(7!B(B $(7!C(B $(7!D(B $(7!E(B $(7!F(B $(7!G(B $(7!H(B $(7!I(B $(7!J(B $(7!K(B $(7!L(B $(7!M(B $(7!N(B $(7!O(B ; Digits and
 ;;;2150 $(7!P(B $(7!Q(B $(7!R(B $(7!S(B $(7!T(B $(7!U(B $(7!V(B $(7!W(B $(7!X(B $(7!Y(B $(7!Z(B $(7![(B $(7!\(B $(7!](B $(7!^(B $(7!_(B ; Special signs.
 ;;;2160 $(7!`(B $(7!a(B $(7!b(B $(7!c(B $(7!d(B $(7!e(B $(7!f(B $(7!g(B $(7!h(B $(7!i(B $(7!j(B $(7!k(B $(7!l(B $(7!m(B $(7!n(B $(7!o(B ;
@@ -424,7 +424,7 @@
     ))
 
 ;;; alist for Tibetan composite vowels (long i, vocalic r, etc.)
-;;; New varialble. created by Tomabechi 2000/06/08
+;;; New variable. created by Tomabechi 2000/06/08
 (defconst tibetan-composite-vowel-alist
   '(;; LONG A
     ;; ("$(7"R(B" . ((bc . tc) ?$(7"R(B))
@@ -604,7 +604,7 @@ This also matches some punctuation characters which need conversion.")
 (defvar tibetan-decomposed-temp nil)
 
 ;; For automatic composition.
-(set-char-table-range 
+(set-char-table-range
  composition-function-table '(#xF00 . #xFD1)
  (list (vector tibetan-composable-pattern 0 'font-shape-gstring)))
 
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 7f595db4814..858cfa85a6f 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -5,7 +5,7 @@
 
 ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best
 ;;;;;;  5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5"
-;;;;;;  "play/5x5.el" (20119 34052))
+;;;;;;  "play/5x5.el" (20168 57844))
 ;;; Generated autoloads from play/5x5.el
 
 (autoload '5x5 "5x5" "\
@@ -68,7 +68,7 @@ should return a grid vector array that is the new solution.
 ;;;***
 
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload 'ada-add-extensions "ada-mode" "\
@@ -88,7 +88,7 @@ Ada mode is the major mode for editing Ada code.
 ;;;***
 
 ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from progmodes/ada-stmt.el
 
 (autoload 'ada-header "ada-stmt" "\
@@ -99,7 +99,7 @@ Insert a descriptive header at the top of the file.
 ;;;***
 
 ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el"
-;;;;;;  (20140 44371))
+;;;;;;  (20176 51947))
 ;;; Generated autoloads from progmodes/ada-xref.el
 
 (autoload 'ada-find-file "ada-xref" "\
@@ -114,7 +114,7 @@ Completion is available.
 ;;;;;;  add-change-log-entry-other-window add-change-log-entry find-change-log
 ;;;;;;  prompt-for-change-log-name add-log-mailing-address add-log-full-name
 ;;;;;;  add-log-current-defun-function) "add-log" "vc/add-log.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20033 22846))
 ;;; Generated autoloads from vc/add-log.el
 
 (put 'change-log-default-name 'safe-local-variable 'string-or-null-p)
@@ -253,7 +253,7 @@ old-style time formats for entries are supported.
 
 ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice
 ;;;;;;  ad-enable-advice ad-default-compilation-action ad-redefinition-action)
-;;;;;;  "advice" "emacs-lisp/advice.el" (20119 34052))
+;;;;;;  "advice" "emacs-lisp/advice.el" (20179 28130))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action 'warn "\
@@ -398,7 +398,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...)
 
 ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule
 ;;;;;;  align-highlight-rule align-current align-entire align-regexp
-;;;;;;  align) "align" "align.el" (20119 34052))
+;;;;;;  align) "align" "align.el" (20182 4358))
 ;;; Generated autoloads from align.el
 
 (autoload 'align "align" "\
@@ -489,7 +489,7 @@ A replacement function for `newline-and-indent', aligning as it goes.
 
 ;;;### (autoloads (outlineify-sticky allout-mode allout-mode-p allout-auto-activation
 ;;;;;;  allout-setup allout-auto-activation-helper) "allout" "allout.el"
-;;;;;;  (20126 50779))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from allout.el
 
 (autoload 'allout-auto-activation-helper "allout" "\
@@ -500,7 +500,7 @@ Intended to be used as the `allout-auto-activation' :set function.
 \(fn VAR VALUE)" nil nil)
 
 (autoload 'allout-setup "allout" "\
-Do fundamental emacs session for allout auto-activation.
+Do fundamental Emacs session for allout auto-activation.
 
 Establishes allout processing as part of visiting a file if
 `allout-auto-activation' is non-nil, or removes it otherwise.
@@ -600,7 +600,7 @@ Below is a description of the key bindings, and then description
 of special `allout-mode' features and terminology.  See also the
 outline menubar additions for quick reference to many of the
 features.  Customize `allout-auto-activation' to prepare your
-emacs session for automatic activation of `allout-mode'.
+Emacs session for automatic activation of `allout-mode'.
 
 The bindings are those listed in `allout-prefixed-keybindings'
 and `allout-unprefixed-keybindings'.  We recommend customizing
@@ -648,7 +648,7 @@ the HOT-SPOT Operation section.
 \\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for
             current topic
 \\[allout-rebullet-topic] `allout-rebullet-topic'   Reconcile bullets of topic and
-            its' offspring -- distinctive bullets are not changed, others
+            its offspring -- distinctive bullets are not changed, others
             are alternated according to nesting depth.
 \\[allout-number-siblings] `allout-number-siblings'  Number bullets of topic and siblings --
            the offspring are not affected.
@@ -658,12 +658,12 @@ the HOT-SPOT Operation section.
         ----------------------------------
 \\[allout-kill-topic] `allout-kill-topic'   Kill current topic, including offspring.
 \\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring.
-\\[allout-kill-line]     `allout-kill-line'    kill-line, attending to outline structure.
+\\[allout-kill-line]     `allout-kill-line'    Kill line, attending to outline structure.
 \\[allout-copy-line-as-kill]     `allout-copy-line-as-kill' Copy line but don't delete it.
 \\[allout-yank] `allout-yank'        Yank, adjusting depth of yanked topic to
                              depth of heading if yanking into bare topic
                              heading (ie, prefix sans text).
-\\[allout-yank-pop]     `allout-yank-pop'       Is to allout-yank as yank-pop is to yank
+\\[allout-yank-pop]     `allout-yank-pop'       Is to `allout-yank' as `yank-pop' is to `yank'.
 
         Topic-oriented Encryption:
         -------------------------
@@ -806,7 +806,7 @@ PREFIX-LEAD:
         When the PREFIX-LEAD is set to the comment-string of a
         programming language, outline structuring can be embedded in
         program code without interfering with processing of the text
-        (by emacs or the language processor) as program code.  This
+        (by Emacs or the language processor) as program code.  This
         setting happens automatically when allout mode is used in
         programming-mode buffers.  See `allout-use-mode-specific-leader'
         docstring for more detail.
@@ -818,8 +818,8 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
         `allout-distinctive-bullets-string'.  When creating a TOPIC,
         plain BULLETs are by default used, according to the DEPTH of the
         TOPIC.  Choice among the distinctive BULLETs is offered when you
-        provide a universal argugment (\\[universal-argument]) to the
-        TOPIC creation command, or when explictly rebulleting a TOPIC.  The
+        provide a universal argument (\\[universal-argument]) to the
+        TOPIC creation command, or when explicitly rebulleting a TOPIC.  The
         significance of the various distinctive bullets is purely by
         convention.  See the documentation for the above bullet strings for
         more details.
@@ -842,7 +842,7 @@ OPEN:	A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be.
 Activate outline mode and establish file var so it is started subsequently.
 
 See `allout-layout' and customization of `allout-auto-activation'
-for details on preparing emacs for automatic allout activation.
+for details on preparing Emacs for automatic allout activation.
 
 \(fn &optional ARG)" t nil)
 
@@ -850,7 +850,7 @@ for details on preparing emacs for automatic allout activation.
 
 ;;;### (autoloads (allout-widgets-mode allout-widgets-auto-activation
 ;;;;;;  allout-widgets-setup allout-widgets) "allout-widgets" "allout-widgets.el"
-;;;;;;  (20126 50769))
+;;;;;;  (20167 36967))
 ;;; Generated autoloads from allout-widgets.el
 
 (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads))))
@@ -910,7 +910,7 @@ outline hot-spot navigation (see `allout-mode').
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (20119 34052))
+;;;;;;  "net/ange-ftp.el" (20178 7273))
 ;;; Generated autoloads from net/ange-ftp.el
 
 (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
@@ -932,7 +932,7 @@ directory, so that Emacs will know its current contents.
 ;;;***
 
 ;;;### (autoloads (animate-birthday-present animate-sequence animate-string)
-;;;;;;  "animate" "play/animate.el" (20119 34052))
+;;;;;;  "animate" "play/animate.el" (20164 60780))
 ;;; Generated autoloads from play/animate.el
 
 (autoload 'animate-string "animate" "\
@@ -965,7 +965,7 @@ the buffer *Birthday-Present-for-Name*.
 ;;;***
 
 ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on)
-;;;;;;  "ansi-color" "ansi-color.el" (20119 34052))
+;;;;;;  "ansi-color" "ansi-color.el" (20164 60780))
 ;;; Generated autoloads from ansi-color.el
 
 (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\
@@ -991,7 +991,7 @@ This is a good function to put in `comint-output-filter-functions'.
 ;;;***
 
 ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules)
-;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (20119 34052))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (19890 42850))
 ;;; Generated autoloads from progmodes/antlr-mode.el
 
 (autoload 'antlr-show-makefile-rules "antlr-mode" "\
@@ -1027,7 +1027,7 @@ Used in `antlr-mode'.  Also a useful function in `java-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (appt-activate appt-add) "appt" "calendar/appt.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19956 37456))
 ;;; Generated autoloads from calendar/appt.el
 
 (autoload 'appt-add "appt" "\
@@ -1050,7 +1050,7 @@ ARG is positive, otherwise off.
 
 ;;;### (autoloads (apropos-documentation apropos-value apropos-library
 ;;;;;;  apropos apropos-documentation-property apropos-command apropos-variable
-;;;;;;  apropos-read-pattern) "apropos" "apropos.el" (20119 34052))
+;;;;;;  apropos-read-pattern) "apropos" "apropos.el" (20161 45793))
 ;;; Generated autoloads from apropos.el
 
 (autoload 'apropos-read-pattern "apropos" "\
@@ -1120,7 +1120,8 @@ Returns list of symbols and documentation found.
 (autoload 'apropos-library "apropos" "\
 List the variables and functions defined by library FILE.
 FILE should be one of the libraries currently loaded and should
-thus be found in `load-history'.
+thus be found in `load-history'.  If `apropos-do-all' is non-nil,
+the output includes key-bindings of commands.
 
 \(fn FILE)" t nil)
 
@@ -1132,7 +1133,9 @@ search for matches for that word as a substring.  If it is a list of words,
 search for matches for any two (or more) of those words.
 
 With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also looks
-at the function and at the names and values of properties.
+at function definitions (arguments, documentation and body) and at the
+names and values of properties.
+
 Returns list of symbols and values found.
 
 \(fn PATTERN &optional DO-ALL)" t nil)
@@ -1144,17 +1147,19 @@ or a regexp (using some regexp special characters).  If it is a word,
 search for matches for that word as a substring.  If it is a list of words,
 search for matches for any two (or more) of those words.
 
-With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also use
-documentation that is not stored in the documentation file and show key
-bindings.
+Note that by default this command only searches in the file specified by
+`internal-doc-file-name'; i.e., the etc/DOC file.  With \\[universal-argument] prefix,
+or if `apropos-do-all' is non-nil, it searches all currently defined
+documentation strings.
+
 Returns list of symbols and documentation found.
 
 \(fn PATTERN &optional DO-ALL)" t nil)
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20165
+;;;;;;  31925))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload 'archive-mode "arc-mode" "\
@@ -1174,7 +1179,7 @@ archive.
 
 ;;;***
 
-;;;### (autoloads (array-mode) "array" "array.el" (20119 34052))
+;;;### (autoloads (array-mode) "array" "array.el" (19845 45374))
 ;;; Generated autoloads from array.el
 
 (autoload 'array-mode "array" "\
@@ -1245,8 +1250,8 @@ Entering array mode calls the function `array-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20172
+;;;;;;  54913))
 ;;; Generated autoloads from textmodes/artist.el
 
 (autoload 'artist-mode "artist" "\
@@ -1452,8 +1457,8 @@ Keymap summary
 
 ;;;***
 
-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19890
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/asm-mode.el
 
 (autoload 'asm-mode "asm-mode" "\
@@ -1481,7 +1486,7 @@ Special commands:
 ;;;***
 
 ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20089 47591))
 ;;; Generated autoloads from gnus/auth-source.el
 
 (defvar auth-source-cache-expiry 7200 "\
@@ -1494,7 +1499,7 @@ let-binding.")
 ;;;***
 
 ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el"
-;;;;;;  (20126 50800))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from autoarg.el
 
 (defvar autoarg-mode nil "\
@@ -1555,7 +1560,7 @@ This is similar to `autoarg-mode' but rebinds the keypad keys
 ;;;***
 
 ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20163 39903))
 ;;; Generated autoloads from progmodes/autoconf.el
 
 (autoload 'autoconf-mode "autoconf" "\
@@ -1566,7 +1571,7 @@ Major mode for editing Autoconf configure.in files.
 ;;;***
 
 ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert)
-;;;;;;  "autoinsert" "autoinsert.el" (20126 50812))
+;;;;;;  "autoinsert" "autoinsert.el" (20127 62865))
 ;;; Generated autoloads from autoinsert.el
 
 (autoload 'auto-insert "autoinsert" "\
@@ -1606,7 +1611,7 @@ insert a template for the file depending on the mode of the buffer.
 
 ;;;### (autoloads (batch-update-autoloads update-directory-autoloads
 ;;;;;;  update-file-autoloads) "autoload" "emacs-lisp/autoload.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20173 35732))
 ;;; Generated autoloads from emacs-lisp/autoload.el
 
 (put 'generated-autoload-file 'safe-local-variable 'stringp)
@@ -1657,7 +1662,7 @@ should be non-nil).
 
 ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode
 ;;;;;;  auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode)
-;;;;;;  "autorevert" "autorevert.el" (20126 50846))
+;;;;;;  "autorevert" "autorevert.el" (20168 57844))
 ;;; Generated autoloads from autorevert.el
 
 (autoload 'auto-revert-mode "autorevert" "\
@@ -1746,7 +1751,7 @@ specifies in the mode line.
 ;;;***
 
 ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid"
-;;;;;;  "avoid.el" (20119 34052))
+;;;;;;  "avoid.el" (19845 45374))
 ;;; Generated autoloads from avoid.el
 
 (defvar mouse-avoidance-mode nil "\
@@ -1787,7 +1792,7 @@ definition of \"random distance\".)
 ;;;***
 
 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (20126 50857))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
 
@@ -1823,7 +1828,7 @@ seconds.
 ;;;***
 
 ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run)
-;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (20119 34052))
+;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (19981 40664))
 ;;; Generated autoloads from emacs-lisp/benchmark.el
 
 (autoload 'benchmark-run "benchmark" "\
@@ -1856,7 +1861,7 @@ For non-interactive use see also `benchmark-run' and
 ;;;***
 
 ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize)
-;;;;;;  "bibtex" "textmodes/bibtex.el" (20119 34052))
+;;;;;;  "bibtex" "textmodes/bibtex.el" (20174 10230))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload 'bibtex-initialize "bibtex" "\
@@ -1945,7 +1950,7 @@ A prefix arg negates the value of `bibtex-search-entry-globally'.
 ;;;***
 
 ;;;### (autoloads (bibtex-style-mode) "bibtex-style" "textmodes/bibtex-style.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19863 8742))
 ;;; Generated autoloads from textmodes/bibtex-style.el
 
 (autoload 'bibtex-style-mode "bibtex-style" "\
@@ -1957,10 +1962,11 @@ Major mode for editing BibTeX style files.
 
 ;;;### (autoloads (binhex-decode-region binhex-decode-region-external
 ;;;;;;  binhex-decode-region-internal) "binhex" "mail/binhex.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20174 10230))
 ;;; Generated autoloads from mail/binhex.el
 
-(defconst binhex-begin-line "^:...............................................................$")
+(defconst binhex-begin-line "^:...............................................................$" "\
+Regular expression matching the start of a BinHex encoded region.")
 
 (autoload 'binhex-decode-region-internal "binhex" "\
 Binhex decode region between START and END without using an external program.
@@ -1980,8 +1986,8 @@ Binhex decode region between START and END.
 
 ;;;***
 
-;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from play/blackbox.el
 
 (autoload 'blackbox "blackbox" "\
@@ -2104,7 +2110,7 @@ a reflection.
 ;;;;;;  bookmark-save bookmark-write bookmark-delete bookmark-insert
 ;;;;;;  bookmark-rename bookmark-insert-location bookmark-relocate
 ;;;;;;  bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark"
-;;;;;;  "bookmark.el" (20119 34052))
+;;;;;;  "bookmark.el" (20178 7273))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-r-map "b" 'bookmark-jump)
  (define-key ctl-x-r-map "m" 'bookmark-set)
@@ -2305,7 +2311,7 @@ Incremental search of bookmarks, hiding the non-matches as we go.
 ;;;;;;  browse-url-xdg-open browse-url-at-mouse browse-url-at-point
 ;;;;;;  browse-url browse-url-of-region browse-url-of-dired-file
 ;;;;;;  browse-url-of-buffer browse-url-of-file browse-url-browser-function)
-;;;;;;  "browse-url" "net/browse-url.el" (20126 51279))
+;;;;;;  "browse-url" "net/browse-url.el" (20168 57844))
 ;;; Generated autoloads from net/browse-url.el
 
 (defvar browse-url-browser-function 'browse-url-default-browser "\
@@ -2618,8 +2624,8 @@ from `browse-url-elinks-wrapper'.
 
 ;;;***
 
-;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (20165
+;;;;;;  31925))
 ;;; Generated autoloads from play/bruce.el
 
 (autoload 'bruce "bruce" "\
@@ -2635,7 +2641,7 @@ Return a vector containing the lines from `bruce-phrases-file'.
 ;;;***
 
 ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next)
-;;;;;;  "bs" "bs.el" (20140 44207))
+;;;;;;  "bs" "bs.el" (20161 45793))
 ;;; Generated autoloads from bs.el
 
 (autoload 'bs-cycle-next "bs" "\
@@ -2675,7 +2681,7 @@ name of buffer configuration.
 
 ;;;***
 
-;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (20119 34052))
+;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (20166 16092))
 ;;; Generated autoloads from play/bubbles.el
 
 (autoload 'bubbles "bubbles" "\
@@ -2697,7 +2703,7 @@ columns on its right towards the left.
 ;;;***
 
 ;;;### (autoloads (bug-reference-prog-mode bug-reference-mode) "bug-reference"
-;;;;;;  "progmodes/bug-reference.el" (20127 25733))
+;;;;;;  "progmodes/bug-reference.el" (20127 62865))
 ;;; Generated autoloads from progmodes/bug-reference.el
 
 (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format)))))
@@ -2721,7 +2727,7 @@ Like `bug-reference-mode', but only buttonize in comments and strings.
 ;;;;;;  batch-byte-compile-if-not-done display-call-tree byte-compile
 ;;;;;;  compile-defun byte-compile-file byte-recompile-directory
 ;;;;;;  byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning)
-;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (20119 34052))
+;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (20178 7273))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 (put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
 (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2841,8 +2847,8 @@ and corresponding effects.
 
 ;;;***
 
-;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (20119
-;;;;;;  34052))
+;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19885
+;;;;;;  24894))
 ;;; Generated autoloads from calendar/cal-china.el
 
 (put 'calendar-chinese-time-zone 'risky-local-variable t)
@@ -2851,7 +2857,7 @@ and corresponding effects.
 
 ;;;***
 
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (20119 34052))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19885 24894))
 ;;; Generated autoloads from calendar/cal-dst.el
 
 (put 'calendar-daylight-savings-starts 'risky-local-variable t)
@@ -2863,7 +2869,7 @@ and corresponding effects.
 ;;;***
 
 ;;;### (autoloads (calendar-hebrew-list-yahrzeits) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19885 24894))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 
 (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\
@@ -2879,8 +2885,8 @@ from the cursor position.
 
 ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle
 ;;;;;;  calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc
-;;;;;;  full-calc calc calc-dispatch) "calc" "calc/calc.el" (20119
-;;;;;;  34052))
+;;;;;;  full-calc calc calc-dispatch) "calc" "calc/calc.el" (20172
+;;;;;;  54913))
 ;;; Generated autoloads from calc/calc.el
  (define-key ctl-x-map "*" 'calc-dispatch)
 
@@ -2964,8 +2970,8 @@ See Info node `(calc)Defining Functions'.
 
 ;;;***
 
-;;;### (autoloads (calc-undo) "calc-undo" "calc/calc-undo.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (calc-undo) "calc-undo" "calc/calc-undo.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from calc/calc-undo.el
 
 (autoload 'calc-undo "calc-undo" "\
@@ -2975,8 +2981,8 @@ See Info node `(calc)Defining Functions'.
 
 ;;;***
 
-;;;### (autoloads (calculator) "calculator" "calculator.el" (20140
-;;;;;;  44219))
+;;;### (autoloads (calculator) "calculator" "calculator.el" (20141
+;;;;;;  9296))
 ;;; Generated autoloads from calculator.el
 
 (autoload 'calculator "calculator" "\
@@ -2988,7 +2994,7 @@ See the documentation for `calculator-mode' for more information.
 ;;;***
 
 ;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20141
-;;;;;;  25678))
+;;;;;;  9296))
 ;;; Generated autoloads from calendar/calendar.el
 
 (autoload 'calendar "calendar" "\
@@ -3032,7 +3038,7 @@ This function is suitable for execution in a .emacs file.
 ;;;***
 
 ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock"
-;;;;;;  "gnus/canlock.el" (20119 34052))
+;;;;;;  "gnus/canlock.el" (19845 45374))
 ;;; Generated autoloads from gnus/canlock.el
 
 (autoload 'canlock-insert-header "canlock" "\
@@ -3050,7 +3056,7 @@ it fails.
 ;;;***
 
 ;;;### (autoloads (capitalized-words-mode) "cap-words" "progmodes/cap-words.el"
-;;;;;;  (20127 25639))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from progmodes/cap-words.el
 
 (autoload 'capitalized-words-mode "cap-words" "\
@@ -3089,15 +3095,15 @@ Obsoletes `c-forward-into-nomenclature'.
 
 ;;;***
 
-;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (20119
-;;;;;;  34052))
+;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from progmodes/cc-compat.el
 (put 'c-indent-level 'safe-local-variable 'integerp)
 
 ;;;***
 
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (20139 28158))
+;;;;;;  (20172 54913))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3109,7 +3115,7 @@ Return the syntactic context of the current line.
 
 ;;;### (autoloads (c-guess-install c-guess-region-no-install c-guess-region
 ;;;;;;  c-guess-buffer-no-install c-guess-buffer c-guess-no-install
-;;;;;;  c-guess) "cc-guess" "progmodes/cc-guess.el" (20119 34052))
+;;;;;;  c-guess) "cc-guess" "progmodes/cc-guess.el" (19981 40664))
 ;;; Generated autoloads from progmodes/cc-guess.el
 
 (defvar c-guess-guessed-offsets-alist nil "\
@@ -3209,7 +3215,7 @@ the absolute file name of the file if STYLE-NAME is nil.
 
 ;;;### (autoloads (awk-mode pike-mode idl-mode java-mode objc-mode
 ;;;;;;  c++-mode c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (20138 48832))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -3386,7 +3392,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (20119 34052))
+;;;;;;  "progmodes/cc-styles.el" (19981 40664))
 ;;; Generated autoloads from progmodes/cc-styles.el
 
 (autoload 'c-set-style "cc-styles" "\
@@ -3437,7 +3443,7 @@ and exists only for compatibility reasons.
 
 ;;;***
 
-;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (20139 28158))
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (20167 36967))
 ;;; Generated autoloads from progmodes/cc-vars.el
 (put 'c-basic-offset 'safe-local-variable 'integerp)
 (put 'c-backslash-column 'safe-local-variable 'integerp)
@@ -3447,7 +3453,7 @@ and exists only for compatibility reasons.
 
 ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program
 ;;;;;;  declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19943 25429))
 ;;; Generated autoloads from international/ccl.el
 
 (autoload 'ccl-compile "ccl" "\
@@ -3708,7 +3714,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 ;;;***
 
 ;;;### (autoloads (cconv-closure-convert) "cconv" "emacs-lisp/cconv.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from emacs-lisp/cconv.el
 
 (autoload 'cconv-closure-convert "cconv" "\
@@ -3723,7 +3729,7 @@ Returns a form where all lambdas don't have any free variables.
 ;;;***
 
 ;;;### (autoloads (cfengine-auto-mode cfengine-mode cfengine3-mode)
-;;;;;;  "cfengine" "progmodes/cfengine.el" (20119 34052))
+;;;;;;  "cfengine" "progmodes/cfengine.el" (20168 57844))
 ;;; Generated autoloads from progmodes/cfengine.el
 
 (autoload 'cfengine3-mode "cfengine" "\
@@ -3753,7 +3759,7 @@ on the buffer contents
 ;;;***
 
 ;;;### (autoloads (check-declare-directory check-declare-file) "check-declare"
-;;;;;;  "emacs-lisp/check-declare.el" (20119 34052))
+;;;;;;  "emacs-lisp/check-declare.el" (19906 31087))
 ;;; Generated autoloads from emacs-lisp/check-declare.el
 
 (autoload 'check-declare-file "check-declare" "\
@@ -3778,7 +3784,7 @@ Returns non-nil if any false statements are found.
 ;;;;;;  checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer
 ;;;;;;  checkdoc-eval-current-buffer checkdoc-message-interactive
 ;;;;;;  checkdoc-interactive checkdoc checkdoc-list-of-strings-p)
-;;;;;;  "checkdoc" "emacs-lisp/checkdoc.el" (20127 23374))
+;;;;;;  "checkdoc" "emacs-lisp/checkdoc.el" (20168 57844))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 (put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp)
 (put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp)
@@ -3974,7 +3980,7 @@ checking of documentation strings.
 
 ;;;### (autoloads (pre-write-encode-hz post-read-decode-hz encode-hz-buffer
 ;;;;;;  encode-hz-region decode-hz-buffer decode-hz-region) "china-util"
-;;;;;;  "language/china-util.el" (20119 34052))
+;;;;;;  "language/china-util.el" (19845 45374))
 ;;; Generated autoloads from language/china-util.el
 
 (autoload 'decode-hz-region "china-util" "\
@@ -4012,7 +4018,7 @@ Encode the text in the current buffer to HZ.
 ;;;***
 
 ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command)
-;;;;;;  "chistory" "chistory.el" (20119 34052))
+;;;;;;  "chistory" "chistory.el" (19845 45374))
 ;;; Generated autoloads from chistory.el
 
 (autoload 'repeat-matching-complex-command "chistory" "\
@@ -4051,7 +4057,7 @@ and runs the normal hook `command-history-hook'.
 
 ;;;***
 
-;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (20138 48832))
+;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (20137 45833))
 ;;; Generated autoloads from emacs-lisp/cl.el
 
 (defvar custom-print-functions nil "\
@@ -4067,7 +4073,7 @@ a future Emacs interpreter will be able to use it.")
 ;;;***
 
 ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20170 64186))
 ;;; Generated autoloads from emacs-lisp/cl-indent.el
 
 (autoload 'common-lisp-indent-function "cl-indent" "\
@@ -4146,7 +4152,7 @@ For example, the function `case' has an indent property
 ;;;***
 
 ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from progmodes/cmacexp.el
 
 (autoload 'c-macro-expand "cmacexp" "\
@@ -4166,8 +4172,8 @@ For use inside Lisp programs, see also `c-macro-expansion'.
 
 ;;;***
 
-;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (20092
+;;;;;;  23754))
 ;;; Generated autoloads from cmuscheme.el
 
 (autoload 'run-scheme "cmuscheme" "\
@@ -4187,7 +4193,7 @@ is run).
 
 ;;;***
 
-;;;### (autoloads (color-name-to-rgb) "color" "color.el" (20119 34052))
+;;;### (autoloads (color-name-to-rgb) "color" "color.el" (20175 31160))
 ;;; Generated autoloads from color.el
 
 (autoload 'color-name-to-rgb "color" "\
@@ -4209,7 +4215,7 @@ If FRAME cannot display COLOR, return nil.
 ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
 ;;;;;;  comint-redirect-send-command-to-process comint-redirect-send-command
 ;;;;;;  comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;;  (20135 20784))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
@@ -4304,7 +4310,7 @@ REGEXP-GROUP is the regular expression group in REGEXP to use.
 ;;;***
 
 ;;;### (autoloads (compare-windows) "compare-w" "vc/compare-w.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from vc/compare-w.el
 
 (autoload 'compare-windows "compare-w" "\
@@ -4341,8 +4347,8 @@ on third call it again advances points to the next difference and so on.
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
 ;;;;;;  compile compilation-disable-input compile-command compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-start-hook
-;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (20127
-;;;;;;  25602))
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (20167
+;;;;;;  36967))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4522,7 +4528,7 @@ This is the value of `next-error-function' in Compilation buffers.
 ;;;***
 
 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from completion.el
 
 (defvar dynamic-completion-mode nil "\
@@ -4544,7 +4550,7 @@ Enable dynamic word-completion.
 ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode
 ;;;;;;  conf-space-keywords conf-space-mode conf-javaprop-mode conf-windows-mode
 ;;;;;;  conf-unix-mode conf-mode) "conf-mode" "textmodes/conf-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from textmodes/conf-mode.el
 
 (autoload 'conf-mode "conf-mode" "\
@@ -4700,7 +4706,7 @@ For details see `conf-mode'.  Example:
 ;;;***
 
 ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie)
-;;;;;;  "cookie1" "play/cookie1.el" (20119 34052))
+;;;;;;  "cookie1" "play/cookie1.el" (19845 45374))
 ;;; Generated autoloads from play/cookie1.el
 
 (autoload 'cookie "cookie1" "\
@@ -4732,8 +4738,8 @@ Randomly permute the elements of VECTOR (all permutations equally likely).
 ;;;***
 
 ;;;### (autoloads (copyright-update-directory copyright copyright-fix-years
-;;;;;;  copyright-update) "copyright" "emacs-lisp/copyright.el" (20119
-;;;;;;  34052))
+;;;;;;  copyright-update) "copyright" "emacs-lisp/copyright.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from emacs-lisp/copyright.el
 (put 'copyright-at-end-flag 'safe-local-variable 'booleanp)
 (put 'copyright-names-regexp 'safe-local-variable 'stringp)
@@ -4772,7 +4778,7 @@ If FIX is non-nil, run `copyright-fix-years' instead.
 ;;;***
 
 ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode)
-;;;;;;  "cperl-mode" "progmodes/cperl-mode.el" (20119 34052))
+;;;;;;  "cperl-mode" "progmodes/cperl-mode.el" (20178 7273))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 (put 'cperl-indent-level 'safe-local-variable 'integerp)
 (put 'cperl-brace-offset 'safe-local-variable 'integerp)
@@ -4971,7 +4977,7 @@ Run a `perldoc' on the word around point.
 ;;;***
 
 ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20104 14925))
 ;;; Generated autoloads from progmodes/cpp.el
 
 (autoload 'cpp-highlight-buffer "cpp" "\
@@ -4990,7 +4996,7 @@ Edit display information for cpp conditionals.
 ;;;***
 
 ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el"
-;;;;;;  (20140 44288))
+;;;;;;  (20161 45793))
 ;;; Generated autoloads from emulation/crisp.el
 
 (defvar crisp-mode nil "\
@@ -5016,7 +5022,7 @@ if ARG is omitted or nil.
 ;;;***
 
 ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emacs-lisp/crm.el
 
 (autoload 'completing-read-multiple "crm" "\
@@ -5051,8 +5057,8 @@ INHERIT-INPUT-METHOD.
 
 ;;;***
 
-;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (19978
+;;;;;;  37530))
 ;;; Generated autoloads from textmodes/css-mode.el
 
 (autoload 'css-mode "css-mode" "\
@@ -5063,7 +5069,7 @@ Major mode to edit Cascading Style Sheets.
 ;;;***
 
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (20128 38948))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -5123,7 +5129,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
 ;;;;;;  customize-mode customize customize-push-and-save customize-save-variable
 ;;;;;;  customize-set-variable customize-set-value custom-menu-sort-alphabetically
 ;;;;;;  custom-buffer-sort-alphabetically custom-browse-sort-alphabetically)
-;;;;;;  "cus-edit" "cus-edit.el" (20119 34052))
+;;;;;;  "cus-edit" "cus-edit.el" (20179 28130))
 ;;; Generated autoloads from cus-edit.el
 
 (defvar custom-browse-sort-alphabetically nil "\
@@ -5439,8 +5445,8 @@ The format is suitable for use with `easy-menu-define'.
 ;;;***
 
 ;;;### (autoloads (customize-themes describe-theme custom-theme-visit-theme
-;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (20119
-;;;;;;  34052))
+;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (20059
+;;;;;;  26455))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload 'customize-create-theme "cus-theme" "\
@@ -5472,7 +5478,7 @@ omitted, a buffer named *Custom Themes* is used.
 ;;;***
 
 ;;;### (autoloads (cvs-status-mode) "cvs-status" "vc/cvs-status.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20174 10230))
 ;;; Generated autoloads from vc/cvs-status.el
 
 (autoload 'cvs-status-mode "cvs-status" "\
@@ -5483,7 +5489,7 @@ Mode used for cvs status output.
 ;;;***
 
 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (20119 34052))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (20168 57844))
 ;;; Generated autoloads from progmodes/cwarn.el
 
 (autoload 'cwarn-mode "cwarn" "\
@@ -5532,7 +5538,7 @@ See `cwarn-mode' for more information on Cwarn mode.
 
 ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char
 ;;;;;;  cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from language/cyril-util.el
 
 (autoload 'cyrillic-encode-koi8-r-char "cyril-util" "\
@@ -5561,7 +5567,7 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
 
 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19989 34789))
 ;;; Generated autoloads from dabbrev.el
 (put 'dabbrev-case-fold-search 'risky-local-variable t)
 (put 'dabbrev-case-replace 'risky-local-variable t)
@@ -5608,7 +5614,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion].
 ;;;***
 
 ;;;### (autoloads (data-debug-new-buffer) "data-debug" "cedet/data-debug.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from cedet/data-debug.el
 
 (autoload 'data-debug-new-buffer "data-debug" "\
@@ -5618,8 +5624,8 @@ Create a new data-debug buffer with NAME.
 
 ;;;***
 
-;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20176
+;;;;;;  51947))
 ;;; Generated autoloads from net/dbus.el
 
 (autoload 'dbus-handle-event "dbus" "\
@@ -5632,8 +5638,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message.
 
 ;;;***
 
-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20162
+;;;;;;  63140))
 ;;; Generated autoloads from progmodes/dcl-mode.el
 
 (autoload 'dcl-mode "dcl-mode" "\
@@ -5677,7 +5683,7 @@ Variables controlling indentation style and extra features:
  dcl-block-begin-regexp
  dcl-block-end-regexp
     Regexps that match command lines that begin and end, respectively,
-    a block of commmand lines that will be given extra indentation.
+    a block of command lines that will be given extra indentation.
     Command lines between THEN-ELSE-ENDIF are always indented; these variables
     make it possible to define other places to indent.
     Set to nil to disable this feature.
@@ -5760,7 +5766,7 @@ There is some minimal font-lock support (see vars
 ;;;***
 
 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (20119 34052))
+;;;;;;  "emacs-lisp/debug.el" (20098 62550))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger 'debug)
@@ -5804,7 +5810,7 @@ To specify a nil argument interactively, exit with an empty minibuffer.
 ;;;***
 
 ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20164 60780))
 ;;; Generated autoloads from play/decipher.el
 
 (autoload 'decipher "decipher" "\
@@ -5833,8 +5839,8 @@ The most useful commands are:
 ;;;***
 
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (20119
-;;;;;;  34052))
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (20154
+;;;;;;  24929))
 ;;; Generated autoloads from delim-col.el
 
 (autoload 'delimit-columns-customize "delim-col" "\
@@ -5858,8 +5864,8 @@ START and END delimits the corners of text rectangle.
 
 ;;;***
 
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (20153
+;;;;;;  32900))
 ;;; Generated autoloads from progmodes/delphi.el
 
 (autoload 'delphi-mode "delphi" "\
@@ -5910,8 +5916,8 @@ with no args, if that value is non-nil.
 
 ;;;***
 
-;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (20126
-;;;;;;  50889))
+;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from delsel.el
 
 (defalias 'pending-delete-mode 'delete-selection-mode)
@@ -5941,7 +5947,7 @@ any selection.
 ;;;***
 
 ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;;  "derived" "emacs-lisp/derived.el" (20134 8296))
+;;;;;;  "derived" "emacs-lisp/derived.el" (20137 12290))
 ;;; Generated autoloads from emacs-lisp/derived.el
 
 (autoload 'define-derived-mode "derived" "\
@@ -6008,7 +6014,7 @@ the first time the mode is used.
 ;;;***
 
 ;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;;  "descr-text.el" (20127 27092))
+;;;;;;  "descr-text.el" (20170 13157))
 ;;; Generated autoloads from descr-text.el
 
 (autoload 'describe-text-properties "descr-text" "\
@@ -6036,7 +6042,7 @@ as well as widgets, buttons, overlays, and text properties.
 ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
 ;;;;;;  desktop-load-default desktop-read desktop-remove desktop-save
 ;;;;;;  desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
-;;;;;;  "desktop.el" (20126 50898))
+;;;;;;  "desktop.el" (20165 31925))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -6223,7 +6229,7 @@ Revert to the last loaded desktop.
 
 ;;;### (autoloads (gnus-article-outlook-deuglify-article gnus-outlook-deuglify-article
 ;;;;;;  gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines)
-;;;;;;  "deuglify" "gnus/deuglify.el" (20119 34052))
+;;;;;;  "deuglify" "gnus/deuglify.el" (19845 45374))
 ;;; Generated autoloads from gnus/deuglify.el
 
 (autoload 'gnus-article-outlook-unwrap-lines "deuglify" "\
@@ -6256,7 +6262,7 @@ Deuglify broken Outlook (Express) articles and redisplay.
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (20119 34052))
+;;;;;;  "calendar/diary-lib.el" (20168 57844))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload 'diary "diary-lib" "\
@@ -6299,7 +6305,7 @@ Major mode for editing the diary file.
 ;;;***
 
 ;;;### (autoloads (diff-buffer-with-file diff-backup diff diff-command
-;;;;;;  diff-switches) "diff" "vc/diff.el" (20119 34052))
+;;;;;;  diff-switches) "diff" "vc/diff.el" (19999 41597))
 ;;; Generated autoloads from vc/diff.el
 
 (defvar diff-switches (purecopy "-c") "\
@@ -6343,7 +6349,7 @@ This requires the external program `diff' to be in your `exec-path'.
 ;;;***
 
 ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el"
-;;;;;;  (20127 23725))
+;;;;;;  (20181 13366))
 ;;; Generated autoloads from vc/diff-mode.el
 
 (autoload 'diff-mode "diff-mode" "\
@@ -6375,7 +6381,7 @@ the mode if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads (dig) "dig" "net/dig.el" (20119 34052))
+;;;### (autoloads (dig) "dig" "net/dig.el" (19845 45374))
 ;;; Generated autoloads from net/dig.el
 
 (autoload 'dig "dig" "\
@@ -6387,7 +6393,7 @@ Optional arguments are passed to `dig-invoke'.
 ;;;***
 
 ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window
-;;;;;;  dired dired-listing-switches) "dired" "dired.el" (20140 44600))
+;;;;;;  dired dired-listing-switches) "dired" "dired.el" (20167 36967))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6509,7 +6515,7 @@ Keybindings:
 ;;;***
 
 ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el"
-;;;;;;  (20126 50922))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from dirtrack.el
 
 (autoload 'dirtrack-mode "dirtrack" "\
@@ -6539,8 +6545,8 @@ function `dirtrack-debug-mode' to turn on debugging output.
 
 ;;;***
 
-;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (19931
+;;;;;;  11784))
 ;;; Generated autoloads from emacs-lisp/disass.el
 
 (autoload 'disassemble "disass" "\
@@ -6559,7 +6565,7 @@ redefine OBJECT if it is a symbol.
 ;;;;;;  standard-display-g1 standard-display-ascii standard-display-default
 ;;;;;;  standard-display-8bit describe-current-display-table describe-display-table
 ;;;;;;  set-display-table-slot display-table-slot make-display-table)
-;;;;;;  "disp-table" "disp-table.el" (20119 34052))
+;;;;;;  "disp-table" "disp-table.el" (19984 16846))
 ;;; Generated autoloads from disp-table.el
 
 (autoload 'make-display-table "disp-table" "\
@@ -6681,7 +6687,7 @@ in `.emacs'.
 ;;;***
 
 ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from play/dissociate.el
 
 (autoload 'dissociated-press "dissociate" "\
@@ -6697,7 +6703,7 @@ Default is 2.
 
 ;;;***
 
-;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (20119 34052))
+;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19886 45771))
 ;;; Generated autoloads from dnd.el
 
 (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\
@@ -6718,7 +6724,7 @@ if some action was made, or nil if the URL is ignored.")
 ;;;***
 
 ;;;### (autoloads (dns-mode-soa-increment-serial dns-mode) "dns-mode"
-;;;;;;  "textmodes/dns-mode.el" (20119 34052))
+;;;;;;  "textmodes/dns-mode.el" (19845 45374))
 ;;; Generated autoloads from textmodes/dns-mode.el
 
 (autoload 'dns-mode "dns-mode" "\
@@ -6742,8 +6748,8 @@ Locate SOA record and increment the serial field.
 ;;;***
 
 ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe
-;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20139
-;;;;;;  28158))
+;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20172
+;;;;;;  54913))
 ;;; Generated autoloads from doc-view.el
 
 (autoload 'doc-view-mode-p "doc-view" "\
@@ -6789,7 +6795,7 @@ See the command `doc-view-mode' for more information on this mode.
 
 ;;;***
 
-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (20119 34052))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (20077 56412))
 ;;; Generated autoloads from play/doctor.el
 
 (autoload 'doctor "doctor" "\
@@ -6799,7 +6805,7 @@ Switch to *doctor* buffer and start giving psychotherapy.
 
 ;;;***
 
-;;;### (autoloads (double-mode) "double" "double.el" (20126 50942))
+;;;### (autoloads (double-mode) "double" "double.el" (20127 62865))
 ;;; Generated autoloads from double.el
 
 (autoload 'double-mode "double" "\
@@ -6815,7 +6821,7 @@ strings when pressed twice.  See `double-map' for details.
 
 ;;;***
 
-;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (20119 34052))
+;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (19845 45374))
 ;;; Generated autoloads from play/dunnet.el
 
 (autoload 'dunnet "dunnet" "\
@@ -6827,7 +6833,7 @@ Switch to *dungeon* buffer and start game.
 
 ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
 ;;;;;;  define-globalized-minor-mode define-minor-mode) "easy-mmode"
-;;;;;;  "emacs-lisp/easy-mmode.el" (20136 49226))
+;;;;;;  "emacs-lisp/easy-mmode.el" (20179 28130))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
@@ -6938,8 +6944,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX).
 ;;;***
 
 ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define
-;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (20119
-;;;;;;  34052))
+;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from emacs-lisp/easymenu.el
 
 (autoload 'easy-menu-define "easymenu" "\
@@ -7093,7 +7099,7 @@ To implement dynamic menus, either call this from
 ;;;;;;  ebnf-eps-file ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer
 ;;;;;;  ebnf-spool-file ebnf-spool-directory ebnf-print-region ebnf-print-buffer
 ;;;;;;  ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps"
-;;;;;;  "progmodes/ebnf2ps.el" (20119 34052))
+;;;;;;  "progmodes/ebnf2ps.el" (20166 16092))
 ;;; Generated autoloads from progmodes/ebnf2ps.el
 
 (autoload 'ebnf-customize "ebnf2ps" "\
@@ -7367,8 +7373,8 @@ See `ebnf-style-database' documentation.
 ;;;;;;  ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition
 ;;;;;;  ebrowse-tags-view-definition ebrowse-tags-find-declaration
 ;;;;;;  ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree
-;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (20119
-;;;;;;  34052))
+;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (20104
+;;;;;;  14925))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload 'ebrowse-tree-mode "ebrowse" "\
@@ -7517,7 +7523,7 @@ Display statistics for a class tree.
 ;;;***
 
 ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20104 14925))
 ;;; Generated autoloads from ebuff-menu.el
 
 (autoload 'electric-buffer-list "ebuff-menu" "\
@@ -7542,7 +7548,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
 ;;;***
 
 ;;;### (autoloads (Electric-command-history-redo-expression) "echistory"
-;;;;;;  "echistory.el" (20119 34052))
+;;;;;;  "echistory.el" (19886 45771))
 ;;; Generated autoloads from echistory.el
 
 (autoload 'Electric-command-history-redo-expression "echistory" "\
@@ -7554,7 +7560,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
 ;;;***
 
 ;;;### (autoloads (ecomplete-setup) "ecomplete" "gnus/ecomplete.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20110 24804))
 ;;; Generated autoloads from gnus/ecomplete.el
 
 (autoload 'ecomplete-setup "ecomplete" "\
@@ -7564,7 +7570,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
 
 ;;;***
 
-;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20131 35255))
+;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20168 57844))
 ;;; Generated autoloads from cedet/ede.el
 
 (defvar global-ede-mode nil "\
@@ -7591,7 +7597,7 @@ an EDE controlled project.
 
 ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form
 ;;;;;;  edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug"
-;;;;;;  "emacs-lisp/edebug.el" (20119 34052))
+;;;;;;  "emacs-lisp/edebug.el" (20166 16092))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -7664,7 +7670,7 @@ Toggle edebugging of all forms.
 ;;;;;;  ediff-merge-directories-with-ancestor ediff-merge-directories
 ;;;;;;  ediff-directories3 ediff-directory-revisions ediff-directories
 ;;;;;;  ediff-buffers3 ediff-buffers ediff-backup ediff-current-file
-;;;;;;  ediff-files3 ediff-files) "ediff" "vc/ediff.el" (20119 34052))
+;;;;;;  ediff-files3 ediff-files) "ediff" "vc/ediff.el" (19996 8027))
 ;;; Generated autoloads from vc/ediff.el
 
 (autoload 'ediff-files "ediff" "\
@@ -7896,7 +7902,7 @@ With optional NODE, goes to that node.
 ;;;***
 
 ;;;### (autoloads (ediff-customize) "ediff-help" "vc/ediff-help.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from vc/ediff-help.el
 
 (autoload 'ediff-customize "ediff-help" "\
@@ -7907,7 +7913,7 @@ With optional NODE, goes to that node.
 ;;;***
 
 ;;;### (autoloads (ediff-show-registry) "ediff-mult" "vc/ediff-mult.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from vc/ediff-mult.el
 
 (autoload 'ediff-show-registry "ediff-mult" "\
@@ -7920,7 +7926,7 @@ Display Ediff's registry.
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "vc/ediff-util.el" (20140 44390))
+;;;;;;  "ediff-util" "vc/ediff-util.el" (20175 31160))
 ;;; Generated autoloads from vc/ediff-util.el
 
 (autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -7941,7 +7947,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see.
 
 ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro
 ;;;;;;  edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from edmacro.el
 
 (autoload 'edit-kbd-macro "edmacro" "\
@@ -7990,7 +7996,7 @@ or nil, use a compact 80-column format.
 ;;;***
 
 ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt"
-;;;;;;  "emulation/edt.el" (20140 44303))
+;;;;;;  "emulation/edt.el" (20154 24929))
 ;;; Generated autoloads from emulation/edt.el
 
 (autoload 'edt-set-scroll-margins "edt" "\
@@ -8008,7 +8014,7 @@ Turn on EDT Emulation.
 ;;;***
 
 ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19865 50420))
 ;;; Generated autoloads from ehelp.el
 
 (autoload 'with-electric-help "ehelp" "\
@@ -8045,7 +8051,7 @@ BUFFER is put back into its original major mode.
 ;;;***
 
 ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string)
-;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (20127 23532))
+;;;;;;  "eldoc" "emacs-lisp/eldoc.el" (20161 45793))
 ;;; Generated autoloads from emacs-lisp/eldoc.el
 
 (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\
@@ -8092,11 +8098,15 @@ Emacs Lisp mode) that support ElDoc.")
 ;;;***
 
 ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode)
-;;;;;;  "electric" "electric.el" (20126 50965))
+;;;;;;  "electric" "electric.el" (20168 57844))
 ;;; Generated autoloads from electric.el
 
 (defvar electric-indent-chars '(10) "\
-Characters that should cause automatic reindentation.")
+Characters that should cause automatic reindentation.
+Each entry of the list can be either a character or a cons of the
+form (CHAR . PREDICATE) which means that CHAR should cause reindentation
+only if PREDICATE returns non-nil.  PREDICATE is called with no arguments
+and with point before the inserted char.")
 
 (defvar electric-indent-mode nil "\
 Non-nil if Electric-Indent mode is enabled.
@@ -8156,8 +8166,8 @@ Automatically insert newlines around some chars.
 
 ;;;***
 
-;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from elide-head.el
 
 (autoload 'elide-head "elide-head" "\
@@ -8174,7 +8184,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks.
 
 ;;;### (autoloads (elint-initialize elint-defun elint-current-buffer
 ;;;;;;  elint-directory elint-file) "elint" "emacs-lisp/elint.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20172 54913))
 ;;; Generated autoloads from emacs-lisp/elint.el
 
 (autoload 'elint-file "elint" "\
@@ -8210,8 +8220,8 @@ optional prefix argument REINIT is non-nil.
 ;;;***
 
 ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
-;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (20119
-;;;;;;  34052))
+;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (19981
+;;;;;;  40664))
 ;;; Generated autoloads from emacs-lisp/elp.el
 
 (autoload 'elp-instrument-function "elp" "\
@@ -8246,7 +8256,7 @@ displayed.
 ;;;***
 
 ;;;### (autoloads (emacs-lock-mode) "emacs-lock" "emacs-lock.el"
-;;;;;;  (20126 50977))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from emacs-lock.el
 
 (autoload 'emacs-lock-mode "emacs-lock" "\
@@ -8274,7 +8284,7 @@ Other values are interpreted as usual.
 ;;;***
 
 ;;;### (autoloads (report-emacs-bug-query-existing-bugs report-emacs-bug)
-;;;;;;  "emacsbug" "mail/emacsbug.el" (20119 34052))
+;;;;;;  "emacsbug" "mail/emacsbug.el" (20093 44623))
 ;;; Generated autoloads from mail/emacsbug.el
 
 (autoload 'report-emacs-bug "emacsbug" "\
@@ -8295,7 +8305,7 @@ The result is an alist with items of the form (URL SUBJECT NO).
 ;;;;;;  emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote
 ;;;;;;  emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor
 ;;;;;;  emerge-buffers emerge-files-with-ancestor emerge-files) "emerge"
-;;;;;;  "vc/emerge.el" (20140 44401))
+;;;;;;  "vc/emerge.el" (20141 9296))
 ;;; Generated autoloads from vc/emerge.el
 
 (autoload 'emerge-files "emerge" "\
@@ -8356,7 +8366,7 @@ Emerge two RCS revisions of a file, with another revision as ancestor.
 ;;;***
 
 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "textmodes/enriched.el" (20127 24788))
+;;;;;;  "enriched" "textmodes/enriched.el" (19845 45374))
 ;;; Generated autoloads from textmodes/enriched.el
 
 (autoload 'enriched-mode "enriched" "\
@@ -8391,8 +8401,8 @@ Commands:
 ;;;;;;  epa-sign-region epa-verify-cleartext-in-region epa-verify-region
 ;;;;;;  epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file
 ;;;;;;  epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys
-;;;;;;  epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20119
-;;;;;;  34052))
+;;;;;;  epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20104
+;;;;;;  14925))
 ;;; Generated autoloads from epa.el
 
 (autoload 'epa-list-keys "epa" "\
@@ -8570,7 +8580,7 @@ Insert selected KEYS after the point.
 ;;;***
 
 ;;;### (autoloads (epa-dired-do-encrypt epa-dired-do-sign epa-dired-do-verify
-;;;;;;  epa-dired-do-decrypt) "epa-dired" "epa-dired.el" (20119 34052))
+;;;;;;  epa-dired-do-decrypt) "epa-dired" "epa-dired.el" (19865 50420))
 ;;; Generated autoloads from epa-dired.el
 
 (autoload 'epa-dired-do-decrypt "epa-dired" "\
@@ -8596,7 +8606,7 @@ Encrypt marked files.
 ;;;***
 
 ;;;### (autoloads (epa-file-disable epa-file-enable epa-file-handler)
-;;;;;;  "epa-file" "epa-file.el" (20119 34052))
+;;;;;;  "epa-file" "epa-file.el" (20038 20303))
 ;;; Generated autoloads from epa-file.el
 
 (autoload 'epa-file-handler "epa-file" "\
@@ -8618,7 +8628,7 @@ Encrypt marked files.
 
 ;;;### (autoloads (epa-global-mail-mode epa-mail-import-keys epa-mail-encrypt
 ;;;;;;  epa-mail-sign epa-mail-verify epa-mail-decrypt epa-mail-mode)
-;;;;;;  "epa-mail" "epa-mail.el" (20119 34052))
+;;;;;;  "epa-mail" "epa-mail.el" (20043 38232))
 ;;; Generated autoloads from epa-mail.el
 
 (autoload 'epa-mail-mode "epa-mail" "\
@@ -8682,7 +8692,7 @@ Minor mode to hook EasyPG into Mail mode.
 
 ;;;***
 
-;;;### (autoloads (epg-make-context) "epg" "epg.el" (20119 34052))
+;;;### (autoloads (epg-make-context) "epg" "epg.el" (20172 54913))
 ;;; Generated autoloads from epg.el
 
 (autoload 'epg-make-context "epg" "\
@@ -8693,7 +8703,7 @@ Return a context object.
 ;;;***
 
 ;;;### (autoloads (epg-expand-group epg-check-configuration epg-configuration)
-;;;;;;  "epg-config" "epg-config.el" (20119 34052))
+;;;;;;  "epg-config" "epg-config.el" (19845 45374))
 ;;; Generated autoloads from epg-config.el
 
 (autoload 'epg-configuration "epg-config" "\
@@ -8714,7 +8724,7 @@ Look at CONFIG and try to expand GROUP.
 ;;;***
 
 ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc"
-;;;;;;  "erc/erc.el" (20127 26333))
+;;;;;;  "erc/erc.el" (20172 54913))
 ;;; Generated autoloads from erc/erc.el
 
 (autoload 'erc-select-read-args "erc" "\
@@ -8756,33 +8766,33 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
 
 ;;;***
 
-;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (20119
-;;;;;;  34052))
+;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (20161
+;;;;;;  45793))
 ;;; Generated autoloads from erc/erc-autoaway.el
  (autoload 'erc-autoaway-mode "erc-autoaway")
 
 ;;;***
 
-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (20119 34052))
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (20093 44623))
 ;;; Generated autoloads from erc/erc-button.el
  (autoload 'erc-button-mode "erc-button" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (20119 34052))
+;;;### (autoloads nil "erc-capab" "erc/erc-capab.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-capab.el
  (autoload 'erc-capab-identify-mode "erc-capab" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (20119 34052))
+;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-compat.el
  (autoload 'erc-define-minor-mode "erc-compat")
 
 ;;;***
 
 ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC)
-;;;;;;  "erc-dcc" "erc/erc-dcc.el" (20119 34052))
+;;;;;;  "erc-dcc" "erc/erc-dcc.el" (20179 28130))
 ;;; Generated autoloads from erc/erc-dcc.el
  (autoload 'erc-dcc-mode "erc-dcc")
 
@@ -8815,7 +8825,7 @@ that subcommand.
 ;;;;;;  erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list
 ;;;;;;  erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action
 ;;;;;;  erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from erc/erc-ezbounce.el
 
 (autoload 'erc-cmd-ezb "erc-ezbounce" "\
@@ -8878,7 +8888,7 @@ Add EZBouncer convenience functions to ERC.
 ;;;***
 
 ;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (20127
-;;;;;;  26298))
+;;;;;;  62865))
 ;;; Generated autoloads from erc/erc-fill.el
  (autoload 'erc-fill-mode "erc-fill" nil t)
 
@@ -8891,7 +8901,7 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'.
 ;;;***
 
 ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd"
-;;;;;;  "erc/erc-identd.el" (20119 34052))
+;;;;;;  "erc/erc-identd.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-identd.el
  (autoload 'erc-identd-mode "erc-identd")
 
@@ -8913,7 +8923,7 @@ system.
 ;;;***
 
 ;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from erc/erc-imenu.el
 
 (autoload 'erc-create-imenu-index "erc-imenu" "\
@@ -8923,20 +8933,20 @@ system.
 
 ;;;***
 
-;;;### (autoloads nil "erc-join" "erc/erc-join.el" (20119 34052))
+;;;### (autoloads nil "erc-join" "erc/erc-join.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-join.el
  (autoload 'erc-autojoin-mode "erc-join" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-list" "erc/erc-list.el" (20119 34052))
+;;;### (autoloads nil "erc-list" "erc/erc-list.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-list.el
  (autoload 'erc-list-mode "erc-list")
 
 ;;;***
 
 ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log"
-;;;;;;  "erc/erc-log.el" (20119 34052))
+;;;;;;  "erc/erc-log.el" (20168 57844))
 ;;; Generated autoloads from erc/erc-log.el
  (autoload 'erc-log-mode "erc-log" nil t)
 
@@ -8944,7 +8954,7 @@ system.
 Return non-nil if logging is enabled for BUFFER.
 If BUFFER is nil, the value of `current-buffer' is used.
 Logging is enabled if `erc-log-channels-directory' is non-nil, the directory
-is writeable (it will be created as necessary) and
+is writable (it will be created as necessary) and
 `erc-enable-logging' returns a non-nil value.
 
 \(fn &optional BUFFER)" nil nil)
@@ -8968,7 +8978,7 @@ You can save every individual message by putting this function on
 ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host
 ;;;;;;  erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool
 ;;;;;;  erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from erc/erc-match.el
  (autoload 'erc-match-mode "erc-match")
 
@@ -9014,14 +9024,14 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'.
 
 ;;;***
 
-;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (20119 34052))
+;;;### (autoloads nil "erc-menu" "erc/erc-menu.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-menu.el
  (autoload 'erc-menu-mode "erc-menu" nil t)
 
 ;;;***
 
 ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from erc/erc-netsplit.el
  (autoload 'erc-netsplit-mode "erc-netsplit")
 
@@ -9033,7 +9043,7 @@ Show who's gone.
 ;;;***
 
 ;;;### (autoloads (erc-server-select erc-determine-network) "erc-networks"
-;;;;;;  "erc/erc-networks.el" (20119 34052))
+;;;;;;  "erc/erc-networks.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-networks.el
 
 (autoload 'erc-determine-network "erc-networks" "\
@@ -9051,13 +9061,13 @@ Interactively select a server to connect to using `erc-server-alist'.
 ;;;***
 
 ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify"
-;;;;;;  "erc/erc-notify.el" (20119 34052))
+;;;;;;  "erc/erc-notify.el" (20161 45793))
 ;;; Generated autoloads from erc/erc-notify.el
  (autoload 'erc-notify-mode "erc-notify" nil t)
 
 (autoload 'erc-cmd-NOTIFY "erc-notify" "\
 Change `erc-notify-list' or list current notify-list members online.
-Without args, list the current list of notificated people online,
+Without args, list the current list of notified people online,
 with args, toggle notify status of people.
 
 \(fn &rest ARGS)" nil nil)
@@ -9069,33 +9079,33 @@ with args, toggle notify status of people.
 
 ;;;***
 
-;;;### (autoloads nil "erc-page" "erc/erc-page.el" (20119 34052))
+;;;### (autoloads nil "erc-page" "erc/erc-page.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-page.el
  (autoload 'erc-page-mode "erc-page")
 
 ;;;***
 
-;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (20119
-;;;;;;  34052))
+;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19936
+;;;;;;  52203))
 ;;; Generated autoloads from erc/erc-pcomplete.el
  (autoload 'erc-completion-mode "erc-pcomplete" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (20119 34052))
+;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-replace.el
  (autoload 'erc-replace-mode "erc-replace")
 
 ;;;***
 
-;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (20119 34052))
+;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-ring.el
  (autoload 'erc-ring-mode "erc-ring" nil t)
 
 ;;;***
 
 ;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode)
-;;;;;;  "erc-services" "erc/erc-services.el" (20119 34052))
+;;;;;;  "erc-services" "erc/erc-services.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-services.el
  (autoload 'erc-services-mode "erc-services" nil t)
 
@@ -9112,14 +9122,14 @@ When called interactively, read the password using `read-passwd'.
 
 ;;;***
 
-;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (20119 34052))
+;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-sound.el
  (autoload 'erc-sound-mode "erc-sound")
 
 ;;;***
 
 ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from erc/erc-speedbar.el
 
 (autoload 'erc-speedbar-browser "erc-speedbar" "\
@@ -9130,21 +9140,21 @@ This will add a speedbar major display mode.
 
 ;;;***
 
-;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (20119
-;;;;;;  34052))
+;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from erc/erc-spelling.el
  (autoload 'erc-spelling-mode "erc-spelling" nil t)
 
 ;;;***
 
-;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (20119 34052))
+;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-stamp.el
  (autoload 'erc-timestamp-mode "erc-stamp" nil t)
 
 ;;;***
 
 ;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el"
-;;;;;;  (20127 26257))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from erc/erc-track.el
 
 (defvar erc-track-minor-mode nil "\
@@ -9170,7 +9180,7 @@ keybindings will not do anything useful.
 ;;;***
 
 ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size)
-;;;;;;  "erc-truncate" "erc/erc-truncate.el" (20119 34052))
+;;;;;;  "erc-truncate" "erc/erc-truncate.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-truncate.el
  (autoload 'erc-truncate-mode "erc-truncate" nil t)
 
@@ -9190,7 +9200,7 @@ Meant to be used in hooks, like `erc-insert-post-hook'.
 ;;;***
 
 ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from erc/erc-xdcc.el
  (autoload 'erc-xdcc-mode "erc-xdcc")
 
@@ -9203,7 +9213,7 @@ Add a file to `erc-xdcc-files'.
 
 ;;;### (autoloads (ert-describe-test ert-run-tests-interactively
 ;;;;;;  ert-run-tests-batch-and-exit ert-run-tests-batch ert-deftest)
-;;;;;;  "ert" "emacs-lisp/ert.el" (20123 28776))
+;;;;;;  "ert" "emacs-lisp/ert.el" (20168 57844))
 ;;; Generated autoloads from emacs-lisp/ert.el
 
 (autoload 'ert-deftest "ert" "\
@@ -9273,7 +9283,7 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test).
 ;;;***
 
 ;;;### (autoloads (ert-kill-all-test-buffers) "ert-x" "emacs-lisp/ert-x.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emacs-lisp/ert-x.el
 
 (put 'ert-with-test-buffer 'lisp-indent-function 1)
@@ -9285,8 +9295,8 @@ Kill all test buffers that are still live.
 
 ;;;***
 
-;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (20164
+;;;;;;  60780))
 ;;; Generated autoloads from eshell/esh-mode.el
 
 (autoload 'eshell-mode "esh-mode" "\
@@ -9299,7 +9309,7 @@ Emacs shell interactive mode.
 ;;;***
 
 ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell"
-;;;;;;  "eshell/eshell.el" (20119 34052))
+;;;;;;  "eshell/eshell.el" (20116 6099))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload 'eshell "eshell" "\
@@ -9340,7 +9350,7 @@ corresponding to a successful execution.
 ;;;;;;  visit-tags-table tags-table-mode find-tag-default-function
 ;;;;;;  find-tag-hook tags-add-tables tags-compression-info-list
 ;;;;;;  tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -9658,7 +9668,7 @@ for \\[find-tag] (which see).
 ;;;;;;  ethio-fidel-to-sera-marker ethio-fidel-to-sera-region ethio-fidel-to-sera-buffer
 ;;;;;;  ethio-sera-to-fidel-marker ethio-sera-to-fidel-region ethio-sera-to-fidel-buffer
 ;;;;;;  setup-ethiopic-environment-internal) "ethio-util" "language/ethio-util.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20175 31160))
 ;;; Generated autoloads from language/ethio-util.el
 
 (autoload 'setup-ethiopic-environment-internal "ethio-util" "\
@@ -9828,7 +9838,7 @@ With ARG, insert that many delimiters.
 
 ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline
 ;;;;;;  eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19931 11784))
 ;;; Generated autoloads from net/eudc.el
 
 (autoload 'eudc-set-server "eudc" "\
@@ -9884,7 +9894,7 @@ This does nothing except loading eudc by autoload side-effect.
 
 ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline
 ;;;;;;  eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary)
-;;;;;;  "eudc-bob" "net/eudc-bob.el" (20119 34052))
+;;;;;;  "eudc-bob" "net/eudc-bob.el" (19845 45374))
 ;;; Generated autoloads from net/eudc-bob.el
 
 (autoload 'eudc-display-generic-binary "eudc-bob" "\
@@ -9920,7 +9930,7 @@ Display a button for the JPEG DATA.
 ;;;***
 
 ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb)
-;;;;;;  "eudc-export" "net/eudc-export.el" (20119 34052))
+;;;;;;  "eudc-export" "net/eudc-export.el" (20175 31160))
 ;;; Generated autoloads from net/eudc-export.el
 
 (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\
@@ -9937,7 +9947,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record.
 ;;;***
 
 ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20162 19074))
 ;;; Generated autoloads from net/eudc-hotlist.el
 
 (autoload 'eudc-edit-hotlist "eudc-hotlist" "\
@@ -9947,8 +9957,8 @@ Edit the hotlist of directory servers in a specialized buffer.
 
 ;;;***
 
-;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from emacs-lisp/ewoc.el
 
 (autoload 'ewoc-create "ewoc" "\
@@ -9977,7 +9987,7 @@ fourth arg NOSEP non-nil inhibits this.
 ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p
 ;;;;;;  executable-self-display executable-set-magic executable-interpret
 ;;;;;;  executable-command-find-posix-p) "executable" "progmodes/executable.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20160 63745))
 ;;; Generated autoloads from progmodes/executable.el
 
 (autoload 'executable-command-find-posix-p "executable" "\
@@ -10020,18 +10030,18 @@ file modes.
 
 ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot
 ;;;;;;  expand-abbrev-hook expand-add-abbrevs) "expand" "expand.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20164 29468))
 ;;; Generated autoloads from expand.el
 
 (autoload 'expand-add-abbrevs "expand" "\
-Add a list of abbrev to abbrev table TABLE.
+Add a list of abbreviations to abbrev table TABLE.
 ABBREVS is a list of abbrev definitions; each abbrev description entry
 has the form (ABBREV EXPANSION ARG).
 
 ABBREV is the abbreviation to replace.
 
 EXPANSION is the replacement string or a function which will make the
-expansion.  For example you, could use the DMacros or skeleton packages
+expansion.  For example, you could use the DMacros or skeleton packages
 to generate such functions.
 
 ARG is an optional argument which can be a number or a list of
@@ -10040,7 +10050,7 @@ beginning of the expanded text.
 
 If ARG is a list of numbers, point is placed according to the first
 member of the list, but you can visit the other specified positions
-cyclicaly with the functions `expand-jump-to-previous-slot' and
+cyclically with the functions `expand-jump-to-previous-slot' and
 `expand-jump-to-next-slot'.
 
 If ARG is omitted, point is placed at the end of the expanded text.
@@ -10069,7 +10079,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (20119 34052))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (20178 7273))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload 'f90-mode "f90" "\
@@ -10139,8 +10149,8 @@ with no args, if that value is non-nil.
 ;;;### (autoloads (variable-pitch-mode buffer-face-toggle buffer-face-set
 ;;;;;;  buffer-face-mode text-scale-adjust text-scale-decrease text-scale-increase
 ;;;;;;  text-scale-set face-remap-set-base face-remap-reset-base
-;;;;;;  face-remap-add-relative) "face-remap" "face-remap.el" (20126
-;;;;;;  41069))
+;;;;;;  face-remap-add-relative) "face-remap" "face-remap.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from face-remap.el
 
 (autoload 'face-remap-add-relative "face-remap" "\
@@ -10280,7 +10290,7 @@ Besides the choice of face, it is the same as `buffer-face-mode'.
 
 ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
 ;;;;;;  feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
-;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (20119 34052))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (20172 54913))
 ;;; Generated autoloads from mail/feedmail.el
 
 (autoload 'feedmail-send-it "feedmail" "\
@@ -10334,7 +10344,7 @@ you can set `feedmail-queue-reminder-alist' to nil.
 ;;;***
 
 ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu
-;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (20119 34052))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (20164 60780))
 ;;; Generated autoloads from ffap.el
 
 (autoload 'ffap-next "ffap" "\
@@ -10398,7 +10408,7 @@ Evaluate the forms in variable `ffap-bindings'.
 ;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively
 ;;;;;;  file-cache-add-directory-using-locate file-cache-add-directory-using-find
 ;;;;;;  file-cache-add-file file-cache-add-directory-list file-cache-add-directory)
-;;;;;;  "filecache" "filecache.el" (20119 34052))
+;;;;;;  "filecache" "filecache.el" (19845 45374))
 ;;; Generated autoloads from filecache.el
 
 (autoload 'file-cache-add-directory "filecache" "\
@@ -10458,7 +10468,7 @@ the name is considered already unique; only the second substitution
 ;;;;;;  copy-file-locals-to-dir-locals delete-dir-local-variable
 ;;;;;;  add-dir-local-variable delete-file-local-variable-prop-line
 ;;;;;;  add-file-local-variable-prop-line delete-file-local-variable
-;;;;;;  add-file-local-variable) "files-x" "files-x.el" (20119 34052))
+;;;;;;  add-file-local-variable) "files-x" "files-x.el" (20167 36967))
 ;;; Generated autoloads from files-x.el
 
 (autoload 'add-file-local-variable "files-x" "\
@@ -10523,8 +10533,8 @@ Copy directory-local variables to the -*- line.
 
 ;;;***
 
-;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20178
+;;;;;;  7273))
 ;;; Generated autoloads from filesets.el
 
 (autoload 'filesets-init "filesets" "\
@@ -10535,7 +10545,7 @@ Set up hooks, load the cache file -- if existing -- and build the menu.
 
 ;;;***
 
-;;;### (autoloads (find-cmd) "find-cmd" "find-cmd.el" (20119 34052))
+;;;### (autoloads (find-cmd) "find-cmd" "find-cmd.el" (19845 45374))
 ;;; Generated autoloads from find-cmd.el
 
 (autoload 'find-cmd "find-cmd" "\
@@ -10555,7 +10565,7 @@ result is a string that should be ready for the command line.
 ;;;***
 
 ;;;### (autoloads (find-grep-dired find-name-dired find-dired) "find-dired"
-;;;;;;  "find-dired.el" (20119 34052))
+;;;;;;  "find-dired.el" (19980 19797))
 ;;; Generated autoloads from find-dired.el
 
 (autoload 'find-dired "find-dired" "\
@@ -10595,7 +10605,7 @@ use in place of \"-ls\" as the final argument.
 
 ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file
 ;;;;;;  ff-find-other-file ff-get-other-file) "find-file" "find-file.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from find-file.el
 
 (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\
@@ -10689,7 +10699,7 @@ Visit the file you click on in another window.
 ;;;;;;  find-variable find-variable-noselect find-function-other-frame
 ;;;;;;  find-function-other-window find-function find-function-noselect
 ;;;;;;  find-function-search-for-symbol find-library) "find-func"
-;;;;;;  "emacs-lisp/find-func.el" (20119 34052))
+;;;;;;  "emacs-lisp/find-func.el" (20153 32815))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 
 (autoload 'find-library "find-func" "\
@@ -10848,7 +10858,7 @@ Define some key bindings for the find-function family of functions.
 ;;;***
 
 ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
-;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (20119 34052))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (19886 45771))
 ;;; Generated autoloads from find-lisp.el
 
 (autoload 'find-lisp-find-dired "find-lisp" "\
@@ -10869,7 +10879,7 @@ Change the filter on a find-lisp-find-dired buffer to REGEXP.
 ;;;***
 
 ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords)
-;;;;;;  "finder" "finder.el" (20119 34052))
+;;;;;;  "finder" "finder.el" (19893 19022))
 ;;; Generated autoloads from finder.el
 
 (autoload 'finder-list-keywords "finder" "\
@@ -10891,7 +10901,7 @@ Find packages matching a given keyword.
 ;;;***
 
 ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl"
-;;;;;;  "flow-ctrl.el" (20119 34052))
+;;;;;;  "flow-ctrl.el" (19845 45374))
 ;;; Generated autoloads from flow-ctrl.el
 
 (autoload 'enable-flow-control "flow-ctrl" "\
@@ -10913,7 +10923,7 @@ to get the effect of a C-q.
 ;;;***
 
 ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/flow-fill.el
 
 (autoload 'fill-flowed-encode "flow-fill" "\
@@ -10929,7 +10939,7 @@ to get the effect of a C-q.
 ;;;***
 
 ;;;### (autoloads (flymake-find-file-hook flymake-mode-off flymake-mode-on
-;;;;;;  flymake-mode) "flymake" "progmodes/flymake.el" (20119 34052))
+;;;;;;  flymake-mode) "flymake" "progmodes/flymake.el" (19984 16846))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload 'flymake-mode "flymake" "\
@@ -10958,14 +10968,14 @@ Turn flymake mode off.
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
-;;;;;;  "flyspell" "textmodes/flyspell.el" (20139 33526))
+;;;;;;  "flyspell" "textmodes/flyspell.el" (20174 10230))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload 'flyspell-prog-mode "flyspell" "\
 Turn on `flyspell-mode' for comments and strings.
 
 \(fn)" t nil)
-(defvar flyspell-mode nil)
+(defvar flyspell-mode nil "Non-nil if Flyspell mode is enabled.")
 
 (autoload 'flyspell-mode "flyspell" "\
 Toggle on-the-fly spell checking (Flyspell mode).
@@ -11030,7 +11040,7 @@ Flyspell whole buffer.
 
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (20140 43930))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from follow.el
 
 (autoload 'turn-on-follow-mode "follow" "\
@@ -11106,8 +11116,8 @@ in your `~/.emacs' file, replacing [f7] by your favorite key:
 
 ;;;***
 
-;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20127
-;;;;;;  26006))
+;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20170
+;;;;;;  13157))
 ;;; Generated autoloads from mail/footnote.el
 
 (autoload 'footnote-mode "footnote" "\
@@ -11126,7 +11136,7 @@ play around with the following keys:
 ;;;***
 
 ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode)
-;;;;;;  "forms" "forms.el" (20119 34052))
+;;;;;;  "forms" "forms.el" (20168 57844))
 ;;; Generated autoloads from forms.el
 
 (autoload 'forms-mode "forms" "\
@@ -11163,7 +11173,7 @@ Visit a file in Forms mode in other window.
 ;;;***
 
 ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el"
-;;;;;;  (20140 44048))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (autoload 'fortran-mode "fortran" "\
@@ -11241,7 +11251,7 @@ with no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region
-;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (20119 34052))
+;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (20165 31925))
 ;;; Generated autoloads from play/fortune.el
 
 (autoload 'fortune-add-fortune "fortune" "\
@@ -11290,7 +11300,7 @@ and choose the directory as the fortune-file.
 ;;;***
 
 ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el"
-;;;;;;  (20140 44067))
+;;;;;;  (20182 4358))
 ;;; Generated autoloads from progmodes/gdb-mi.el
 
 (defvar gdb-enable-debug nil "\
@@ -11357,8 +11367,8 @@ detailed description of this mode.
 ;;;***
 
 ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal
-;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (20119
-;;;;;;  34052))
+;;;;;;  define-generic-mode) "generic" "emacs-lisp/generic.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from emacs-lisp/generic.el
 
 (defvar generic-mode-list nil "\
@@ -11435,7 +11445,7 @@ regular expression that can be used as an element of
 ;;;***
 
 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19906 31087))
 ;;; Generated autoloads from progmodes/glasses.el
 
 (autoload 'glasses-mode "glasses" "\
@@ -11449,7 +11459,7 @@ at places they belong to.
 
 ;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error
 ;;;;;;  gmm-message gmm-regexp-concat) "gmm-utils" "gnus/gmm-utils.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20175 31160))
 ;;; Generated autoloads from gnus/gmm-utils.el
 
 (autoload 'gmm-regexp-concat "gmm-utils" "\
@@ -11504,7 +11514,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST.
 ;;;***
 
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (20119 34052))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (20164 60780))
 ;;; Generated autoloads from gnus/gnus.el
 (when (fboundp 'custom-autoload)
  (custom-autoload 'gnus-select-method "gnus"))
@@ -11557,7 +11567,7 @@ prompt the user for the name of an NNTP server to use.
 ;;;;;;  gnus-agent-get-undownloaded-list gnus-agent-delete-group
 ;;;;;;  gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize
 ;;;;;;  gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent"
-;;;;;;  "gnus/gnus-agent.el" (20119 34052))
+;;;;;;  "gnus/gnus-agent.el" (20168 57844))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload 'gnus-unplugged "gnus-agent" "\
@@ -11648,7 +11658,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20182 4358))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11659,7 +11669,7 @@ Make the current buffer look like a nice article.
 ;;;***
 
 ;;;### (autoloads (gnus-bookmark-bmenu-list gnus-bookmark-jump gnus-bookmark-set)
-;;;;;;  "gnus-bookmark" "gnus/gnus-bookmark.el" (20119 34052))
+;;;;;;  "gnus-bookmark" "gnus/gnus-bookmark.el" (19845 45374))
 ;;; Generated autoloads from gnus/gnus-bookmark.el
 
 (autoload 'gnus-bookmark-set "gnus-bookmark" "\
@@ -11684,8 +11694,8 @@ deletion, or > if it is flagged for displaying.
 
 ;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group
 ;;;;;;  gnus-cache-generate-nov-databases gnus-cache-generate-active
-;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (20119
-;;;;;;  34052))
+;;;;;;  gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from gnus/gnus-cache.el
 
 (autoload 'gnus-jog-cache "gnus-cache" "\
@@ -11727,7 +11737,7 @@ supported.
 ;;;***
 
 ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article)
-;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (20119 34052))
+;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (19931 11784))
 ;;; Generated autoloads from gnus/gnus-delay.el
 
 (autoload 'gnus-delay-article "gnus-delay" "\
@@ -11763,7 +11773,7 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil.
 ;;;***
 
 ;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d)
-;;;;;;  "gnus-diary" "gnus/gnus-diary.el" (20119 34052))
+;;;;;;  "gnus-diary" "gnus/gnus-diary.el" (20161 45793))
 ;;; Generated autoloads from gnus/gnus-diary.el
 
 (autoload 'gnus-user-format-function-d "gnus-diary" "\
@@ -11779,7 +11789,7 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil.
 ;;;***
 
 ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20167 36967))
 ;;; Generated autoloads from gnus/gnus-dired.el
 
 (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\
@@ -11790,7 +11800,7 @@ Convenience method to turn on gnus-dired-mode.
 ;;;***
 
 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from gnus/gnus-draft.el
 
 (autoload 'gnus-draft-reminder "gnus-draft" "\
@@ -11802,8 +11812,8 @@ Reminder user if there are unsent drafts.
 
 ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png
 ;;;;;;  gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header
-;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (20119
-;;;;;;  34052))
+;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (20088
+;;;;;;  26718))
 ;;; Generated autoloads from gnus/gnus-fun.el
 
 (autoload 'gnus-random-x-face "gnus-fun" "\
@@ -11848,7 +11858,7 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to
 ;;;***
 
 ;;;### (autoloads (gnus-treat-mail-gravatar gnus-treat-from-gravatar)
-;;;;;;  "gnus-gravatar" "gnus/gnus-gravatar.el" (20119 34052))
+;;;;;;  "gnus-gravatar" "gnus/gnus-gravatar.el" (19845 45374))
 ;;; Generated autoloads from gnus/gnus-gravatar.el
 
 (autoload 'gnus-treat-from-gravatar "gnus-gravatar" "\
@@ -11866,7 +11876,7 @@ If gravatars are already displayed, remove them.
 ;;;***
 
 ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;;  "gnus-group" "gnus/gnus-group.el" (20119 34052))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (20179 28130))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload 'gnus-fetch-group "gnus-group" "\
@@ -11884,7 +11894,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-html-prefetch-images gnus-article-html) "gnus-html"
-;;;;;;  "gnus/gnus-html.el" (20119 34052))
+;;;;;;  "gnus/gnus-html.el" (20050 11479))
 ;;; Generated autoloads from gnus/gnus-html.el
 
 (autoload 'gnus-article-html "gnus-html" "\
@@ -11900,7 +11910,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/gnus-kill.el
 
 (defalias 'gnus-batch-kill 'gnus-batch-score)
@@ -11915,7 +11925,7 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score
 
 ;;;### (autoloads (gnus-mailing-list-mode gnus-mailing-list-insinuate
 ;;;;;;  turn-on-gnus-mailing-list-mode) "gnus-ml" "gnus/gnus-ml.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/gnus-ml.el
 
 (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" "\
@@ -11940,7 +11950,7 @@ Minor mode for providing mailing-list commands.
 
 ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update
 ;;;;;;  gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/gnus-mlspl.el
 
 (autoload 'gnus-group-split-setup "gnus-mlspl" "\
@@ -12041,7 +12051,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
 ;;;***
 
 ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail)
-;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (20119 34052))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (20183 25152))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload 'gnus-msg-mail "gnus-msg" "\
@@ -12067,7 +12077,7 @@ Like `message-reply'.
 
 ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon
 ;;;;;;  gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/gnus-picon.el
 
 (autoload 'gnus-treat-from-picon "gnus-picon" "\
@@ -12094,7 +12104,7 @@ If picons are already displayed, remove them.
 ;;;;;;  gnus-sorted-nintersection gnus-sorted-range-intersection
 ;;;;;;  gnus-sorted-intersection gnus-intersection gnus-sorted-complement
 ;;;;;;  gnus-sorted-ndifference gnus-sorted-difference) "gnus-range"
-;;;;;;  "gnus/gnus-range.el" (20119 34052))
+;;;;;;  "gnus/gnus-range.el" (19845 45374))
 ;;; Generated autoloads from gnus/gnus-range.el
 
 (autoload 'gnus-sorted-difference "gnus-range" "\
@@ -12162,7 +12172,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (20124 52030))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (20143 51029))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload 'gnus-registry-initialize "gnus-registry" "\
@@ -12178,8 +12188,8 @@ Install the registry hooks.
 ;;;***
 
 ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate
-;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (20119
-;;;;;;  34052))
+;;;;;;  gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from gnus/gnus-sieve.el
 
 (autoload 'gnus-sieve-update "gnus-sieve" "\
@@ -12207,7 +12217,7 @@ See the documentation for these variables and functions for details.
 ;;;***
 
 ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20076 35541))
 ;;; Generated autoloads from gnus/gnus-spec.el
 
 (autoload 'gnus-update-format "gnus-spec" "\
@@ -12218,7 +12228,7 @@ Update the format specification near point.
 ;;;***
 
 ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20176 51947))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -12229,7 +12239,7 @@ Declare back end NAME with ABILITIES as a Gnus back end.
 ;;;***
 
 ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20172 54913))
 ;;; Generated autoloads from gnus/gnus-sum.el
 
 (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -12241,7 +12251,7 @@ BOOKMARK is a bookmark name or a bookmark record.
 ;;;***
 
 ;;;### (autoloads (gnus-sync-install-hooks gnus-sync-initialize)
-;;;;;;  "gnus-sync" "gnus/gnus-sync.el" (20119 34052))
+;;;;;;  "gnus-sync" "gnus/gnus-sync.el" (19845 45374))
 ;;; Generated autoloads from gnus/gnus-sync.el
 
 (autoload 'gnus-sync-initialize "gnus-sync" "\
@@ -12257,7 +12267,7 @@ Install the sync hooks.
 ;;;***
 
 ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20161 45793))
 ;;; Generated autoloads from gnus/gnus-win.el
 
 (autoload 'gnus-add-configuration "gnus-win" "\
@@ -12268,7 +12278,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 ;;;***
 
 ;;;### (autoloads (gnutls-min-prime-bits) "gnutls" "net/gnutls.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20176 51947))
 ;;; Generated autoloads from net/gnutls.el
 
 (defvar gnutls-min-prime-bits nil "\
@@ -12284,7 +12294,7 @@ A value of nil says to use the default gnutls value.")
 
 ;;;***
 
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20119 34052))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20178 7273))
 ;;; Generated autoloads from play/gomoku.el
 
 (autoload 'gomoku "gomoku" "\
@@ -12312,7 +12322,7 @@ Use \\[describe-mode] for more info.
 
 ;;;### (autoloads (goto-address-prog-mode goto-address-mode goto-address
 ;;;;;;  goto-address-at-point) "goto-addr" "net/goto-addr.el" (20127
-;;;;;;  25813))
+;;;;;;  62865))
 ;;; Generated autoloads from net/goto-addr.el
 
 (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1")
@@ -12351,7 +12361,7 @@ Like `goto-address-mode', but only for comments and strings.
 ;;;***
 
 ;;;### (autoloads (gravatar-retrieve-synchronously gravatar-retrieve)
-;;;;;;  "gravatar" "gnus/gravatar.el" (20119 34052))
+;;;;;;  "gravatar" "gnus/gravatar.el" (19845 45374))
 ;;; Generated autoloads from gnus/gravatar.el
 
 (autoload 'gravatar-retrieve "gravatar" "\
@@ -12369,7 +12379,7 @@ Retrieve MAIL-ADDRESS gravatar and returns it.
 
 ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults
 ;;;;;;  grep-process-setup grep-setup-hook grep-find-command grep-command
-;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (20119 34052))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (20174 10230))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -12427,9 +12437,11 @@ Any other value means to use `find -print' and `xargs'.
 
 This variable's value takes effect when `grep-compute-defaults' is called.")
 
-(defvar grep-history nil)
+(defvar grep-history nil "\
+History list for grep.")
 
-(defvar grep-find-history nil)
+(defvar grep-find-history nil "\
+History list for grep-find.")
 
 (autoload 'grep-process-setup "grep" "\
 Setup compilation variables and buffer for `grep'.
@@ -12526,7 +12538,7 @@ file name to `*.gz', and sets `grep-highlight-matches' to `always'.
 
 ;;;***
 
-;;;### (autoloads (gs-load-image) "gs" "gs.el" (20119 34052))
+;;;### (autoloads (gs-load-image) "gs" "gs.el" (19845 45374))
 ;;; Generated autoloads from gs.el
 
 (autoload 'gs-load-image "gs" "\
@@ -12540,7 +12552,7 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful.
 ;;;***
 
 ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb
-;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20127 25495))
+;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20178 7273))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload 'gud-gdb "gud" "\
@@ -12628,8 +12640,8 @@ it if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19889
+;;;;;;  21967))
 ;;; Generated autoloads from play/handwrite.el
 
 (autoload 'handwrite "handwrite" "\
@@ -12647,7 +12659,7 @@ Variables: `handwrite-linespace'     (default 12)
 ;;;***
 
 ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from play/hanoi.el
 
 (autoload 'hanoi "hanoi" "\
@@ -12676,7 +12688,7 @@ to be updated.
 
 ;;;### (autoloads (mail-check-payment mail-add-payment-async mail-add-payment
 ;;;;;;  hashcash-verify-payment hashcash-insert-payment-async hashcash-insert-payment)
-;;;;;;  "hashcash" "mail/hashcash.el" (20119 34052))
+;;;;;;  "hashcash" "mail/hashcash.el" (19845 45374))
 ;;; Generated autoloads from mail/hashcash.el
 
 (autoload 'hashcash-insert-payment "hashcash" "\
@@ -12721,7 +12733,7 @@ Prefix arg sets default accept amount temporarily.
 ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region
 ;;;;;;  scan-buf-move-to-region help-at-pt-display-when-idle help-at-pt-set-timer
 ;;;;;;  help-at-pt-cancel-timer display-local-help help-at-pt-kbd-string
-;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (20119 34052))
+;;;;;;  help-at-pt-string) "help-at-pt" "help-at-pt.el" (19845 45374))
 ;;; Generated autoloads from help-at-pt.el
 
 (autoload 'help-at-pt-string "help-at-pt" "\
@@ -12851,7 +12863,7 @@ different regions.  With numeric argument ARG, behaves like
 ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories
 ;;;;;;  describe-syntax describe-variable variable-at-point describe-function-1
 ;;;;;;  find-lisp-object-file-name help-C-file-name describe-function)
-;;;;;;  "help-fns" "help-fns.el" (20119 34052))
+;;;;;;  "help-fns" "help-fns.el" (20161 45793))
 ;;; Generated autoloads from help-fns.el
 
 (autoload 'describe-function "help-fns" "\
@@ -12931,7 +12943,7 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file.
 ;;;***
 
 ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from help-macro.el
 
 (defvar three-step-help nil "\
@@ -12947,8 +12959,8 @@ gives the window that lists the options.")
 
 ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button
 ;;;;;;  help-make-xrefs help-buffer help-setup-xref help-mode-finish
-;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (20119
-;;;;;;  34052))
+;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (20167
+;;;;;;  36967))
 ;;; Generated autoloads from help-mode.el
 
 (autoload 'help-mode "help-mode" "\
@@ -13041,7 +13053,7 @@ Add xrefs for symbols in `pp's output between FROM and TO.
 ;;;***
 
 ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper"
-;;;;;;  "emacs-lisp/helper.el" (20119 34052))
+;;;;;;  "emacs-lisp/helper.el" (19845 45374))
 ;;; Generated autoloads from emacs-lisp/helper.el
 
 (autoload 'Helper-describe-bindings "helper" "\
@@ -13057,7 +13069,7 @@ Provide help for current mode.
 ;;;***
 
 ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
-;;;;;;  "hexl.el" (20119 34052))
+;;;;;;  "hexl.el" (19865 50420))
 ;;; Generated autoloads from hexl.el
 
 (autoload 'hexl-mode "hexl" "\
@@ -13154,7 +13166,7 @@ This discards the buffer's undo information.
 ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
 ;;;;;;  hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
 ;;;;;;  global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el"
-;;;;;;  (20126 50093))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from hi-lock.el
 
 (autoload 'hi-lock-mode "hi-lock" "\
@@ -13293,7 +13305,7 @@ be found in variable `hi-lock-interactive-patterns'.
 ;;;***
 
 ;;;### (autoloads (hide-ifdef-mode) "hideif" "progmodes/hideif.el"
-;;;;;;  (20127 25465))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from progmodes/hideif.el
 
 (autoload 'hide-ifdef-mode "hideif" "\
@@ -13337,7 +13349,7 @@ Several variables affect how the hiding is done:
 ;;;***
 
 ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20172 54913))
 ;;; Generated autoloads from progmodes/hideshow.el
 
 (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\
@@ -13399,8 +13411,8 @@ Unconditionally turn off `hs-minor-mode'.
 ;;;;;;  highlight-compare-buffers highlight-changes-rotate-faces
 ;;;;;;  highlight-changes-previous-change highlight-changes-next-change
 ;;;;;;  highlight-changes-remove-highlight highlight-changes-visible-mode
-;;;;;;  highlight-changes-mode) "hilit-chg" "hilit-chg.el" (20126
-;;;;;;  50110))
+;;;;;;  highlight-changes-mode) "hilit-chg" "hilit-chg.el" (20164
+;;;;;;  60780))
 ;;; Generated autoloads from hilit-chg.el
 
 (autoload 'highlight-changes-mode "hilit-chg" "\
@@ -13535,7 +13547,7 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode.
 ;;;;;;  hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction
 ;;;;;;  hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space
 ;;;;;;  hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp"
-;;;;;;  "hippie-exp.el" (20119 34052))
+;;;;;;  "hippie-exp.el" (20167 36967))
 ;;; Generated autoloads from hippie-exp.el
 
 (defvar hippie-expand-try-functions-list '(try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol) "\
@@ -13608,7 +13620,7 @@ argument VERBOSE non-nil makes the function verbose.
 ;;;***
 
 ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el"
-;;;;;;  (20126 50128))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from hl-line.el
 
 (autoload 'hl-line-mode "hl-line" "\
@@ -13661,7 +13673,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 ;;;;;;  holiday-bahai-holidays holiday-islamic-holidays holiday-christian-holidays
 ;;;;;;  holiday-hebrew-holidays holiday-other-holidays holiday-local-holidays
 ;;;;;;  holiday-oriental-holidays holiday-general-holidays) "holidays"
-;;;;;;  "calendar/holidays.el" (20119 34052))
+;;;;;;  "calendar/holidays.el" (20107 16822))
 ;;; Generated autoloads from calendar/holidays.el
 
 (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1")
@@ -13809,8 +13821,8 @@ The optional LABEL is used to label the buffer created.
 
 ;;;***
 
-;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (20164
+;;;;;;  60780))
 ;;; Generated autoloads from gnus/html2text.el
 
 (autoload 'html2text "html2text" "\
@@ -13821,7 +13833,7 @@ Convert HTML to plain text in the current buffer.
 ;;;***
 
 ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer)
-;;;;;;  "htmlfontify" "htmlfontify.el" (20119 34052))
+;;;;;;  "htmlfontify" "htmlfontify.el" (20183 25152))
 ;;; Generated autoloads from htmlfontify.el
 
 (autoload 'htmlfontify-buffer "htmlfontify" "\
@@ -13854,8 +13866,8 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'.
 ;;;***
 
 ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter
-;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (20119
-;;;;;;  34052))
+;;;;;;  define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from ibuf-macs.el
 
 (autoload 'define-ibuffer-column "ibuf-macs" "\
@@ -13952,7 +13964,7 @@ bound to the current value of the filter.
 ;;;***
 
 ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;;  "ibuffer" "ibuffer.el" (20126 50992))
+;;;;;;  "ibuffer" "ibuffer.el" (20162 19074))
 ;;; Generated autoloads from ibuffer.el
 
 (autoload 'ibuffer-list-buffers "ibuffer" "\
@@ -13993,7 +14005,7 @@ FORMATS is the value to use for `ibuffer-formats'.
 
 ;;;### (autoloads (icalendar-import-buffer icalendar-import-file
 ;;;;;;  icalendar-export-region icalendar-export-file) "icalendar"
-;;;;;;  "calendar/icalendar.el" (20119 34052))
+;;;;;;  "calendar/icalendar.el" (20164 29468))
 ;;; Generated autoloads from calendar/icalendar.el
 
 (autoload 'icalendar-export-file "icalendar" "\
@@ -14045,8 +14057,8 @@ buffer `*icalendar-errors*'.
 
 ;;;***
 
-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20126
-;;;;;;  50158))
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from icomplete.el
 
 (defvar icomplete-mode nil "\
@@ -14068,7 +14080,7 @@ the mode if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (20119 34052))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19890 42850))
 ;;; Generated autoloads from progmodes/icon.el
 
 (autoload 'icon-mode "icon" "\
@@ -14109,7 +14121,7 @@ with no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el"
-;;;;;;  (20127 25340))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 
 (autoload 'idlwave-shell "idlw-shell" "\
@@ -14135,7 +14147,7 @@ See also the variable `idlwave-shell-prompt-pattern'.
 ;;;***
 
 ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el"
-;;;;;;  (20129 34279))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from progmodes/idlwave.el
 
 (autoload 'idlwave-mode "idlwave" "\
@@ -14269,8 +14281,8 @@ The main features of this mode are
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20139
-;;;;;;  37519))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20178
+;;;;;;  7273))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -14531,7 +14543,7 @@ DEF, if non-nil, is the default value.
 
 ;;;***
 
-;;;### (autoloads (ielm) "ielm" "ielm.el" (20119 34052))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (20077 56412))
 ;;; Generated autoloads from ielm.el
 
 (autoload 'ielm "ielm" "\
@@ -14542,7 +14554,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist.
 
 ;;;***
 
-;;;### (autoloads (iimage-mode) "iimage" "iimage.el" (20119 34052))
+;;;### (autoloads (iimage-mode) "iimage" "iimage.el" (19845 45374))
 ;;; Generated autoloads from iimage.el
 
 (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1")
@@ -14559,7 +14571,7 @@ Toggle inline image minor mode.
 ;;;;;;  create-image image-type-auto-detected-p image-type-available-p
 ;;;;;;  image-type image-type-from-file-name image-type-from-file-header
 ;;;;;;  image-type-from-buffer image-type-from-data) "image" "image.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20084 29660))
 ;;; Generated autoloads from image.el
 
 (autoload 'image-type-from-data "image" "\
@@ -14756,7 +14768,7 @@ If Emacs is compiled without ImageMagick support, do nothing.
 ;;;;;;  image-dired-jump-thumbnail-buffer image-dired-delete-tag
 ;;;;;;  image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
 ;;;;;;  image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs)
-;;;;;;  "image-dired" "image-dired.el" (20140 44252))
+;;;;;;  "image-dired" "image-dired.el" (20168 57844))
 ;;; Generated autoloads from image-dired.el
 
 (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\
@@ -14894,7 +14906,7 @@ easy-to-use form.
 
 ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp
 ;;;;;;  image-file-name-regexps image-file-name-extensions) "image-file"
-;;;;;;  "image-file.el" (20126 50176))
+;;;;;;  "image-file.el" (20127 62865))
 ;;; Generated autoloads from image-file.el
 
 (defvar image-file-name-extensions (purecopy '("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm" "svg")) "\
@@ -14957,7 +14969,7 @@ An image file is one whose name has an extension in
 ;;;***
 
 ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode
-;;;;;;  image-mode) "image-mode" "image-mode.el" (20126 50186))
+;;;;;;  image-mode) "image-mode" "image-mode.el" (20160 63745))
 ;;; Generated autoloads from image-mode.el
 
 (autoload 'image-mode "image-mode" "\
@@ -15002,7 +15014,7 @@ on these modes.
 ;;;***
 
 ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar
-;;;;;;  imenu-sort-function) "imenu" "imenu.el" (20119 34052))
+;;;;;;  imenu-sort-function) "imenu" "imenu.el" (19845 45374))
 ;;; Generated autoloads from imenu.el
 
 (defvar imenu-sort-function nil "\
@@ -15119,7 +15131,7 @@ for more information.
 
 ;;;### (autoloads (indian-2-column-to-ucs-region in-is13194-pre-write-conversion
 ;;;;;;  in-is13194-post-read-conversion indian-compose-string indian-compose-region)
-;;;;;;  "ind-util" "language/ind-util.el" (20119 34052))
+;;;;;;  "ind-util" "language/ind-util.el" (20097 41737))
 ;;; Generated autoloads from language/ind-util.el
 
 (autoload 'indian-compose-region "ind-util" "\
@@ -15151,7 +15163,7 @@ Convert old Emacs Devanagari characters to UCS.
 
 ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command
 ;;;;;;  inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp"
-;;;;;;  "progmodes/inf-lisp.el" (20119 34052))
+;;;;;;  "progmodes/inf-lisp.el" (20168 57844))
 ;;; Generated autoloads from progmodes/inf-lisp.el
 
 (defvar inferior-lisp-filter-regexp (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'") "\
@@ -15218,7 +15230,7 @@ of `inferior-lisp-program').  Runs the hooks from
 ;;;;;;  Info-goto-emacs-key-command-node Info-goto-emacs-command-node
 ;;;;;;  Info-mode info-finder info-apropos Info-index Info-directory
 ;;;;;;  Info-on-current-buffer info-standalone info-emacs-manual
-;;;;;;  info info-other-window) "info" "info.el" (20134 14214))
+;;;;;;  info info-other-window) "info" "info.el" (20172 54913))
 ;;; Generated autoloads from info.el
 
 (autoload 'info-other-window "info" "\
@@ -15404,7 +15416,7 @@ Go to Info buffer that displays MANUAL, creating it if none already exists.
 
 ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file
 ;;;;;;  info-lookup-symbol info-lookup-reset) "info-look" "info-look.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19984 16846))
 ;;; Generated autoloads from info-look.el
 
 (autoload 'info-lookup-reset "info-look" "\
@@ -15453,7 +15465,7 @@ Perform completion on file preceding point.
 
 ;;;### (autoloads (info-xref-docstrings info-xref-check-all-custom
 ;;;;;;  info-xref-check-all info-xref-check) "info-xref" "info-xref.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from info-xref.el
 
 (autoload 'info-xref-check "info-xref" "\
@@ -15536,7 +15548,7 @@ the sources handy.
 ;;;***
 
 ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold
-;;;;;;  Info-tagify) "informat" "informat.el" (20119 34052))
+;;;;;;  Info-tagify) "informat" "informat.el" (19886 45771))
 ;;; Generated autoloads from informat.el
 
 (autoload 'Info-tagify "informat" "\
@@ -15583,7 +15595,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\"
 
 ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method
 ;;;;;;  isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from international/isearch-x.el
 
 (autoload 'isearch-toggle-specified-input-method "isearch-x" "\
@@ -15603,8 +15615,8 @@ Toggle input method in interactive search.
 
 ;;;***
 
-;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from isearchb.el
 
 (autoload 'isearchb-activate "isearchb" "\
@@ -15620,7 +15632,7 @@ accessed via isearchb.
 ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only
 ;;;;;;  iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso
 ;;;;;;  iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt"
-;;;;;;  "international/iso-cvt.el" (20119 34052))
+;;;;;;  "international/iso-cvt.el" (19845 45374))
 ;;; Generated autoloads from international/iso-cvt.el
 
 (autoload 'iso-spanish "iso-cvt" "\
@@ -15711,7 +15723,7 @@ Add submenus to the File menu, to convert to and from various formats.
 ;;;***
 
 ;;;### (autoloads nil "iso-transl" "international/iso-transl.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from international/iso-transl.el
  (or key-translation-map (setq key-translation-map (make-sparse-keymap)))
  (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map)
@@ -15723,7 +15735,7 @@ Add submenus to the File menu, to convert to and from various formats.
 ;;;;;;  ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings
 ;;;;;;  ispell-region ispell-change-dictionary ispell-kill-ispell
 ;;;;;;  ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary)
-;;;;;;  "ispell" "textmodes/ispell.el" (20139 33409))
+;;;;;;  "ispell" "textmodes/ispell.el" (20178 7273))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
@@ -15949,8 +15961,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 ;;;***
 
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20126
-;;;;;;  50194))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20168
+;;;;;;  57844))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -15978,7 +15990,7 @@ between buffers using substrings.  See `iswitchb' for details.
 ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region
 ;;;;;;  japanese-hiragana-region japanese-katakana-region japanese-zenkaku
 ;;;;;;  japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal)
-;;;;;;  "japan-util" "language/japan-util.el" (20119 34052))
+;;;;;;  "japan-util" "language/japan-util.el" (19845 45374))
 ;;; Generated autoloads from language/japan-util.el
 
 (autoload 'setup-japanese-environment-internal "japan-util" "\
@@ -16056,7 +16068,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
 ;;;***
 
 ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;;  "jka-compr.el" (20119 34052))
+;;;;;;  "jka-compr.el" (20000 30139))
 ;;; Generated autoloads from jka-compr.el
 
 (defvar jka-compr-inhibit nil "\
@@ -16079,7 +16091,7 @@ by `jka-compr-installed'.
 
 ;;;***
 
-;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20119 34052))
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20167 36967))
 ;;; Generated autoloads from progmodes/js.el
 
 (autoload 'js-mode "js" "\
@@ -16093,7 +16105,7 @@ Major mode for editing JavaScript.
 
 ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup
 ;;;;;;  keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emulation/keypad.el
 
 (defvar keypad-setup nil "\
@@ -16149,7 +16161,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.'
 ;;;***
 
 ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from international/kinsoku.el
 
 (autoload 'kinsoku "kinsoku" "\
@@ -16170,8 +16182,8 @@ the context of text formatting.
 
 ;;;***
 
-;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from international/kkc.el
 
 (defvar kkc-after-update-conversion-functions nil "\
@@ -16196,7 +16208,7 @@ and the return value is the length of the conversion.
 ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro
 ;;;;;;  kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter
 ;;;;;;  kmacro-call-macro kmacro-end-macro kmacro-start-macro kmacro-exec-ring-item)
-;;;;;;  "kmacro" "kmacro.el" (20119 34052))
+;;;;;;  "kmacro" "kmacro.el" (20164 60780))
 ;;; Generated autoloads from kmacro.el
  (global-set-key "\C-x(" 'kmacro-start-macro)
  (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -16307,7 +16319,7 @@ If kbd macro currently being defined end it before activating it.
 ;;;***
 
 ;;;### (autoloads (setup-korean-environment-internal) "korea-util"
-;;;;;;  "language/korea-util.el" (20119 34052))
+;;;;;;  "language/korea-util.el" (19845 45374))
 ;;; Generated autoloads from language/korea-util.el
 
 (defvar default-korean-keyboard (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "")) "\
@@ -16322,7 +16334,7 @@ If kbd macro currently being defined end it before activating it.
 ;;;***
 
 ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias 'landmark-repeat 'landmark-test-run)
@@ -16354,7 +16366,7 @@ Use \\[describe-mode] for more info.
 
 ;;;### (autoloads (lao-compose-region lao-composition-function lao-transcribe-roman-to-lao-string
 ;;;;;;  lao-transcribe-single-roman-syllable-to-lao lao-compose-string)
-;;;;;;  "lao-util" "language/lao-util.el" (20119 34052))
+;;;;;;  "lao-util" "language/lao-util.el" (20165 31925))
 ;;; Generated autoloads from language/lao-util.el
 
 (autoload 'lao-compose-string "lao-util" "\
@@ -16393,7 +16405,7 @@ Transcribe Romanized Lao string STR to Lao character string.
 
 ;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc
 ;;;;;;  latexenc-inputenc-to-coding-system latex-inputenc-coding-alist)
-;;;;;;  "latexenc" "international/latexenc.el" (20119 34052))
+;;;;;;  "latexenc" "international/latexenc.el" (19845 45374))
 ;;; Generated autoloads from international/latexenc.el
 
 (defvar latex-inputenc-coding-alist (purecopy '(("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\
@@ -16425,7 +16437,7 @@ coding system names is determined from `latex-inputenc-coding-alist'.
 ;;;***
 
 ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display)
-;;;;;;  "latin1-disp" "international/latin1-disp.el" (20119 34052))
+;;;;;;  "latin1-disp" "international/latin1-disp.el" (19845 45374))
 ;;; Generated autoloads from international/latin1-disp.el
 
 (defvar latin1-display nil "\
@@ -16467,7 +16479,7 @@ use either \\[customize] or the function `latin1-display'.")
 ;;;***
 
 ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19961 55377))
 ;;; Generated autoloads from progmodes/ld-script.el
 
 (autoload 'ld-script-mode "ld-script" "\
@@ -16478,7 +16490,7 @@ A major mode to edit GNU ld script files
 ;;;***
 
 ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from ledit.el
 
 (defconst ledit-save-files t "\
@@ -16513,7 +16525,7 @@ do (setq lisp-mode-hook 'ledit-from-lisp-mode)
 
 ;;;***
 
-;;;### (autoloads (life) "life" "play/life.el" (20119 34052))
+;;;### (autoloads (life) "life" "play/life.el" (19845 45374))
 ;;; Generated autoloads from play/life.el
 
 (autoload 'life "life" "\
@@ -16527,7 +16539,7 @@ generations (this defaults to 1).
 ;;;***
 
 ;;;### (autoloads (global-linum-mode linum-mode linum-format) "linum"
-;;;;;;  "linum.el" (20126 50215))
+;;;;;;  "linum.el" (20127 62865))
 ;;; Generated autoloads from linum.el
 
 (defvar linum-format 'dynamic "\
@@ -16572,8 +16584,8 @@ See `linum-mode' for more information on Linum mode.
 
 ;;;***
 
-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20168
+;;;;;;  57844))
 ;;; Generated autoloads from loadhist.el
 
 (autoload 'unload-feature "loadhist" "\
@@ -16605,7 +16617,7 @@ something strange, such as redefining an Emacs function.
 ;;;***
 
 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (20119 34052))
+;;;;;;  "locate" "locate.el" (19886 45771))
 ;;; Generated autoloads from locate.el
 
 (defvar locate-ls-subdir-switches (purecopy "-al") "\
@@ -16657,7 +16669,7 @@ except that FILTER is not optional.
 
 ;;;***
 
-;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (20138 48832))
+;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (20138 33157))
 ;;; Generated autoloads from vc/log-edit.el
 
 (autoload 'log-edit "log-edit" "\
@@ -16684,8 +16696,8 @@ uses the current buffer.
 
 ;;;***
 
-;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (19946
+;;;;;;  1612))
 ;;; Generated autoloads from vc/log-view.el
 
 (autoload 'log-view-mode "log-view" "\
@@ -16695,8 +16707,8 @@ Major mode for browsing CVS log output.
 
 ;;;***
 
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (20126
-;;;;;;  50224))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from longlines.el
 
 (autoload 'longlines-mode "longlines" "\
@@ -16722,13 +16734,15 @@ newlines are indicated with a symbol.
 ;;;***
 
 ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer
-;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (20119
-;;;;;;  34052))
+;;;;;;  lpr-command lpr-switches printer-name) "lpr" "lpr.el" (20174
+;;;;;;  10230))
 ;;; Generated autoloads from lpr.el
 
-(defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)))
+(defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\
+Non-nil if running on MS-DOS or MS Windows.")
 
-(defvar lpr-lp-system (memq system-type '(usg-unix-v hpux irix)))
+(defvar lpr-lp-system (memq system-type '(usg-unix-v hpux irix)) "\
+Non-nil if running on a system type that uses the \"lp\" command.")
 
 (defvar printer-name (and (eq system-type 'ms-dos) "PRN") "\
 The name of a local printer to which data is sent for printing.
@@ -16817,7 +16831,7 @@ for further customization of the printer command.
 ;;;***
 
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from ls-lisp.el
 
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16828,8 +16842,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).")
 
 ;;;***
 
-;;;### (autoloads (lunar-phases) "lunar" "calendar/lunar.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (lunar-phases) "lunar" "calendar/lunar.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from calendar/lunar.el
 
 (autoload 'lunar-phases "lunar" "\
@@ -16843,8 +16857,8 @@ This function is suitable for execution in a .emacs file.
 
 ;;;***
 
-;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from progmodes/m4-mode.el
 
 (autoload 'm4-mode "m4-mode" "\
@@ -16855,7 +16869,7 @@ A major mode to edit m4 macro files.
 ;;;***
 
 ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19930 13389))
 ;;; Generated autoloads from emacs-lisp/macroexp.el
 
 (autoload 'macroexpand-all "macroexp" "\
@@ -16869,7 +16883,7 @@ definitions to shadow the loaded ones for use in file byte-compilation.
 ;;;***
 
 ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro
-;;;;;;  name-last-kbd-macro) "macros" "macros.el" (20119 34052))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (19886 45771))
 ;;; Generated autoloads from macros.el
 
 (autoload 'name-last-kbd-macro "macros" "\
@@ -16958,7 +16972,7 @@ and then select the region of un-tablified names and use
 ;;;***
 
 ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr"
-;;;;;;  "mail/mail-extr.el" (20119 34052))
+;;;;;;  "mail/mail-extr.el" (20160 63745))
 ;;; Generated autoloads from mail/mail-extr.el
 
 (autoload 'mail-extract-address-components "mail-extr" "\
@@ -16990,7 +17004,7 @@ Convert mail domain DOMAIN to the country it corresponds to.
 
 ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history
 ;;;;;;  mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from mail/mail-hist.el
 
 (autoload 'mail-hist-define-keys "mail-hist" "\
@@ -17022,7 +17036,7 @@ This function normally would be called when the message is sent.
 ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region
 ;;;;;;  mail-unquote-printable mail-quote-printable-region mail-quote-printable
 ;;;;;;  mail-file-babyl-p mail-dont-reply-to-names mail-use-rfc822)
-;;;;;;  "mail-utils" "mail/mail-utils.el" (20119 34052))
+;;;;;;  "mail-utils" "mail/mail-utils.el" (19922 19303))
 ;;; Generated autoloads from mail/mail-utils.el
 
 (defvar mail-use-rfc822 nil "\
@@ -17095,7 +17109,7 @@ matches may be returned from the message body.
 
 ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup
 ;;;;;;  mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (20127
-;;;;;;  25972))
+;;;;;;  62865))
 ;;; Generated autoloads from mail/mailabbrev.el
 
 (defvar mail-abbrevs-mode nil "\
@@ -17146,7 +17160,7 @@ double-quotes.
 
 ;;;### (autoloads (mail-complete mail-completion-at-point-function
 ;;;;;;  define-mail-alias expand-mail-aliases mail-complete-style)
-;;;;;;  "mailalias" "mail/mailalias.el" (20119 34052))
+;;;;;;  "mailalias" "mail/mailalias.el" (19881 27850))
 ;;; Generated autoloads from mail/mailalias.el
 
 (defvar mail-complete-style 'angles "\
@@ -17198,7 +17212,7 @@ current header, calls `mail-complete-function' and passes prefix ARG if any.
 ;;;***
 
 ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from mail/mailclient.el
 
 (autoload 'mailclient-send-it "mailclient" "\
@@ -17212,7 +17226,7 @@ The mail client is taken to be the handler of mailto URLs.
 
 ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
 ;;;;;;  makefile-gmake-mode makefile-automake-mode makefile-mode)
-;;;;;;  "make-mode" "progmodes/make-mode.el" (20119 34052))
+;;;;;;  "make-mode" "progmodes/make-mode.el" (20176 51947))
 ;;; Generated autoloads from progmodes/make-mode.el
 
 (autoload 'makefile-mode "make-mode" "\
@@ -17329,8 +17343,8 @@ An adapted `makefile-mode' that knows about imake.
 
 ;;;***
 
-;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19886
+;;;;;;  45771))
 ;;; Generated autoloads from makesum.el
 
 (autoload 'make-command-summary "makesum" "\
@@ -17342,7 +17356,7 @@ Previous contents of that buffer are killed first.
 ;;;***
 
 ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from man.el
 
 (defalias 'manual-entry 'man)
@@ -17396,7 +17410,7 @@ Default bookmark handler for Man buffers.
 
 ;;;***
 
-;;;### (autoloads (master-mode) "master" "master.el" (20126 50238))
+;;;### (autoloads (master-mode) "master" "master.el" (20127 62865))
 ;;; Generated autoloads from master.el
 
 (autoload 'master-mode "master" "\
@@ -17419,7 +17433,7 @@ yourself the value of `master-of' by calling `master-show-slave'.
 ;;;***
 
 ;;;### (autoloads (minibuffer-depth-indicate-mode) "mb-depth" "mb-depth.el"
-;;;;;;  (20126 50247))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from mb-depth.el
 
 (defvar minibuffer-depth-indicate-mode nil "\
@@ -17452,7 +17466,7 @@ recursion depth in the minibuffer prompt.  This is only useful if
 ;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
 ;;;;;;  message-reply message-news message-mail message-mode) "message"
-;;;;;;  "gnus/message.el" (20136 50092))
+;;;;;;  "gnus/message.el" (20183 25152))
 ;;; Generated autoloads from gnus/message.el
 
 (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -17618,7 +17632,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20164 60780))
 ;;; Generated autoloads from progmodes/meta-mode.el
 
 (autoload 'metafont-mode "meta-mode" "\
@@ -17635,7 +17649,7 @@ Major mode for editing MetaPost sources.
 
 ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body
 ;;;;;;  metamail-interpret-header) "metamail" "mail/metamail.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from mail/metamail.el
 
 (autoload 'metamail-interpret-header "metamail" "\
@@ -17680,7 +17694,7 @@ redisplayed as output is inserted.
 
 ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose
 ;;;;;;  mh-smail-batch mh-smail-other-window mh-smail) "mh-comp"
-;;;;;;  "mh-e/mh-comp.el" (20119 34052))
+;;;;;;  "mh-e/mh-comp.el" (20160 63745))
 ;;; Generated autoloads from mh-e/mh-comp.el
 
 (autoload 'mh-smail "mh-comp" "\
@@ -17770,7 +17784,7 @@ delete the draft message.
 
 ;;;***
 
-;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (20119 34052))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (20170 13157))
 ;;; Generated autoloads from mh-e/mh-e.el
 
 (put 'mh-progs 'risky-local-variable t)
@@ -17787,7 +17801,7 @@ Display version information about MH-E and the MH mail handling system.
 ;;;***
 
 ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder"
-;;;;;;  "mh-e/mh-folder.el" (20119 34052))
+;;;;;;  "mh-e/mh-folder.el" (20004 2139))
 ;;; Generated autoloads from mh-e/mh-folder.el
 
 (autoload 'mh-rmail "mh-folder" "\
@@ -17869,7 +17883,7 @@ perform the operation on all messages in that region.
 ;;;***
 
 ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight"
-;;;;;;  "midnight.el" (20119 34052))
+;;;;;;  "midnight.el" (19853 59245))
 ;;; Generated autoloads from midnight.el
 
 (autoload 'clean-buffer-list "midnight" "\
@@ -17896,7 +17910,7 @@ to its second argument TM.
 ;;;***
 
 ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef"
-;;;;;;  "minibuf-eldef.el" (20126 50271))
+;;;;;;  "minibuf-eldef.el" (20127 62865))
 ;;; Generated autoloads from minibuf-eldef.el
 
 (defvar minibuffer-electric-default-mode nil "\
@@ -17926,7 +17940,7 @@ is modified to remove the default indication.
 ;;;***
 
 ;;;### (autoloads (list-dynamic-libraries butterfly) "misc" "misc.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19968 28627))
 ;;; Generated autoloads from misc.el
 
 (autoload 'butterfly "misc" "\
@@ -17956,7 +17970,7 @@ The return value is always nil.
 
 ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files
 ;;;;;;  multi-isearch-buffers-regexp multi-isearch-buffers multi-isearch-setup)
-;;;;;;  "misearch" "misearch.el" (20119 34052))
+;;;;;;  "misearch" "misearch.el" (20168 57844))
 ;;; Generated autoloads from misearch.el
  (add-hook 'isearch-mode-hook 'multi-isearch-setup)
 
@@ -18038,7 +18052,7 @@ whose file names match the specified wildcard.
 ;;;***
 
 ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20162 19074))
 ;;; Generated autoloads from progmodes/mixal-mode.el
 
 (autoload 'mixal-mode "mixal-mode" "\
@@ -18049,7 +18063,7 @@ Major mode for the mixal asm language.
 ;;;***
 
 ;;;### (autoloads (mm-default-file-encoding) "mm-encode" "gnus/mm-encode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20075 14682))
 ;;; Generated autoloads from gnus/mm-encode.el
 
 (autoload 'mm-default-file-encoding "mm-encode" "\
@@ -18060,7 +18074,7 @@ Return a default encoding for FILE.
 ;;;***
 
 ;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents)
-;;;;;;  "mm-extern" "gnus/mm-extern.el" (20119 34052))
+;;;;;;  "mm-extern" "gnus/mm-extern.el" (19845 45374))
 ;;; Generated autoloads from gnus/mm-extern.el
 
 (autoload 'mm-extern-cache-contents "mm-extern" "\
@@ -18079,7 +18093,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 
 ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/mm-partial.el
 
 (autoload 'mm-inline-partial "mm-partial" "\
@@ -18093,7 +18107,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 
 ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents)
-;;;;;;  "mm-url" "gnus/mm-url.el" (20119 34052))
+;;;;;;  "mm-url" "gnus/mm-url.el" (19877 30798))
 ;;; Generated autoloads from gnus/mm-url.el
 
 (autoload 'mm-url-insert-file-contents "mm-url" "\
@@ -18110,7 +18124,7 @@ Insert file contents of URL using `mm-url-program'.
 ;;;***
 
 ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu"
-;;;;;;  "gnus/mm-uu.el" (20119 34052))
+;;;;;;  "gnus/mm-uu.el" (19845 45374))
 ;;; Generated autoloads from gnus/mm-uu.el
 
 (autoload 'mm-uu-dissect "mm-uu" "\
@@ -18130,7 +18144,7 @@ Assume text has been decoded if DECODED is non-nil.
 ;;;***
 
 ;;;### (autoloads (mml-attach-file mml-to-mime) "mml" "gnus/mml.el"
-;;;;;;  (20136 50092))
+;;;;;;  (20183 25152))
 ;;; Generated autoloads from gnus/mml.el
 
 (autoload 'mml-to-mime "mml" "\
@@ -18155,7 +18169,7 @@ body) or \"attachment\" (separate from the body).
 ;;;***
 
 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (20124 17058))
+;;;;;;  (20124 236))
 ;;; Generated autoloads from gnus/mml1991.el
 
 (autoload 'mml1991-encrypt "mml1991" "\
@@ -18172,7 +18186,7 @@ body) or \"attachment\" (separate from the body).
 
 ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt
 ;;;;;;  mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt)
-;;;;;;  "mml2015" "gnus/mml2015.el" (20124 17058))
+;;;;;;  "mml2015" "gnus/mml2015.el" (20124 236))
 ;;; Generated autoloads from gnus/mml2015.el
 
 (autoload 'mml2015-decrypt "mml2015" "\
@@ -18212,8 +18226,8 @@ body) or \"attachment\" (separate from the body).
 
 ;;;***
 
-;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (20159
+;;;;;;  42847))
 ;;; Generated autoloads from progmodes/modula2.el
 
 (defalias 'modula-2-mode 'm2-mode)
@@ -18247,7 +18261,7 @@ followed by the first character of the construct.
 ;;;***
 
 ;;;### (autoloads (denato-region nato-region unmorse-region morse-region)
-;;;;;;  "morse" "play/morse.el" (20119 34052))
+;;;;;;  "morse" "play/morse.el" (19869 36706))
 ;;; Generated autoloads from play/morse.el
 
 (autoload 'morse-region "morse" "\
@@ -18273,7 +18287,7 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text.
 ;;;***
 
 ;;;### (autoloads (mouse-drag-drag mouse-drag-throw) "mouse-drag"
-;;;;;;  "mouse-drag.el" (20119 34052))
+;;;;;;  "mouse-drag.el" (19890 42850))
 ;;; Generated autoloads from mouse-drag.el
 
 (autoload 'mouse-drag-throw "mouse-drag" "\
@@ -18320,8 +18334,8 @@ To test this function, evaluate:
 
 ;;;***
 
-;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (20126
-;;;;;;  50277))
+;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (20168
+;;;;;;  57844))
 ;;; Generated autoloads from mouse-sel.el
 
 (defvar mouse-sel-mode nil "\
@@ -18364,7 +18378,7 @@ kill ring; mouse-1 or mouse-3 kills it.
 
 ;;;***
 
-;;;### (autoloads (mpc) "mpc" "mpc.el" (20120 43280))
+;;;### (autoloads (mpc) "mpc" "mpc.el" (20178 7273))
 ;;; Generated autoloads from mpc.el
 
 (autoload 'mpc "mpc" "\
@@ -18374,7 +18388,7 @@ Main entry point for MPC.
 
 ;;;***
 
-;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (20119 34052))
+;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19890 42850))
 ;;; Generated autoloads from play/mpuz.el
 
 (autoload 'mpuz "mpuz" "\
@@ -18384,7 +18398,7 @@ Multiplication puzzle with GNU Emacs.
 
 ;;;***
 
-;;;### (autoloads (msb-mode) "msb" "msb.el" (20126 50286))
+;;;### (autoloads (msb-mode) "msb" "msb.el" (20127 62865))
 ;;; Generated autoloads from msb.el
 
 (defvar msb-mode nil "\
@@ -18414,7 +18428,7 @@ different buffer menu using the function `msb'.
 ;;;;;;  describe-current-coding-system describe-current-coding-system-briefly
 ;;;;;;  describe-coding-system describe-character-set list-charset-chars
 ;;;;;;  read-charset list-character-sets) "mule-diag" "international/mule-diag.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20160 63745))
 ;;; Generated autoloads from international/mule-diag.el
 
 (autoload 'list-character-sets "mule-diag" "\
@@ -18551,7 +18565,7 @@ The default is 20.  If LIMIT is negative, do not limit the listing.
 ;;;;;;  coding-system-translation-table-for-decode coding-system-pre-write-conversion
 ;;;;;;  coding-system-post-read-conversion lookup-nested-alist set-nested-alist
 ;;;;;;  truncate-string-to-width store-substring string-to-sequence)
-;;;;;;  "mule-util" "international/mule-util.el" (20119 34052))
+;;;;;;  "mule-util" "international/mule-util.el" (19845 45374))
 ;;; Generated autoloads from international/mule-util.el
 
 (autoload 'string-to-sequence "mule-util" "\
@@ -18691,8 +18705,8 @@ per-character basis, this may not be accurate.
 ;;;### (autoloads (network-connection network-connection-to-service
 ;;;;;;  whois-reverse-lookup whois finger ftp run-dig dns-lookup-host
 ;;;;;;  nslookup nslookup-host ping traceroute route arp netstat
-;;;;;;  iwconfig ifconfig) "net-utils" "net/net-utils.el" (20119
-;;;;;;  34052))
+;;;;;;  iwconfig ifconfig) "net-utils" "net/net-utils.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from net/net-utils.el
 
 (autoload 'ifconfig "net-utils" "\
@@ -18786,8 +18800,8 @@ Open a network connection to HOST on PORT.
 
 ;;;***
 
-;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from net/netrc.el
 
 (autoload 'netrc-credentials "netrc" "\
@@ -18800,7 +18814,7 @@ listed in the PORTS list.
 ;;;***
 
 ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el"
-;;;;;;  (20121 47865))
+;;;;;;  (20122 44898))
 ;;; Generated autoloads from net/network-stream.el
 
 (autoload 'open-network-stream "network-stream" "\
@@ -18896,7 +18910,7 @@ functionality.
 ;;;;;;  uncomment-region comment-kill comment-set-column comment-indent
 ;;;;;;  comment-indent-default comment-normalize-vars comment-multi-line
 ;;;;;;  comment-padding comment-style comment-column) "newcomment"
-;;;;;;  "newcomment.el" (20119 34052))
+;;;;;;  "newcomment.el" (20087 5852))
 ;;; Generated autoloads from newcomment.el
 
 (defalias 'indent-for-comment 'comment-indent)
@@ -19096,7 +19110,7 @@ unless optional argument SOFT is non-nil.
 ;;;***
 
 ;;;### (autoloads (newsticker-start newsticker-running-p) "newst-backend"
-;;;;;;  "net/newst-backend.el" (20119 34052))
+;;;;;;  "net/newst-backend.el" (19918 22236))
 ;;; Generated autoloads from net/newst-backend.el
 
 (autoload 'newsticker-running-p "newst-backend" "\
@@ -19118,7 +19132,7 @@ Run `newsticker-start-hook' if newsticker was not running already.
 ;;;***
 
 ;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20167 36967))
 ;;; Generated autoloads from net/newst-plainview.el
 
 (autoload 'newsticker-plainview "newst-plainview" "\
@@ -19129,7 +19143,7 @@ Start newsticker plainview.
 ;;;***
 
 ;;;### (autoloads (newsticker-show-news) "newst-reader" "net/newst-reader.el"
-;;;;;;  (20139 41953))
+;;;;;;  (20094 65493))
 ;;; Generated autoloads from net/newst-reader.el
 
 (autoload 'newsticker-show-news "newst-reader" "\
@@ -19140,7 +19154,7 @@ Start reading news.  You may want to bind this to a key.
 ;;;***
 
 ;;;### (autoloads (newsticker-start-ticker newsticker-ticker-running-p)
-;;;;;;  "newst-ticker" "net/newst-ticker.el" (20119 34052))
+;;;;;;  "newst-ticker" "net/newst-ticker.el" (19845 45374))
 ;;; Generated autoloads from net/newst-ticker.el
 
 (autoload 'newsticker-ticker-running-p "newst-ticker" "\
@@ -19161,7 +19175,7 @@ running already.
 ;;;***
 
 ;;;### (autoloads (newsticker-treeview) "newst-treeview" "net/newst-treeview.el"
-;;;;;;  (20141 61905))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from net/newst-treeview.el
 
 (autoload 'newsticker-treeview "newst-treeview" "\
@@ -19172,7 +19186,7 @@ Start newsticker treeview.
 ;;;***
 
 ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from gnus/nndiary.el
 
 (autoload 'nndiary-generate-nov-databases "nndiary" "\
@@ -19182,8 +19196,8 @@ Generate NOV databases in all nndiary directories.
 
 ;;;***
 
-;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from gnus/nndoc.el
 
 (autoload 'nndoc-add-type "nndoc" "\
@@ -19198,7 +19212,7 @@ symbol in the alist.
 ;;;***
 
 ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/nnfolder.el
 
 (autoload 'nnfolder-generate-active-file "nnfolder" "\
@@ -19210,7 +19224,7 @@ This command does not work if you use short group names.
 ;;;***
 
 ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from gnus/nnml.el
 
 (autoload 'nnml-generate-nov-databases "nnml" "\
@@ -19221,7 +19235,7 @@ Generate NOV databases in all nnml directories.
 ;;;***
 
 ;;;### (autoloads (disable-command enable-command disabled-command-function)
-;;;;;;  "novice" "novice.el" (20119 34052))
+;;;;;;  "novice" "novice.el" (19845 45374))
 ;;; Generated autoloads from novice.el
 
 (defvar disabled-command-function 'disabled-command-function "\
@@ -19254,7 +19268,7 @@ to future sessions.
 ;;;***
 
 ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el"
-;;;;;;  (20127 24590))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from textmodes/nroff-mode.el
 
 (autoload 'nroff-mode "nroff-mode" "\
@@ -19269,7 +19283,7 @@ closing requests for requests that are used in matched pairs.
 ;;;***
 
 ;;;### (autoloads (nxml-glyph-display-string) "nxml-glyph" "nxml/nxml-glyph.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from nxml/nxml-glyph.el
 
 (autoload 'nxml-glyph-display-string "nxml-glyph" "\
@@ -19281,8 +19295,8 @@ Return nil if the face cannot display a glyph for N.
 
 ;;;***
 
-;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19927
+;;;;;;  37225))
 ;;; Generated autoloads from nxml/nxml-mode.el
 
 (autoload 'nxml-mode "nxml-mode" "\
@@ -19344,7 +19358,7 @@ Many aspects this mode can be customized using
 ;;;***
 
 ;;;### (autoloads (nxml-enable-unicode-char-name-sets) "nxml-uchnm"
-;;;;;;  "nxml/nxml-uchnm.el" (20119 34052))
+;;;;;;  "nxml/nxml-uchnm.el" (19845 45374))
 ;;; Generated autoloads from nxml/nxml-uchnm.el
 
 (autoload 'nxml-enable-unicode-char-name-sets "nxml-uchnm" "\
@@ -19367,7 +19381,7 @@ the variable `nxml-enabled-unicode-blocks'.
 ;;;;;;  org-babel-pop-to-session-maybe org-babel-load-in-session-maybe
 ;;;;;;  org-babel-expand-src-block-maybe org-babel-view-src-block-info
 ;;;;;;  org-babel-execute-maybe org-babel-execute-safely-maybe) "ob"
-;;;;;;  "org/ob.el" (20119 34052))
+;;;;;;  "org/ob.el" (20174 10230))
 ;;; Generated autoloads from org/ob.el
 
 (autoload 'org-babel-execute-safely-maybe "ob" "\
@@ -19414,7 +19428,7 @@ Insert the results of execution into the buffer.  Source code
 execution and the collection and formatting of results can be
 controlled through a variety of header arguments.
 
-With prefix argument ARG, force re-execution even if a an
+With prefix argument ARG, force re-execution even if an
 existing result cached in the buffer would otherwise have been
 returned.
 
@@ -19570,7 +19584,7 @@ Mark current src block
 ;;;***
 
 ;;;### (autoloads (org-babel-describe-bindings) "ob-keys" "org/ob-keys.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20045 30710))
 ;;; Generated autoloads from org/ob-keys.el
 
 (autoload 'org-babel-describe-bindings "ob-keys" "\
@@ -19581,7 +19595,7 @@ Describe all keybindings behind `org-babel-key-prefix'.
 ;;;***
 
 ;;;### (autoloads (org-babel-lob-get-info org-babel-lob-execute-maybe
-;;;;;;  org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (20119 34052))
+;;;;;;  org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (20045 31431))
 ;;; Generated autoloads from org/ob-lob.el
 
 (autoload 'org-babel-lob-ingest "ob-lob" "\
@@ -19606,7 +19620,7 @@ Return a Library of Babel function call as a string.
 
 ;;;### (autoloads (org-babel-tangle org-babel-tangle-file org-babel-load-file
 ;;;;;;  org-babel-tangle-lang-exts) "ob-tangle" "org/ob-tangle.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20045 30712))
 ;;; Generated autoloads from org/ob-tangle.el
 
 (defvar org-babel-tangle-lang-exts '(("emacs-lisp" . "el")) "\
@@ -19648,7 +19662,7 @@ exported source code blocks by language.
 ;;;***
 
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (20136 50092))
+;;;;;;  (20135 56947))
 ;;; Generated autoloads from progmodes/octave-inf.el
 
 (autoload 'inferior-octave "octave-inf" "\
@@ -19671,7 +19685,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (20136 50092))
+;;;;;;  (20135 56947))
 ;;; Generated autoloads from progmodes/octave-mod.el
 
 (autoload 'octave-mode "octave-mod" "\
@@ -19759,7 +19773,7 @@ including a reproducible test case and send the message.
 ;;;;;;  org-insert-link-global org-store-link org-run-like-in-org-mode
 ;;;;;;  turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle
 ;;;;;;  org-mode org-babel-do-load-languages) "org" "org/org.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20170 13157))
 ;;; Generated autoloads from org/org.el
 
 (autoload 'org-babel-do-load-languages "org" "\
@@ -19983,7 +19997,7 @@ Call the customize function with org as argument.
 ;;;;;;  org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list
 ;;;;;;  org-search-view org-agenda-list org-batch-store-agenda-views
 ;;;;;;  org-store-agenda-views org-batch-agenda-csv org-batch-agenda
-;;;;;;  org-agenda) "org-agenda" "org/org-agenda.el" (20119 34052))
+;;;;;;  org-agenda) "org-agenda" "org/org-agenda.el" (20178 7273))
 ;;; Generated autoloads from org/org-agenda.el
 
 (autoload 'org-agenda "org-agenda" "\
@@ -20228,7 +20242,7 @@ belonging to the \"Work\" category.
 
 ;;;### (autoloads (org-archive-subtree-default-with-confirmation
 ;;;;;;  org-archive-subtree-default) "org-archive" "org/org-archive.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20045 30713))
 ;;; Generated autoloads from org/org-archive.el
 
 (autoload 'org-archive-subtree-default "org-archive" "\
@@ -20248,8 +20262,8 @@ This command is set with the variable `org-archive-default-command'.
 ;;;### (autoloads (org-export-as-ascii org-export-region-as-ascii
 ;;;;;;  org-replace-region-by-ascii org-export-as-ascii-to-buffer
 ;;;;;;  org-export-as-utf8-to-buffer org-export-as-utf8 org-export-as-latin1-to-buffer
-;;;;;;  org-export-as-latin1) "org-ascii" "org/org-ascii.el" (20119
-;;;;;;  34052))
+;;;;;;  org-export-as-latin1) "org-ascii" "org/org-ascii.el" (20045
+;;;;;;  30713))
 ;;; Generated autoloads from org/org-ascii.el
 
 (autoload 'org-export-as-latin1 "org-ascii" "\
@@ -20322,8 +20336,8 @@ publishing directory.
 
 ;;;***
 
-;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (20045
+;;;;;;  30713))
 ;;; Generated autoloads from org/org-attach.el
 
 (autoload 'org-attach "org-attach" "\
@@ -20335,7 +20349,7 @@ Shows a list of commands and prompts for another key to execute a command.
 ;;;***
 
 ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org/org-bbdb.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20164 29468))
 ;;; Generated autoloads from org/org-bbdb.el
 
 (autoload 'org-bbdb-anniversaries "org-bbdb" "\
@@ -20346,7 +20360,7 @@ Extract anniversaries from BBDB for display in the agenda.
 ;;;***
 
 ;;;### (autoloads (org-capture-import-remember-templates org-capture-insert-template-here
-;;;;;;  org-capture) "org-capture" "org/org-capture.el" (20119 34052))
+;;;;;;  org-capture) "org-capture" "org/org-capture.el" (20168 57844))
 ;;; Generated autoloads from org/org-capture.el
 
 (autoload 'org-capture "org-capture" "\
@@ -20384,7 +20398,7 @@ Set org-capture-templates to be similar to `org-remember-templates'.
 ;;;***
 
 ;;;### (autoloads (org-clock-persistence-insinuate org-get-clocktable)
-;;;;;;  "org-clock" "org/org-clock.el" (20119 34052))
+;;;;;;  "org-clock" "org/org-clock.el" (20172 54913))
 ;;; Generated autoloads from org/org-clock.el
 
 (autoload 'org-get-clocktable "org-clock" "\
@@ -20402,7 +20416,7 @@ Set up hooks for clock persistence.
 ;;;***
 
 ;;;### (autoloads (org-datetree-find-date-create) "org-datetree"
-;;;;;;  "org/org-datetree.el" (20119 34052))
+;;;;;;  "org/org-datetree.el" (20045 30713))
 ;;; Generated autoloads from org/org-datetree.el
 
 (autoload 'org-datetree-find-date-create "org-datetree" "\
@@ -20418,7 +20432,7 @@ tree can be found.
 ;;;### (autoloads (org-export-as-docbook org-export-as-docbook-pdf-and-open
 ;;;;;;  org-export-as-docbook-pdf org-export-region-as-docbook org-replace-region-by-docbook
 ;;;;;;  org-export-as-docbook-to-buffer org-export-as-docbook-batch)
-;;;;;;  "org-docbook" "org/org-docbook.el" (20119 34052))
+;;;;;;  "org-docbook" "org/org-docbook.el" (20045 30713))
 ;;; Generated autoloads from org/org-docbook.el
 
 (autoload 'org-export-as-docbook-batch "org-docbook" "\
@@ -20495,7 +20509,7 @@ publishing directory.
 
 ;;;### (autoloads (org-insert-export-options-template org-export-as-org
 ;;;;;;  org-export-visible org-export) "org-exp" "org/org-exp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20167 36967))
 ;;; Generated autoloads from org/org-exp.el
 
 (autoload 'org-export "org-exp" "\
@@ -20556,8 +20570,8 @@ Insert into the buffer a template with information for exporting.
 ;;;***
 
 ;;;### (autoloads (org-feed-show-raw-feed org-feed-goto-inbox org-feed-update
-;;;;;;  org-feed-update-all) "org-feed" "org/org-feed.el" (20119
-;;;;;;  34052))
+;;;;;;  org-feed-update-all) "org-feed" "org/org-feed.el" (20065
+;;;;;;  65310))
 ;;; Generated autoloads from org/org-feed.el
 
 (autoload 'org-feed-update-all "org-feed" "\
@@ -20585,7 +20599,7 @@ Show the raw feed buffer of a feed.
 ;;;***
 
 ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote"
-;;;;;;  "org/org-footnote.el" (20119 34052))
+;;;;;;  "org/org-footnote.el" (20161 45793))
 ;;; Generated autoloads from org/org-footnote.el
 
 (autoload 'org-footnote-action "org-footnote" "\
@@ -20636,7 +20650,7 @@ Additional note on `org-footnote-insert-pos-for-preprocessor':
 ;;;### (autoloads (org-freemind-to-org-mode org-freemind-from-org-sparse-tree
 ;;;;;;  org-freemind-from-org-mode org-freemind-from-org-mode-node
 ;;;;;;  org-freemind-show org-export-as-freemind) "org-freemind"
-;;;;;;  "org/org-freemind.el" (20119 34052))
+;;;;;;  "org/org-freemind.el" (20172 54913))
 ;;; Generated autoloads from org/org-freemind.el
 
 (autoload 'org-export-as-freemind "org-freemind" "\
@@ -20697,7 +20711,7 @@ Convert FreeMind file MM-FILE to `org-mode' file ORG-FILE.
 ;;;### (autoloads (org-export-htmlize-generate-css org-export-as-html
 ;;;;;;  org-export-region-as-html org-replace-region-by-html org-export-as-html-to-buffer
 ;;;;;;  org-export-as-html-batch org-export-as-html-and-open) "org-html"
-;;;;;;  "org/org-html.el" (20119 34052))
+;;;;;;  "org/org-html.el" (20065 65310))
 ;;; Generated autoloads from org/org-html.el
 
 (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp)
@@ -20791,7 +20805,7 @@ that uses these same face definitions.
 
 ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
 ;;;;;;  org-export-icalendar-this-file) "org-icalendar" "org/org-icalendar.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20164 29468))
 ;;; Generated autoloads from org/org-icalendar.el
 
 (autoload 'org-export-icalendar-this-file "org-icalendar" "\
@@ -20819,7 +20833,7 @@ The file is stored under the name `org-combined-agenda-icalendar-file'.
 ;;;### (autoloads (org-id-store-link org-id-find-id-file org-id-find
 ;;;;;;  org-id-goto org-id-get-with-outline-drilling org-id-get-with-outline-path-completion
 ;;;;;;  org-id-get org-id-copy org-id-get-create) "org-id" "org/org-id.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20065 65310))
 ;;; Generated autoloads from org/org-id.el
 
 (autoload 'org-id-get-create "org-id" "\
@@ -20888,7 +20902,7 @@ Store a link to the current entry, using its ID.
 ;;;***
 
 ;;;### (autoloads (org-indent-mode) "org-indent" "org/org-indent.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20045 30716))
 ;;; Generated autoloads from org/org-indent.el
 
 (autoload 'org-indent-mode "org-indent" "\
@@ -20903,7 +20917,7 @@ FIXME:  How to update when broken?
 ;;;***
 
 ;;;### (autoloads (org-irc-store-link) "org-irc" "org/org-irc.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20065 65310))
 ;;; Generated autoloads from org/org-irc.el
 
 (autoload 'org-irc-store-link "org-irc" "\
@@ -20916,7 +20930,7 @@ Dispatch to the appropriate function to store a link to an IRC session.
 ;;;### (autoloads (org-export-as-pdf-and-open org-export-as-pdf org-export-as-latex
 ;;;;;;  org-export-region-as-latex org-replace-region-by-latex org-export-as-latex-to-buffer
 ;;;;;;  org-export-as-latex-batch) "org-latex" "org/org-latex.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20164 29468))
 ;;; Generated autoloads from org/org-latex.el
 
 (autoload 'org-export-as-latex-batch "org-latex" "\
@@ -20996,8 +21010,8 @@ Export as LaTeX, then process through to PDF, and open.
 ;;;***
 
 ;;;### (autoloads (org-mobile-create-sumo-agenda org-mobile-pull
-;;;;;;  org-mobile-push) "org-mobile" "org/org-mobile.el" (20119
-;;;;;;  34052))
+;;;;;;  org-mobile-push) "org-mobile" "org/org-mobile.el" (20065
+;;;;;;  65310))
 ;;; Generated autoloads from org/org-mobile.el
 
 (autoload 'org-mobile-push "org-mobile" "\
@@ -21022,7 +21036,7 @@ Create a file that contains all custom agenda views.
 ;;;***
 
 ;;;### (autoloads (org-plot/gnuplot) "org-plot" "org/org-plot.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20157 54694))
 ;;; Generated autoloads from org/org-plot.el
 
 (autoload 'org-plot/gnuplot "org-plot" "\
@@ -21036,7 +21050,7 @@ line directly before or after the table.
 
 ;;;### (autoloads (org-publish-current-project org-publish-current-file
 ;;;;;;  org-publish-all org-publish) "org-publish" "org/org-publish.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20161 45793))
 ;;; Generated autoloads from org/org-publish.el
 
 (defalias 'org-publish-project 'org-publish)
@@ -21070,7 +21084,7 @@ the project.
 
 ;;;### (autoloads (org-remember-handler org-remember org-remember-apply-template
 ;;;;;;  org-remember-annotation org-remember-insinuate) "org-remember"
-;;;;;;  "org/org-remember.el" (20119 34052))
+;;;;;;  "org/org-remember.el" (20165 31925))
 ;;; Generated autoloads from org/org-remember.el
 
 (autoload 'org-remember-insinuate "org-remember" "\
@@ -21146,7 +21160,7 @@ See also the variable `org-reverse-note-order'.
 ;;;***
 
 ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl)
-;;;;;;  "org-table" "org/org-table.el" (20119 34052))
+;;;;;;  "org-table" "org/org-table.el" (20168 57844))
 ;;; Generated autoloads from org/org-table.el
 
 (autoload 'turn-on-orgtbl "org-table" "\
@@ -21170,7 +21184,7 @@ The table is taken from the parameter TXT, or from the buffer at point.
 ;;;***
 
 ;;;### (autoloads (org-export-as-taskjuggler-and-open org-export-as-taskjuggler)
-;;;;;;  "org-taskjuggler" "org/org-taskjuggler.el" (20119 34052))
+;;;;;;  "org-taskjuggler" "org/org-taskjuggler.el" (20166 16092))
 ;;; Generated autoloads from org/org-taskjuggler.el
 
 (autoload 'org-export-as-taskjuggler "org-taskjuggler" "\
@@ -21198,7 +21212,7 @@ with the TaskJuggler GUI.
 
 ;;;### (autoloads (org-timer-set-timer org-timer-item org-timer-change-times-in-region
 ;;;;;;  org-timer org-timer-start) "org-timer" "org/org-timer.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20045 30718))
 ;;; Generated autoloads from org/org-timer.el
 
 (autoload 'org-timer-start "org-timer" "\
@@ -21259,7 +21273,7 @@ replace any running timer.
 ;;;***
 
 ;;;### (autoloads (org-export-as-xoxo) "org-xoxo" "org/org-xoxo.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20045 30719))
 ;;; Generated autoloads from org/org-xoxo.el
 
 (autoload 'org-export-as-xoxo "org-xoxo" "\
@@ -21271,7 +21285,7 @@ The XOXO buffer is named *xoxo-<source buffer name>*
 ;;;***
 
 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (20126 50306))
+;;;;;;  (20162 63140))
 ;;; Generated autoloads from outline.el
 (put 'outline-regexp 'safe-local-variable 'stringp)
 (put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
@@ -21335,7 +21349,7 @@ See the command `outline-mode' for more information on this mode.
 ;;;### (autoloads (list-packages describe-package package-initialize
 ;;;;;;  package-refresh-contents package-install-file package-install-from-buffer
 ;;;;;;  package-install package-enable-at-startup) "package" "emacs-lisp/package.el"
-;;;;;;  (20139 30186))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from emacs-lisp/package.el
 
 (defvar package-enable-at-startup t "\
@@ -21405,7 +21419,7 @@ The list is displayed in a buffer named `*Packages*'.
 
 ;;;***
 
-;;;### (autoloads (show-paren-mode) "paren" "paren.el" (20126 50320))
+;;;### (autoloads (show-paren-mode) "paren" "paren.el" (20127 62865))
 ;;; Generated autoloads from paren.el
 
 (defvar show-paren-mode nil "\
@@ -21432,7 +21446,7 @@ matching parenthesis is highlighted in `show-paren-style' after
 ;;;***
 
 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from calendar/parse-time.el
 (put 'parse-time-rules 'risky-local-variable t)
 
@@ -21445,8 +21459,8 @@ unknown are returned as nil.
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20168
+;;;;;;  57844))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload 'pascal-mode "pascal" "\
@@ -21499,7 +21513,7 @@ no args, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (password-in-cache-p password-cache-expiry password-cache)
-;;;;;;  "password-cache" "password-cache.el" (20119 34052))
+;;;;;;  "password-cache" "password-cache.el" (20089 47591))
 ;;; Generated autoloads from password-cache.el
 
 (defvar password-cache t "\
@@ -21521,7 +21535,7 @@ Check if KEY is in the cache.
 ;;;***
 
 ;;;### (autoloads (pcase-let pcase-let* pcase) "pcase" "emacs-lisp/pcase.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19863 8742))
 ;;; Generated autoloads from emacs-lisp/pcase.el
 
 (autoload 'pcase "pcase" "\
@@ -21580,8 +21594,8 @@ of the form (UPAT EXP).
 
 ;;;***
 
-;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (20100
+;;;;;;  17869))
 ;;; Generated autoloads from pcmpl-cvs.el
 
 (autoload 'pcomplete/cvs "pcmpl-cvs" "\
@@ -21592,7 +21606,7 @@ Completion rules for the `cvs' command.
 ;;;***
 
 ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip)
-;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (20119 34052))
+;;;;;;  "pcmpl-gnu" "pcmpl-gnu.el" (20104 14925))
 ;;; Generated autoloads from pcmpl-gnu.el
 
 (autoload 'pcomplete/gzip "pcmpl-gnu" "\
@@ -21620,7 +21634,7 @@ Completion for the GNU tar utility.
 ;;;***
 
 ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill)
-;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (20119 34052))
+;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (19986 58615))
 ;;; Generated autoloads from pcmpl-linux.el
 
 (autoload 'pcomplete/kill "pcmpl-linux" "\
@@ -21640,8 +21654,8 @@ Completion for GNU/Linux `mount'.
 
 ;;;***
 
-;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (19961
+;;;;;;  55377))
 ;;; Generated autoloads from pcmpl-rpm.el
 
 (autoload 'pcomplete/rpm "pcmpl-rpm" "\
@@ -21653,7 +21667,7 @@ Completion for the `rpm' command.
 
 ;;;### (autoloads (pcomplete/scp pcomplete/ssh pcomplete/chgrp pcomplete/chown
 ;;;;;;  pcomplete/which pcomplete/xargs pcomplete/rm pcomplete/rmdir
-;;;;;;  pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (20120 43280))
+;;;;;;  pcomplete/cd) "pcmpl-unix" "pcmpl-unix.el" (20121 24048))
 ;;; Generated autoloads from pcmpl-unix.el
 
 (autoload 'pcomplete/cd "pcmpl-unix" "\
@@ -21710,8 +21724,8 @@ Includes files as well as host names followed by a colon.
 
 ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list
 ;;;;;;  pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete
-;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20119
-;;;;;;  34052))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20106
+;;;;;;  17429))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload 'pcomplete "pcomplete" "\
@@ -21770,7 +21784,7 @@ Setup `shell-mode' to use pcomplete.
 
 ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status
 ;;;;;;  cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs"
-;;;;;;  "vc/pcvs.el" (20119 34052))
+;;;;;;  "vc/pcvs.el" (20164 60780))
 ;;; Generated autoloads from vc/pcvs.el
 
 (autoload 'cvs-checkout "pcvs" "\
@@ -21845,15 +21859,16 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 
 ;;;***
 
-;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20119 34052))
+;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20174 10230))
 ;;; Generated autoloads from vc/pcvs-defs.el
 
-(defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)))
+(defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\
+Global menu used by PCL-CVS.")
 
 ;;;***
 
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20108 12033))
 ;;; Generated autoloads from progmodes/perl-mode.el
 (put 'perl-indent-level 'safe-local-variable 'integerp)
 (put 'perl-continued-statement-offset 'safe-local-variable 'integerp)
@@ -21915,7 +21930,7 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20093 44623))
 ;;; Generated autoloads from textmodes/picture.el
 
 (autoload 'picture-mode "picture" "\
@@ -21995,8 +22010,8 @@ they are not defaultly assigned to keys.
 
 ;;;***
 
-;;;### (autoloads (plstore-open) "plstore" "gnus/plstore.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (plstore-open) "plstore" "gnus/plstore.el" (20097
+;;;;;;  41737))
 ;;; Generated autoloads from gnus/plstore.el
 
 (autoload 'plstore-open "plstore" "\
@@ -22007,7 +22022,7 @@ Create a plstore instance associated with FILE.
 ;;;***
 
 ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from textmodes/po.el
 
 (autoload 'po-find-file-coding-system "po" "\
@@ -22018,7 +22033,7 @@ Called through `file-coding-system-alist', before the file is visited for real.
 
 ;;;***
 
-;;;### (autoloads (pong) "pong" "play/pong.el" (20119 34052))
+;;;### (autoloads (pong) "pong" "play/pong.el" (19845 45374))
 ;;; Generated autoloads from play/pong.el
 
 (autoload 'pong "pong" "\
@@ -22034,7 +22049,7 @@ pong-mode keybindings:\\<pong-mode-map>
 
 ;;;***
 
-;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (20119 34052))
+;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (20178 7273))
 ;;; Generated autoloads from gnus/pop3.el
 
 (autoload 'pop3-movemail "pop3" "\
@@ -22047,7 +22062,7 @@ Use streaming commands.
 
 ;;;### (autoloads (pp-macroexpand-last-sexp pp-eval-last-sexp pp-macroexpand-expression
 ;;;;;;  pp-eval-expression pp pp-buffer pp-to-string) "pp" "emacs-lisp/pp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emacs-lisp/pp.el
 
 (autoload 'pp-to-string "pp" "\
@@ -22115,7 +22130,7 @@ Ignores leading comment characters.
 ;;;;;;  pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview
 ;;;;;;  pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript
 ;;;;;;  pr-ps-directory-preview pr-interface) "printing" "printing.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20175 31160))
 ;;; Generated autoloads from printing.el
 
 (autoload 'pr-interface "printing" "\
@@ -22702,7 +22717,7 @@ are both set to t.
 
 ;;;***
 
-;;;### (autoloads (proced) "proced" "proced.el" (20119 34052))
+;;;### (autoloads (proced) "proced" "proced.el" (20053 39261))
 ;;; Generated autoloads from proced.el
 
 (autoload 'proced "proced" "\
@@ -22718,7 +22733,7 @@ See `proced-mode' for a description of features available in Proced buffers.
 ;;;***
 
 ;;;### (autoloads (run-prolog mercury-mode prolog-mode) "prolog"
-;;;;;;  "progmodes/prolog.el" (20119 34052))
+;;;;;;  "progmodes/prolog.el" (20176 51947))
 ;;; Generated autoloads from progmodes/prolog.el
 
 (autoload 'prolog-mode "prolog" "\
@@ -22753,8 +22768,8 @@ With prefix argument ARG, restart the Prolog process if running before.
 
 ;;;***
 
-;;;### (autoloads (bdf-directory-list) "ps-bdf" "ps-bdf.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (bdf-directory-list) "ps-bdf" "ps-bdf.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from ps-bdf.el
 
 (defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\
@@ -22765,8 +22780,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 
 ;;;***
 
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20167
+;;;;;;  36967))
 ;;; Generated autoloads from progmodes/ps-mode.el
 
 (autoload 'ps-mode "ps-mode" "\
@@ -22817,8 +22832,8 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 ;;;;;;  ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
 ;;;;;;  ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
 ;;;;;;  ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type
-;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (20119
-;;;;;;  34052))
+;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (20172
+;;;;;;  55048))
 ;;; Generated autoloads from ps-print.el
 
 (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\
@@ -23015,7 +23030,7 @@ If EXTENSION is any other symbol, it is ignored.
 ;;;***
 
 ;;;### (autoloads (jython-mode python-mode python-after-info-look
-;;;;;;  run-python) "python" "progmodes/python.el" (20119 34052))
+;;;;;;  run-python) "python" "progmodes/python.el" (20170 13157))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode))
@@ -23101,7 +23116,7 @@ Runs `jython-mode-hook' after `python-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/qp.el
 
 (autoload 'quoted-printable-decode-region "qp" "\
@@ -23124,7 +23139,7 @@ them into characters should be done separately.
 ;;;;;;  quail-defrule quail-install-decode-map quail-install-map
 ;;;;;;  quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
 ;;;;;;  quail-define-package quail-use-package quail-title) "quail"
-;;;;;;  "international/quail.el" (20119 34052))
+;;;;;;  "international/quail.el" (20166 16092))
 ;;; Generated autoloads from international/quail.el
 
 (autoload 'quail-title "quail" "\
@@ -23355,8 +23370,8 @@ of each directory.
 
 ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls
 ;;;;;;  quickurl-browse-url-ask quickurl-browse-url quickurl-add-url
-;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20119
-;;;;;;  34052))
+;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20168
+;;;;;;  57844))
 ;;; Generated autoloads from net/quickurl.el
 
 (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\
@@ -23428,7 +23443,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
 
 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (20138 51043))
+;;;;;;  "net/rcirc.el" (20170 13157))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload 'rcirc "rcirc" "\
@@ -23463,8 +23478,8 @@ Global minor mode for tracking activity in rcirc buffers.
 
 ;;;***
 
-;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from net/rcompile.el
 
 (autoload 'remote-compile "rcompile" "\
@@ -23476,7 +23491,7 @@ See \\[compile].
 ;;;***
 
 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19975 1875))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias 'regexp-builder 're-builder)
@@ -23494,7 +23509,7 @@ matching parts of the target buffer will be highlighted.
 
 ;;;***
 
-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (20126 50335))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (20167 36967))
 ;;; Generated autoloads from recentf.el
 
 (defvar recentf-mode nil "\
@@ -23524,7 +23539,7 @@ were operated on recently.
 ;;;;;;  string-rectangle delete-whitespace-rectangle open-rectangle
 ;;;;;;  insert-rectangle yank-rectangle kill-rectangle extract-rectangle
 ;;;;;;  delete-extract-rectangle delete-rectangle) "rect" "rect.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19999 41597))
 ;;; Generated autoloads from rect.el
  (define-key ctl-x-r-map "c" 'clear-rectangle)
  (define-key ctl-x-r-map "k" 'kill-rectangle)
@@ -23661,7 +23676,7 @@ with a prefix argument, prompt for START-AT and FORMAT.
 ;;;***
 
 ;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (20127
-;;;;;;  24416))
+;;;;;;  62865))
 ;;; Generated autoloads from textmodes/refill.el
 
 (autoload 'refill-mode "refill" "\
@@ -23682,7 +23697,7 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead.
 ;;;***
 
 ;;;### (autoloads (reftex-reset-scanning-information reftex-mode
-;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (20136 50092))
+;;;;;;  turn-on-reftex) "reftex" "textmodes/reftex.el" (20164 60780))
 ;;; Generated autoloads from textmodes/reftex.el
 
 (autoload 'turn-on-reftex "reftex" "\
@@ -23738,7 +23753,7 @@ This enforces rescanning the buffer on next use.
 ;;;***
 
 ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from textmodes/reftex-cite.el
 
 (autoload 'reftex-citation "reftex-cite" "\
@@ -23768,7 +23783,7 @@ While entering the regexp, completion on knows citation keys is possible.
 ;;;***
 
 ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20164 60780))
 ;;; Generated autoloads from textmodes/reftex-global.el
 
 (autoload 'reftex-isearch-minor-mode "reftex-global" "\
@@ -23785,7 +23800,7 @@ With no argument, this command toggles
 ;;;***
 
 ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20162 63140))
 ;;; Generated autoloads from textmodes/reftex-index.el
 
 (autoload 'reftex-index-phrases-mode "reftex-index" "\
@@ -23818,7 +23833,7 @@ Here are all local bindings.
 ;;;***
 
 ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20161 45793))
 ;;; Generated autoloads from textmodes/reftex-parse.el
 
 (autoload 'reftex-all-document-files "reftex-parse" "\
@@ -23830,8 +23845,8 @@ of master file.
 
 ;;;***
 
-;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (20119
-;;;;;;  34052))
+;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from textmodes/reftex-vars.el
 (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
 (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
@@ -23841,7 +23856,7 @@ of master file.
 ;;;***
 
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload 'regexp-opt "regexp-opt" "\
@@ -23872,7 +23887,7 @@ This means the number of non-shy regexp grouping constructs
 
 ;;;### (autoloads (remember-diary-extract-entries remember-clipboard
 ;;;;;;  remember-other-frame remember) "remember" "textmodes/remember.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20161 45793))
 ;;; Generated autoloads from textmodes/remember.el
 
 (autoload 'remember "remember" "\
@@ -23903,7 +23918,7 @@ Extract diary entries from the region.
 
 ;;;***
 
-;;;### (autoloads (repeat) "repeat" "repeat.el" (20119 34052))
+;;;### (autoloads (repeat) "repeat" "repeat.el" (20172 54913))
 ;;; Generated autoloads from repeat.el
 
 (autoload 'repeat "repeat" "\
@@ -23926,7 +23941,7 @@ recently executed command not bound to an input event\".
 ;;;***
 
 ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20076 35541))
 ;;; Generated autoloads from mail/reporter.el
 
 (autoload 'reporter-submit-bug-report "reporter" "\
@@ -23958,7 +23973,7 @@ mail-sending package is used for editing and sending the message.
 ;;;***
 
 ;;;### (autoloads (reposition-window) "reposition" "reposition.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from reposition.el
 
 (autoload 'reposition-window "reposition" "\
@@ -23985,7 +24000,7 @@ first comment line visible (if point is in a comment).
 ;;;***
 
 ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el"
-;;;;;;  (20126 50360))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from reveal.el
 
 (autoload 'reveal-mode "reveal" "\
@@ -24021,7 +24036,7 @@ the mode if ARG is omitted or nil.
 ;;;***
 
 ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emacs-lisp/ring.el
 
 (autoload 'ring-p "ring" "\
@@ -24036,7 +24051,7 @@ Make a ring that can contain SIZE elements.
 
 ;;;***
 
-;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (20119 34052))
+;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (20077 56412))
 ;;; Generated autoloads from net/rlogin.el
 
 (autoload 'rlogin "rlogin" "\
@@ -24085,7 +24100,7 @@ variable.
 ;;;;;;  rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
 ;;;;;;  rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
 ;;;;;;  rmail-user-mail-address-regexp rmail-movemail-variant-p)
-;;;;;;  "rmail" "mail/rmail.el" (20138 48832))
+;;;;;;  "rmail" "mail/rmail.el" (20174 10633))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -24183,8 +24198,8 @@ This is set to nil by default.")
 
 (defvar rmail-insert-mime-forwarded-message-function nil "\
 Function to insert a message in MIME format so it can be forwarded.
-This function is called if `rmail-enable-mime' or
-`rmail-enable-mime-composing' is non-nil.
+This function is called if `rmail-enable-mime' and
+`rmail-enable-mime-composing' are non-nil.
 It is called with one argument FORWARD-BUFFER, which is a
 buffer containing the message to forward.  The current buffer
 is the outgoing mail buffer.")
@@ -24269,7 +24284,7 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server.
 ;;;***
 
 ;;;### (autoloads (rmail-output-body-to-file rmail-output-as-seen
-;;;;;;  rmail-output) "rmailout" "mail/rmailout.el" (20119 34052))
+;;;;;;  rmail-output) "rmailout" "mail/rmailout.el" (20172 54913))
 ;;; Generated autoloads from mail/rmailout.el
 (put 'rmail-output-file-alist 'risky-local-variable t)
 
@@ -24334,7 +24349,7 @@ than appending to it.  Deletes the message after writing if
 ;;;***
 
 ;;;### (autoloads (rng-c-load-schema) "rng-cmpct" "nxml/rng-cmpct.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from nxml/rng-cmpct.el
 
 (autoload 'rng-c-load-schema "rng-cmpct" "\
@@ -24346,7 +24361,7 @@ Return a pattern.
 ;;;***
 
 ;;;### (autoloads (rng-nxml-mode-init) "rng-nxml" "nxml/rng-nxml.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from nxml/rng-nxml.el
 
 (autoload 'rng-nxml-mode-init "rng-nxml" "\
@@ -24359,7 +24374,7 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil.
 ;;;***
 
 ;;;### (autoloads (rng-validate-mode) "rng-valid" "nxml/rng-valid.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from nxml/rng-valid.el
 
 (autoload 'rng-validate-mode "rng-valid" "\
@@ -24377,7 +24392,7 @@ will be automatically rechecked when Emacs becomes idle; the
 rechecking will be paused whenever there is input pending.
 
 By default, uses a vacuous schema that allows any well-formed XML
-document.  A schema can be specified explictly using
+document.  A schema can be specified explicitly using
 \\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
 file name or on the root element name.  In each case the schema must
 be a RELAX NG schema using the compact schema (such schemas
@@ -24389,8 +24404,8 @@ to use for finding the schema.
 
 ;;;***
 
-;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (19930
+;;;;;;  13389))
 ;;; Generated autoloads from nxml/rng-xsd.el
 
 (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile)
@@ -24418,7 +24433,7 @@ must be equal.
 ;;;***
 
 ;;;### (autoloads (robin-use-package robin-modify-package robin-define-package)
-;;;;;;  "robin" "international/robin.el" (20119 34052))
+;;;;;;  "robin" "international/robin.el" (20159 42847))
 ;;; Generated autoloads from international/robin.el
 
 (autoload 'robin-define-package "robin" "\
@@ -24451,7 +24466,7 @@ Start using robin package NAME, which is a string.
 ;;;***
 
 ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region
-;;;;;;  rot13-string rot13) "rot13" "rot13.el" (20119 34052))
+;;;;;;  rot13-string rot13) "rot13" "rot13.el" (20154 24929))
 ;;; Generated autoloads from rot13.el
 
 (autoload 'rot13 "rot13" "\
@@ -24489,7 +24504,7 @@ Toggle the use of ROT13 encoding for the current window.
 ;;;***
 
 ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el"
-;;;;;;  (20127 24234))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from textmodes/rst.el
  (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))
 
@@ -24526,7 +24541,7 @@ for modes derived from Text mode, like Mail mode.
 ;;;***
 
 ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from progmodes/ruby-mode.el
 
 (autoload 'ruby-mode "ruby-mode" "\
@@ -24547,8 +24562,8 @@ The variable `ruby-indent-level' controls the amount of indentation.
 
 ;;;***
 
-;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (20126
-;;;;;;  50390))
+;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from ruler-mode.el
 
 (defvar ruler-mode nil "\
@@ -24565,8 +24580,8 @@ if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (20161
+;;;;;;  45793))
 ;;; Generated autoloads from emacs-lisp/rx.el
 
 (autoload 'rx-to-string "rx" "\
@@ -24877,8 +24892,8 @@ enclosed in `(and ...)'.
 
 ;;;***
 
-;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (20126
-;;;;;;  50398))
+;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from savehist.el
 
 (defvar savehist-mode nil "\
@@ -24910,7 +24925,7 @@ histories, which is probably undesirable.
 ;;;***
 
 ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20079 39251))
 ;;; Generated autoloads from progmodes/scheme.el
 
 (autoload 'scheme-mode "scheme" "\
@@ -24952,7 +24967,7 @@ that variable's value is a string.
 ;;;***
 
 ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/score-mode.el
 
 (autoload 'gnus-score-mode "score-mode" "\
@@ -24966,7 +24981,7 @@ This mode is an extended emacs-lisp mode.
 ;;;***
 
 ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el"
-;;;;;;  (20126 50406))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from scroll-all.el
 
 (defvar scroll-all-mode nil "\
@@ -24992,7 +25007,7 @@ one window apply to all visible windows in the same frame.
 ;;;***
 
 ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el"
-;;;;;;  (20126 43719))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from scroll-lock.el
 
 (autoload 'scroll-lock-mode "scroll-lock" "\
@@ -25006,7 +25021,7 @@ during scrolling.
 
 ;;;***
 
-;;;### (autoloads nil "secrets" "net/secrets.el" (20119 34052))
+;;;### (autoloads nil "secrets" "net/secrets.el" (20175 31160))
 ;;; Generated autoloads from net/secrets.el
 (when (featurep 'dbusbind)
  (autoload 'secrets-show-secrets "secrets" nil t))
@@ -25014,7 +25029,7 @@ during scrolling.
 ;;;***
 
 ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic"
-;;;;;;  "cedet/semantic.el" (20127 23255))
+;;;;;;  "cedet/semantic.el" (20172 54913))
 ;;; Generated autoloads from cedet/semantic.el
 
 (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\
@@ -25068,7 +25083,7 @@ Semantic mode.
 ;;;;;;  mail-personal-alias-file mail-default-reply-to mail-archive-file-name
 ;;;;;;  mail-header-separator send-mail-function mail-interactive
 ;;;;;;  mail-self-blind mail-specify-envelope-from mail-from-style)
-;;;;;;  "sendmail" "mail/sendmail.el" (20121 46524))
+;;;;;;  "sendmail" "mail/sendmail.el" (20122 44898))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style 'default "\
@@ -25350,8 +25365,8 @@ Like `mail' command, but display mail buffer in another frame.
 ;;;***
 
 ;;;### (autoloads (server-save-buffers-kill-terminal server-mode
-;;;;;;  server-force-delete server-start) "server" "server.el" (20126
-;;;;;;  50430))
+;;;;;;  server-force-delete server-start) "server" "server.el" (20172
+;;;;;;  54913))
 ;;; Generated autoloads from server.el
 
 (put 'server-host 'risky-local-variable t)
@@ -25418,7 +25433,7 @@ only these files will be asked to be saved.
 
 ;;;***
 
-;;;### (autoloads (ses-mode) "ses" "ses.el" (20119 34052))
+;;;### (autoloads (ses-mode) "ses" "ses.el" (20172 54913))
 ;;; Generated autoloads from ses.el
 
 (autoload 'ses-mode "ses" "\
@@ -25437,7 +25452,7 @@ These are active only in the minibuffer, when entering or editing a formula:
 ;;;***
 
 ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el"
-;;;;;;  (20127 24193))
+;;;;;;  (20167 36967))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 
 (autoload 'sgml-mode "sgml-mode" "\
@@ -25503,7 +25518,7 @@ To work around that, do:
 ;;;***
 
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (20120 43373))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from progmodes/sh-script.el
 (put 'sh-shell 'safe-local-variable 'symbolp)
 
@@ -25568,7 +25583,7 @@ with your script for an edit-interpret-debug cycle.
 ;;;***
 
 ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emacs-lisp/shadow.el
 
 (autoload 'list-load-path-shadows "shadow" "\
@@ -25618,8 +25633,8 @@ function, `load-path-shadows-find'.
 ;;;***
 
 ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group
-;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (20119
-;;;;;;  34052))
+;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (19886
+;;;;;;  45771))
 ;;; Generated autoloads from shadowfile.el
 
 (autoload 'shadow-define-cluster "shadowfile" "\
@@ -25658,7 +25673,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (20126 50438))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\
@@ -25706,8 +25721,8 @@ Otherwise, one argument `-i' is passed to the shell.
 
 ;;;***
 
-;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20172
+;;;;;;  54913))
 ;;; Generated autoloads from gnus/shr.el
 
 (autoload 'shr-insert-document "shr" "\
@@ -25718,7 +25733,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
 
 ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage)
-;;;;;;  "sieve" "gnus/sieve.el" (20119 34052))
+;;;;;;  "sieve" "gnus/sieve.el" (20165 31925))
 ;;; Generated autoloads from gnus/sieve.el
 
 (autoload 'sieve-manage "sieve" "\
@@ -25739,7 +25754,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
 
 ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from gnus/sieve-mode.el
 
 (autoload 'sieve-mode "sieve-mode" "\
@@ -25754,8 +25769,8 @@ Turning on Sieve mode runs `sieve-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19890
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/simula.el
 
 (autoload 'simula-mode "simula" "\
@@ -25804,7 +25819,7 @@ with no arguments, if that value is non-nil.
 ;;;***
 
 ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new
-;;;;;;  define-skeleton) "skeleton" "skeleton.el" (20119 34052))
+;;;;;;  define-skeleton) "skeleton" "skeleton.el" (19845 45374))
 ;;; Generated autoloads from skeleton.el
 
 (defvar skeleton-filter-function 'identity "\
@@ -25914,7 +25929,7 @@ symmetrical ones, and the same character twice for the others.
 ;;;***
 
 ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff)
-;;;;;;  "smerge-mode" "vc/smerge-mode.el" (20119 34052))
+;;;;;;  "smerge-mode" "vc/smerge-mode.el" (19946 1612))
 ;;; Generated autoloads from vc/smerge-mode.el
 
 (autoload 'smerge-ediff "smerge-mode" "\
@@ -25939,7 +25954,7 @@ If no conflict maker is found, turn off `smerge-mode'.
 ;;;***
 
 ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19939 28373))
 ;;; Generated autoloads from gnus/smiley.el
 
 (autoload 'smiley-region "smiley" "\
@@ -25957,7 +25972,7 @@ interactively.  If there's no argument, do it at the current buffer.
 ;;;***
 
 ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail"
-;;;;;;  "mail/smtpmail.el" (20119 34052))
+;;;;;;  "mail/smtpmail.el" (20168 57844))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload 'smtpmail-send-it "smtpmail" "\
@@ -25972,7 +25987,7 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'.
 
 ;;;***
 
-;;;### (autoloads (snake) "snake" "play/snake.el" (20119 34052))
+;;;### (autoloads (snake) "snake" "play/snake.el" (19845 45374))
 ;;; Generated autoloads from play/snake.el
 
 (autoload 'snake "snake" "\
@@ -25996,7 +26011,7 @@ Snake mode keybindings:
 ;;;***
 
 ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20161 45793))
 ;;; Generated autoloads from net/snmp-mode.el
 
 (autoload 'snmp-mode "snmp-mode" "\
@@ -26025,8 +26040,8 @@ then `snmpv2-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19886
+;;;;;;  45771))
 ;;; Generated autoloads from calendar/solar.el
 
 (autoload 'sunrise-sunset "solar" "\
@@ -26041,8 +26056,8 @@ This function is suitable for execution in a .emacs file.
 
 ;;;***
 
-;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (20165
+;;;;;;  31925))
 ;;; Generated autoloads from play/solitaire.el
 
 (autoload 'solitaire "solitaire" "\
@@ -26119,7 +26134,7 @@ Pick your favorite shortcuts:
 
 ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields
 ;;;;;;  sort-fields sort-numeric-fields sort-pages sort-paragraphs
-;;;;;;  sort-lines sort-subr) "sort" "sort.el" (20119 34052))
+;;;;;;  sort-lines sort-subr) "sort" "sort.el" (19845 45374))
 ;;; Generated autoloads from sort.el
 (put 'sort-fold-case 'safe-local-variable 'booleanp)
 
@@ -26263,8 +26278,8 @@ From a program takes two point or marker arguments, BEG and END.
 
 ;;;***
 
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (20167
+;;;;;;  36967))
 ;;; Generated autoloads from gnus/spam.el
 
 (autoload 'spam-initialize "spam" "\
@@ -26280,7 +26295,7 @@ installed through `spam-necessary-extra-headers'.
 
 ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file
 ;;;;;;  spam-report-url-ping-mm-url spam-report-process-queue) "spam-report"
-;;;;;;  "gnus/spam-report.el" (20119 34052))
+;;;;;;  "gnus/spam-report.el" (20166 16092))
 ;;; Generated autoloads from gnus/spam-report.el
 
 (autoload 'spam-report-process-queue "spam-report" "\
@@ -26323,7 +26338,7 @@ Spam reports will be queued with the method used when
 ;;;***
 
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (20119 34052))
+;;;;;;  "speedbar.el" (20178 7273))
 ;;; Generated autoloads from speedbar.el
 
 (defalias 'speedbar 'speedbar-frame-mode)
@@ -26347,8 +26362,8 @@ selected.  If the speedbar frame is active, then select the attached frame.
 
 ;;;***
 
-;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from play/spook.el
 
 (autoload 'spook "spook" "\
@@ -26367,7 +26382,7 @@ Return a vector containing the lines from `spook-phrases-file'.
 ;;;;;;  sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix
 ;;;;;;  sql-sybase sql-oracle sql-product-interactive sql-connect
 ;;;;;;  sql-mode sql-help sql-add-product-keywords) "sql" "progmodes/sql.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload 'sql-add-product-keywords "sql" "\
@@ -26863,7 +26878,7 @@ buffer.
 ;;;***
 
 ;;;### (autoloads (srecode-template-mode) "srecode/srt-mode" "cedet/srecode/srt-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20160 63745))
 ;;; Generated autoloads from cedet/srecode/srt-mode.el
 
 (autoload 'srecode-template-mode "srecode/srt-mode" "\
@@ -26876,7 +26891,7 @@ Major-mode for writing SRecode macros.
 ;;;***
 
 ;;;### (autoloads (starttls-open-stream) "starttls" "gnus/starttls.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20175 31160))
 ;;; Generated autoloads from gnus/starttls.el
 
 (autoload 'starttls-open-stream "starttls" "\
@@ -26893,7 +26908,7 @@ BUFFER is the buffer (or `buffer-name') to associate with the process.
 Third arg is name of the host to connect to, or its IP address.
 Fourth arg PORT is an integer specifying a port to connect to.
 If `starttls-use-gnutls' is nil, this may also be a service name, but
-GNUTLS requires a port number.
+GnuTLS requires a port number.
 
 \(fn NAME BUFFER HOST PORT)" nil nil)
 
@@ -26903,8 +26918,8 @@ GNUTLS requires a port number.
 ;;;;;;  strokes-mode strokes-list-strokes strokes-load-user-strokes
 ;;;;;;  strokes-help strokes-describe-stroke strokes-do-complex-stroke
 ;;;;;;  strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke
-;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (20126
-;;;;;;  50576))
+;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from strokes.el
 
 (autoload 'strokes-global-set-stroke "strokes" "\
@@ -27018,7 +27033,7 @@ Read a complex stroke and insert its glyph into the current buffer.
 ;;;***
 
 ;;;### (autoloads (studlify-buffer studlify-word studlify-region)
-;;;;;;  "studly" "play/studly.el" (20119 34052))
+;;;;;;  "studly" "play/studly.el" (19845 45374))
 ;;; Generated autoloads from play/studly.el
 
 (autoload 'studlify-region "studly" "\
@@ -27039,7 +27054,7 @@ Studlify-case the current buffer.
 ;;;***
 
 ;;;### (autoloads (global-subword-mode subword-mode) "subword" "progmodes/subword.el"
-;;;;;;  (20127 25236))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from progmodes/subword.el
 
 (autoload 'subword-mode "subword" "\
@@ -27095,7 +27110,7 @@ See `subword-mode' for more information on Subword mode.
 ;;;***
 
 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19931 11784))
 ;;; Generated autoloads from mail/supercite.el
 
 (autoload 'sc-cite-original "supercite" "\
@@ -27127,8 +27142,8 @@ and `sc-post-hook' is run after the guts of this function.
 
 ;;;***
 
-;;;### (autoloads (gpm-mouse-mode) "t-mouse" "t-mouse.el" (20126
-;;;;;;  50587))
+;;;### (autoloads (gpm-mouse-mode) "t-mouse" "t-mouse.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from t-mouse.el
 
 (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1")
@@ -27156,7 +27171,7 @@ It relies on the `gpm' daemon being activated.
 
 ;;;***
 
-;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (20119 34052))
+;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (19998 49767))
 ;;; Generated autoloads from tabify.el
 
 (autoload 'untabify "tabify" "\
@@ -27191,7 +27206,7 @@ The variable `tab-width' controls the spacing of tab stops.
 ;;;;;;  table-recognize table-insert-row-column table-insert-column
 ;;;;;;  table-insert-row table-insert table-point-left-cell-hook
 ;;;;;;  table-point-entered-cell-hook table-load-hook table-cell-map-hook)
-;;;;;;  "table" "textmodes/table.el" (20119 34052))
+;;;;;;  "table" "textmodes/table.el" (20179 28130))
 ;;; Generated autoloads from textmodes/table.el
 
 (defvar table-cell-map-hook nil "\
@@ -27771,7 +27786,7 @@ companion command to `table-capture' this way.
 
 (autoload 'table-release "table" "\
 Convert a table into plain text by removing the frame from a table.
-Remove the frame from a table and inactivate the table.  This command
+Remove the frame from a table and deactivate the table.  This command
 converts a table into plain text without frames.  It is a companion to
 `table-capture' which does the opposite process.
 
@@ -27780,7 +27795,7 @@ converts a table into plain text without frames.  It is a companion to
 ;;;***
 
 ;;;### (autoloads (tabulated-list-mode) "tabulated-list" "emacs-lisp/tabulated-list.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20170 13157))
 ;;; Generated autoloads from emacs-lisp/tabulated-list.el
 
 (autoload 'tabulated-list-mode "tabulated-list" "\
@@ -27822,7 +27837,7 @@ as the ewoc pretty-printer.
 
 ;;;***
 
-;;;### (autoloads (talk talk-connect) "talk" "talk.el" (20140 44272))
+;;;### (autoloads (talk talk-connect) "talk" "talk.el" (20141 9296))
 ;;; Generated autoloads from talk.el
 
 (autoload 'talk-connect "talk" "\
@@ -27837,7 +27852,7 @@ Connect to the Emacs talk group from the current X display or tty frame.
 
 ;;;***
 
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20129 34168))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20161 45793))
 ;;; Generated autoloads from tar-mode.el
 
 (autoload 'tar-mode "tar-mode" "\
@@ -27861,7 +27876,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
 ;;;***
 
 ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
-;;;;;;  "progmodes/tcl.el" (20119 34052))
+;;;;;;  "progmodes/tcl.el" (20164 29468))
 ;;; Generated autoloads from progmodes/tcl.el
 
 (autoload 'tcl-mode "tcl" "\
@@ -27909,7 +27924,7 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'.
 
 ;;;***
 
-;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (20119 34052))
+;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (20077 56412))
 ;;; Generated autoloads from net/telnet.el
 
 (autoload 'telnet "telnet" "\
@@ -27935,7 +27950,7 @@ Normally input is edited in Emacs and sent a line at a time.
 ;;;***
 
 ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from term.el
 
 (autoload 'make-term "term" "\
@@ -27977,8 +27992,8 @@ use in that buffer.
 
 ;;;***
 
-;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (20167
+;;;;;;  36967))
 ;;; Generated autoloads from terminal.el
 
 (autoload 'terminal-emulator "terminal" "\
@@ -28015,7 +28030,7 @@ subprocess started.
 ;;;***
 
 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20172 54913))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 
 (autoload 'testcover-this-defun "testcover" "\
@@ -28025,7 +28040,7 @@ Start coverage on function under point.
 
 ;;;***
 
-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (20119 34052))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19889 21967))
 ;;; Generated autoloads from play/tetris.el
 
 (autoload 'tetris "tetris" "\
@@ -28056,7 +28071,7 @@ tetris-mode keybindings:
 ;;;;;;  tex-start-commands tex-start-options slitex-run-command latex-run-command
 ;;;;;;  tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp
 ;;;;;;  tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el"
-;;;;;;  (20134 8463))
+;;;;;;  (20178 7273))
 ;;; Generated autoloads from textmodes/tex-mode.el
 
 (defvar tex-shell-file-name nil "\
@@ -28358,7 +28373,7 @@ Major mode to edit DocTeX files.
 ;;;***
 
 ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer)
-;;;;;;  "texinfmt" "textmodes/texinfmt.el" (20119 34052))
+;;;;;;  "texinfmt" "textmodes/texinfmt.el" (20183 25152))
 ;;; Generated autoloads from textmodes/texinfmt.el
 
 (autoload 'texinfo-format-buffer "texinfmt" "\
@@ -28398,7 +28413,7 @@ if large.  You can use `Info-split' to do this manually.
 ;;;***
 
 ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote)
-;;;;;;  "texinfo" "textmodes/texinfo.el" (20119 34052))
+;;;;;;  "texinfo" "textmodes/texinfo.el" (19845 45374))
 ;;; Generated autoloads from textmodes/texinfo.el
 
 (defvar texinfo-open-quote (purecopy "``") "\
@@ -28484,7 +28499,7 @@ value of `texinfo-mode-hook'.
 
 ;;;### (autoloads (thai-composition-function thai-compose-buffer
 ;;;;;;  thai-compose-string thai-compose-region) "thai-util" "language/thai-util.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from language/thai-util.el
 
 (autoload 'thai-compose-region "thai-util" "\
@@ -28513,7 +28528,7 @@ Compose Thai characters in the current buffer.
 
 ;;;### (autoloads (list-at-point number-at-point symbol-at-point
 ;;;;;;  sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing)
-;;;;;;  "thingatpt" "thingatpt.el" (20119 34052))
+;;;;;;  "thingatpt" "thingatpt.el" (19990 55648))
 ;;; Generated autoloads from thingatpt.el
 
 (autoload 'forward-thing "thingatpt" "\
@@ -28576,7 +28591,7 @@ Return the Lisp list at point, or nil if none is found.
 
 ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked
 ;;;;;;  thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from thumbs.el
 
 (autoload 'thumbs-find-thumb "thumbs" "\
@@ -28614,8 +28629,8 @@ In dired, call the setroot program on the image at point.
 ;;;;;;  tibetan-post-read-conversion tibetan-compose-buffer tibetan-decompose-buffer
 ;;;;;;  tibetan-decompose-string tibetan-decompose-region tibetan-compose-region
 ;;;;;;  tibetan-compose-string tibetan-transcription-to-tibetan tibetan-tibetan-to-transcription
-;;;;;;  tibetan-char-p) "tibet-util" "language/tibet-util.el" (20119
-;;;;;;  34052))
+;;;;;;  tibetan-char-p) "tibet-util" "language/tibet-util.el" (20175
+;;;;;;  31160))
 ;;; Generated autoloads from language/tibet-util.el
 
 (autoload 'tibetan-char-p "tibet-util" "\
@@ -28689,7 +28704,7 @@ See also docstring of the function tibetan-compose-region.
 ;;;***
 
 ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from textmodes/tildify.el
 
 (autoload 'tildify-region "tildify" "\
@@ -28714,7 +28729,7 @@ This function performs no refilling of the changed text.
 
 ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world
 ;;;;;;  display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (20126 50604))
+;;;;;;  "time" "time.el" (20127 62865))
 ;;; Generated autoloads from time.el
 
 (defvar display-time-day-and-date nil "\
@@ -28780,7 +28795,7 @@ Return a string giving the duration of the Emacs initialization.
 ;;;;;;  time-to-day-in-year date-leap-year-p days-between date-to-day
 ;;;;;;  time-add time-subtract time-since days-to-time time-less-p
 ;;;;;;  seconds-to-time date-to-time) "time-date" "calendar/time-date.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19885 24894))
 ;;; Generated autoloads from calendar/time-date.el
 
 (autoload 'date-to-time "time-date" "\
@@ -28894,7 +28909,7 @@ This function does not work for SECONDS greater than `most-positive-fixnum'.
 ;;;***
 
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (20119 34052))
+;;;;;;  "time-stamp.el" (20033 22846))
 ;;; Generated autoloads from time-stamp.el
 (put 'time-stamp-format 'safe-local-variable 'stringp)
 (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p)
@@ -28938,7 +28953,7 @@ With ARG, turn time stamping on if and only if arg is positive.
 ;;;;;;  timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out
 ;;;;;;  timeclock-change timeclock-status-string timeclock-out timeclock-in
 ;;;;;;  timeclock-modeline-display) "timeclock" "calendar/timeclock.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20165 31925))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload 'timeclock-modeline-display "timeclock" "\
@@ -29038,7 +29053,7 @@ relative only to the time worked today, and not to past time.
 ;;;***
 
 ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv"
-;;;;;;  "international/titdic-cnv.el" (20119 34052))
+;;;;;;  "international/titdic-cnv.el" (20175 31160))
 ;;; Generated autoloads from international/titdic-cnv.el
 
 (autoload 'titdic-convert "titdic-cnv" "\
@@ -29061,7 +29076,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\".
 ;;;***
 
 ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
-;;;;;;  "tmm.el" (20119 34052))
+;;;;;;  "tmm.el" (20163 39903))
 ;;; Generated autoloads from tmm.el
  (define-key global-map "\M-`" 'tmm-menubar)
  (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse)
@@ -29101,7 +29116,7 @@ Its value should be an event that has a binding in MENU.
 
 ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities
 ;;;;;;  todo-insert-item todo-add-item-non-interactively todo-add-category)
-;;;;;;  "todo-mode" "calendar/todo-mode.el" (20119 34052))
+;;;;;;  "todo-mode" "calendar/todo-mode.el" (20168 57844))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload 'todo-add-category "todo-mode" "\
@@ -29161,7 +29176,7 @@ Show TODO list.
 
 ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
 ;;;;;;  tool-bar-local-item tool-bar-add-item toggle-tool-bar-mode-from-frame)
-;;;;;;  "tool-bar" "tool-bar.el" (20126 50619))
+;;;;;;  "tool-bar" "tool-bar.el" (20127 62865))
 ;;; Generated autoloads from tool-bar.el
 
 (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\
@@ -29232,7 +29247,7 @@ holds a keymap.
 ;;;***
 
 ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el"
-;;;;;;  (20140 44316))
+;;;;;;  (20141 9296))
 ;;; Generated autoloads from emulation/tpu-edt.el
 
 (defvar tpu-edt-mode nil "\
@@ -29259,7 +29274,7 @@ Turn on TPU/edt emulation.
 ;;;***
 
 ;;;### (autoloads (tpu-mapper) "tpu-mapper" "emulation/tpu-mapper.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from emulation/tpu-mapper.el
 
 (autoload 'tpu-mapper "tpu-mapper" "\
@@ -29293,7 +29308,7 @@ your local X guru can try to figure out why the key is being ignored.
 
 ;;;***
 
-;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (20119 34052))
+;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (19845 45374))
 ;;; Generated autoloads from emacs-lisp/tq.el
 
 (autoload 'tq-create "tq" "\
@@ -29307,7 +29322,7 @@ to a tcp server on another machine.
 ;;;***
 
 ;;;### (autoloads (trace-function-background trace-function trace-buffer)
-;;;;;;  "trace" "emacs-lisp/trace.el" (20119 34052))
+;;;;;;  "trace" "emacs-lisp/trace.el" (19845 45374))
 ;;; Generated autoloads from emacs-lisp/trace.el
 
 (defvar trace-buffer (purecopy "*trace-output*") "\
@@ -29344,7 +29359,7 @@ BUFFER defaults to `trace-buffer'.
 ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
 ;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
 ;;;;;;  tramp-file-name-handler tramp-syntax tramp-mode) "tramp"
-;;;;;;  "net/tramp.el" (20127 27092))
+;;;;;;  "net/tramp.el" (20179 28130))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-mode t "\
@@ -29477,7 +29492,7 @@ Discard Tramp from loading remote files.
 ;;;***
 
 ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19946 29209))
 ;;; Generated autoloads from net/tramp-ftp.el
 
 (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\
@@ -29487,8 +29502,8 @@ Discard Tramp from loading remote files.
 
 ;;;***
 
-;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20140
-;;;;;;  41907))
+;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20176
+;;;;;;  51947))
 ;;; Generated autoloads from tutorial.el
 
 (autoload 'help-with-tutorial "tutorial" "\
@@ -29513,7 +29528,7 @@ resumed later.
 ;;;***
 
 ;;;### (autoloads (tai-viet-composition-function) "tv-util" "language/tv-util.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from language/tv-util.el
 
 (autoload 'tai-viet-composition-function "tv-util" "\
@@ -29524,7 +29539,7 @@ resumed later.
 ;;;***
 
 ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column"
-;;;;;;  "textmodes/two-column.el" (20140 44080))
+;;;;;;  "textmodes/two-column.el" (20141 9296))
 ;;; Generated autoloads from textmodes/two-column.el
  (autoload '2C-command "two-column" () t 'keymap)
  (global-set-key "\C-x6" '2C-command)
@@ -29575,7 +29590,7 @@ First column's text    sSs  Second column's text
 ;;;;;;  type-break type-break-mode type-break-keystroke-threshold
 ;;;;;;  type-break-good-break-interval type-break-good-rest-interval
 ;;;;;;  type-break-interval type-break-mode) "type-break" "type-break.el"
-;;;;;;  (20126 50662))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from type-break.el
 
 (defvar type-break-mode nil "\
@@ -29757,7 +29772,7 @@ FRAC should be the inverse of the fractional value; for example, a value of
 
 ;;;***
 
-;;;### (autoloads (uce-reply-to-uce) "uce" "mail/uce.el" (20119 34052))
+;;;### (autoloads (uce-reply-to-uce) "uce" "mail/uce.el" (19845 45374))
 ;;; Generated autoloads from mail/uce.el
 
 (autoload 'uce-reply-to-uce "uce" "\
@@ -29775,7 +29790,7 @@ You might need to set `uce-mail-reader' before using this.
 ;;;;;;  ucs-normalize-NFKC-string ucs-normalize-NFKC-region ucs-normalize-NFKD-string
 ;;;;;;  ucs-normalize-NFKD-region ucs-normalize-NFC-string ucs-normalize-NFC-region
 ;;;;;;  ucs-normalize-NFD-string ucs-normalize-NFD-region) "ucs-normalize"
-;;;;;;  "international/ucs-normalize.el" (20119 34052))
+;;;;;;  "international/ucs-normalize.el" (20052 53218))
 ;;; Generated autoloads from international/ucs-normalize.el
 
 (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\
@@ -29841,7 +29856,7 @@ Normalize the string STR by the Unicode NFC and Mac OS's HFS Plus.
 ;;;***
 
 ;;;### (autoloads (ununderline-region underline-region) "underline"
-;;;;;;  "textmodes/underline.el" (20119 34052))
+;;;;;;  "textmodes/underline.el" (19845 45374))
 ;;; Generated autoloads from textmodes/underline.el
 
 (autoload 'underline-region "underline" "\
@@ -29862,7 +29877,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20172 54913))
 ;;; Generated autoloads from mail/unrmail.el
 
 (autoload 'batch-unrmail "unrmail" "\
@@ -29881,8 +29896,8 @@ Convert old-style Rmail Babyl file FILE to system inbox format file TO-FILE.
 
 ;;;***
 
-;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from emacs-lisp/unsafep.el
 
 (autoload 'unsafep "unsafep" "\
@@ -29895,7 +29910,7 @@ UNSAFEP-VARS is a list of symbols with local bindings.
 ;;;***
 
 ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url"
-;;;;;;  "url/url.el" (20119 34052))
+;;;;;;  "url/url.el" (20162 19074))
 ;;; Generated autoloads from url/url.el
 
 (autoload 'url-retrieve "url" "\
@@ -29937,7 +29952,7 @@ no further processing).  URL is either a string or a parsed URL.
 ;;;***
 
 ;;;### (autoloads (url-register-auth-scheme url-get-authentication)
-;;;;;;  "url-auth" "url/url-auth.el" (20119 34052))
+;;;;;;  "url-auth" "url/url-auth.el" (19845 45374))
 ;;; Generated autoloads from url/url-auth.el
 
 (autoload 'url-get-authentication "url-auth" "\
@@ -29979,7 +29994,7 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
 ;;;***
 
 ;;;### (autoloads (url-cache-extract url-is-cached url-store-in-cache)
-;;;;;;  "url-cache" "url/url-cache.el" (20119 34052))
+;;;;;;  "url-cache" "url/url-cache.el" (19988 13913))
 ;;; Generated autoloads from url/url-cache.el
 
 (autoload 'url-store-in-cache "url-cache" "\
@@ -30000,7 +30015,7 @@ Extract FNAM from the local disk cache.
 
 ;;;***
 
-;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (20119 34052))
+;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (19845 45374))
 ;;; Generated autoloads from url/url-cid.el
 
 (autoload 'url-cid "url-cid" "\
@@ -30011,7 +30026,7 @@ Extract FNAM from the local disk cache.
 ;;;***
 
 ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav"
-;;;;;;  "url/url-dav.el" (20119 34052))
+;;;;;;  "url/url-dav.el" (20168 57844))
 ;;; Generated autoloads from url/url-dav.el
 
 (autoload 'url-dav-supported-p "url-dav" "\
@@ -30026,8 +30041,8 @@ Extract FNAM from the local disk cache.
 
 ;;;***
 
-;;;### (autoloads (url-file) "url-file" "url/url-file.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (url-file) "url-file" "url/url-file.el" (19845
+;;;;;;  45374))
 ;;; Generated autoloads from url/url-file.el
 
 (autoload 'url-file "url-file" "\
@@ -30038,7 +30053,7 @@ Handle file: and ftp: URLs.
 ;;;***
 
 ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw"
-;;;;;;  "url/url-gw.el" (20119 34052))
+;;;;;;  "url/url-gw.el" (19864 29553))
 ;;; Generated autoloads from url/url-gw.el
 
 (autoload 'url-gateway-nslookup-host "url-gw" "\
@@ -30058,7 +30073,7 @@ Might do a non-blocking connection; use `process-status' to check.
 
 ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file
 ;;;;;;  url-file-handler url-handler-mode) "url-handlers" "url/url-handlers.el"
-;;;;;;  (20127 23866))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from url/url-handlers.el
 
 (defvar url-handler-mode nil "\
@@ -30113,7 +30128,7 @@ accessible.
 ;;;***
 
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (20119 34052))
+;;;;;;  url-http) "url-http" "url/url-http.el" (20167 36967))
 ;;; Generated autoloads from url/url-http.el
 
 (autoload 'url-http "url-http" "\
@@ -30179,7 +30194,7 @@ HTTPS retrievals are asynchronous.")
 
 ;;;***
 
-;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (20119 34052))
+;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (19845 45374))
 ;;; Generated autoloads from url/url-irc.el
 
 (autoload 'url-irc "url-irc" "\
@@ -30189,8 +30204,8 @@ HTTPS retrievals are asynchronous.")
 
 ;;;***
 
-;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (20119
-;;;;;;  34052))
+;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (20164
+;;;;;;  60780))
 ;;; Generated autoloads from url/url-ldap.el
 
 (autoload 'url-ldap "url-ldap" "\
@@ -30204,7 +30219,7 @@ URL can be a URL string, or a URL vector of the type returned by
 ;;;***
 
 ;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from url/url-mailto.el
 
 (autoload 'url-mail "url-mailto" "\
@@ -30220,7 +30235,7 @@ Handle the mailto: URL syntax.
 ;;;***
 
 ;;;### (autoloads (url-data url-generic-emulator-loader url-info
-;;;;;;  url-man) "url-misc" "url/url-misc.el" (20119 34052))
+;;;;;;  url-man) "url-misc" "url/url-misc.el" (19845 45374))
 ;;; Generated autoloads from url/url-misc.el
 
 (autoload 'url-man "url-misc" "\
@@ -30252,7 +30267,7 @@ Fetch a data URL (RFC 2397).
 ;;;***
 
 ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from url/url-news.el
 
 (autoload 'url-news "url-news" "\
@@ -30269,7 +30284,7 @@ Fetch a data URL (RFC 2397).
 
 ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable
 ;;;;;;  dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from url/url-ns.el
 
 (autoload 'isPlainHostName "url-ns" "\
@@ -30310,7 +30325,7 @@ Fetch a data URL (RFC 2397).
 ;;;***
 
 ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse"
-;;;;;;  "url/url-parse.el" (20119 34052))
+;;;;;;  "url/url-parse.el" (19845 45374))
 ;;; Generated autoloads from url/url-parse.el
 
 (autoload 'url-recreate-url "url-parse" "\
@@ -30328,7 +30343,7 @@ TYPE USER PASSWORD HOST PORTSPEC FILENAME TARGET ATTRIBUTES FULLNESS.
 ;;;***
 
 ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from url/url-privacy.el
 
 (autoload 'url-setup-privacy-info "url-privacy" "\
@@ -30339,7 +30354,7 @@ Setup variables that expose info about you and your system.
 ;;;***
 
 ;;;### (autoloads (url-queue-retrieve) "url-queue" "url/url-queue.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19943 25429))
 ;;; Generated autoloads from url/url-queue.el
 
 (autoload 'url-queue-retrieve "url-queue" "\
@@ -30358,7 +30373,7 @@ controls the level of parallelism via the
 ;;;;;;  url-pretty-length url-strip-leading-spaces url-eat-trailing-space
 ;;;;;;  url-get-normalized-date url-lazy-message url-normalize-url
 ;;;;;;  url-insert-entities-in-string url-parse-args url-debug url-debug)
-;;;;;;  "url-util" "url/url-util.el" (20119 34052))
+;;;;;;  "url-util" "url/url-util.el" (19867 59212))
 ;;; Generated autoloads from url/url-util.el
 
 (defvar url-debug nil "\
@@ -30494,7 +30509,7 @@ This uses `url-current-object', set locally to the buffer.
 ;;;***
 
 ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock)
-;;;;;;  "userlock" "userlock.el" (20119 34052))
+;;;;;;  "userlock" "userlock.el" (19845 45374))
 ;;; Generated autoloads from userlock.el
 
 (autoload 'ask-user-about-lock "userlock" "\
@@ -30524,7 +30539,7 @@ The buffer in question is current when this function is called.
 
 ;;;### (autoloads (utf-7-imap-pre-write-conversion utf-7-pre-write-conversion
 ;;;;;;  utf-7-imap-post-read-conversion utf-7-post-read-conversion)
-;;;;;;  "utf-7" "international/utf-7.el" (20119 34052))
+;;;;;;  "utf-7" "international/utf-7.el" (19845 45374))
 ;;; Generated autoloads from international/utf-7.el
 
 (autoload 'utf-7-post-read-conversion "utf-7" "\
@@ -30549,7 +30564,7 @@ The buffer in question is current when this function is called.
 
 ;;;***
 
-;;;### (autoloads (utf7-encode) "utf7" "gnus/utf7.el" (20119 34052))
+;;;### (autoloads (utf7-encode) "utf7" "gnus/utf7.el" (19845 45374))
 ;;; Generated autoloads from gnus/utf7.el
 
 (autoload 'utf7-encode "utf7" "\
@@ -30561,7 +30576,7 @@ Encode UTF-7 STRING.  Use IMAP modification if FOR-IMAP is non-nil.
 
 ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal
 ;;;;;;  uudecode-decode-region-external) "uudecode" "mail/uudecode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from mail/uudecode.el
 
 (autoload 'uudecode-decode-region-external "uudecode" "\
@@ -30591,8 +30606,8 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
 ;;;;;;  vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers
 ;;;;;;  vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff
 ;;;;;;  vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook
-;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20128
-;;;;;;  38948))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20172
+;;;;;;  54913))
 ;;; Generated autoloads from vc/vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -30875,7 +30890,7 @@ Return the branch part of a revision number REV.
 ;;;***
 
 ;;;### (autoloads (vc-annotate) "vc-annotate" "vc/vc-annotate.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19920 63959))
 ;;; Generated autoloads from vc/vc-annotate.el
 
 (autoload 'vc-annotate "vc-annotate" "\
@@ -30912,7 +30927,7 @@ mode-specific menu.  `vc-annotate-color-map' and
 
 ;;;***
 
-;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20119 34052))
+;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20168 57844))
 ;;; Generated autoloads from vc/vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -30922,13 +30937,14 @@ mode-specific menu.  `vc-annotate-color-map' and
 
 ;;;***
 
-;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20127 27092))
+;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20174 10230))
 ;;; Generated autoloads from vc/vc-bzr.el
 
 (defconst vc-bzr-admin-dirname ".bzr" "\
 Name of the directory containing Bzr repository status files.")
 
-(defconst vc-bzr-admin-checkout-format-file (concat vc-bzr-admin-dirname "/checkout/format"))
+(defconst vc-bzr-admin-checkout-format-file (concat vc-bzr-admin-dirname "/checkout/format") "\
+Name of the format file in a .bzr directory.")
  (defun vc-bzr-registered (file)
   (if (vc-find-root file vc-bzr-admin-checkout-format-file)
       (progn
@@ -30937,9 +30953,10 @@ Name of the directory containing Bzr repository status files.")
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20119 34052))
+;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20174 10230))
 ;;; Generated autoloads from vc/vc-cvs.el
- (defun vc-cvs-registered (f)
+(defun vc-cvs-registered (f)
+  "Return non-nil if file F is registered with CVS."
   (when (file-readable-p (expand-file-name
                           "CVS/Entries" (file-name-directory f)))
       (load "vc-cvs")
@@ -30947,7 +30964,7 @@ Name of the directory containing Bzr repository status files.")
 
 ;;;***
 
-;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20119 34052))
+;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20168 57844))
 ;;; Generated autoloads from vc/vc-dir.el
 
 (autoload 'vc-dir "vc-dir" "\
@@ -30972,7 +30989,7 @@ These are the commands available for use in the file status buffer:
 ;;;***
 
 ;;;### (autoloads (vc-do-command) "vc-dispatcher" "vc/vc-dispatcher.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from vc/vc-dispatcher.el
 
 (autoload 'vc-do-command "vc-dispatcher" "\
@@ -30995,7 +31012,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20119 34052))
+;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20087 5852))
 ;;; Generated autoloads from vc/vc-git.el
  (defun vc-git-registered (file)
   "Return non-nil if FILE is registered with git."
@@ -31006,7 +31023,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20119 34052))
+;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (19845 45374))
 ;;; Generated autoloads from vc/vc-hg.el
  (defun vc-hg-registered (file)
   "Return non-nil if FILE is registered with hg."
@@ -31017,12 +31034,14 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20119 34052))
+;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20174 10230))
 ;;; Generated autoloads from vc/vc-mtn.el
 
-(defconst vc-mtn-admin-dir "_MTN")
+(defconst vc-mtn-admin-dir "_MTN" "\
+Name of the monotone directory.")
 
-(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format"))
+(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format") "\
+Name of the monotone directory's format file.")
  (defun vc-mtn-registered (file)
   (if (vc-find-root file vc-mtn-admin-format)
       (progn
@@ -31032,7 +31051,7 @@ case, and the process object in the asynchronous case.
 ;;;***
 
 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc/vc-rcs.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20161 45793))
 ;;; Generated autoloads from vc/vc-rcs.el
 
 (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -31046,7 +31065,7 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
 
 ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc/vc-sccs.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19845 45374))
 ;;; Generated autoloads from vc/vc-sccs.el
 
 (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -31063,7 +31082,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20119 34052))
+;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20162 19074))
 ;;; Generated autoloads from vc/vc-svn.el
  (defun vc-svn-registered (f)
   (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
@@ -31077,7 +31096,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;***
 
 ;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el"
-;;;;;;  (20129 34267))
+;;;;;;  (20131 59880))
 ;;; Generated autoloads from progmodes/vera-mode.el
  (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'")  'vera-mode))
 
@@ -31135,7 +31154,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20183 25152))
 ;;; Generated autoloads from progmodes/verilog-mode.el
 
 (autoload 'verilog-mode "verilog-mode" "\
@@ -31242,6 +31261,8 @@ Some other functions are:
     \\[verilog-sk-initial]  Insert an initial begin .. end block.
     \\[verilog-sk-fork]  Insert a fork begin .. end .. join block.
     \\[verilog-sk-module]  Insert a module .. (/*AUTOARG*/);.. endmodule block.
+    \\[verilog-sk-ovm-class]  Insert an OVM Class block.
+    \\[verilog-sk-uvm-class]  Insert an UVM Class block.
     \\[verilog-sk-primitive]  Insert a primitive .. (.. );.. endprimitive block.
     \\[verilog-sk-repeat]  Insert a repeat (..) begin .. end block.
     \\[verilog-sk-specify]  Insert a specify .. endspecify block.
@@ -31272,7 +31293,7 @@ Key bindings specific to `verilog-mode-map' are:
 ;;;***
 
 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (20127 25049))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 
 (autoload 'vhdl-mode "vhdl-mode" "\
@@ -31724,10 +31745,10 @@ Usage:
 
 
   PRINTING:
-    Postscript printing with different faces (an optimized set of faces is
+    PostScript printing with different faces (an optimized set of faces is
     used if `vhdl-print-customize-faces' is non-nil) or colors (if
     `ps-print-color-p' is non-nil) is possible using the standard Emacs
-    postscript printing commands.  Option `vhdl-print-two-column' defines
+    PostScript printing commands.  Option `vhdl-print-two-column' defines
     appropriate default settings for nice landscape two-column printing.
     The paper format can be set by option `ps-paper-type'.  Do not forget to
     switch `ps-print-color-p' to nil for printing on black-and-white
@@ -31813,7 +31834,7 @@ Key bindings:
 
 ;;;***
 
-;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (20119 34052))
+;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (20104 14925))
 ;;; Generated autoloads from emulation/vi.el
 
 (autoload 'vi-mode "vi" "\
@@ -31868,7 +31889,7 @@ Syntax table and abbrevs while in vi mode remain as they were in Emacs.
 ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion
 ;;;;;;  viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer
 ;;;;;;  viet-decode-viqr-region viet-encode-viscii-char) "viet-util"
-;;;;;;  "language/viet-util.el" (20119 34052))
+;;;;;;  "language/viet-util.el" (19845 45374))
 ;;; Generated autoloads from language/viet-util.el
 
 (autoload 'viet-encode-viscii-char "viet-util" "\
@@ -31916,7 +31937,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics.
 ;;;;;;  view-mode view-buffer-other-frame view-buffer-other-window
 ;;;;;;  view-buffer view-file-other-frame view-file-other-window
 ;;;;;;  view-file kill-buffer-if-not-modified view-remove-frame-by-deleting)
-;;;;;;  "view" "view.el" (20126 50686))
+;;;;;;  "view" "view.el" (20174 10230))
 ;;; Generated autoloads from view.el
 
 (defvar view-remove-frame-by-deleting t "\
@@ -32158,8 +32179,8 @@ Exit View mode and make the current buffer editable.
 
 ;;;***
 
-;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20140
-;;;;;;  44329))
+;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20141
+;;;;;;  9296))
 ;;; Generated autoloads from emulation/vip.el
 
 (autoload 'vip-setup "vip" "\
@@ -32175,7 +32196,7 @@ Turn on VIP emulation of VI.
 ;;;***
 
 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20167 36967))
 ;;; Generated autoloads from emulation/viper.el
 
 (autoload 'toggle-viper-mode "viper" "\
@@ -32192,7 +32213,7 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'.
 ;;;***
 
 ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19906 31087))
 ;;; Generated autoloads from emacs-lisp/warnings.el
 
 (defvar warning-prefix-function nil "\
@@ -32282,7 +32303,7 @@ this is equivalent to `display-warning', using
 ;;;***
 
 ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20174 10230))
 ;;; Generated autoloads from wdired.el
 
 (autoload 'wdired-change-to-wdired-mode "wdired" "\
@@ -32298,7 +32319,7 @@ See `wdired-mode'.
 
 ;;;***
 
-;;;### (autoloads (webjump) "webjump" "net/webjump.el" (20119 34052))
+;;;### (autoloads (webjump) "webjump" "net/webjump.el" (20159 42847))
 ;;; Generated autoloads from net/webjump.el
 
 (autoload 'webjump "webjump" "\
@@ -32315,7 +32336,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 ;;;***
 
 ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el"
-;;;;;;  (20127 25007))
+;;;;;;  (20127 62865))
 ;;; Generated autoloads from progmodes/which-func.el
  (put 'which-func-format 'risky-local-variable t)
  (put 'which-func-current 'risky-local-variable t)
@@ -32348,7 +32369,7 @@ in certain major modes.
 ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region
 ;;;;;;  whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options
 ;;;;;;  global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode
-;;;;;;  whitespace-mode) "whitespace" "whitespace.el" (20142 405))
+;;;;;;  whitespace-mode) "whitespace" "whitespace.el" (20176 51947))
 ;;; Generated autoloads from whitespace.el
 
 (autoload 'whitespace-mode "whitespace" "\
@@ -32747,7 +32768,7 @@ cleaning up these problems.
 ;;;***
 
 ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse
-;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (20126 45211))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (20127 62865))
 ;;; Generated autoloads from wid-browse.el
 
 (autoload 'widget-browse-at "wid-browse" "\
@@ -32773,8 +32794,8 @@ Minor mode for traversing widgets.
 ;;;***
 
 ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create
-;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20119
-;;;;;;  34052))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20162
+;;;;;;  19074))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload 'widgetp "wid-edit" "\
@@ -32817,8 +32838,8 @@ Setup current buffer so editing string widgets works.
 ;;;***
 
 ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
-;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (20119
-;;;;;;  34052))
+;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (20161
+;;;;;;  45793))
 ;;; Generated autoloads from windmove.el
 
 (autoload 'windmove-left "windmove" "\
@@ -32871,7 +32892,7 @@ Default MODIFIER is 'shift.
 ;;;***
 
 ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el"
-;;;;;;  (20119 34052))
+;;;;;;  (19998 49767))
 ;;; Generated autoloads from winner.el
 
 (defvar winner-mode nil "\
@@ -32890,7 +32911,7 @@ With arg, turn Winner mode on if and only if arg is positive.
 ;;;***
 
 ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file
-;;;;;;  woman woman-locale) "woman" "woman.el" (20119 34052))
+;;;;;;  woman woman-locale) "woman" "woman.el" (20168 57844))
 ;;; Generated autoloads from woman.el
 
 (defvar woman-locale nil "\
@@ -32939,7 +32960,7 @@ Default bookmark handler for Woman buffers.
 ;;;***
 
 ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el"
-;;;;;;  (20140 44344))
+;;;;;;  (20141 9296))
 ;;; Generated autoloads from emulation/ws-mode.el
 
 (autoload 'wordstar-mode "ws-mode" "\
@@ -33051,7 +33072,7 @@ The key bindings are:
 
 ;;;***
 
-;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20127 25788))
+;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20175 31160))
 ;;; Generated autoloads from net/xesam.el
 
 (autoload 'xesam-search "xesam" "\
@@ -33071,7 +33092,7 @@ Example:
 ;;;***
 
 ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;;  (20119 34052))
+;;;;;;  (20168 57844))
 ;;; Generated autoloads from xml.el
 
 (autoload 'xml-parse-file "xml" "\
@@ -33097,7 +33118,7 @@ If PARSE-NS is non-nil, then QNAMES are expanded.
 ;;;***
 
 ;;;### (autoloads (xmltok-get-declared-encoding-position) "xmltok"
-;;;;;;  "nxml/xmltok.el" (20119 34052))
+;;;;;;  "nxml/xmltok.el" (19845 45374))
 ;;; Generated autoloads from nxml/xmltok.el
 
 (autoload 'xmltok-get-declared-encoding-position "xmltok" "\
@@ -33115,8 +33136,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT.
 
 ;;;***
 
-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (20126
-;;;;;;  50742))
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (20127
+;;;;;;  62865))
 ;;; Generated autoloads from xt-mouse.el
 
 (defvar xterm-mouse-mode nil "\
@@ -33146,7 +33167,7 @@ down the SHIFT key while pressing the mouse button.
 ;;;***
 
 ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc"
-;;;;;;  "gnus/yenc.el" (20119 34052))
+;;;;;;  "gnus/yenc.el" (19845 45374))
 ;;; Generated autoloads from gnus/yenc.el
 
 (autoload 'yenc-decode-region "yenc" "\
@@ -33162,7 +33183,7 @@ Extract file name from an yenc header.
 ;;;***
 
 ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
-;;;;;;  yow) "yow" "play/yow.el" (20119 34052))
+;;;;;;  yow) "yow" "play/yow.el" (19845 45374))
 ;;; Generated autoloads from play/yow.el
 
 (autoload 'yow "yow" "\
@@ -33188,7 +33209,7 @@ Zippy goes to the analyst.
 
 ;;;***
 
-;;;### (autoloads (zone) "zone" "play/zone.el" (20119 34052))
+;;;### (autoloads (zone) "zone" "play/zone.el" (19889 21967))
 ;;; Generated autoloads from play/zone.el
 
 (autoload 'zone "zone" "\
@@ -33204,46 +33225,47 @@ Zone out, completely.
 ;;;;;;  "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el"
 ;;;;;;  "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el"
 ;;;;;;  "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el"
-;;;;;;  "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el"
-;;;;;;  "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el"
-;;;;;;  "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el"
-;;;;;;  "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el"
-;;;;;;  "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el"
-;;;;;;  "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el"
-;;;;;;  "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el"
-;;;;;;  "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el"
-;;;;;;  "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el"
-;;;;;;  "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el"
-;;;;;;  "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el"
-;;;;;;  "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el"
-;;;;;;  "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el"
-;;;;;;  "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el"
-;;;;;;  "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el"
-;;;;;;  "cedet/cedet.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el"
-;;;;;;  "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el"
-;;;;;;  "cedet/ede/dired.el" "cedet/ede/emacs.el" "cedet/ede/files.el"
-;;;;;;  "cedet/ede/generic.el" "cedet/ede/linux.el" "cedet/ede/locate.el"
-;;;;;;  "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el"
-;;;;;;  "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el"
-;;;;;;  "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el"
-;;;;;;  "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el"
-;;;;;;  "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el"
-;;;;;;  "cedet/ede/project-am.el" "cedet/ede/shell.el" "cedet/ede/simple.el"
-;;;;;;  "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el"
-;;;;;;  "cedet/ede/system.el" "cedet/ede/util.el" "cedet/inversion.el"
-;;;;;;  "cedet/mode-local.el" "cedet/pulse.el" "cedet/semantic/analyze.el"
-;;;;;;  "cedet/semantic/analyze/complete.el" "cedet/semantic/analyze/debug.el"
-;;;;;;  "cedet/semantic/analyze/fcn.el" "cedet/semantic/analyze/refs.el"
-;;;;;;  "cedet/semantic/bovine.el" "cedet/semantic/bovine/c-by.el"
-;;;;;;  "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el"
-;;;;;;  "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el"
-;;;;;;  "cedet/semantic/bovine/make-by.el" "cedet/semantic/bovine/make.el"
-;;;;;;  "cedet/semantic/bovine/scm-by.el" "cedet/semantic/bovine/scm.el"
-;;;;;;  "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el"
-;;;;;;  "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el"
-;;;;;;  "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el"
-;;;;;;  "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el"
-;;;;;;  "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
+;;;;;;  "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el"
+;;;;;;  "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el"
+;;;;;;  "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el"
+;;;;;;  "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el"
+;;;;;;  "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el"
+;;;;;;  "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el"
+;;;;;;  "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el"
+;;;;;;  "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el"
+;;;;;;  "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el"
+;;;;;;  "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el"
+;;;;;;  "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el"
+;;;;;;  "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el"
+;;;;;;  "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el"
+;;;;;;  "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el"
+;;;;;;  "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el"
+;;;;;;  "cedet/cedet-idutils.el" "cedet/cedet.el" "cedet/ede/auto.el"
+;;;;;;  "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" "cedet/ede/cpp-root.el"
+;;;;;;  "cedet/ede/custom.el" "cedet/ede/dired.el" "cedet/ede/emacs.el"
+;;;;;;  "cedet/ede/files.el" "cedet/ede/generic.el" "cedet/ede/linux.el"
+;;;;;;  "cedet/ede/loaddefs.el" "cedet/ede/locate.el" "cedet/ede/make.el"
+;;;;;;  "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" "cedet/ede/pmake.el"
+;;;;;;  "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el"
+;;;;;;  "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el"
+;;;;;;  "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el"
+;;;;;;  "cedet/ede/proj-shared.el" "cedet/ede/proj.el" "cedet/ede/project-am.el"
+;;;;;;  "cedet/ede/shell.el" "cedet/ede/simple.el" "cedet/ede/source.el"
+;;;;;;  "cedet/ede/speedbar.el" "cedet/ede/srecode.el" "cedet/ede/system.el"
+;;;;;;  "cedet/ede/util.el" "cedet/inversion.el" "cedet/mode-local.el"
+;;;;;;  "cedet/pulse.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el"
+;;;;;;  "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el"
+;;;;;;  "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el"
+;;;;;;  "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el"
+;;;;;;  "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el"
+;;;;;;  "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el"
+;;;;;;  "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el"
+;;;;;;  "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el"
+;;;;;;  "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el"
+;;;;;;  "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el"
+;;;;;;  "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el"
+;;;;;;  "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el"
+;;;;;;  "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
 ;;;;;;  "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el"
 ;;;;;;  "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el"
 ;;;;;;  "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el"
@@ -33251,13 +33273,13 @@ Zone out, completely.
 ;;;;;;  "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el"
 ;;;;;;  "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el"
 ;;;;;;  "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el"
-;;;;;;  "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el"
-;;;;;;  "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el"
-;;;;;;  "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el"
-;;;;;;  "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el"
-;;;;;;  "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el"
-;;;;;;  "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el"
-;;;;;;  "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el"
+;;;;;;  "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el"
+;;;;;;  "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el"
+;;;;;;  "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el"
+;;;;;;  "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el"
+;;;;;;  "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el"
+;;;;;;  "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el"
+;;;;;;  "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el"
 ;;;;;;  "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el"
 ;;;;;;  "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el"
 ;;;;;;  "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el"
@@ -33269,32 +33291,33 @@ Zone out, completely.
 ;;;;;;  "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el"
 ;;;;;;  "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el"
 ;;;;;;  "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el"
-;;;;;;  "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el"
-;;;;;;  "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el"
-;;;;;;  "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el"
-;;;;;;  "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el"
-;;;;;;  "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
-;;;;;;  "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el"
-;;;;;;  "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el"
-;;;;;;  "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el"
-;;;;;;  "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-custom.el"
-;;;;;;  "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el"
-;;;;;;  "emacs-lisp/eieio-speedbar.el" "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el"
-;;;;;;  "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el"
-;;;;;;  "emacs-lisp/regi.el" "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el"
-;;;;;;  "emacs-lisp/tcover-unsafep.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el"
-;;;;;;  "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el"
-;;;;;;  "emulation/edt-vt100.el" "emulation/tpu-extras.el" "emulation/viper-cmd.el"
-;;;;;;  "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el"
-;;;;;;  "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el"
-;;;;;;  "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el"
-;;;;;;  "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el"
-;;;;;;  "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el"
-;;;;;;  "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el"
-;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
-;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
-;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
-;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-io.el"
+;;;;;;  "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el"
+;;;;;;  "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el"
+;;;;;;  "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el"
+;;;;;;  "cus-dep.el" "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el"
+;;;;;;  "dos-vars.el" "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el"
+;;;;;;  "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el"
+;;;;;;  "emacs-lisp/byte-opt.el" "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el"
+;;;;;;  "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el"
+;;;;;;  "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el"
+;;;;;;  "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el"
+;;;;;;  "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el"
+;;;;;;  "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el"
+;;;;;;  "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/regi.el"
+;;;;;;  "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el"
+;;;;;;  "emulation/cua-gmrk.el" "emulation/cua-rect.el" "emulation/edt-lk201.el"
+;;;;;;  "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el"
+;;;;;;  "emulation/tpu-extras.el" "emulation/viper-cmd.el" "emulation/viper-ex.el"
+;;;;;;  "emulation/viper-init.el" "emulation/viper-keym.el" "emulation/viper-macs.el"
+;;;;;;  "emulation/viper-mous.el" "emulation/viper-util.el" "erc/erc-backend.el"
+;;;;;;  "erc/erc-goodies.el" "erc/erc-ibuffer.el" "erc/erc-lang.el"
+;;;;;;  "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el"
+;;;;;;  "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el"
+;;;;;;  "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el"
+;;;;;;  "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el"
+;;;;;;  "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el"
+;;;;;;  "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el"
+;;;;;;  "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el"
 ;;;;;;  "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el"
 ;;;;;;  "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "foldout.el"
 ;;;;;;  "format-spec.el" "forms-d2.el" "forms-pass.el" "fringe.el"
@@ -33397,8 +33420,8 @@ Zone out, completely.
 ;;;;;;  "vc/ediff-init.el" "vc/ediff-merg.el" "vc/ediff-ptch.el"
 ;;;;;;  "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el"
 ;;;;;;  "vc/pcvs-util.el" "vc/vc-dav.el" "vcursor.el" "vt-control.el"
-;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20142
-;;;;;;  850 416521))
+;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20183
+;;;;;;  25444 347950))
 
 ;;;***
 
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 76c69f3308c..296063549fc 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -33,11 +33,13 @@
 
 ;;;###autoload
 (defvar lpr-windows-system
-  (memq system-type '(ms-dos windows-nt)))
+  (memq system-type '(ms-dos windows-nt))
+  "Non-nil if running on MS-DOS or MS Windows.")
 
 ;;;###autoload
 (defvar lpr-lp-system
-  (memq system-type '(usg-unix-v hpux irix)))
+  (memq system-type '(usg-unix-v hpux irix))
+  "Non-nil if running on a system type that uses the \"lp\" command.")
 
 
 (defgroup lpr nil
diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el
index 5332c0f14ba..32593462062 100644
--- a/lisp/mail/binhex.el
+++ b/lisp/mail/binhex.el
@@ -79,10 +79,11 @@ input and write the converted data to its standard output."
 
 ;;;###autoload
 (defconst binhex-begin-line
-  "^:...............................................................$")
+  "^:...............................................................$"
+  "Regular expression matching the start of a BinHex encoded region.")
 (defconst binhex-body-line
   "^[^:]...............................................................$")
-(defconst binhex-end-line ":$")
+(defconst binhex-end-line ":$")         ; unused
 
 (defvar binhex-temporary-file-directory
   (cond ((fboundp 'temp-directory) (temp-directory))
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 7167fa567d3..7e3d983a76c 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2026,7 +2026,7 @@ backup file names and the like)."
               (if (looking-at ".*\r\n.*\r\n")
                   (while (search-forward "\r\n" nil t)
                     (replace-match "\n" nil t)))
-;;                 ;; work around text-vs-binary wierdness
+;;                 ;; work around text-vs-binary weirdness
 ;;                 ;; if we don't find the normal M-H-S, try reading the file a different way
 ;;                 (if (not (feedmail-find-eoh t))
 ;;                         (let ((file-name-buffer-file-type-alist nil) (default-buffer-file-type nil))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 184eaca6c4b..230424c1920 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -482,6 +482,7 @@ still the current message in the Rmail buffer.")
 ;; It's not clear what it should do now, since there is nothing that
 ;; records when a message is shown for the first time (unseen is not
 ;; necessarily the same thing).
+;; See http://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00013.html
 (defcustom rmail-message-filter nil
   "If non-nil, a filter function for new messages in RMAIL.
 Called with region narrowed to the message, including headers,
@@ -489,30 +490,41 @@ before obeying `rmail-ignored-headers'."
   :group 'rmail-headers
   :type '(choice (const nil) function))
 
+(make-obsolete-variable 'rmail-message-filter
+                        "it is not used (try `rmail-show-message-hook')."
+                        "23.1")
+
 (defcustom rmail-automatic-folder-directives nil
-  "List of directives specifying where to put a message.
+  "List of directives specifying how to automatically file messages.
+Whenever Rmail shows a message in the folder that `rmail-file-name'
+specifies, it calls `rmail-auto-file' to maybe file the message in
+another folder according to this list.  Messages that are already
+marked as `filed', or are in different folders, are left alone.
+
 Each element of the list is of the form:
 
   (FOLDERNAME FIELD REGEXP [ FIELD REGEXP ] ... )
 
-Where FOLDERNAME is the name of a folder to put the message.
-If any of the field regexp's are nil, then it is ignored.
+FOLDERNAME is the name of a folder in which to put the message.
+If FOLDERNAME is nil then Rmail deletes the message, and moves on to
+the next.  If FOLDERNAME is \"/dev/null\", Rmail deletes the message,
+but does not move to the next.
 
-If FOLDERNAME is \"/dev/null\", it is deleted.
-If FOLDERNAME is nil then it is deleted, and skipped.
+FIELD is the name of a header field in the message, such as
+\"subject\" or \"from\".  A FIELD of \"to\" includes all text
+from both the \"to\" and \"cc\" headers.
 
-FIELD is the plain text name of a field in the message, such as
-\"subject\" or \"from\".  A FIELD of \"to\" will automatically include
-all text from the \"cc\" field as well.
+REGEXP is a regular expression to match (case-sensitively) against
+the preceding specified FIELD.
 
-REGEXP is an expression to match in the preceding specified FIELD.
-FIELD/REGEXP pairs continue in the list.
+There may be any number of FIELD/REGEXP pairs.
+All pairs must match for a directive to apply to a message.
+For a given message, Rmail applies only the first matching directive.
 
-examples:
+Examples:
   (\"/dev/null\" \"from\" \"@spam.com\") ; delete all mail from spam.com
   (\"RMS\" \"from\" \"rms@\") ; save all mail from RMS.
-
-Note that this is only applied in the folder specifed by `rmail-file-name'."
+"
   :group 'rmail
   :version "21.1"
   :type '(repeat (sexp :tag "Directive")))
@@ -552,7 +564,9 @@ In a summary buffer, this holds the RMAIL buffer it is a summary for.")
 ;; Message counters and markers.  Deleted flags.
 
 (defvar rmail-current-message nil
-  "Integer specifying the message currently being displayed in this folder.")
+  "Integer specifying the message currently being displayed in this folder.
+Counts messages from 1 to `rmail-total-messages'.  A value of 0
+means there are no messages in the folder.")
 (put 'rmail-current-message 'permanent-local t)
 
 (defvar rmail-total-messages nil
@@ -2934,8 +2948,11 @@ Uses the face specified by `rmail-highlight-face'."
                         (cons overlay rmail-overlay-list))))))))))
 
 (defun rmail-auto-file ()
-  "Automatically move a message into a sub-folder based on criteria.
-Called when a new message is displayed."
+  "Automatically move a message into another sfolder based on criteria.
+This moves messages according to `rmail-automatic-folder-directives'.
+It only does something in the folder that `rmail-file-name' specifies.
+The function `rmail-show-message' calls this whenever it shows a message.
+This leaves a message alone if it already has the `filed' attribute."
   (if (or (zerop rmail-total-messages)
           (rmail-message-attr-p rmail-current-message "...F")
           (not (string= (buffer-file-name)
@@ -2955,10 +2972,14 @@ Called when a new message is displayed."
               directive-loop (cdr (car d)))
         (while (and (car directive-loop)
                     (let ((f (cond
-                              ((string= (car directive-loop) "from") from)
-                              ((string= (car directive-loop) "to") to)
-                              ((string= (car directive-loop) "subject") subj)
+                              ((string= (downcase (car directive-loop)) "from")
+                               from)
+                              ((string= (downcase (car directive-loop)) "to")
+                               to)
+                              ((string= (downcase (car directive-loop))
+                                        "subject") subj)
                               (t (mail-fetch-field (car directive-loop))))))
+                      ;; FIXME - shouldn't this ignore case?
                       (and f (string-match (car (cdr directive-loop)) f))))
           (setq directive-loop (cdr (cdr directive-loop))))
         ;; If there are no directives left, then it was a complete match.
@@ -3779,6 +3800,8 @@ which is an element of rmail-msgref-vector."
 With prefix argument, \"resend\" the message instead of forwarding it;
 see the documentation of `rmail-resend'."
   (interactive "P")
+  (if (zerop rmail-current-message)
+      (error "No message to forward"))
   (if resend
       (call-interactively 'rmail-resend)
     (let ((forward-buffer rmail-buffer)
@@ -4461,7 +4484,7 @@ Edit the contents of this message.
 
 ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message
 ;;;;;;  rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd"
-;;;;;;  "rmailkwd.el" "08c288c88cfe7be50830122c064e3884")
+;;;;;;  "rmailkwd.el" "ec13237a2b0a9e9c1893e38d36b11134")
 ;;; Generated autoloads from rmailkwd.el
 
 (autoload 'rmail-add-label "rmailkwd" "\
@@ -4504,7 +4527,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5ecb69456c4d86a4e905eb3008602a95")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2cb1f29b88b0c724fdba389fd7b98b00")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index 73542578bf6..472740aefd8 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -96,7 +96,8 @@ LABEL may be a symbol or string."
       (error "More than one label specified"))
   (with-current-buffer rmail-buffer
     (rmail-maybe-set-message-counters)
-    (or msg (setq msg rmail-current-message))
+    (if (zerop (or msg (setq msg rmail-current-message)))
+        (error "No message"))
     ;; Force recalculation of summary for this message.
     (aset rmail-summary-vector (1- msg) nil)
     (let (attr-index)
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index e53e0c0744e..d01cfc7f2c8 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1269,7 +1269,8 @@ The arguments ARG and STATE have no effect in this case."
                              (or arg (goto-char (point-min)))
                              (point)) 'rmail-mime-entity)))
               (if (or (not arg) entity) (rmail-mime-toggle-raw state)))
-          (message "Not a MIME message")))
+          (message "Not a MIME message, just toggling headers")
+          (rmail-toggle-header)))
     (let* ((data (rmail-apply-in-message rmail-current-message 'buffer-string))
            (buf (get-buffer-create "*RMAIL*"))
            (rmail-mime-mbox-buffer rmail-view-buffer)
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index c168ca9d8f5..ad76a493483 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -468,6 +468,8 @@ from a non-Rmail buffer.  In this case, COUNT is ignored."
       (if rmail-buffer
           (set-buffer rmail-buffer)
         (error "There is no Rmail buffer"))
+      (if (zerop rmail-total-messages)
+          (error "No messages to output"))
       (let ((orig-count count)
             beg end)
         (while (> count 0)
@@ -533,6 +535,8 @@ so you should call `rmail-output' directly in that case."
     (if rmail-buffer
         (set-buffer rmail-buffer)
       (error "There is no Rmail buffer"))
+    (if (zerop rmail-total-messages)
+        (error "No messages to output"))
     (let ((orig-count count)
           (cur (current-buffer)))
       (while (> count 0)
@@ -594,6 +598,8 @@ than appending to it.  Deletes the message after writing if
         (expand-file-name file-name
                           (and rmail-default-body-file
                                (file-name-directory rmail-default-body-file))))
+  (if (zerop rmail-current-message)
+      (error "No message to output"))
   (save-excursion
     (goto-char (point-min))
     (search-forward "\n\n")
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 9ed2e90b456..652693209e8 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -231,10 +231,9 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
               (while (search-forward "\nFrom " nil t)
                 (forward-char -5)
                 (insert ?>)))
-            ;; Make sure the message ends with two newlines
             (goto-char (point-max))
-            (unless (looking-back "\n\n")
-              (insert "\n"))
+            ;; Add terminator blank line to message.
+            (insert "\n")
             ;; Write it to the output file, suitably encoded.
             (let ((coding-system-for-write coding))
               (write-region (point-min) (point-max) to-file t
diff --git a/lisp/man.el b/lisp/man.el
index 14fdac4e5da..c9ba64bf5e0 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -754,8 +754,10 @@ POS defaults to `point'."
 
 (defun Man-completion-table (string pred action)
   (cond
-   ((eq action 'lambda)
-    (not (string-match "([^)]*\\'" string)))
+   ;; This ends up returning t for pretty much any string, and hence leads to
+   ;; spurious "complete but not unique" messages.  And since `man' doesn't
+   ;; require-match anyway, there's not point being clever.
+   ;;((eq action 'lambda) (not (string-match "([^)]*\\'" string)))
    ((equal string "-k")
     ;; Let SPC (minibuffer-complete-word) insert the space.
     (complete-with-action action '("-k ") string pred))
@@ -1095,7 +1097,7 @@ Same for the ANSI bold and normal escape sequences."
       (replace-match "+")
       (put-text-property (1- (point)) (point) 'face 'bold))
     ;; When the header is longer than the manpage name, groff tries to
-    ;; condense it to a shorter line interspered with ^H.  Remove ^H with
+    ;; condense it to a shorter line interspersed with ^H.  Remove ^H with
     ;; their preceding chars (but don't put Man-overstrike-face).  (Bug#5566)
     (goto-char (point-min))
     (while (re-search-forward ".\b" nil t) (backward-delete-char 2))
@@ -1189,7 +1191,7 @@ script would have done them."
   (goto-char (point-min))
   (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+"))
   ;; When the header is longer than the manpage name, groff tries to
-  ;; condense it to a shorter line interspered with ^H.  Remove ^H with
+  ;; condense it to a shorter line interspersed with ^H.  Remove ^H with
   ;; their preceding chars (but don't put Man-overstrike-face).  (Bug#5566)
   (goto-char (point-min))
   (while (re-search-forward ".\b" nil t) (backward-delete-char 2))
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 6bdd96c0fcc..02e531120be 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -2674,7 +2674,7 @@
 
         Follow MH-E Developers Guide conventions.  Use `' quotes for Help
         hyperlinks such as symbols, Info nodes, or URLs.  Use \" quotes for
-        everything else.  Otherwise, you can accidently get links to
+        everything else.  Otherwise, you can accidentally get links to
         nonsense symbols.
 
 2005-12-22  Bill Wohler  <wohler@newt.com>
@@ -3456,4 +3456,3 @@
 ;; sentence-end-double-space: nil
 ;; add-log-time-zone-rule: t
 ;; End:
-
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index d35d7d4c676..871b84dd039 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -2553,7 +2553,7 @@
         for users who have customized it to a long list now redundant with
         `mh-invisible-header-fields-default'.
         (mh-invisible-header-fields-default-override): New defcustom.
-        Users check off the fields they want displyed from what we
+        Users check off the fields they want displayed from what we
         included in `mh-invisible-header-fields-default'.
         (mh-invisible-headers): Function adapted to new variables.
 
@@ -7385,7 +7385,7 @@
         (mh-visit-folder) alias, and v (mh-visit-folder).
         (mh-index-folder-mode-help-messages): Changes for above.
         (mh-index-folder-message-menu, mh-index-folder-folder-menu): New
-        menus. I decided to delete the unavailable items since greying out
+        menus. I decided to delete the unavailable items since graying out
         implies that the user can do something to access them. In this
         case, that's not the case. Well, that's not entirely true--the
         user could write code for those functions ;-).
@@ -9150,7 +9150,7 @@
         %number(msg).
         (mh-scan-msg-format-string): Format to be used with the current
         maximum width of message number for the folder in the
-        `mh-upate-scan-format' function.
+        `mh-update-scan-format' function.
         (mh-update-scan-format): Use `mh-scan-msg-format-regexp' for greater
         flexibility. The message number is no longer anchored to the
         beginning of the `mh-scan-format-nmh' or `mh-scan-format-mh' format
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index ddc9b3ffe94..4469c043b15 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -127,7 +127,7 @@ where,
   first line is useful and complete without the rest of the string.
 
   Optional item ENABLE-EXPR is an arbitrary lisp expression. If it
-  evaluates to nil, then the button is deactivated, otherwise it is
+  evaluates to nil, then the button is inactive, otherwise it is
   active. If it isn't present then the button is always active."
   ;; The following variable names have been carefully chosen to make code
   ;; generation easier. Modifying the names should be done carefully.
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 6c2556b1f39..224131623f4 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1651,7 +1651,7 @@ Return non-nil if a selection was deactivated."
 ;;; Hierarchical tagbrowser ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Todo:
 ;; - Add a button on each dir to open/close it (?)
-;; - add the parent dir on the previous line, greyed-out, if it's not
+;; - add the parent dir on the previous line, grayed-out, if it's not
 ;;   present (because we're in the non-selected part and the parent is
 ;;   in the selected part).
 
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index f6a5b53ae7f..7ae6912cf8f 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -49,7 +49,7 @@
 ;; 'user@' part may be omitted.  This syntax can be customized to a certain
 ;; extent by changing ange-ftp-name-format.  There are limitations.
 ;; The `host' part has an optional suffix `#port' which may be used to
-;; specify a non-default port number for the connexion.
+;; specify a non-default port number for the connection.
 ;;
 ;; If the user part is omitted then ange-ftp generates a default user
 ;; instead whose value depends on the variable ange-ftp-default-user.
@@ -5995,7 +5995,7 @@ Other orders of $ and _ seem to all work just fine.")
              (concat
               pubset
               (and userid (concat userid "."))
-              ;; change every '/' in filename to a '.', normally not neccessary
+              ;; change every '/' in filename to a '.', normally not necessary
               (and filename
                    (subst-char-in-string ?/ ?. filename)))))
         ;; Let's hope that BS2000 recognize this anyway:
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 03b84a45ea3..8a8d9e6332f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -150,7 +150,7 @@ association to the service from D-Bus."
     ;; entry has the structure ((UNAME SERVICE PATH MEMBER [RULE]) ...).
     ;; MEMBER is either a string (the handler), or a cons cell (a
     ;; property value).  UNAME and property values are not taken into
-    ;; account for comparision.
+    ;; account for comparison.
 
     ;; Loop over the registered functions.
     (dolist (elt entry)
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index 87ff0b4060f..af8bc084b57 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -128,7 +128,7 @@ LOCATION is used as the address location for bbdb."
          zip city state)
     (setq addr-components (nreverse addr-components))
     ;; If not containing the zip code the last line is supposed to contain a
-    ;; country name and the addres is supposed to be in european style
+    ;; country name and the address is supposed to be in european style
     (if (not (string-match "[0-9][0-9][0-9]" last1))
         (progn
           (setq state last1)
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 9cb071b185d..18471782f2c 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -108,7 +108,7 @@ trust and key files, and priority string."
            trustfiles crlfiles keylist min-prime-bits
            verify-flags verify-error verify-hostname-error
            &allow-other-keys)
-  "Negotiate a SSL/TLS connection.  Returns proc. Signals gnutls-error.
+  "Negotiate a SSL/TLS connection.  Returns proc.  Signals gnutls-error.
 
 Note arguments are passed CL style, :type TYPE instead of just TYPE.
 
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 7e0eaff1dce..1a48e8863f1 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -729,7 +729,7 @@ to their attributes."
     ;; Create the search buffer.
     (with-current-buffer (get-buffer-create "*Secrets*")
       (switch-to-buffer-other-window (current-buffer))
-      ;; Inialize buffer with `secrets-mode'.
+      ;; Initialize buffer with `secrets-mode'.
       (secrets-mode)
       (secrets-show-collections))))
 
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 42ae5920eee..6f66156a7e2 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -123,7 +123,7 @@ successful negotiation."
 
 (defcustom tls-success "- Handshake was completed\\|SSL handshake has read "
   "Regular expression indicating completed TLS handshakes.
-The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's
+The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's
 \"openssl s_client\" outputs."
   :version "22.1"
   :type 'regexp
@@ -150,7 +150,7 @@ consider trustworthy, e.g.:
 (defcustom tls-untrusted
   "- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^ ]\\)"
   "Regular expression indicating failure of TLS certificate verification.
-The default is what GNUTLS's \"gnutls-cli\" or OpenSSL's
+The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's
 \"openssl s_client\" return in the event of unsuccessful
 verification."
   :type 'regexp
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index fda88351253..df841bade79 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -996,7 +996,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"."
     (let ((signal-name (dbus-event-member-name last-input-event))
           (elt mount-info))
       ;; Jump over the first elements of the mount info. Since there
-      ;; were changes in the antries, we cannot access dedicated
+      ;; were changes in the entries, we cannot access dedicated
       ;; elements.
       (while (stringp (car elt)) (setq elt (cdr elt)))
       (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt)))
@@ -1066,7 +1066,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"."
               tramp-gvfs-interface-mounttracker "listMounts"))
           nil)
        ;; Jump over the first elements of the mount info. Since there
-       ;; were changes in the antries, we cannot access dedicated
+       ;; were changes in the entries, we cannot access dedicated
        ;; elements.
        (while (stringp (car elt)) (setq elt (cdr elt)))
        (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt)))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 941b788ae4d..ee4c8966626 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1042,9 +1042,9 @@ target of the symlink differ."
       (tramp-flush-file-property l (file-name-directory l-localname))
       (tramp-flush-file-property l l-localname)
 
-      ;; Right, they are on the same host, regardless of user, method, etc.
-      ;; We now make the link on the remote machine. This will occur as the user
-      ;; that FILENAME belongs to.
+      ;; Right, they are on the same host, regardless of user, method,
+      ;; etc.  We now make the link on the remote machine. This will
+      ;; occur as the user that FILENAME belongs to.
       (tramp-send-command-and-check
        l
        (format
@@ -4224,148 +4224,166 @@ connection if a previous connection has died for some reason."
          (setq p nil)))
 
       ;; New connection must be opened.
-      (unless (and p (processp p) (memq (process-status p) '(run open)))
-
-        ;; We call `tramp-get-buffer' in order to get a debug buffer for
-        ;; messages from the beginning.
-        (tramp-get-buffer vec)
-        (tramp-with-progress-reporter
-            vec 3
-            (if (zerop (length (tramp-file-name-user vec)))
-                (format "Opening connection for %s using %s"
-                        (tramp-file-name-host vec)
-                        (tramp-file-name-method vec))
-              (format "Opening connection for %s@%s using %s"
-                      (tramp-file-name-user vec)
-                      (tramp-file-name-host vec)
-                      (tramp-file-name-method vec)))
-
-          ;; Start new process.
-          (when (and p (processp p))
-            (delete-process p))
-          (setenv "TERM" tramp-terminal-type)
-          (setenv "LC_ALL" "C")
-          (setenv "PROMPT_COMMAND")
-          (setenv "PS1" tramp-initial-end-of-output)
-          (let* ((target-alist (tramp-compute-multi-hops vec))
-                 (process-connection-type tramp-process-connection-type)
-                 (process-adaptive-read-buffering nil)
-                 (coding-system-for-read nil)
-                 ;; This must be done in order to avoid our file name handler.
-                 (p (let ((default-directory
-                            (tramp-compat-temporary-file-directory)))
-                      (apply
-                       'start-process
-                       (tramp-get-connection-name vec)
-                       (tramp-get-connection-buffer vec)
-                       (if tramp-encoding-command-interactive
-                           (list tramp-encoding-shell
-                                 tramp-encoding-command-interactive)
-                         (list tramp-encoding-shell))))))
-
-            ;; Set sentinel and query flag.
-            (tramp-set-connection-property p "vector" vec)
-            (set-process-sentinel p 'tramp-process-sentinel)
-            (tramp-compat-set-process-query-on-exit-flag p nil)
+      (condition-case err
+          (unless (and p (processp p) (memq (process-status p) '(run open)))
+
+            ;; We call `tramp-get-buffer' in order to get a debug
+            ;; buffer for messages from the beginning.
+            (tramp-get-buffer vec)
+            (tramp-with-progress-reporter
+                vec 3
+                (if (zerop (length (tramp-file-name-user vec)))
+                    (format "Opening connection for %s using %s"
+                            (tramp-file-name-host vec)
+                            (tramp-file-name-method vec))
+                  (format "Opening connection for %s@%s using %s"
+                          (tramp-file-name-user vec)
+                          (tramp-file-name-host vec)
+                          (tramp-file-name-method vec)))
+
+              ;; Start new process.
+              (when (and p (processp p))
+                (delete-process p))
+              (setenv "TERM" tramp-terminal-type)
+              (setenv "LC_ALL" "C")
+              (setenv "PROMPT_COMMAND")
+              (setenv "PS1" tramp-initial-end-of-output)
+              (let* ((target-alist (tramp-compute-multi-hops vec))
+                     (process-connection-type tramp-process-connection-type)
+                     (process-adaptive-read-buffering nil)
+                     (coding-system-for-read nil)
+                     ;; This must be done in order to avoid our file
+                     ;; name handler.
+                     (p (let ((default-directory
+                                (tramp-compat-temporary-file-directory)))
+                          (apply
+                           'start-process
+                           (tramp-get-connection-name vec)
+                           (tramp-get-connection-buffer vec)
+                           (if tramp-encoding-command-interactive
+                               (list tramp-encoding-shell
+                                     tramp-encoding-command-interactive)
+                             (list tramp-encoding-shell))))))
+
+                ;; Set sentinel and query flag.
+                (tramp-set-connection-property p "vector" vec)
+                (set-process-sentinel p 'tramp-process-sentinel)
+                (tramp-compat-set-process-query-on-exit-flag p nil)
 
-            (tramp-message
-             vec 6 "%s" (mapconcat 'identity (process-command p) " "))
-
-            ;; Check whether process is alive.
-            (tramp-barf-if-no-shell-prompt
-             p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)
-
-            ;; Now do all the connections as specified.
-            (while target-alist
-              (let* ((hop (car target-alist))
-                     (l-method (tramp-file-name-method hop))
-                     (l-user (tramp-file-name-user hop))
-                     (l-host (tramp-file-name-host hop))
-                     (l-port nil)
-                     (login-program
-                      (tramp-get-method-parameter
-                       l-method 'tramp-login-program))
-                     (login-args
-                      (tramp-get-method-parameter l-method 'tramp-login-args))
-                     (async-args
-                      (tramp-get-method-parameter l-method 'tramp-async-args))
-                     (gw-args
-                      (tramp-get-method-parameter l-method 'tramp-gw-args))
-                     (gw (tramp-get-file-property hop "" "gateway" nil))
-                     (g-method (and gw (tramp-file-name-method gw)))
-                     (g-user (and gw (tramp-file-name-user gw)))
-                     (g-host (and gw (tramp-file-name-real-host gw)))
-                     (command login-program)
-                     ;; We don't create the temporary file.  In fact,
-                     ;; it is just a prefix for the ControlPath option
-                     ;; of ssh; the real temporary file has another
-                     ;; name, and it is created and protected by ssh.
-                     ;; It is also removed by ssh when the connection
-                     ;; is closed.
-                     (tmpfile
-                      (tramp-set-connection-property
-                       p "temp-file"
-                       (make-temp-name
-                        (expand-file-name
-                         tramp-temp-name-prefix
-                         (tramp-compat-temporary-file-directory)))))
-                     spec)
-
-                ;; Add arguments for asynchronous processes.
-                (when (and process-name async-args)
-                  (setq login-args (append async-args login-args)))
-
-                ;; Add gateway arguments if necessary.
-                (when (and gw gw-args)
-                  (setq login-args (append gw-args login-args)))
-
-                ;; Check for port number.  Until now, there's no need
-                ;; for handling like method, user, host.
-                (when (string-match tramp-host-with-port-regexp l-host)
-                (setq l-port (match-string 2 l-host)
-                      l-host (match-string 1 l-host)))
-
-                ;; Set variables for computing the prompt for reading
-                ;; password.  They can also be derived from a gateway.
-                (setq tramp-current-method (or g-method l-method)
-                      tramp-current-user   (or g-user   l-user)
-                      tramp-current-host   (or g-host   l-host))
-
-                ;; Replace login-args place holders.
-                (setq
-                 l-host (or l-host "")
-                 l-user (or l-user "")
-                 l-port (or l-port "")
-                 spec (format-spec-make
-                       ?h l-host ?u l-user ?p l-port ?t tmpfile)
-                 command
-                 (concat
-                  ;; We do not want to see the trailing local prompt in
-                  ;; `start-file-process'.
-                  (unless (memq system-type '(windows-nt)) "exec ")
-                  command " "
-                  (mapconcat
-                   (lambda (x)
-                     (setq x (mapcar (lambda (y) (format-spec y spec)) x))
-                     (unless (member "" x) (mapconcat 'identity x " ")))
-                   login-args " ")
-                  ;; Local shell could be a Windows COMSPEC.  It
-                  ;; doesn't know the ";" syntax, but we must exit
-                  ;; always for `start-file-process'.  "exec" does not
-                  ;; work either.
-                  (if (memq system-type '(windows-nt)) " && exit || exit")))
-
-                ;; Send the command.
-                (tramp-message vec 3 "Sending command `%s'" command)
-                (tramp-send-command vec command t t)
-                (tramp-process-actions p vec pos tramp-actions-before-shell 60)
                 (tramp-message
-                 vec 3 "Found remote shell prompt on `%s'" l-host))
-              ;; Next hop.
-              (setq target-alist (cdr target-alist)))
-
-            ;; Make initial shell settings.
-            (tramp-open-connection-setup-interactive-shell p vec)))))))
+                 vec 6 "%s" (mapconcat 'identity (process-command p) " "))
+
+                ;; Check whether process is alive.
+                (tramp-barf-if-no-shell-prompt
+                 p 60
+                 "Couldn't find local shell prompt %s" tramp-encoding-shell)
+
+                ;; Now do all the connections as specified.
+                (while target-alist
+                  (let* ((hop (car target-alist))
+                         (l-method (tramp-file-name-method hop))
+                         (l-user (tramp-file-name-user hop))
+                         (l-host (tramp-file-name-host hop))
+                         (l-port nil)
+                         (login-program
+                          (tramp-get-method-parameter
+                           l-method 'tramp-login-program))
+                         (login-args
+                          (tramp-get-method-parameter
+                           l-method 'tramp-login-args))
+                         (async-args
+                          (tramp-get-method-parameter
+                           l-method 'tramp-async-args))
+                         (gw-args
+                          (tramp-get-method-parameter l-method 'tramp-gw-args))
+                         (gw (tramp-get-file-property hop "" "gateway" nil))
+                         (g-method (and gw (tramp-file-name-method gw)))
+                         (g-user (and gw (tramp-file-name-user gw)))
+                         (g-host (and gw (tramp-file-name-real-host gw)))
+                         (command login-program)
+                         ;; We don't create the temporary file.  In
+                         ;; fact, it is just a prefix for the
+                         ;; ControlPath option of ssh; the real
+                         ;; temporary file has another name, and it is
+                         ;; created and protected by ssh.  It is also
+                         ;; removed by ssh when the connection is
+                         ;; closed.
+                         (tmpfile
+                          (tramp-set-connection-property
+                           p "temp-file"
+                           (make-temp-name
+                            (expand-file-name
+                             tramp-temp-name-prefix
+                             (tramp-compat-temporary-file-directory)))))
+                         spec)
+
+                    ;; Add arguments for asynchronous processes.
+                    (when (and process-name async-args)
+                      (setq login-args (append async-args login-args)))
+
+                    ;; Add gateway arguments if necessary.
+                    (when (and gw gw-args)
+                      (setq login-args (append gw-args login-args)))
+
+                    ;; Check for port number.  Until now, there's no
+                    ;; need for handling like method, user, host.
+                    (when (string-match tramp-host-with-port-regexp l-host)
+                      (setq l-port (match-string 2 l-host)
+                            l-host (match-string 1 l-host)))
+
+                    ;; Set variables for computing the prompt for
+                    ;; reading password.  They can also be derived
+                    ;; from a gateway.
+                    (setq tramp-current-method (or g-method l-method)
+                          tramp-current-user   (or g-user   l-user)
+                          tramp-current-host   (or g-host   l-host))
+
+                    ;; Replace login-args place holders.
+                    (setq
+                     l-host (or l-host "")
+                     l-user (or l-user "")
+                     l-port (or l-port "")
+                     spec (format-spec-make
+                           ?h l-host ?u l-user ?p l-port ?t tmpfile)
+                     command
+                     (concat
+                      ;; We do not want to see the trailing local
+                      ;; prompt in `start-file-process'.
+                      (unless (memq system-type '(windows-nt)) "exec ")
+                      command " "
+                      (mapconcat
+                       (lambda (x)
+                         (setq x (mapcar (lambda (y) (format-spec y spec)) x))
+                         (unless (member "" x) (mapconcat 'identity x " ")))
+                       login-args " ")
+                      ;; Local shell could be a Windows COMSPEC.  It
+                      ;; doesn't know the ";" syntax, but we must exit
+                      ;; always for `start-file-process'.  "exec" does
+                      ;; not work either.
+                      (if (memq system-type '(windows-nt)) " && exit || exit")))
+
+                    ;; Send the command.
+                    (tramp-message vec 3 "Sending command `%s'" command)
+                    (tramp-send-command vec command t t)
+                    (tramp-process-actions
+                     p vec pos tramp-actions-before-shell 60)
+                    (tramp-message
+                     vec 3 "Found remote shell prompt on `%s'" l-host))
+                  ;; Next hop.
+                  (setq target-alist (cdr target-alist)))
+
+                ;; Make initial shell settings.
+                (tramp-open-connection-setup-interactive-shell p vec))))
+
+        ;; When the user did interrupt, we must cleanup.
+        (quit
+         (let ((p (tramp-get-connection-process vec)))
+           (when (and p (processp p))
+             (tramp-flush-connection-property vec)
+             (tramp-flush-connection-property p)
+             (delete-process p)))
+         ;; Propagate the quit signal.
+         (signal (car err) (cdr err)))))))
 
 (defun tramp-send-command (vec command &optional neveropen nooutput)
   "Send the COMMAND to connection VEC.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0ee6ad8dea4..c89b61c2eb1 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1331,7 +1331,7 @@ ARGS to actually emit the message (if applicable)."
                 (setq fn nil)))
             (setq btn (1+ btn))))
         ;; The following code inserts filename and line number.
-        ;; Should be deactivated by default, because it is time
+        ;; Should be inactive by default, because it is time
         ;; consuming.
 ;       (let ((ffn (find-function-noselect (intern fn))))
 ;         (insert
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index ea4a887898e..ab817a43885 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -196,7 +196,7 @@ be different at least in one face property not set in that face."
 (defconst xesam-all-fields
   '("xesam:35mmEquivalent" "xesam:aimContactMedium" "xesam:aperture"
     "xesam:aspectRatio" "xesam:attachmentEncoding" "xesam:attendee"
-    "xesam:audioBirate" "xesam:audioChannels" "xesam:audioCodec"
+    "xesam:audioBitrate" "xesam:audioChannels" "xesam:audioCodec"
     "xesam:audioCodecType" "xesam:audioSampleFormat" "xesam:audioSampleRate"
     "xesam:author" "xesam:bcc" "xesam:birthDate" "xesam:blogContactURL"
     "xesam:cameraManufacturer" "xesam:cameraModel" "xesam:cc" "xesam:ccdWidth"
@@ -240,7 +240,8 @@ be different at least in one face property not set in that face."
     "xesam:subject" "xesam:supercedes" "xesam:title" "xesam:to"
     "xesam:totalSpace" "xesam:totalUncompressedSize" "xesam:url"
     "xesam:usageIntensity" "xesam:userComment" "xesam:userKeyword"
-    "xesam:uuid" "xesam:version" "xesam:verticalResolution" "xesam:videoBirate"
+    "xesam:uuid" "xesam:version" "xesam:verticalResolution"
+    "xesam:videoBitrate"
     "xesam:videoCodec" "xesam:videoCodecType" "xesam:whiteBalance"
     "xesam:width" "xesam:wordCount" "xesam:workEmailAddress"
     "xesam:workPhoneNumber" "xesam:workPostalAddress"
@@ -819,7 +820,7 @@ search, is returned."
     (with-current-buffer
         (generate-new-buffer (xesam-buffer-name service search))
       (switch-to-buffer-other-window (current-buffer))
-      ;; Inialize buffer with `xesam-mode'.  `xesam-vendor' must be
+      ;; Initialize buffer with `xesam-mode'.  `xesam-vendor' must be
       ;; set before calling `xesam-mode', because we want to give the
       ;; hook functions a chance to identify their search engine.
       (setq xesam-vendor (xesam-get-cached-property engine "vendor.id"))
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 876e582ed21..9a29e3d4cca 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -230,7 +230,7 @@ will be automatically rechecked when Emacs becomes idle; the
 rechecking will be paused whenever there is input pending.
 
 By default, uses a vacuous schema that allows any well-formed XML
-document.  A schema can be specified explictly using
+document.  A schema can be specified explicitly using
 \\[rng-set-schema-file-and-validate], or implicitly based on the buffer's
 file name or on the root element name.  In each case the schema must
 be a RELAX NG schema using the compact schema \(such schemas
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 9c750ca5e89..c42c2309413 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -144,7 +144,7 @@
 ;; 3.07--3.08:
 ;; - Made `fast-lock-read-cache' set `fast-lock-cache-filename'
 ;; 3.08--3.09:
-;; - Made `fast-lock-save-cache' cope if `fast-lock-minimum-size' is an a list
+;; - Made `fast-lock-save-cache' cope if `fast-lock-minimum-size' is a list
 ;; - Made `fast-lock-mode' respect the value of `font-lock-inhibit-thing-lock'
 ;; - Added `fast-lock-after-unfontify-buffer'
 ;; 3.09--3.10:
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 1cdb0a6f574..1c8a3e72956 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ob.el (org-babel-execute-src-block): Fix typo.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * org.el (org-link-unescape, org-link-unescape-compound): Fix typos.
@@ -15461,7 +15465,7 @@
 
         * org.el (org-enforce-todo-checkbox-dependencies): New option.
         (org-block-todo-from-checkboxes): New function.
-        (org-todo): Make tripple prefix arg circumvent blocking.
+        (org-todo): Make triple prefix arg circumvent blocking.
 
 2009-01-30  Glenn Morris  <rgm@gnu.org>
 
@@ -17592,7 +17596,7 @@
 2008-06-17  Carsten Dominik  <dominik@science.uva.nl>
 
         * org.el (org-schedule, org-deadline): Protect scheduled and
-        deadline tasks against changes that accidently remove the
+        deadline tasks against changes that accidentally remove the
         repeater.  Also show a message with the new date when done.
 
 2008-06-17  Carsten Dominik  <dominik@science.uva.nl>
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 728c6c5cb5e..f34d1fbda9e 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -380,7 +380,7 @@ Insert the results of execution into the buffer.  Source code
 execution and the collection and formatting of results can be
 controlled through a variety of header arguments.
 
-With prefix argument ARG, force re-execution even if a an
+With prefix argument ARG, force re-execution even if an
 existing result cached in the buffer would otherwise have been
 returned.
 
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 50761ede7cb..2f4617f5146 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -800,7 +800,7 @@ will only be dimmed."
   :group 'org-agenda-todo-list
   :type '(choice
           (const :tag "Do not dim" nil)
-          (const :tag "Dim to a grey face" t)
+          (const :tag "Dim to a gray face" t)
           (const :tag "Make invisible" invisible)))
 
 (defcustom org-timeline-show-empty-dates 3
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 138d99a36d9..3607458a410 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -215,7 +215,7 @@
   "List to hold parsed bibtex entries.")
 
 (defcustom org-bibtex-autogen-keys nil
-  "Set to a truthy value to use `bibtex-generate-autokey' to generate keys."
+  "Set to a truth value to use `bibtex-generate-autokey' to generate keys."
   :group 'org-bibtex
   :type  'boolean)
 
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 6279ed3df0d..6d82d4529b6 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1919,7 +1919,7 @@ the returned times will be formatted strings."
                shiftedm (- 13 (* 3 (nth 1 tmp)))
                shiftedq (- 5 (nth 1 tmp))))
        (setq d 1 h 0 m 0 d1 1 month shiftedm month1 (+ 3 shiftedm) h1 0 m1 0 y shiftedy))
-       ((> (+ q shift) 0) ; shift is whitin this year
+       ((> (+ q shift) 0) ; shift is within this year
        (setq shiftedq (+ q shift))
        (setq shiftedy y)
        (setq d 1 h 0 m 0 d1 1 month (+ 1 (* 3 (- (+ q shift) 1))) month1 (+ 4 (* 3 (- (+ q shift) 1))) h1 0 m1 0))))
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 05df6bb7524..0f6fc0bed6a 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -474,7 +474,7 @@ Where possible, use the standard interface for changing this line."
        ((equal major-mode 'org-agenda-mode)
         (org-columns-eval eval)
         ;; The following let preserves the current format, and makes sure
-        ;; that in only a single file things need to be upated.
+        ;; that in only a single file things need to be updated.
         (let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
                (buffer (marker-buffer pom))
                (org-agenda-contributing-files
@@ -605,7 +605,7 @@ an integer, select that value."
      ((equal major-mode 'org-agenda-mode)
       (org-columns-eval '(org-entry-put pom key nval))
       ;; The following let preserves the current format, and makes sure
-      ;; that in only a single file things need to be upated.
+      ;; that in only a single file things need to be updated.
       (let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
              (buffer (marker-buffer pom))
              (org-agenda-contributing-files
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 91a1e5e59cb..b01f6d9fa6e 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -660,7 +660,7 @@ Otherwise give an error say the file exists."
         (with-current-buffer mm-buffer
           (erase-buffer)
           (setq buffer-file-coding-system 'utf-8)
-          ;; Fix-me: Currentl Freemind (ver 0.9.0 RC9) does not support this:
+          ;; Fix-me: Currently Freemind (ver 0.9.0 RC9) does not support this:
           ;;(insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
           (insert "<map version=\"0.9.0\">\n")
           (insert "<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->\n"))
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index b2c8de6ec2f..608a9dc2e88 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -309,7 +309,8 @@
                      (let* ((fa (file-attributes (pcomplete-arg 1)))
                             (size (nth 7 fa)))
                        (and (numberp size)
-                            (< size large-file-warning-threshold))))
+                            (or (null large-file-warning-threshold)
+                                (< size large-file-warning-threshold)))))
                 (let ((file (pcomplete-arg 1)))
                   (completion-table-dynamic
                    (lambda (_string)
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 33fcf451ebb..ee6b67e6109 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -379,7 +379,7 @@ Other useful commands:\n
                   best-square square
                   score-max   score)
             (aset gomoku-score-table square -1))) ; no: kill it !
-       ;; If score is equally good, choose randomly. But first check freeness:
+       ;; If score is equally good, choose randomly. But first check freedom:
        ((not (zerop (aref gomoku-board square)))
         (aset gomoku-score-table square -1))
        ((zerop (random (setq count (1+ count))))
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 8629baf35d3..9ef03725c60 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -385,7 +385,7 @@ is non-nil.  One interesting value is `turn-on-font-lock'."
                   best-square square
                   score-max   score)
             (aset landmark-score-table square -1))) ; no: kill it !
-       ;; If score is equally good, choose randomly. But first check freeness:
+       ;; If score is equally good, choose randomly. But first check freedom:
        ((not (zerop (aref landmark-board square)))
         (aset landmark-score-table square -1))
        ((zerop (random (setq count (1+ count))))
diff --git a/lisp/printing.el b/lisp/printing.el
index d6c67cc68a6..2dea24149a7 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -547,7 +547,7 @@ Please send all bug fixes and enhancements to
 ;; `pr-auto-region'             Non-nil means region is automagically detected.
 ;;
 ;; `pr-auto-mode'               Non-nil means major-mode specific printing is
-;;                              prefered over normal printing.
+;;                              preferred over normal printing.
 ;;
 ;; `pr-mode-alist'              Specify an alist for a major-mode and printing
 ;;                              function.
@@ -2426,7 +2426,7 @@ marked instead of all buffer."
 
 
 (defcustom pr-auto-mode t
-  "Non-nil means major-mode specific printing is prefered over normal printing.
+  "Non-nil means major-mode specific printing is preferred over normal printing.
 
 That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*'
 and `*-region*' commands will behave like `*-mode*' commands; otherwise,
@@ -5458,7 +5458,7 @@ If menu binding was not done, calls `pr-menu-bind'."
 
 
 (defun pr-toggle-mode-menu (&optional no-menu)
-  "Toggle whether major-mode specific printing is prefered over normal printing."
+  "Toggle whether major-mode specific printing is preferred over normal printing."
   (interactive)
   (pr-toggle 'pr-auto-mode "Auto mode"
              'printing 1 12 'toggle nil no-menu))
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index b8bf62d90b4..64734420a8c 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1694,7 +1694,7 @@ ARG is ignored, and is there for compatibility with `capitalize-word' only."
 (defun ada-no-auto-case (&optional _arg)
   "Do nothing.  ARG is ignored.
 This function can be used for the auto-casing variables in Ada mode, to
-adapt to unusal auto-casing schemes.  Since it does nothing, you can for
+adapt to unusual auto-casing schemes.  Since it does nothing, you can for
 instance use it for `ada-case-identifier' if you don't want any special
 auto-casing for identifiers, whereas keywords have to be lower-cased.
 See also `ada-auto-case' to disable auto casing altogether."
@@ -3939,7 +3939,7 @@ If NOERROR is non-nil, it only returns nil if no matching start found."
        ;; processing them recursively avoids the need for any special
        ;; handling.
        ;; Nothing should be done if we have only the specs or a
-       ;; generic instantion.
+       ;; generic instantiation.
 
        ((and (looking-at "\\<procedure\\|function\\>"))
         (if first
@@ -4401,7 +4401,7 @@ Moves to 'begin' if in a declarative part."
           (ada-goto-matching-end 1))
 
          ;; on first line of subprogram body
-         ;; Do nothing for specs or generic instantion, since these are
+         ;; Do nothing for specs or generic instantiation, since these are
          ;; handled as the general case (find the enclosing block)
          ;; We also need to make sure that we ignore nested subprograms
          ((save-excursion
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 0cfdab23702..2f6a7be393a 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1357,7 +1357,7 @@ project file."
                           (or executable-name
                               (file-name-sans-extension (buffer-file-name))))))
 
-    ;;  For gvd, add an extra switch so that the Emacs window is completly
+    ;;  For gvd, add an extra switch so that the Emacs window is completely
     ;;  swallowed inside the Gvd one
     (if (and ada-tight-gvd-integration
              (string-match "^[^ \t]*gvd" cmd))
@@ -1783,7 +1783,7 @@ Information is extracted from the ali file."
             )
           )
 
-      ;; Last check to be completly sure we have found the correct line (the
+      ;; Last check to be completely sure we have found the correct line (the
       ;; ali might not be up to date for instance)
       (if declaration-found
           (progn
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 1eaf8910d14..8e4ac92d96f 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -2316,7 +2316,7 @@ function does not require the declaration to contain a brace block."
 
 (defun c-after-statement-terminator-p () ; Should we pass in LIM here?
   ;; Does point immediately follow a statement "terminator"?  A virtual
-  ;; semicolon is regarded here as such.  So is a an opening brace ;-)
+  ;; semicolon is regarded here as such.  So is an opening brace ;-)
   ;;
   ;; This function might do hidden buffer changes.
   (or (save-excursion
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index c794cad65db..9544c4f8728 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6467,7 +6467,7 @@ comment at the start of cc-engine.el for more info."
                     (when (c-keyword-member kwd-sym 'c-typeless-decl-kwds)
                       (setq maybe-typeless t))
 
-                    ;; Haven't matched a type so it's an umambiguous
+                    ;; Haven't matched a type so it's an unambiguous
                     ;; specifier keyword and we know we're in a
                     ;; declaration.
                     (setq at-decl-or-cast t)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 4a6344727b4..37818638d41 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -433,7 +433,7 @@ element is a cons where the car is the character to modify and the cdr
 the new syntax, as accepted by `modify-syntax-entry'."
   ;; The $ character is not allowed in most languages (one exception
   ;; is Java which allows it for legacy reasons) but we still classify
-  ;; it as an indentifier character since it's often used in various
+  ;; it as an identifier character since it's often used in various
   ;; machine generated identifiers.
   t    '((?_ . "w") (?$ . "w"))
   (objc java) (append '((?@ . "w"))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 0e649480dda..13fa310106c 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1388,12 +1388,12 @@ The expansion is entirely correct because it uses the C preprocessor."
 
 ;;; These two must be unwound, otherwise take exponential time
 (defconst cperl-maybe-white-and-comment-rex "[ \t\n]*\\(#[^\n]*\n[ \t\n]*\\)*"
-"Regular expression to match optional whitespace with interpspersed comments.
+"Regular expression to match optional whitespace with interspersed comments.
 Should contain exactly one group.")
 
 ;;; This one is tricky to unwind; still very inefficient...
 (defconst cperl-white-and-comment-rex "\\([ \t\n]\\|#[^\n]*\n\\)+"
-"Regular expression to match whitespace with interpspersed comments.
+"Regular expression to match whitespace with interspersed comments.
 Should contain exactly one group.")
 
 
@@ -1811,7 +1811,7 @@ or as help on variables `cperl-tips', `cperl-problems',
                (funcall f))
            (make-local-variable 'compilation-error-regexp-alist)
            (push 'cperl compilation-error-regexp-alist)))
-        ((boundp 'compilation-error-regexp-alist);; xmeacs 19.x
+        ((boundp 'compilation-error-regexp-alist);; xemacs 19.x
          (make-local-variable 'compilation-error-regexp-alist)
          (set 'compilation-error-regexp-alist
                (append cperl-compilation-error-regexp-alist
@@ -7650,7 +7650,7 @@ $~	The name of the current report format.
 ... &= ...      Bitwise and assignment.
 ... * ...       Multiplication.
 ... ** ...      Exponentiation.
-*NAME   Glob: all objects refered by NAME.  *NAM1 = *NAM2 aliases NAM1 to NAM2.
+*NAME   Glob: all objects referred by NAME.  *NAM1 = *NAM2 aliases NAM1 to NAM2.
 &NAME(arg0, ...)        Subroutine call.  Arguments go to @_.
 ... + ...       Addition.               +EXPR   Makes EXPR into scalar context.
 ++      Auto-increment (magical on strings).    ++EXPR  EXPR++
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index ce04d8b390e..95b8d810028 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -724,7 +724,7 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
          ["Reset to Saved" Custom-reset-saved :active t
           :help "Reset all edited or set settings to saved"]
          ["Reset to Standard Settings" Custom-reset-standard :active t
-          :help "Erase all cusomizations in buffer"]
+          :help "Erase all customizations in buffer"]
          )
         "--"
         ["Indent Subprogram" f90-indent-subprogram t]
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index e98ca58f3e0..2dac46a6d5b 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -665,7 +665,7 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
          ["Reset to Saved" Custom-reset-saved :active t
           :help "Reset all edited or set settings to saved"]
          ["Reset to Standard Settings" Custom-reset-standard :active t
-          :help "Erase all cusomizations in buffer"]
+          :help "Erase all customizations in buffer"]
          )
         "--"
         ["Comment Region" fortran-comment-region mark-active]
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index a1a41bd0b1b..ab40dff24f1 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -214,7 +214,7 @@ Emacs can't find.")
 (defvar gdb-source-window nil)
 (defvar gdb-inferior-status nil)
 (defvar gdb-continuation nil)
-(defvar gdb-version nil)
+(defvar gdb-supports-non-stop nil)
 (defvar gdb-filter-output nil
   "Message to be shown in GUD console.
 
@@ -574,7 +574,7 @@ When `gdb-non-stop' is nil, return COMMAND unchanged."
   (if gdb-non-stop
       (if (and gdb-gud-control-all-threads
                (not noall)
-               (string-equal gdb-version "7.0+"))
+               gdb-supports-non-stop)
           (concat command " --all ")
         (gdb-current-context-command command))
     command))
@@ -872,14 +872,16 @@ detailed description of this mode.
   (when gdb-non-stop
     (gdb-input (list "-gdb-set non-stop 1" 'gdb-non-stop-handler)))
 
+  (gdb-input (list "-enable-pretty-printing" 'ignore))
+
   ;; find source file and compilation directory here
-  (gdb-input
-                                        ; Needs GDB 6.2 onwards.
-   (list "-file-list-exec-source-files" 'gdb-get-source-file-list))
   (if gdb-create-source-file-list
       (gdb-input
+                                        ; Needs GDB 6.2 onwards.
+       (list "-file-list-exec-source-files" 'gdb-get-source-file-list)))
+  (gdb-input
                                         ; Needs GDB 6.0 onwards.
-       (list "-file-list-exec-source-file" 'gdb-get-source-file)))
+   (list "-file-list-exec-source-file" 'gdb-get-source-file))
   (gdb-input
    (list "-gdb-show prompt" 'gdb-get-prompt)))
 
@@ -890,10 +892,18 @@ detailed description of this mode.
         (message
          "This version of GDB doesn't support non-stop mode.  Turning it off.")
         (setq gdb-non-stop nil)
-        (setq gdb-version "pre-7.0"))
-    (setq gdb-version "7.0+")
+        (setq gdb-supports-non-stop nil))
+    (setq gdb-supports-non-stop t)
     (gdb-input (list "-gdb-set target-async 1" 'ignore))
-    (gdb-input (list "-enable-pretty-printing" 'ignore))))
+    (gdb-input (list "-list-target-features" 'gdb-check-target-async))))
+
+(defun gdb-check-target-async ()
+  (goto-char (point-min))
+  (unless (re-search-forward "async" nil t)
+    (message
+     "Target doesn't support non-stop mode.  Turning it off.")
+    (setq gdb-non-stop nil)
+    (gdb-input (list "-gdb-set non-stop 0" 'ignore))))
 
 (defvar gdb-define-alist nil "Alist of #define directives for GUD tooltips.")
 
@@ -1071,7 +1081,7 @@ With arg, enter name of variable to be watched in the minibuffer."
                                (tooltip-identifier-from-point (point)))))))
               (set-text-properties 0 (length expr) nil expr)
               (gdb-input
-               (list (concat"-var-create - * "  expr "")
+               (list (concat "-var-create - * "  expr "")
                      `(lambda () (gdb-var-create-handler ,expr)))))))
       (message "gud-watch is a no-op in this mode."))))
 
@@ -1699,7 +1709,7 @@ static char *magick[] = {
 (defun gdb-current-context-command (command)
   "Add --thread to gdb COMMAND when needed."
   (if (and gdb-thread-number
-           (string-equal gdb-version "7.0+"))
+           gdb-supports-non-stop)
       (concat command " --thread " gdb-thread-number)
     command))
 
@@ -1983,8 +1993,8 @@ current thread and update GDB buffers."
     (when (not gdb-register-names)
       (gdb-input
        (list (concat "-data-list-register-names"
-                     (if (string-equal gdb-version "7.0+")
-                         (concat" --thread " thread-id)))
+                     (if gdb-supports-non-stop
+                         (concat " --thread " thread-id)))
              'gdb-register-names-handler)))
 
 ;;; Don't set gud-last-frame here as it's currently done in gdb-frame-handler
@@ -4133,7 +4143,7 @@ buffers, if required."
   (if gdb-many-windows
       (gdb-setup-windows)
     (gdb-get-buffer-create 'gdb-breakpoints-buffer)
-    (if gdb-show-main
+    (if (and gdb-show-main gdb-main-file)
         (let ((pop-up-windows t))
           (display-buffer (gud-find-file gdb-main-file))))))
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index dbffbc266e7..75d71d2d8a9 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -438,9 +438,9 @@ This variable's value takes effect when `grep-compute-defaults' is called.")
 
 ;; History of grep commands.
 ;;;###autoload
-(defvar grep-history nil)
+(defvar grep-history nil "History list for grep.")
 ;;;###autoload
-(defvar grep-find-history nil)
+(defvar grep-find-history nil "History list for grep-find.")
 
 ;; History of lgrep and rgrep regexp and files args.
 (defvar grep-regexp-history nil)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 527bc51eef8..406db76487d 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -103,7 +103,7 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
 
 (defvar gud-running nil
   "Non-nil if debugged program is running.
-Used to grey out relevant toolbar icons.")
+Used to gray out relevant toolbar icons.")
 
 (defvar gud-target-name "--unknown--"
   "The apparent name of the program being debugged in a gud buffer.")
@@ -1745,7 +1745,7 @@ and source-file directory for your debugger."
 ;; All the .java files in the directories in gud-jdb-directories are
 ;; syntactically analyzed each time gud jdb is invoked.  It would be
 ;; nice to keep as much information as possible between runs.  It would
-;; be really nice to analyze the files only as neccessary (when the
+;; be really nice to analyze the files only as necessary (when the
 ;; source needs to be displayed.)  I'm not sure to what extent the former
 ;; can be accomplished and I'm not sure the latter can be done at all
 ;; since I don't know of any general way to tell which .class files are
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index ca8be01d4a8..9cbc1dc6d32 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -194,9 +194,9 @@
 ;;     Unfortunately, these workarounds do not restore hideshow state.
 ;;     If someone figures out a better way, please let me know.
 
-;; * Correspondance
+;; * Correspondence
 ;;
-;; Correspondance welcome; please indicate version number.  Send bug
+;; Correspondence welcome; please indicate version number.  Send bug
 ;; reports and inquiries to <ttn@gnu.org>.
 
 ;; * Thanks
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index faccbb1f0ca..aa46b54d848 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -1844,7 +1844,7 @@ file name."
     (cond
      ((file-regular-p file2) file2)
      ((file-regular-p file1) file1)
-     ;; If we cannot veryfy the existence of the file, we return the shorter
+     ;; If we cannot verify the existence of the file, we return the shorter
      ;; name.  The idea behind this is that this may be a relative file name
      ;; and our idea about the current working directory may be wrong.
      ;; If it is a relative file name, it hopefully is short.
@@ -2903,7 +2903,7 @@ from `idlwave-shell-examine-alist' via mini-buffer shortcut key."
          ;; Move to beginning of current or previous expression
          (if (looking-at "\\<\\|(")
              ;; At beginning of expression, don't move backwards unless
-             ;; this is at the end of an indentifier.
+             ;; this is at the end of an identifier.
              (if (looking-at "\\>")
                  (backward-sexp))
            (backward-sexp))
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index c49519ed179..c1a87a9d033 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1278,7 +1278,7 @@ definition and conveniently use this command."
      ((or (eq (char-before (line-end-position 1)) ?\\)
           (eq (char-before (line-end-position 0)) ?\\))
       ;; A backslash region.  Find beginning and end, remove
-      ;; backslashes, fill, and then reapply backslahes.
+      ;; backslashes, fill, and then reapply backslashes.
       (end-of-line)
       (let ((beginning
              (save-excursion
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 8b4798e1c14..5b229cc0c24 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -164,7 +164,7 @@
 ;;     with the original form).  My code on the matter was improved
 ;;     considerably by Markus Triska.
 ;;  o  Fixed `prolog-insert-spaces-after-paren' (which used an
-;;     unitialized variable).
+;;     uninitialized variable).
 ;;  o  Minor changes to clean up the code and avoid some implicit
 ;;     package requirements.
 ;; Version 1.13:
@@ -691,7 +691,7 @@ nil means send actual operating system end of file."
 (defcustom prolog-use-standard-consult-compile-method-flag t
   "*Non-nil means use the standard compilation method.
 Otherwise the new compilation method will be used.  This
-utilises a special compilation buffer with the associated
+utilizes a special compilation buffer with the associated
 features such as parsing of error messages and automatically
 jumping to the source code responsible for the error.
 
@@ -868,8 +868,9 @@ VERSION is of the format (Major . Minor)"
 (defun prolog-find-value-by-system (alist)
   "Get value from ALIST according to `prolog-system'."
   (let ((system (or prolog-system
-                    (buffer-local-value 'prolog-system
-                                        (prolog-inferior-buffer 'dont-run)))))
+                    (let ((infbuf (prolog-inferior-buffer 'dont-run)))
+                      (when infbuf
+                        (buffer-local-value 'prolog-system infbuf))))))
     (if (listp alist)
         (let (result
               id)
@@ -1522,7 +1523,7 @@ This function must be called from the source code buffer."
           ;; Emacs-20).
             (set (make-local-variable 'compilation-parse-errors-function)
                'prolog-parse-sicstus-compilation-errors))
-      (toggle-read-only 0)
+      (setq buffer-read-only nil)
       (insert command-string "\n"))
     (save-selected-window
       (pop-to-buffer buffer))
@@ -1569,7 +1570,7 @@ For use with the `compilation-parse-errors-function' variable."
          limit t)
         (setq filepath (match-string 2)))
 
-      ;; ###### Does this work with SICStus under Windows (i.e. backslahes and stuff?)
+      ;; ###### Does this work with SICStus under Windows (i.e. backslashes and stuff?)
       (if (string-match "\\(.*/\\)\\([^/]*\\)$" filepath)
           (progn
             (setq dir (match-string 1 filepath))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index af9ab537893..03e095b6bfc 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -96,7 +96,7 @@
 ;; This improves the interaction under Emacs but it still is somewhat
 ;; awkward.
 
-;; Quoted identifiers are not supported for hilighting.  Most
+;; Quoted identifiers are not supported for highlighting.  Most
 ;; databases support the use of double quoted strings in place of
 ;; identifiers; ms (Microsoft SQLServer) also supports identifiers
 ;; enclosed within brackets [].
@@ -1329,9 +1329,9 @@ statement.  The format of variable should be a valid
 ;; are not followed closely, and most vendors offer significant
 ;; capabilities beyond those defined in the standard specifications.
 
-;; SQL mode provides support for hilighting based on the product.  In
-;; addition to hilighting the product keywords, any ANSI keywords not
-;; used by the product are also hilighted.  This will help identify
+;; SQL mode provides support for highlighting based on the product.  In
+;; addition to highlighting the product keywords, any ANSI keywords not
+;; used by the product are also highlighted.  This will help identify
 ;; keywords that could be restricted in future versions of the product
 ;; or might be a problem if ported to another product.
 
@@ -2506,7 +2506,7 @@ See `sql-product-alist' for a list of products and supported features."
   "Configure font-lock and imenu with product-specific settings.
 
 The KEYWORDS-ONLY flag is passed to font-lock to specify whether
-only keywords should be hilighted and syntactic hilighting
+only keywords should be highlighted and syntactic highlighting
 skipped.  The IMENU flag indicates whether `imenu-mode' should
 also be configured."
 
@@ -3807,7 +3807,7 @@ you entered, right above the output it created.
 
   ;; Note that making KEYWORDS-ONLY nil will cause havoc if you try
   ;; SELECT 'x' FROM DUAL with SQL*Plus, because the title of the column
-  ;; will have just one quote.  Therefore syntactic hilighting is
+  ;; will have just one quote.  Therefore syntactic highlighting is
   ;; disabled for interactive buffers.  No imenu support.
   (sql-product-font-lock t nil)
 
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 4cc4a133c8e..3ae66a477e8 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -87,7 +87,7 @@
 ;; you may add the below lines (the values of the variables presented
 ;; here are the defaults). Note also that if you use an Emacs that
 ;; supports custom, it's probably better to use the custom menu to
-;; edit these. If working as a member of a large team these settings
+;; edit these.  If working as a member of a large team these settings
 ;; should be common across all users (in a site-start file), or set
 ;; in Local Variables in every file.  Otherwise, different people's
 ;; AUTO expansion may result different whitespace changes.
@@ -123,9 +123,9 @@
 ;;; Code:
 
 ;; This variable will always hold the version number of the mode
-(defconst verilog-mode-version "650"
+(defconst verilog-mode-version "725"
   "Version of this Verilog mode.")
-(defconst verilog-mode-release-date "2010-11-05-GNU"
+(defconst verilog-mode-release-date "2011-11-27-GNU"
   "Release date of this Verilog mode.")
 (defconst verilog-mode-release-emacs t
   "If non-nil, this version of Verilog mode was released with Emacs itself.")
@@ -174,6 +174,18 @@
             (char-after (1- (point)))))
       (error nil))
     (condition-case nil
+        (if (fboundp 'when)
+            nil ;; fab
+          (defsubst point-at-bol (&optional N)
+            (save-excursion (beginning-of-line N) (point))))
+      (error nil))
+    (condition-case nil
+        (if (fboundp 'when)
+            nil ;; fab
+          (defsubst point-at-eol (&optional N)
+            (save-excursion (end-of-line N) (point))))
+      (error nil))
+    (condition-case nil
         (require 'custom)
       (error nil))
     (condition-case nil
@@ -275,8 +287,19 @@ STRING should be given if the last search was by `string-match' on STRING."
 (eval-and-compile
   ;; Both xemacs and emacs
   (condition-case nil
+      (require 'diff) ;; diff-command and diff-switches
+    (error nil))
+  (condition-case nil
+      (require 'compile) ;; compilation-error-regexp-alist-alist
+    (error nil))
+  (condition-case nil
       (unless (fboundp 'buffer-chars-modified-tick)  ;; Emacs 22 added
         (defmacro buffer-chars-modified-tick () (buffer-modified-tick)))
+    (error nil))
+  ;; Added in Emacs 24.1
+  (condition-case nil
+      (unless (fboundp 'prog-mode)
+        (define-derived-mode prog-mode fundamental-mode "Prog"))
     (error nil)))
 
 (eval-when-compile
@@ -310,6 +333,14 @@ STRING should be given if the last search was by `string-match' on STRING."
 ;;  `("Verilog" ("MA" ["SAA" nil :help "Help SAA"] ["SAB" nil :help "Help SAA"])
 ;;     "----" ["MB" nil :help "Help MB"]))
 
+(defun verilog-define-abbrev (table name expansion &optional hook)
+  "Filter `define-abbrev' TABLE NAME EXPANSION and call HOOK.
+Provides SYSTEM-FLAG in newer Emacs."
+  (condition-case nil
+      (define-abbrev table name expansion hook 0 t)
+    (error
+     (define-abbrev table name expansion hook))))
+
 (defun verilog-customize ()
   "Customize variables and other settings used by Verilog-Mode."
   (interactive)
@@ -335,9 +366,31 @@ This function may be removed when Emacs 21 is no longer supported."
             ;; And GNU Emacs 22 has obsoleted last-command-char
             last-command-event)))
 
-(defalias 'verilog-syntax-ppss
-  (if (fboundp 'syntax-ppss) 'syntax-ppss
-    (lambda (&optional pos) (parse-partial-sexp (point-min) (or pos (point))))))
+(defvar verilog-no-change-functions nil
+  "True if `after-change-functions' is disabled.
+Use of `syntax-ppss' may break, as ppss's cache may get corrupted.")
+
+(defvar verilog-in-hooks nil
+  "True when within a `verilog-run-hooks' block.")
+
+(defmacro verilog-run-hooks (&rest hooks)
+  "Run each hook in HOOKS using `run-hooks'.
+Set `verilog-in-hooks' during this time, to assist AUTO caches."
+  `(let ((verilog-in-hooks t))
+     (run-hooks ,@hooks)))
+
+(defun verilog-syntax-ppss (&optional pos)
+  (when verilog-no-change-functions
+    (if verilog-in-hooks
+        (verilog-scan-cache-flush)
+      ;; else don't let the AUTO code itself get away with flushing the cache,
+      ;; as that'll make things very slow
+      (backtrace)
+      (error "%s: Internal problem; use of syntax-ppss when cache may be corrupt"
+             (verilog-point-text))))
+  (if (fboundp 'syntax-ppss)
+      (syntax-ppss pos)
+    (parse-partial-sexp (point-min) (or pos (point)))))
 
 (defgroup verilog-mode nil
   "Facilitates easy editing of Verilog source text."
@@ -631,6 +684,22 @@ file referenced.  If false, this is not supported."
   :type 'boolean)
 (put 'verilog-highlight-includes 'safe-local-variable 'verilog-booleanp)
 
+(defcustom verilog-auto-declare-nettype nil
+  "*Non-nil specifies the data type to use with `verilog-auto-input' etc.
+Set this to \"wire\" if the Verilog code uses \"`default_nettype
+none\".  Note using `default_nettype none isn't recommended practice; this
+mode is experimental."
+  :group 'verilog-mode-actions
+  :type 'boolean)
+(put 'verilog-auto-declare-nettype 'safe-local-variable `stringp)
+
+(defcustom verilog-auto-wire-type nil
+  "*Non-nil specifies the data type to use with `verilog-auto-wire' etc.
+Set this to \"logic\" for SystemVerilog code, or use `verilog-auto-logic'."
+  :group 'verilog-mode-actions
+  :type 'boolean)
+(put 'verilog-auto-wire-type 'safe-local-variable `stringp)
+
 (defcustom verilog-auto-endcomments t
   "*True means insert a comment /* ... */ after 'end's.
 The name of the function or case will be set between the braces."
@@ -638,6 +707,12 @@ The name of the function or case will be set between the braces."
   :type 'boolean)
 (put 'verilog-auto-endcomments 'safe-local-variable 'verilog-booleanp)
 
+(defcustom verilog-auto-delete-trailing-whitespace nil
+  "*True means to `delete-trailing-whitespace' in `verilog-auto'."
+  :group 'verilog-mode-actions
+  :type 'boolean)
+(put 'verilog-auto-delete-trailing-whitespace 'safe-local-variable 'verilog-booleanp)
+
 (defcustom verilog-auto-ignore-concat nil
   "*True means ignore signals in {...} concatenations for AUTOWIRE etc.
 This will exclude signals referenced as pin connections in {...}
@@ -696,6 +771,12 @@ always be saved."
 (defvar verilog-auto-last-file-locals nil
   "Text from file-local-variables during last evaluation.")
 
+(defvar verilog-diff-function 'verilog-diff-report
+  "*Function to run when `verilog-diff-auto' detects differences.
+Function takes three arguments, the original buffer, the
+difference buffer, and the point in original buffer with the
+first difference.")
+
 ;;; Compile support
 (require 'compile)
 (defvar verilog-error-regexp-added nil)
@@ -896,6 +977,19 @@ of each Verilog file that requires it, rather than being set globally."
   :type 'boolean)
 (put 'verilog-auto-sense-defines-constant 'safe-local-variable 'verilog-booleanp)
 
+(defcustom verilog-auto-reset-blocking-in-non t
+  "*If true, AUTORESET will reset those signals which were
+assigned with blocking assignments (=) even in a block with
+non-blocking assignments (<=).
+  
+If nil, all blocking assigned signals are ignored when any
+non-blocking assignment is in the AUTORESET block.  This allows
+blocking assignments to be used for temporary values and not have
+those temporaries reset.  See example in `verilog-auto-reset'."
+  :type 'boolean
+  :group 'verilog-mode-auto)
+(put 'verilog-auto-reset-blocking-in-non 'safe-local-variable 'verilog-booleanp)
+
 (defcustom verilog-auto-reset-widths t
   "*If true, AUTORESET should determine the width of signals.
 This is then used to set the width of the zero (32'h0 for example).  This
@@ -917,7 +1011,9 @@ the MSB or LSB of a signal inside an AUTORESET."
 Declaration order is advantageous with order based instantiations
 and is the default for backward compatibility.  Sorted order
 reduces changes when declarations are moved around in a file, and
-it's bad practice to rely on order based instantiations anyhow."
+it's bad practice to rely on order based instantiations anyhow.
+
+See also `verilog-auto-inst-sort'."
   :group 'verilog-mode-auto
   :type 'boolean)
 (put 'verilog-auto-arg-sort 'safe-local-variable 'verilog-booleanp)
@@ -969,6 +1065,18 @@ instead expand to:
   :type 'boolean)
 (put 'verilog-auto-inst-param-value 'safe-local-variable 'verilog-booleanp)
 
+(defcustom verilog-auto-inst-sort nil
+  "*If set, AUTOINST signal names will be sorted, not in declaration order.
+Also affects AUTOINSTPARAM.  Declaration order is the default for
+backward compatibility, and as some teams prefer signals that are
+declared together to remain together.  Sorted order reduces
+changes when declarations are moved around in a file.
+
+See also `verilog-auto-arg-sort'."
+  :group 'verilog-mode-auto
+  :type 'boolean)
+(put 'verilog-auto-inst-sort 'safe-local-variable 'verilog-booleanp)
+
 (defcustom verilog-auto-inst-vector t
   "*If true, when creating default ports with AUTOINST, use bus subscripts.
 If nil, skip the subscript when it matches the entire bus as declared in
@@ -981,12 +1089,20 @@ speed up some simulators, but is less general and harder to read, so avoid."
 
 (defcustom verilog-auto-inst-template-numbers nil
   "*If true, when creating templated ports with AUTOINST, add a comment.
-The comment will add the line number of the template that was used for that
-port declaration.  Setting this aids in debugging, but nil is suggested for
-regular use to prevent large numbers of merge conflicts."
+
+If t, the comment will add the line number of the template that
+was used for that port declaration.  This setting is suggested
+only for debugging use, as regular use may cause a large numbers
+of merge conflicts.
+
+If 'lhs', the comment will show the left hand side of the
+AUTO_TEMPLATE rule that is matched.  This is less precise than
+numbering (t) when multiple rules have the same pin name, but
+won't merge conflict."
   :group 'verilog-mode-auto
-  :type 'boolean)
-(put 'verilog-auto-inst-template-numbers 'safe-local-variable 'verilog-booleanp)
+  :type '(choice (const nil) (const t) (const lhs)))
+(put 'verilog-auto-inst-template-numbers 'safe-local-variable
+     '(lambda (x) (memq x '(nil t lhs))))
 
 (defcustom verilog-auto-inst-column 40
   "*Indent-to column number for net name part of AUTOINST created pin."
@@ -1015,6 +1131,14 @@ See the \\[verilog-faq] for examples on using this."
   :type 'string)
 (put 'verilog-auto-output-ignore-regexp 'safe-local-variable 'stringp)
 
+(defcustom verilog-auto-tieoff-declaration "wire"
+  "*Data type used for the declaration for AUTOTIEOFF.  If \"wire\" then
+create a wire, if \"assign\" create an assignment, else the data type for
+variable creation."
+  :group 'verilog-mode-auto
+  :type 'string)
+(put 'verilog-auto-tieoff-declaration 'safe-local-variable 'stringp)
+
 (defcustom verilog-auto-tieoff-ignore-regexp nil
   "*If set, when creating AUTOTIEOFF list, ignore signals matching this regexp.
 See the \\[verilog-faq] for examples on using this."
@@ -1114,8 +1238,10 @@ If set will become buffer local.")
     (define-key map "\M-\r"    `electric-verilog-terminate-and-indent)
     (define-key map "\M-\t"    'verilog-complete-word)
     (define-key map "\M-?"     'verilog-show-completions)
+    ;; Note \C-c and letter are reserved for users
     (define-key map "\C-c\`"   'verilog-lint-off)
     (define-key map "\C-c\*"   'verilog-delete-auto-star-implicit)
+    (define-key map "\C-c\?"   'verilog-diff-auto)
     (define-key map "\C-c\C-r" 'verilog-label-be)
     (define-key map "\C-c\C-i" 'verilog-pretty-declarations)
     (define-key map "\C-c="    'verilog-pretty-expr)
@@ -1241,6 +1367,8 @@ If set will become buffer local.")
       :help             "Expand AUTO meta-comment statements"]
      ["Kill AUTOs"                      verilog-delete-auto
       :help             "Remove AUTO expansions"]
+     ["Diff AUTOs"                      verilog-diff-auto
+      :help             "Show differences in AUTO expansions"]
      ["Inject AUTOs"                    verilog-inject-auto
       :help             "Inject AUTOs into legacy non-AUTO buffer"]
      ("AUTO Help..."
@@ -1264,6 +1392,8 @@ If set will become buffer local.")
        :help            "Help on AUTOASCIIENUM - creating ASCII for enumerations"]
       ["AUTOINOUTCOMP"                  (describe-function 'verilog-auto-inout-comp)
        :help            "Help on AUTOINOUTCOMP - copying complemented i/o from another file"]
+      ["AUTOINOUTIN"                    (describe-function 'verilog-auto-inout-in)
+       :help            "Help on AUTOINOUTCOMP - copying i/o from another file as all inputs"]
       ["AUTOINOUTMODULE"                (describe-function 'verilog-auto-inout-module)
        :help            "Help on AUTOINOUTMODULE - copying i/o from another file"]
       ["AUTOINSERTLISP"                 (describe-function 'verilog-auto-insert-lisp)
@@ -1278,6 +1408,8 @@ If set will become buffer local.")
        :help            "Help on expanding Verilog-2001 .* pins"]
       ["AUTOINSTPARAM"                  (describe-function 'verilog-auto-inst-param)
        :help            "Help on AUTOINSTPARAM - adding parameter pins to cells"]
+      ["AUTOLOGIC"                      (describe-function 'verilog-auto-logic)
+       :help            "Help on AUTOLOGIC - declaring logic signals"]
       ["AUTOOUTPUT"                     (describe-function 'verilog-auto-output)
        :help            "Help on AUTOOUTPUT - adding outputs from cells"]
       ["AUTOOUTPUTEVERY"                (describe-function 'verilog-auto-output-every)
@@ -1318,6 +1450,10 @@ If set will become buffer local.")
      "----"
      ["Module"          verilog-sk-module
       :help             "Insert a module .. (/*AUTOARG*/);.. endmodule block"]
+     ["OVM Class"       verilog-sk-ovm-class
+      :help             "Insert an OVM class block"]
+     ["UVM Class"       verilog-sk-uvm-class
+      :help             "Insert an UVM class block"]
      ["Primitive"       verilog-sk-primitive
       :help             "Insert a primitive .. (.. );.. endprimitive block"]
      "----"
@@ -1372,6 +1508,31 @@ If set will become buffer local.")
   "Abbrev table in use in Verilog-mode buffers.")
 
 (define-abbrev-table 'verilog-mode-abbrev-table ())
+(verilog-define-abbrev verilog-mode-abbrev-table "class" "" 'verilog-sk-ovm-class)
+(verilog-define-abbrev verilog-mode-abbrev-table "always" "" 'verilog-sk-always)
+(verilog-define-abbrev verilog-mode-abbrev-table "begin" nil `verilog-sk-begin)
+(verilog-define-abbrev verilog-mode-abbrev-table "case" "" `verilog-sk-case)
+(verilog-define-abbrev verilog-mode-abbrev-table "for" "" `verilog-sk-for)
+(verilog-define-abbrev verilog-mode-abbrev-table "generate" "" `verilog-sk-generate)
+(verilog-define-abbrev verilog-mode-abbrev-table "initial" "" `verilog-sk-initial)
+(verilog-define-abbrev verilog-mode-abbrev-table "fork" "" `verilog-sk-fork)
+(verilog-define-abbrev verilog-mode-abbrev-table "module" "" `verilog-sk-module)
+(verilog-define-abbrev verilog-mode-abbrev-table "primitive" "" `verilog-sk-primitive)
+(verilog-define-abbrev verilog-mode-abbrev-table "repeat" "" `verilog-sk-repeat)
+(verilog-define-abbrev verilog-mode-abbrev-table "specify" "" `verilog-sk-specify)
+(verilog-define-abbrev verilog-mode-abbrev-table "task" "" `verilog-sk-task)
+(verilog-define-abbrev verilog-mode-abbrev-table "while" "" `verilog-sk-while)
+(verilog-define-abbrev verilog-mode-abbrev-table "casex" "" `verilog-sk-casex)
+(verilog-define-abbrev verilog-mode-abbrev-table "casez" "" `verilog-sk-casez)
+(verilog-define-abbrev verilog-mode-abbrev-table "if" "" `verilog-sk-if)
+(verilog-define-abbrev verilog-mode-abbrev-table "else if" "" `verilog-sk-else-if)
+(verilog-define-abbrev verilog-mode-abbrev-table "assign" "" `verilog-sk-assign)
+(verilog-define-abbrev verilog-mode-abbrev-table "function" "" `verilog-sk-function)
+(verilog-define-abbrev verilog-mode-abbrev-table "input" "" `verilog-sk-input)
+(verilog-define-abbrev verilog-mode-abbrev-table "output" "" `verilog-sk-output)
+(verilog-define-abbrev verilog-mode-abbrev-table "inout" "" `verilog-sk-inout)
+(verilog-define-abbrev verilog-mode-abbrev-table "wire" "" `verilog-sk-wire)
+(verilog-define-abbrev verilog-mode-abbrev-table "reg" "" `verilog-sk-reg)
 
 ;;
 ;;  Macros
@@ -1386,6 +1547,9 @@ FIXEDCASE and LITERAL as in `replace-match`.  STRING is what to replace.
 The case (verilog-string-replace-matches \"o\" \"oo\" nil nil \"foobar\")
 will break, as the o's continuously replace.  xa -> x works ok though."
   ;; Hopefully soon to a emacs built-in
+  ;; Also note \ in the replacement prevent multiple replacements; IE
+  ;;   (verilog-string-replace-matches "@" "\\\\([0-9]+\\\\)" nil nil "wire@_@")
+  ;;   Gives "wire\([0-9]+\)_@" not "wire\([0-9]+\)_\([0-9]+\)"
   (let ((start 0))
     (while (string-match from-string string start)
       (setq string (replace-match to-string fixedcase literal string)
@@ -1434,26 +1598,28 @@ will break, as the o's continuously replace.  xa -> x works ok though."
 (defsubst verilog-re-search-forward-quick (regexp bound noerror)
   "Like `verilog-re-search-forward', including use of REGEXP BOUND and NOERROR,
 but trashes match data and is faster for REGEXP that doesn't match often.
-This may at some point use text properties to ignore comments,
+This uses `verilog-scan' and text properties to ignore comments,
 so there may be a large up front penalty for the first search."
   (let (pt)
     (while (and (not pt)
                 (re-search-forward regexp bound noerror))
-      (if (not (verilog-inside-comment-p))
-          (setq pt (match-end 0))))
+      (if (verilog-inside-comment-or-string-p)
+          (re-search-forward "[/\"\n]" nil t) ;; Only way a comment or quote can end
+        (setq pt (match-end 0))))
     pt))
 
 (defsubst verilog-re-search-backward-quick (regexp bound noerror)
   ; checkdoc-params: (REGEXP BOUND NOERROR)
   "Like `verilog-re-search-backward', including use of REGEXP BOUND and NOERROR,
 but trashes match data and is faster for REGEXP that doesn't match often.
-This may at some point use text properties to ignore comments,
+This uses `verilog-scan' and text properties to ignore comments,
 so there may be a large up front penalty for the first search."
   (let (pt)
     (while (and (not pt)
                 (re-search-backward regexp bound noerror))
-      (if (not (verilog-inside-comment-p))
-          (setq pt (match-end 0))))
+      (if (verilog-inside-comment-or-string-p)
+          (re-search-backward "[/\"]" nil t) ;; Only way a comment or quote can begin
+        (setq pt (match-beginning 0))))
     pt))
 
 (defsubst verilog-re-search-forward-substr (substr regexp bound noerror)
@@ -1496,6 +1662,14 @@ This speeds up complicated regexp matches."
     done))
 ;;(verilog-re-search-backward-substr "-end" "get-end-of" nil t) ;;-end (test bait)
 
+(defun verilog-delete-trailing-whitespace ()
+  "Delete trailing spaces or tabs, but not newlines nor linefeeds."
+  ;; Similar to `delete-trailing-whitespace' but that's not present in XEmacs
+  (save-excursion
+    (goto-char (point-min))
+    (while (re-search-forward "[ \t]+$" nil t)  ;; Not syntatic WS as no formfeed
+      (replace-match "" nil nil))))
+
 (defvar compile-command)
 
 ;; compilation program
@@ -1535,11 +1709,11 @@ portion, will be substituted."
     (set (make-local-variable 'compile-command) "make "))
    (t
     (set (make-local-variable 'compile-command)
-         (if verilog-tool
-             (if (string-match "%s" (eval verilog-tool))
-                 (format (eval verilog-tool) (or buffer-file-name ""))
-               (concat (eval verilog-tool) " " (or buffer-file-name "")))
-           ""))))
+         (if verilog-tool
+             (if (string-match "%s" (eval verilog-tool))
+                 (format (eval verilog-tool) (or buffer-file-name ""))
+               (concat (eval verilog-tool) " " (or buffer-file-name "")))
+           ""))))
   (verilog-modify-compile-command))
 
 (defun verilog-expand-command (command)
@@ -1564,7 +1738,7 @@ be substituted."
          (stringp compile-command)
          (string-match "\\b\\(__FLAGS__\\|__FILE__\\)\\b" compile-command))
     (set (make-local-variable 'compile-command)
-         (verilog-expand-command compile-command))))
+         (verilog-expand-command compile-command))))
 
 (if (featurep 'xemacs)
     ;; Following code only gets called from compilation-mode-hook on XEmacs to add error handling.
@@ -1585,8 +1759,8 @@ find the errors."
                             (cdr compilation-error-regexp-alist-alist)))))
       (if (boundp 'compilation-font-lock-keywords)
           (progn
-            (set (make-local-variable 'compilation-font-lock-keywords)
-                 verilog-error-font-lock-keywords)
+            (set (make-local-variable 'compilation-font-lock-keywords)
+                 verilog-error-font-lock-keywords)
             (font-lock-set-defaults)))
       ;; Need to re-run compilation-error-regexp builder
       (if (fboundp 'compilation-build-compilation-error-regexp-alist)
@@ -1657,6 +1831,30 @@ find the errors."
        "`ovm_sequencer_utils_end"
        ) nil )))
 
+(defconst verilog-uvm-begin-re
+  (eval-when-compile
+    (verilog-regexp-opt
+     '(
+       "`uvm_component_utils_begin"
+       "`uvm_component_param_utils_begin"
+       "`uvm_field_utils_begin"
+       "`uvm_object_utils_begin"
+       "`uvm_object_param_utils_begin"
+       "`uvm_sequence_utils_begin"
+       "`uvm_sequencer_utils_begin"
+       ) nil )))
+
+(defconst verilog-uvm-end-re
+  (eval-when-compile
+    (verilog-regexp-opt
+     '(
+       "`uvm_component_utils_end"
+       "`uvm_field_utils_end"
+       "`uvm_object_utils_end"
+       "`uvm_sequence_utils_end"
+       "`uvm_sequencer_utils_end"
+       ) nil )))
+
 (defconst verilog-vmm-begin-re
   (eval-when-compile
     (verilog-regexp-opt
@@ -1794,6 +1992,145 @@ find the errors."
        "`static_dut_error"
        "`static_message") nil )))
 
+(defconst verilog-uvm-statement-re
+  (eval-when-compile
+    (verilog-regexp-opt
+     '(
+       ;; Statements
+       "`uvm_analysis_imp_decl"
+       "`uvm_blocking_get_imp_decl"
+       "`uvm_blocking_get_peek_imp_decl"
+       "`uvm_blocking_master_imp_decl"
+       "`uvm_blocking_peek_imp_decl"
+       "`uvm_blocking_put_imp_decl"
+       "`uvm_blocking_slave_imp_decl"
+       "`uvm_blocking_transport_imp_decl"
+       "`uvm_component_param_utils"
+       "`uvm_component_registry"
+       "`uvm_component_registry_param"
+       "`uvm_component_utils"
+       "`uvm_create"
+       "`uvm_create_on"
+       "`uvm_create_seq"                ;; Undocumented in 1.1 
+       "`uvm_declare_p_sequencer"
+       "`uvm_declare_sequence_lib"      ;; Deprecated in 1.1
+       "`uvm_do"
+       "`uvm_do_callbacks"
+       "`uvm_do_callbacks_exit_on"
+       "`uvm_do_obj_callbacks"
+       "`uvm_do_obj_callbacks_exit_on"
+       "`uvm_do_on"
+       "`uvm_do_on_pri"
+       "`uvm_do_on_pri_with"
+       "`uvm_do_on_with"
+       "`uvm_do_pri"
+       "`uvm_do_pri_with"
+       "`uvm_do_seq"                    ;; Undocumented in 1.1
+       "`uvm_do_seq_with"               ;; Undocumented in 1.1
+       "`uvm_do_with"
+       "`uvm_error"
+       "`uvm_error_context"
+       "`uvm_fatal"
+       "`uvm_fatal_context"
+       "`uvm_field_aa_int_byte"
+       "`uvm_field_aa_int_byte_unsigned"
+       "`uvm_field_aa_int_enum"
+       "`uvm_field_aa_int_int"
+       "`uvm_field_aa_int_int_unsigned"
+       "`uvm_field_aa_int_integer"
+       "`uvm_field_aa_int_integer_unsigned"
+       "`uvm_field_aa_int_key"
+       "`uvm_field_aa_int_longint"
+       "`uvm_field_aa_int_longint_unsigned"
+       "`uvm_field_aa_int_shortint"
+       "`uvm_field_aa_int_shortint_unsigned"
+       "`uvm_field_aa_int_string"
+       "`uvm_field_aa_object_int"
+       "`uvm_field_aa_object_string"
+       "`uvm_field_aa_string_int"
+       "`uvm_field_aa_string_string"
+       "`uvm_field_array_enum"
+       "`uvm_field_array_int"
+       "`uvm_field_array_object"
+       "`uvm_field_array_string"
+       "`uvm_field_enum"
+       "`uvm_field_event"
+       "`uvm_field_int"
+       "`uvm_field_object"
+       "`uvm_field_queue_enum"
+       "`uvm_field_queue_int"
+       "`uvm_field_queue_object"
+       "`uvm_field_queue_string"
+       "`uvm_field_real"
+       "`uvm_field_sarray_enum"
+       "`uvm_field_sarray_int"
+       "`uvm_field_sarray_object"
+       "`uvm_field_sarray_string"
+       "`uvm_field_string"
+       "`uvm_field_utils"
+       "`uvm_file"              ;; Undocumented in 1.1, use `__FILE__
+       "`uvm_get_imp_decl"
+       "`uvm_get_peek_imp_decl"
+       "`uvm_info"
+       "`uvm_info_context"
+       "`uvm_line"              ;; Undocumented in 1.1, use `__LINE__
+       "`uvm_master_imp_decl"
+       "`uvm_non_blocking_transport_imp_decl"   ;; Deprecated in 1.1
+       "`uvm_nonblocking_get_imp_decl"
+       "`uvm_nonblocking_get_peek_imp_decl"
+       "`uvm_nonblocking_master_imp_decl"
+       "`uvm_nonblocking_peek_imp_decl"
+       "`uvm_nonblocking_put_imp_decl"
+       "`uvm_nonblocking_slave_imp_decl"
+       "`uvm_nonblocking_transport_imp_decl"
+       "`uvm_object_param_utils"
+       "`uvm_object_registry"
+       "`uvm_object_registry_param"     ;; Undocumented in 1.1
+       "`uvm_object_utils"
+       "`uvm_pack_array"
+       "`uvm_pack_arrayN"
+       "`uvm_pack_enum"
+       "`uvm_pack_enumN"
+       "`uvm_pack_int"
+       "`uvm_pack_intN"
+       "`uvm_pack_queue"
+       "`uvm_pack_queueN"
+       "`uvm_pack_real"
+       "`uvm_pack_sarray"
+       "`uvm_pack_sarrayN"
+       "`uvm_pack_string"
+       "`uvm_peek_imp_decl"
+       "`uvm_put_imp_decl"
+       "`uvm_rand_send"
+       "`uvm_rand_send_pri"
+       "`uvm_rand_send_pri_with"
+       "`uvm_rand_send_with"
+       "`uvm_record_attribute"
+       "`uvm_record_field"
+       "`uvm_register_cb"
+       "`uvm_send"
+       "`uvm_send_pri"
+       "`uvm_sequence_utils"            ;; Deprecated in 1.1
+       "`uvm_set_super_type"
+       "`uvm_slave_imp_decl"
+       "`uvm_transport_imp_decl"
+       "`uvm_unpack_array"
+       "`uvm_unpack_arrayN"
+       "`uvm_unpack_enum"
+       "`uvm_unpack_enumN"
+       "`uvm_unpack_int"
+       "`uvm_unpack_intN"
+       "`uvm_unpack_queue"
+       "`uvm_unpack_queueN"
+       "`uvm_unpack_real"
+       "`uvm_unpack_sarray"
+       "`uvm_unpack_sarrayN"
+       "`uvm_unpack_string"
+       "`uvm_update_sequence_lib"               ;; Deprecated in 1.1
+       "`uvm_update_sequence_lib_and_item"      ;; Deprecated in 1.1
+       "`uvm_warning"
+       "`uvm_warning_context") nil )))
+
 
 ;;
 ;; Regular expressions used to calculate indent, etc.
@@ -1805,6 +2142,29 @@ find the errors."
 ;; a[34:32] :
 ;; a,
 ;;   b :
+(defconst verilog-assignment-operator-re
+  (eval-when-compile
+     (verilog-regexp-opt
+      `(
+        ;; blocking assignment_operator
+        "=" "+=" "-=" "*=" "/=" "%=" "&=" "|=" "^=" "<<=" ">>=" "<<<=" ">>>="
+        ;; non blocking assignment operator
+        "<="
+        ;; comparison
+        "==" "!=" "===" "!===" "<=" ">=" "==\?" "!=\?"
+        ;; event_trigger
+        "->" "->>"
+        ;; property_expr
+        "|->" "|=>"
+        ;; Is this a legal verilog operator?
+        ":="
+        ) 't
+      )))
+(defconst verilog-assignment-operation-re
+  (concat
+;     "\\(^\\s-*[A-Za-z0-9_]+\\(\\[\\([A-Za-z0-9_]+\\)\\]\\)*\\s-*\\)"
+;     "\\(^\\s-*[^=<>+-*/%&|^:\\s-]+[^=<>+-*/%&|^\n]*?\\)"
+     "\\(^.*?\\)" "\\B" verilog-assignment-operator-re "\\B" ))
 
 (defconst verilog-label-re (concat verilog-symbol-re "\\s-*:\\s-*"))
 (defconst verilog-property-re
@@ -1843,7 +2203,12 @@ find the errors."
    "\\(\\<`ovm_object_utils_end\\>\\)\\|"
    "\\(\\<`ovm_sequence_utils_end\\>\\)\\|"
    "\\(\\<`ovm_sequencer_utils_end\\>\\)"
-
+   ;; UVM
+   "\\(\\<`uvm_component_utils_end\\>\\)\\|"
+   "\\(\\<`uvm_field_utils_end\\>\\)\\|"
+   "\\(\\<`uvm_object_utils_end\\>\\)\\|"
+   "\\(\\<`uvm_sequence_utils_end\\>\\)\\|"
+   "\\(\\<`uvm_sequencer_utils_end\\>\\)"
    ))
 
 (defconst verilog-auto-end-comment-lines-re
@@ -1925,6 +2290,12 @@ find the errors."
        "`ovm_object_utils_end"
        "`ovm_sequence_utils_end"
        "`ovm_sequencer_utils_end"
+       ;; UVM
+       "`uvm_component_utils_end"
+       "`uvm_field_utils_end"
+       "`uvm_object_utils_end"
+       "`uvm_sequence_utils_end"
+       "`uvm_sequencer_utils_end"
        ;; VMM
        "`vmm_data_member_end"
        "`vmm_env_member_end"
@@ -1979,7 +2350,7 @@ find the errors."
        "specify"
        "table"
        "task"
-       ;;; OVM
+       ;; OVM
        "`ovm_component_utils_begin"
        "`ovm_component_param_utils_begin"
        "`ovm_field_utils_begin"
@@ -1987,6 +2358,14 @@ find the errors."
        "`ovm_object_param_utils_begin"
        "`ovm_sequence_utils_begin"
        "`ovm_sequencer_utils_begin"
+       ;; UVM
+       "`uvm_component_utils_begin"
+       "`uvm_component_param_utils_begin"
+       "`uvm_field_utils_begin"
+       "`uvm_object_utils_begin"
+       "`uvm_object_param_utils_begin"
+       "`uvm_sequence_utils_begin"
+       "`uvm_sequencer_utils_begin"
        ;; VMM
        "`vmm_data_member_begin"
        "`vmm_env_member_begin"
@@ -2000,7 +2379,7 @@ find the errors."
 (defconst verilog-beg-block-re-ordered
   ( concat "\\(\\<begin\\>\\)"          ;1
            "\\|\\(\\<randcase\\>\\|\\(\\<unique\\s-+\\|priority\\s-+\\)?case[xz]?\\>\\)" ; 2,3
-           "\\|\\(\\(\\<disable\\>\\s-+\\)?fork\\>\\)" ;4,5
+           "\\|\\(\\(\\<disable\\>\\s-+\\|\\<wait\\>\\s-+\\)?fork\\>\\)" ;4,5
            "\\|\\(\\<class\\>\\)"               ;6
            "\\|\\(\\<table\\>\\)"               ;7
            "\\|\\(\\<specify\\>\\)"             ;8
@@ -2013,7 +2392,7 @@ find the errors."
            "\\|\\(\\(\\(\\<cover\\>\\s-+\\)\\|\\(\\<assert\\>\\s-+\\)\\)*\\<property\\>\\)"     ;17 21
            "\\|\\(\\<\\(rand\\)?sequence\\>\\)" ;21 25
            "\\|\\(\\<clocking\\>\\)"          ;22 27
-           "\\|\\(\\<`ovm_[a-z_]+_begin\\>\\)" ;28
+           "\\|\\(\\<`[ou]vm_[a-z_]+_begin\\>\\)" ;28
            "\\|\\(\\<`vmm_[a-z_]+_member_begin\\>\\)"
            ;;
 
@@ -2125,6 +2504,8 @@ find the errors."
   (eval-when-compile (verilog-regexp-words `("endmodule" "endclass" "endprogram" "endinterface" "endpackage" "endprimitive" "endconfig"))))
 (defconst verilog-zero-indent-re
   (concat verilog-defun-re "\\|" verilog-end-defun-re))
+(defconst verilog-inst-comment-re
+  (eval-when-compile (verilog-regexp-words `("Outputs" "Inouts" "Inputs" "Interfaces" "Interfaced"))))
 
 (defconst verilog-behavioral-block-beg-re
   (eval-when-compile (verilog-regexp-words `("initial" "final" "always" "always_comb" "always_latch" "always_ff"
@@ -2186,6 +2567,20 @@ find the errors."
        "`ovm_object_utils_end"
        "`ovm_sequence_utils_end"
        "`ovm_sequencer_utils_end"
+       ;; UVM Begin tokens
+       "`uvm_component_utils_begin"
+       "`uvm_component_param_utils_begin"
+       "`uvm_field_utils_begin"
+       "`uvm_object_utils_begin"
+       "`uvm_object_param_utils_begin"
+       "`uvm_sequence_utils_begin"
+       "`uvm_sequencer_utils_begin"
+       ;; UVM End tokens
+       "`uvm_component_utils_end"       ;; Typo in spec, it's not uvm_component_end
+       "`uvm_field_utils_end"
+       "`uvm_object_utils_end"
+       "`uvm_sequence_utils_end"
+       "`uvm_sequencer_utils_end"
        ;; VMM Begin tokens
        "`vmm_data_member_begin"
        "`vmm_env_member_begin"
@@ -2227,8 +2622,7 @@ find the errors."
      `(
        "endmodule" "endprimitive" "endinterface" "endpackage" "endprogram" "endclass"
        ))))
-(defconst verilog-disable-fork-re "disable\\s-+fork\\>")
-(defconst verilog-fork-wait-re "fork\\s-+wait\\>")
+(defconst verilog-disable-fork-re "\\(disable\\|wait\\)\\s-+fork\\>")
 (defconst verilog-extended-case-re "\\(unique\\s-+\\|priority\\s-+\\)?case[xz]?")
 (defconst verilog-extended-complete-re
   (concat "\\(\\<extern\\s-+\\|\\<\\(\\<pure\\>\\s-+\\)?virtual\\s-+\\|\\<protected\\s-+\\)*\\(\\<function\\>\\|\\<task\\>\\)"
@@ -2609,6 +3003,7 @@ user-visible changes to the buffer must not be within a
           (buffer-undo-list t)
           (inhibit-read-only t)
           (inhibit-point-motion-hooks t)
+          (verilog-no-change-functions t)
           before-change-functions
           after-change-functions
           deactivate-mark
@@ -2624,6 +3019,7 @@ user-visible changes to the buffer must not be within a
   "Execute BODY forms, disabling all change hooks in BODY.
 For insignificant changes, see instead `verilog-save-buffer-state'."
   `(let* ((inhibit-point-motion-hooks t)
+          (verilog-no-change-functions t)
           before-change-functions
           after-change-functions)
      (progn ,@body)))
@@ -2633,13 +3029,17 @@ For insignificant changes, see instead `verilog-save-buffer-state'."
 
 (defvar verilog-scan-cache-preserving nil
   "If set, the specified buffer's comment properties are static.
-Buffer changes will be ignored.  See `verilog-inside-comment-p'
+Buffer changes will be ignored.  See `verilog-inside-comment-or-string-p'
 and `verilog-scan'.")
 
 (defvar verilog-scan-cache-tick nil
   "Modification tick at which `verilog-scan' was last completed.")
 (make-variable-buffer-local 'verilog-scan-cache-tick)
 
+(defun verilog-scan-cache-flush ()
+  "Flush the `verilog-scan' cache."
+  (setq verilog-scan-cache-tick nil))
+
 (defun verilog-scan-cache-ok-p ()
   "Return t iff the scan cache is up to date."
   (or (and verilog-scan-cache-preserving
@@ -2660,8 +3060,8 @@ This requires that insertions must use `verilog-insert'."
        (progn ,@body))))
 
 (defun verilog-scan-region (beg end)
-  "Parse comments between BEG and END for `verilog-inside-comment-p'.
-This creates v-cmt properties where comments are in force."
+  "Parse between BEG and END for `verilog-inside-comment-or-string-p'.
+This creates v-cmts properties where comments are in force."
   ;; Why properties and not overlays?  Overlays have much slower non O(1)
   ;; lookup times.
   ;; This function is warm - called on every verilog-insert
@@ -2678,8 +3078,9 @@ This creates v-cmt properties where comments are in force."
                   ;; "1+": The leading // or /* itself isn't considered as
                   ;; being "inside" the comment, so that a (search-backward)
                   ;; that lands at the start of the // won't mis-indicate
-                  ;; it's inside a comment
-                  (put-text-property (1+ pt) (point) 'v-cmt t))
+                  ;; it's inside a comment.  Also otherwise it would be
+                  ;; hard to find a commented out /*AS*/ vs one that isn't
+                  (put-text-property (1+ pt) (point) 'v-cmts t))
                  ((looking-at "/\\*")
                   (setq pt (point))
                   (or (search-forward "*/" end t)
@@ -2688,17 +3089,24 @@ This creates v-cmt properties where comments are in force."
                       ;;(error "%s: Unmatched /* */, at char %d"
                       ;;       (verilog-point-text) (point))
                       (goto-char end))
-                  (put-text-property (1+ pt) (point) 'v-cmt t))
+                  (put-text-property (1+ pt) (point) 'v-cmts t))
+                 ((looking-at "\"")
+                  (setq pt (point))
+                  (or (re-search-forward "[^\\]\"" end t)       ;; don't forward-char first, since we look for a non backslash first
+                      ;; No error - let later code indicate it so we can
+                      (goto-char end))
+                  (put-text-property (1+ pt) (point) 'v-cmts t))
                  (t
                   (forward-char 1)
-                  (if (re-search-forward "/[/*]" end t)
-                      (backward-char 2)
+                  (if (re-search-forward "[/\"]" end t)
+                      (backward-char 1)
                     (goto-char end))))))))))
 
 (defun verilog-scan ()
   "Parse the buffer, marking all comments with properties.
 Also assumes any text inserted since `verilog-scan-cache-tick'
 either is ok to parse as a non-comment, or `verilog-insert' was used."
+  ;; See also `verilog-scan-debug' and `verilog-scan-and-debug'
   (unless (verilog-scan-cache-ok-p)
     (save-excursion
       (verilog-save-buffer-state
@@ -2706,21 +3114,47 @@ either is ok to parse as a non-comment, or `verilog-insert' was used."
           (message "Scanning %s cache=%s cachetick=%S tick=%S" (current-buffer)
                    verilog-scan-cache-preserving verilog-scan-cache-tick
                    (buffer-chars-modified-tick)))
-        (remove-text-properties (point-min) (point-max) '(v-cmt nil))
+        (remove-text-properties (point-min) (point-max) '(v-cmts nil))
         (verilog-scan-region (point-min) (point-max))
         (setq verilog-scan-cache-tick (buffer-chars-modified-tick))
         (when verilog-debug (message "Scanning... done"))))))
 
-(defun verilog-inside-comment-p ()
-  "Check if point inside a comment.
+(defun verilog-scan-debug ()
+  "For debugging, show with display face results of `verilog-scan'."
+  (font-lock-mode 0)
+  ;;(if dbg (setq dbg (concat dbg (format "verilog-scan-debug\n"))))
+  (save-excursion
+    (goto-char (point-min))
+    (remove-text-properties (point-min) (point-max) '(face nil))
+    (while (not (eobp))
+      (cond ((get-text-property (point) 'v-cmts)
+             (put-text-property (point) (1+ (point)) `face 'underline)
+             ;;(if dbg (setq dbg (concat dbg (format "  v-cmts at %S\n" (point)))))
+             (forward-char 1))
+            (t
+             (goto-char (or (next-property-change (point)) (point-max))))))))
+
+(defun verilog-scan-and-debug ()
+  "For debugging, run `verilog-scan' and `verilog-scan-debug'."
+  (let (verilog-scan-cache-preserving
+        verilog-scan-cache-tick)
+    (goto-char (point-min))
+    (verilog-scan)
+    (verilog-scan-debug)))
+
+(defun verilog-inside-comment-or-string-p (&optional pos)
+  "Check if optional point POS is inside a comment.
 This may require a slow pre-parse of the buffer with `verilog-scan'
 to establish comment properties on all text."
   ;; This function is very hot
   (verilog-scan)
-  (get-text-property (point) 'v-cmt))
+  (if pos
+      (and (>= pos (point-min))
+           (get-text-property pos 'v-cmts))
+    (get-text-property (point) 'v-cmts)))
 
 (defun verilog-insert (&rest stuff)
-  "Insert STUFF arguments, tracking comments for `verilog-inside-comment-p'.
+  "Insert STUFF arguments, tracking for `verilog-inside-comment-or-string-p'.
 Any insert that includes a comment must have the entire commente
 inserted using a single call to `verilog-insert'."
   (let ((pt (point)))
@@ -2741,7 +3175,7 @@ Use filename, if current buffer being edited shorten to just buffer name."
                    (buffer-name))
               buffer-file-name
               (buffer-name))
-          ":" (int-to-string (count-lines (point-min) (or pointnum (point))))))
+          ":" (int-to-string (1+ (count-lines (point-min) (or pointnum (point)))))))
 
 (defun electric-verilog-backward-sexp ()
   "Move backward over one balanced expression."
@@ -2835,28 +3269,24 @@ Use filename, if current buffer being edited shorten to just buffer name."
         (setq md 3) ;; ender is third item in regexp
         )
        ((match-end 4)
-        ;; might be "disable fork" or "fork wait"
+        ;; might be "disable fork" or "wait fork"
         (let
             (here)
-          (if (looking-at verilog-fork-wait-re)
-              (progn  ;; it is a fork wait; ignore it
+          (if (or
+               (looking-at verilog-disable-fork-re)
+               (and (looking-at "fork")
+                    (progn
+                      (setq here (point)) ;; sometimes a fork is just a fork
+                      (forward-word -1)
+                      (looking-at verilog-disable-fork-re))))
+              (progn ;; it is a disable fork; ignore it
                 (goto-char (match-end 0))
+                (forward-word 1)
                 (setq reg nil))
-            (if (or
-                 (looking-at verilog-disable-fork-re)
-                 (and (looking-at "fork")
-                      (progn
-                        (setq here (point)) ;; sometimes a fork is just a fork
-                        (forward-word -1)
-                        (looking-at verilog-disable-fork-re))))
-                (progn ;; it is a disable fork; ignore it
-                  (goto-char (match-end 0))
-                  (forward-word 1)
-                  (setq reg nil))
-              (progn ;; it is a nice simple fork
-                (goto-char here)   ;; return from looking for "disable fork"
-                ;; Search forward for matching join
-                (setq reg "\\(\\<fork\\>\\)\\|\\(\\<join\\(_any\\|_none\\)?\\>\\)" ))))))
+            (progn ;; it is a nice simple fork
+              (goto-char here)   ;; return from looking for "disable fork"
+              ;; Search forward for matching join
+              (setq reg "\\(\\<fork\\>\\)\\|\\(\\<join\\(_any\\|_none\\)?\\>\\)" )))))
        ((match-end 6)
         ;; Search forward for matching endclass
         (setq reg "\\(\\<class\\>\\)\\|\\(\\<endclass\\>\\)" ))
@@ -2916,8 +3346,6 @@ Use filename, if current buffer being edited shorten to just buffer name."
                       (setq here (point)) ; remember where we started
                       (goto-char (match-beginning 1))
                       (cond
-                       ((looking-at verilog-fork-wait-re)
-                        (goto-char (match-end 0))) ; false alarm
                        ((if (or
                              (looking-at verilog-disable-fork-re)
                              (and (looking-at "fork")
@@ -3076,6 +3504,8 @@ Some other functions are:
     \\[verilog-sk-initial]  Insert an initial begin .. end block.
     \\[verilog-sk-fork]  Insert a fork begin .. end .. join block.
     \\[verilog-sk-module]  Insert a module .. (/*AUTOARG*/);.. endmodule block.
+    \\[verilog-sk-ovm-class]  Insert an OVM Class block.
+    \\[verilog-sk-uvm-class]  Insert an UVM Class block.
     \\[verilog-sk-primitive]  Insert a primitive .. (.. );.. endprimitive block.
     \\[verilog-sk-repeat]  Insert a repeat (..) begin .. end block.
     \\[verilog-sk-specify]  Insert a specify .. endspecify block.
@@ -3110,7 +3540,6 @@ Key bindings specific to `verilog-mode-map' are:
        #'verilog-indent-line-relative)
   (setq comment-indent-function 'verilog-comment-indent)
   (set (make-local-variable 'parse-sexp-ignore-comments) nil)
-
   (set (make-local-variable 'comment-start) "// ")
   (set (make-local-variable 'comment-end) "")
   (set (make-local-variable 'comment-start-skip) "/\\*+ *\\|// *")
@@ -3168,7 +3597,9 @@ Key bindings specific to `verilog-mode-map' are:
                   hs-special-modes-alist))))
 
   ;; Stuff for autos
-  (add-hook 'write-contents-hooks 'verilog-auto-save-check nil 'local))
+  (add-hook 'write-contents-hooks 'verilog-auto-save-check nil 'local)
+  ;; verilog-mode-hook call added by define-derived-mode
+  )
 
 
 ;;
@@ -3519,6 +3950,12 @@ area.  See also `verilog-comment-region'."
   (interactive)
   (verilog-re-search-backward verilog-defun-re nil 'move))
 
+(defun verilog-beg-of-defun-quick ()
+  "Move backward to the beginning of the current function or procedure.
+Uses `verilog-scan' cache."
+  (interactive)
+  (verilog-re-search-backward-quick verilog-defun-re nil 'move))
+
 (defun verilog-end-of-defun ()
   "Move forward to the end of the current function or procedure."
   (interactive)
@@ -3741,13 +4178,21 @@ More specifically, point @ in the line foo : @ begin"
                (t
                 (throw 'found (= nest 0)))))))
       nil)))
+
 (defun verilog-backward-up-list (arg)
-  "Like backward-up-list, but deal with comments."
-  (let (saved-psic parse-sexp-ignore-comments)
-    (setq parse-sexp-ignore-comments 1)
-    (backward-up-list arg)
-    (setq parse-sexp-ignore-comments saved-psic)
-    ))
+  "Like `backward-up-list', but deal with comments."
+  (let ((parse-sexp-ignore-comments t))
+    (backward-up-list arg)))
+
+(defun verilog-forward-sexp-cmt (arg)
+  "Call `forward-sexp', inside comments."
+  (let ((parse-sexp-ignore-comments nil))
+    (forward-sexp arg)))
+
+(defun verilog-forward-sexp-ign-cmt (arg)
+  "Call `forward-sexp', ignoring comments."
+  (let ((parse-sexp-ignore-comments t))
+    (forward-sexp arg)))
 
 (defun verilog-in-struct-region-p ()
   "Return true if in a struct region.
@@ -4449,7 +4894,6 @@ becomes:
                   next-error-last-buffer
                 compilation-last-buffer)))
     (when (buffer-live-p buff)
-      ;; FIXME with-current-buffer?
       (save-excursion
         (switch-to-buffer buff)
         (beginning-of-line)
@@ -4565,8 +5009,9 @@ This lets programs calling batch mode to easily extract error messages."
       (error "%%Error: %s%s" (error-message-string err)
              (if (featurep 'xemacs) "\n" "")))))  ;; XEmacs forgets to add a newline
 
-(defun verilog-batch-execute-func (funref)
-  "Internal processing of a batch command, running FUNREF on all command arguments."
+(defun verilog-batch-execute-func (funref &optional no-save)
+  "Internal processing of a batch command, running FUNREF on all command arguments.
+Save the result unless optional NO-SAVE is t."
   (verilog-batch-error-wrapper
    ;; Setting global variables like that is *VERY NASTY* !!!  --Stef
    ;; However, this function is called only when Emacs is being used as
@@ -4587,15 +5032,15 @@ This lets programs calling batch mode to easily extract error messages."
          (buffer-list))
    ;; Process the files
    (mapcar (lambda (buf)
-              (when (buffer-file-name buf)
-                (save-excursion
-                  (if (not (file-exists-p (buffer-file-name buf)))
-                      (error
-                       (concat "File not found: " (buffer-file-name buf))))
-                  (message (concat "Processing " (buffer-file-name buf)))
-                  (set-buffer buf)
-                  (funcall funref)
-                  (save-buffer))))
+             (when (buffer-file-name buf)
+               (save-excursion
+                 (if (not (file-exists-p (buffer-file-name buf)))
+                     (error
+                      (concat "File not found: " (buffer-file-name buf))))
+                 (message (concat "Processing " (buffer-file-name buf)))
+                 (set-buffer buf)
+                 (funcall funref)
+                 (unless no-save (save-buffer)))))
            (buffer-list))))
 
 (defun verilog-batch-auto ()
@@ -4616,6 +5061,16 @@ with \\[verilog-delete-auto] on all command-line files, and saves the buffers."
     (error "Use verilog-batch-delete-auto only with --batch"))  ;; Otherwise we'd mess up buffer modes
   (verilog-batch-execute-func `verilog-delete-auto))
 
+(defun verilog-batch-diff-auto ()
+  "For use with --batch, perform automatic differences as a stand-alone tool.
+This sets up the appropriate Verilog mode environment, expand automatics
+with \\[verilog-diff-auto] on all command-line files, and reports an error
+if any differences are observed.  This is appropriate for adding to regressions
+to insure automatics are always properly maintained."
+  (unless noninteractive
+    (error "Use verilog-batch-diff-auto only with --batch"))  ;; Otherwise we'd mess up buffer modes
+  (verilog-batch-execute-func `verilog-diff-auto t))
+
 (defun verilog-batch-inject-auto ()
   "For use with --batch, perform automatic injection as a stand-alone tool.
 This sets up the appropriate Verilog mode environment, injects new automatics
@@ -4692,123 +5147,123 @@ Return a list of two elements: (INDENT-TYPE INDENT-LEVEL)."
                    ;; if we have a directive, done.
                    (if (save-excursion (beginning-of-line)
                                        (and (looking-at verilog-directive-re-1)
-                                            (not (or (looking-at "[ \t]*`ovm_")
+                                            (not (or (looking-at "[ \t]*`[ou]vm_")
                                  (looking-at "[ \t]*`vmm_")))))
                        (throw 'nesting 'directive))
            ;; indent structs as if there were module level
            (if (verilog-in-struct-p)
                (throw 'nesting 'block))
 
-                   ;; unless we are in the newfangled coverpoint or constraint blocks
-                   ;; if we are in a parenthesized list, and the user likes to indent these, return.
-                   (if (and
+           ;; if we are in a parenthesized list, and the user likes to indent these, return.
+           ;; unless we are in the newfangled coverpoint or constraint blocks
+           (if (and
                 verilog-indent-lists
                 (verilog-in-paren)
                 (not (verilog-in-coverage-p))
                 )
-                       (progn (setq par 1)
+               (progn (setq par 1)
                       (throw 'nesting 'block)))
 
-                   ;; See if we are continuing a previous line
-                   (while t
-                     ;; trap out if we crawl off the top of the buffer
-                     (if (bobp) (throw 'nesting 'cpp))
-
-                     (if (verilog-continued-line-1 lim)
-                         (let ((sp (point)))
-                           (if (and
-                                (not (looking-at verilog-complete-reg))
-                                (verilog-continued-line-1 lim))
-                               (progn (goto-char sp)
-                                      (throw 'nesting 'cexp))
-
-                             (goto-char sp))
-
-                           (if (and begin
-                                    (not verilog-indent-begin-after-if)
-                                    (looking-at verilog-no-indent-begin-re))
-                               (progn
-                                 (beginning-of-line)
-                                 (skip-chars-forward " \t")
-                                 (throw 'nesting 'statement))
-                             (progn
-                               (throw 'nesting 'cexp))))
-                       ;; not a continued line
-                       (goto-char starting_position))
-
-                     (if (looking-at "\\<else\\>")
-                         ;; search back for governing if, striding across begin..end pairs
-                         ;; appropriately
-                         (let ((elsec 1))
-                           (while (verilog-re-search-backward verilog-ends-re nil 'move)
+           ;; See if we are continuing a previous line
+           (while t
+             ;; trap out if we crawl off the top of the buffer
+             (if (bobp) (throw 'nesting 'cpp))
+
+             (if (verilog-continued-line-1 lim)
+                 (let ((sp (point)))
+                   (if (and
+                        (not (looking-at verilog-complete-reg))
+                        (verilog-continued-line-1 lim))
+                       (progn (goto-char sp)
+                              (throw 'nesting 'cexp))
+
+                     (goto-char sp))
+
+                   (if (and begin
+                            (not verilog-indent-begin-after-if)
+                            (looking-at verilog-no-indent-begin-re))
+                       (progn
+                         (beginning-of-line)
+                         (skip-chars-forward " \t")
+                         (throw 'nesting 'statement))
+                     (progn
+                       (throw 'nesting 'cexp))))
+               ;; not a continued line
+               (goto-char starting_position))
+
+             (if (looking-at "\\<else\\>")
+                 ;; search back for governing if, striding across begin..end pairs
+                 ;; appropriately
+                 (let ((elsec 1))
+                   (while (verilog-re-search-backward verilog-ends-re nil 'move)
+                     (cond
+                      ((match-end 1) ; else, we're in deep
+                       (setq elsec (1+ elsec)))
+                      ((match-end 2) ; if
+                       (setq elsec (1- elsec))
+                       (if (= 0 elsec)
+                           (if verilog-align-ifelse
+                               (throw 'nesting 'statement)
+                             (progn ;; back up to first word on this line
+                               (beginning-of-line)
+                               (verilog-forward-syntactic-ws)
+                               (throw 'nesting 'statement)))))
+                      ((match-end 3) ; assert block
+                       (setq elsec (1- elsec))
+                       (verilog-beg-of-statement) ;; doesn't get to beginning
+                       (if (looking-at verilog-property-re)
+                           (throw 'nesting 'statement) ; We don't need an endproperty for these
+                         (throw 'nesting 'block)        ;We still need a endproperty
+                         ))
+                      (t ; endblock
+                                        ; try to leap back to matching outward block by striding across
+                                        ; indent level changing tokens then immediately
+                                        ; previous line governs indentation.
+                       (let (( reg) (nest 1))
+                         ;;      verilog-ends =>  else|if|end|join(_any|_none|)|endcase|endclass|endtable|endspecify|endfunction|endtask|endgenerate|endgroup
+                         (cond
+                          ((match-end 4) ; end
+                           ;; Search back for matching begin
+                           (setq reg "\\(\\<begin\\>\\)\\|\\(\\<end\\>\\)" ))
+                          ((match-end 5) ; endcase
+                           ;; Search back for matching case
+                           (setq reg "\\(\\<randcase\\>\\|\\<case[xz]?\\>[^:]\\)\\|\\(\\<endcase\\>\\)" ))
+                          ((match-end 6) ; endfunction
+                           ;; Search back for matching function
+                           (setq reg "\\(\\<function\\>\\)\\|\\(\\<endfunction\\>\\)" ))
+                          ((match-end 7) ; endtask
+                           ;; Search back for matching task
+                           (setq reg "\\(\\<task\\>\\)\\|\\(\\<endtask\\>\\)" ))
+                          ((match-end 8) ; endspecify
+                           ;; Search back for matching specify
+                           (setq reg "\\(\\<specify\\>\\)\\|\\(\\<endspecify\\>\\)" ))
+                          ((match-end 9) ; endtable
+                           ;; Search back for matching table
+                           (setq reg "\\(\\<table\\>\\)\\|\\(\\<endtable\\>\\)" ))
+                          ((match-end 10) ; endgenerate
+                           ;; Search back for matching generate
+                           (setq reg "\\(\\<generate\\>\\)\\|\\(\\<endgenerate\\>\\)" ))
+                          ((match-end 11) ; joins
+                           ;; Search back for matching fork
+                           (setq reg "\\(\\<fork\\>\\)\\|\\(\\<join\\(_any\\|none\\)?\\>\\)" ))
+                          ((match-end 12) ; class
+                           ;; Search back for matching class
+                           (setq reg "\\(\\<class\\>\\)\\|\\(\\<endclass\\>\\)" ))
+                          ((match-end 13) ; covergroup
+                           ;; Search back for matching covergroup
+                           (setq reg "\\(\\<covergroup\\>\\)\\|\\(\\<endgroup\\>\\)" )))
+                         (catch 'skip
+                           (while (verilog-re-search-backward reg nil 'move)
                              (cond
-                              ((match-end 1) ; else, we're in deep
-                               (setq elsec (1+ elsec)))
-                              ((match-end 2) ; if
-                               (setq elsec (1- elsec))
-                               (if (= 0 elsec)
-                                   (if verilog-align-ifelse
-                                       (throw 'nesting 'statement)
-                                     (progn ;; back up to first word on this line
-                                       (beginning-of-line)
-                                       (verilog-forward-syntactic-ws)
-                                       (throw 'nesting 'statement)))))
-                              ((match-end 3) ; assert block
-                               (setq elsec (1- elsec))
-                               (verilog-beg-of-statement) ;; doesn't get to beginning
-                               (if (looking-at verilog-property-re)
-                                   (throw 'nesting 'statement) ; We don't need an endproperty for these
-                                 (throw 'nesting 'block)        ;We still need a endproperty
-                                 ))
-                              (t ; endblock
-                                ; try to leap back to matching outward block by striding across
-                                ; indent level changing tokens then immediately
-                                ; previous line governs indentation.
-                               (let (( reg) (nest 1))
-;;       verilog-ends =>  else|if|end|join(_any|_none|)|endcase|endclass|endtable|endspecify|endfunction|endtask|endgenerate|endgroup
-                                 (cond
-                                  ((match-end 4) ; end
-                                   ;; Search back for matching begin
-                                   (setq reg "\\(\\<begin\\>\\)\\|\\(\\<end\\>\\)" ))
-                                  ((match-end 5) ; endcase
-                                   ;; Search back for matching case
-                                   (setq reg "\\(\\<randcase\\>\\|\\<case[xz]?\\>[^:]\\)\\|\\(\\<endcase\\>\\)" ))
-                                  ((match-end 6) ; endfunction
-                                   ;; Search back for matching function
-                                   (setq reg "\\(\\<function\\>\\)\\|\\(\\<endfunction\\>\\)" ))
-                                  ((match-end 7) ; endtask
-                                   ;; Search back for matching task
-                                   (setq reg "\\(\\<task\\>\\)\\|\\(\\<endtask\\>\\)" ))
-                                  ((match-end 8) ; endspecify
-                                   ;; Search back for matching specify
-                                   (setq reg "\\(\\<specify\\>\\)\\|\\(\\<endspecify\\>\\)" ))
-                                  ((match-end 9) ; endtable
-                                   ;; Search back for matching table
-                                   (setq reg "\\(\\<table\\>\\)\\|\\(\\<endtable\\>\\)" ))
-                                  ((match-end 10) ; endgenerate
-                                   ;; Search back for matching generate
-                                   (setq reg "\\(\\<generate\\>\\)\\|\\(\\<endgenerate\\>\\)" ))
-                                  ((match-end 11) ; joins
-                                   ;; Search back for matching fork
-                                   (setq reg "\\(\\<fork\\>\\)\\|\\(\\<join\\(_any\\|none\\)?\\>\\)" ))
-                                  ((match-end 12) ; class
-                                   ;; Search back for matching class
-                                   (setq reg "\\(\\<class\\>\\)\\|\\(\\<endclass\\>\\)" ))
-                                  ((match-end 13) ; covergroup
-                                   ;; Search back for matching covergroup
-                                   (setq reg "\\(\\<covergroup\\>\\)\\|\\(\\<endgroup\\>\\)" )))
-                                 (catch 'skip
-                                   (while (verilog-re-search-backward reg nil 'move)
-                                     (cond
-                                      ((match-end 1) ; begin
-                                       (setq nest (1- nest))
-                                       (if (= 0 nest)
-                                           (throw 'skip 1)))
-                                      ((match-end 2) ; end
-                                       (setq nest (1+ nest)))))
-                                   )))))))
-                     (throw 'nesting (verilog-calc-1)))
-                   );; catch nesting
+                              ((match-end 1) ; begin
+                               (setq nest (1- nest))
+                               (if (= 0 nest)
+                                   (throw 'skip 1)))
+                              ((match-end 2) ; end
+                               (setq nest (1+ nest)))))
+                           )))))))
+             (throw 'nesting (verilog-calc-1)))
+           );; catch nesting
                  );; type
            )
       ;; Return type of block and indent level.
@@ -4883,8 +5338,7 @@ Return a list of two elements: (INDENT-TYPE INDENT-LEVEL)."
              ((match-end 4)  ; *sigh* could be "disable fork"
               (let ((here (point)))
                 (verilog-beg-of-statement)
-                (if (or (looking-at verilog-disable-fork-re)
-                        (looking-at verilog-fork-wait-re))
+                (if (looking-at verilog-disable-fork-re)
                     t ; this is a normal statement
                   (progn ; or is fork, starts a new block
                     (goto-char here)
@@ -5050,6 +5504,9 @@ Jump from end to matching begin, from endcase to matching case, and so on."
      ((looking-at "\\<endproperty\\>")
       ;; 11: Search back for matching property
       (setq reg "\\(\\<property\\>\\)\\|\\(\\<endproperty\\>\\)" ))
+     ((looking-at verilog-uvm-end-re)
+      ;; 12: Search back for matching sequence
+      (setq reg (concat "\\(" verilog-uvm-begin-re "\\|" verilog-uvm-end-re "\\)")))
      ((looking-at verilog-ovm-end-re)
       ;; 12: Search back for matching sequence
       (setq reg (concat "\\(" verilog-ovm-begin-re "\\|" verilog-ovm-end-re "\\)")))
@@ -5177,6 +5634,12 @@ Set point to where line starts."
          ;;XX
          ((looking-at "\\<\\(always\\(_latch\\|_ff\\|_comb\\)?\\|case\\(\\|[xz]\\)\\|for\\(\\|each\\|ever\\)\\|i\\(f\\|nitial\\)\\|repeat\\|while\\)\\>")
           (not (looking-at "\\<randcase\\>\\|\\<case[xz]?\\>[^:]")))
+         ((looking-at verilog-uvm-statement-re)
+          nil)
+         ((looking-at verilog-uvm-begin-re)
+          t)
+         ((looking-at verilog-uvm-end-re)
+          t)
          ((looking-at verilog-ovm-statement-re)
           nil)
          ((looking-at verilog-ovm-begin-re)
@@ -5241,9 +5704,24 @@ Set point to where line starts."
           t))))))))
 
 (defun verilog-backward-syntactic-ws ()
+  "Move backwards putting point after first non-whitespace non-comment."
   (verilog-skip-backward-comments)
   (forward-comment (- (buffer-size))))
 
+(defun verilog-backward-syntactic-ws-quick ()
+  "As with `verilog-backward-syntactic-ws' but uses `verilog-scan' cache."
+  (while (cond ((bobp)
+                nil) ; Done
+               ((> (skip-syntax-backward " ") 0)
+                t)
+               ((eq (preceding-char) ?\n)  ;; \n's terminate // so aren't space syntax
+                (forward-char -1)
+                t)
+               ((or (verilog-inside-comment-or-string-p (1- (point)))
+                    (verilog-inside-comment-or-string-p (point)))
+                (re-search-backward "[/\"]" nil t) ;; Only way a comment or quote can begin
+                t))))
+
 (defun verilog-forward-syntactic-ws ()
   (verilog-skip-forward-comment-p)
   (forward-comment (buffer-size)))
@@ -5339,9 +5817,17 @@ Optional BOUND limits search."
 
 (defun verilog-in-attribute-p ()
  "Return true if point is in an attribute (* [] attribute *)."
- (save-excursion
-   (verilog-re-search-backward "\\((\\*\\)\\|\\(\\*)\\)" nil 'move)
-   (numberp (match-beginning 1))))
+ (save-match-data
+   (save-excursion
+     (verilog-re-search-backward "\\((\\*\\)\\|\\(\\*)\\)" nil 'move)
+     (numberp (match-beginning 1)))))
+
+(defun verilog-in-parameter-p ()
+ "Return true if point is in a parameter assignment #( p1=1, p2=5)."
+ (save-match-data
+   (save-excursion
+     (verilog-re-search-backward "\\(#(\\)\\|\\()\\)" nil 'move)
+     (numberp (match-beginning 1)))))
 
 (defun verilog-in-escaped-name-p ()
  "Return true if in an escaped name."
@@ -5357,11 +5843,27 @@ Optional BOUND limits search."
    (beginning-of-line)
    (looking-at verilog-directive-re-1)))
 
+(defun verilog-in-parenthesis-p ()
+ "Return true if in a ( ) expression (but not { } or [ ])."
+ (save-match-data
+   (save-excursion
+     (verilog-re-search-backward "\\((\\)\\|\\()\\)" nil 'move)
+     (numberp (match-beginning 1)))))
+
 (defun verilog-in-paren ()
- "Return true if in a parenthetical expression."
+ "Return true if in a parenthetical expression.
+May cache result using `verilog-syntax-ppss'."
  (let ((state (save-excursion (verilog-syntax-ppss))))
    (> (nth 0 state) 0 )))
 
+(defun verilog-in-paren-quick ()
+ "Return true if in a parenthetical expression.
+Always starts from point-min, to allow inserts with hooks disabled."
+ ;; The -quick refers to its use alongside the other -quick functions,
+ ;; not that it's likely to be faster than verilog-in-paren.
+ (let ((state (save-excursion (parse-partial-sexp (point-min) (point)))))
+   (> (nth 0 state) 0 )))
+
 (defun verilog-in-struct-p ()
  "Return true if in a struct declaration."
  (interactive)
@@ -5607,7 +6109,11 @@ Only look at a few lines to determine indent level."
                          (goto-char fst)
                          (+ (current-column) verilog-cexp-indent))))))
             (goto-char here)
-            (indent-line-to val)))
+            (indent-line-to val)
+            (if (and (not verilog-indent-lists)
+                     (verilog-in-paren))
+                (verilog-pretty-declarations))
+            ))
          ((= (preceding-char) ?\) )
           (goto-char here)
           (let ((val (eval (cdr (assoc type verilog-indent-alist)))))
@@ -5915,102 +6421,104 @@ Be verbose about progress unless optional QUIET set."
             (unless quiet (message "")))))))
 
 (defun verilog-pretty-expr (&optional quiet myre)
-  "Line up expressions around point, optionally QUIET with regexp MYRE."
-  (interactive "i\nsRegular Expression: ((<|:)?=) ")
-  (save-excursion
-    (if (or (eq myre nil)
-            (string-equal myre ""))
-        (setq myre "\\(<\\|:\\)?="))
-    ;; want to match the first <= |  := | =
-    (setq myre (concat "\\(^.*?\\)\\(" myre "\\)"))
-    (let ((rexp(concat "^\\s-*" verilog-complete-reg)))
-      (beginning-of-line)
-      (if (and (not (looking-at rexp ))
-               (looking-at myre)
-               (save-excursion
-                 (goto-char (match-beginning 2))
-                 (not (verilog-in-comment-or-string-p))))
-          (let* ((here (point))
-                 (e) (r)
-                 (start
-                  (progn
-                    (beginning-of-line)
-                    (setq e (point))
-                    (verilog-backward-syntactic-ws)
-                    (beginning-of-line)
-                    (while (and (not (looking-at rexp ))
-                                (looking-at myre)
-                                (not (bobp))
-                                )
-                      (setq e (point))
-                      (verilog-backward-syntactic-ws)
-                      (beginning-of-line)
-                      ) ;Ack, need to grok `define
-                    e))
-                 (end
-                  (progn
-                    (goto-char here)
-                    (end-of-line)
-                    (setq e (point))    ;Might be on last line
-                    (verilog-forward-syntactic-ws)
-                    (beginning-of-line)
-                    (while (and
-                            (not (looking-at rexp ))
-                            (looking-at myre)
-                            (progn
-                              (end-of-line)
-                              (not (eq e (point)))))
-                      (setq e (point))
-                      (verilog-forward-syntactic-ws)
-                      (beginning-of-line)
-                      )
-                    e))
-                 (endpos (set-marker (make-marker) end))
-                 (ind)
-                 )
-            (goto-char start)
-            (verilog-do-indent (verilog-calculate-indent))
-            (if (and (not quiet)
-                     (> (- end start) 100))
-                (message "Lining up expressions..(please stand by)"))
-
-            ;; Set indent to minimum throughout region
-            (while (< (point) (marker-position endpos))
-              (beginning-of-line)
-              (verilog-just-one-space myre)
-              (end-of-line)
-              (verilog-forward-syntactic-ws)
-              )
-
-            ;; Now find biggest prefix
-            (setq ind (verilog-get-lineup-indent-2 myre start endpos))
-
-            ;; Now indent each line.
-            (goto-char start)
-            (while (progn (setq e (marker-position endpos))
-                          (setq r (- e (point)))
-                          (> r 0))
-              (setq e (point))
-              (if (not quiet) (message "%d" r))
-              (cond
-               ((looking-at myre)
-                (goto-char (match-beginning 2))
-                (if (not (verilog-parenthesis-depth)) ;; ignore parenthesized exprs
-                    (if (eq (char-after) ?=)
-                        (indent-to (1+ ind))    ; line up the = of the <= with surrounding =
-                      (indent-to ind)
-                      )))
-               ((verilog-continued-line-1 start)
-                (goto-char e)
-                (indent-line-to ind))
-               (t               ; Must be comment or white space
-                (goto-char e)
-                (verilog-forward-ws&directives)
-                (forward-line -1))
-               )
-              (forward-line 1))
-            (unless quiet (message ""))
-            )))))
+  "Line up expressions around point, optionally QUIET with regexp MYRE ignored."
+  (interactive)
+  (if (not (verilog-in-comment-or-string-p))
+      (save-excursion
+        (let ((rexp (concat "^\\s-*" verilog-complete-reg)))
+          (beginning-of-line)
+          (if (and (not (looking-at rexp ))
+                   (looking-at verilog-assignment-operation-re)
+                   (save-excursion
+                     (goto-char (match-end 2))
+                     (and (not (verilog-in-attribute-p))
+                          (not (verilog-in-parameter-p))
+                          (not (verilog-in-comment-or-string-p)))))
+              (let* ((here (point))
+                     (e) (r)
+                     (start
+                      (progn
+                        (beginning-of-line)
+                        (setq e (point))
+                        (verilog-backward-syntactic-ws)
+                        (beginning-of-line)
+                        (while (and (not (looking-at rexp ))
+                                    (looking-at verilog-assignment-operation-re)
+                                    (not (bobp))
+                                    )
+                          (setq e (point))
+                          (verilog-backward-syntactic-ws)
+                          (beginning-of-line)
+                          ) ;Ack, need to grok `define
+                        e))
+                     (end
+                      (progn
+                        (goto-char here)
+                        (end-of-line)
+                        (setq e (point))        ;Might be on last line
+                        (verilog-forward-syntactic-ws)
+                        (beginning-of-line)
+                        (while (and
+                                (not (looking-at rexp ))
+                                (looking-at verilog-assignment-operation-re)
+                                (progn
+                                  (end-of-line)
+                                  (not (eq e (point)))))
+                          (setq e (point))
+                          (verilog-forward-syntactic-ws)
+                          (beginning-of-line)
+                          )
+                        e))
+                     (endpos (set-marker (make-marker) end))
+                     (ind)
+                     )
+                (goto-char start)
+                (verilog-do-indent (verilog-calculate-indent))
+                (if (and (not quiet)
+                         (> (- end start) 100))
+                    (message "Lining up expressions..(please stand by)"))
+
+                ;; Set indent to minimum throughout region
+                (while (< (point) (marker-position endpos))
+                  (beginning-of-line)
+                  (verilog-just-one-space verilog-assignment-operation-re)
+                  (beginning-of-line)
+                  (verilog-do-indent (verilog-calculate-indent))
+                  (end-of-line)
+                  (verilog-forward-syntactic-ws)
+                  )
+
+                ;; Now find biggest prefix
+                (setq ind (verilog-get-lineup-indent-2 verilog-assignment-operation-re start endpos))
+
+                ;; Now indent each line.
+                (goto-char start)
+                (while (progn (setq e (marker-position endpos))
+                              (setq r (- e (point)))
+                              (> r 0))
+                  (setq e (point))
+                  (if (not quiet) (message "%d" r))
+                  (cond
+                   ((looking-at verilog-assignment-operation-re)
+                    (goto-char (match-beginning 2))
+                    (if (not (or (verilog-in-parenthesis-p) ;; leave attributes and comparisons alone
+                                 (verilog-in-coverage-p)))
+                        (if (eq (char-after) ?=)
+                            (indent-to (1+ ind))        ; line up the = of the <= with surrounding =
+                          (indent-to ind)
+                          ))
+                    )
+                   ((verilog-continued-line-1 start)
+                    (goto-char e)
+                    (indent-line-to ind))
+                   (t           ; Must be comment or white space
+                    (goto-char e)
+                    (verilog-forward-ws&directives)
+                    (forward-line -1))
+                   )
+                  (forward-line 1))
+                (unless quiet (message ""))
+            ))))))
 
 (defun verilog-just-one-space (myre)
   "Remove extra spaces around regular expression MYRE."
@@ -6021,11 +6529,9 @@ Be verbose about progress unless optional QUIET set."
             (p2 (match-end 2)))
         (progn
           (goto-char p2)
-          (if (looking-at "\\s-") (just-one-space))
+          (just-one-space)
           (goto-char p1)
-          (forward-char -1)
-          (if (looking-at "\\s-") (just-one-space))
-          ))))
+          (just-one-space)))))
 
 (defun verilog-indent-declaration (baseind)
   "Indent current lines as declaration.
@@ -6128,7 +6634,7 @@ Region is defined by B and EDPOS."
       (while (progn (setq e (marker-position edpos))
                     (< (point) e))
         (if (and (verilog-re-search-forward myre e 'move)
-                 (not (verilog-parenthesis-depth))) ;; skip parenthesized exprs
+                 (not (verilog-in-attribute-p))) ;; skip attribute exprs
             (progn
               (goto-char (match-beginning 2))
               (verilog-backward-syntactic-ws)
@@ -6374,10 +6880,10 @@ for matches of `str' and adding the occurrence tp `all' through point END."
 (defun verilog-keyword-completion (keyword-list)
   "Give list of all possible completions of keywords in KEYWORD-LIST."
   (mapcar (lambda (s)
-             (if (string-match (concat "\\<" verilog-str) s)
-                 (if (or (null verilog-pred)
-                         (funcall verilog-pred s))
-                     (setq verilog-all (cons s verilog-all)))))
+            (if (string-match (concat "\\<" verilog-str) s)
+                (if (or (null verilog-pred)
+                        (funcall verilog-pred s))
+                    (setq verilog-all (cons s verilog-all)))))
           keyword-list))
 
 
@@ -6883,16 +7389,18 @@ See also `verilog-sk-header' for an alternative format."
 (defsubst verilog-sig-width (sig)
   (verilog-make-width-expression (verilog-sig-bits sig)))
 
-(defsubst verilog-alw-new (outputs temps inputs delayed)
-  (list outputs temps inputs delayed))
-(defsubst verilog-alw-get-outputs (sigs)
+(defsubst verilog-alw-new (outputs-del outputs-imm temps inputs)
+  (list outputs-del outputs-imm temps inputs))
+(defsubst verilog-alw-get-outputs-delayed (sigs)
   (nth 0 sigs))
-(defsubst verilog-alw-get-temps (sigs)
+(defsubst verilog-alw-get-outputs-immediate (sigs)
   (nth 1 sigs))
-(defsubst verilog-alw-get-inputs (sigs)
+(defsubst verilog-alw-get-temps (sigs)
   (nth 2 sigs))
-(defsubst verilog-alw-get-uses-delayed (sigs)
+(defsubst verilog-alw-get-inputs (sigs)
   (nth 3 sigs))
+(defsubst verilog-alw-get-uses-delayed (sigs)
+  (nth 0 sigs))
 
 (defsubst verilog-modi-new (name fob pt type)
   (vector name fob pt type))
@@ -6911,18 +7419,18 @@ See also `verilog-sk-header' for an alternative format."
 
 ;; Signal reading for given module
 ;; Note these all take modi's - as returned from verilog-modi-current
-(defsubst verilog-decls-new (out inout in wires regs assigns consts gparams interfaces)
-  (vector out inout in wires regs assigns consts gparams interfaces))
+(defsubst verilog-decls-new (out inout in vars unuseds assigns consts gparams interfaces)
+  (vector out inout in vars unuseds assigns consts gparams interfaces))
 (defsubst verilog-decls-get-outputs (decls)
   (aref decls 0))
 (defsubst verilog-decls-get-inouts (decls)
   (aref decls 1))
 (defsubst verilog-decls-get-inputs (decls)
   (aref decls 2))
-(defsubst verilog-decls-get-wires (decls)
+(defsubst verilog-decls-get-vars (decls)
   (aref decls 3))
-(defsubst verilog-decls-get-regs (decls)
-  (aref decls 4))
+;;(defsubst verilog-decls-get-unused (decls)
+;;  (aref decls 4))
 (defsubst verilog-decls-get-assigns (decls)
   (aref decls 5))
 (defsubst verilog-decls-get-consts (decls)
@@ -7026,6 +7534,7 @@ Duplicate signals are also removed.  For example A[2] and A[1] become A[2:1]."
               buswarn ""))
       ;; Extract bus details
       (setq bus (verilog-sig-bits sig))
+      (setq bus (and bus (verilog-simplify-range-expression bus)))
       (cond ((and bus
                   (or (and (string-match "\\[\\([0-9]+\\):\\([0-9]+\\)\\]" bus)
                            (setq highbit (string-to-number (match-string 1 bus))
@@ -7145,9 +7654,10 @@ Ignore width if optional NO-WIDTH is set."
   "Return module name when after its ( or ;."
   (save-excursion
     (re-search-backward "[(;]")
-    (verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_\$]" nil nil)
-    (skip-chars-backward "a-zA-Z0-9`_$")
-    (looking-at "[a-zA-Z0-9`_\$]+")
+    ;; Due to "module x import y (" we must search for declaration begin
+    (verilog-re-search-backward-quick verilog-defun-re nil nil)
+    (goto-char (match-end 0))
+    (verilog-re-search-forward-quick "\\b[a-zA-Z0-9`_\$]+" nil nil)
     ;; Important: don't use match string, this must work with Emacs 19 font-lock on
     (verilog-symbol-detick
      (buffer-substring-no-properties (match-beginning 0) (match-end 0)) t)))
@@ -7203,13 +7713,13 @@ Optional NUM-PARAM and MAX-PARAM check for a specific number of parameters."
 Return a array of [outputs inouts inputs wire reg assign const]."
   (let ((end-mod-point (or (verilog-get-end-of-defun t) (point-max)))
         (functask 0) (paren 0) (sig-paren 0) (v2kargs-ok t)
-        in-modport
-        sigs-in sigs-out sigs-inout sigs-wire sigs-reg sigs-assign sigs-const
+        in-modport ign-prop
+        sigs-in sigs-out sigs-inout sigs-var sigs-assign sigs-const
         sigs-gparam sigs-intf
         vec expect-signal keywd newsig rvalue enum io signed typedefed multidim
         modport)
     (save-excursion
-      (verilog-beg-of-defun)
+      (verilog-beg-of-defun-quick)
       (setq sigs-const (verilog-read-auto-constants (point) end-mod-point))
       (while (< (point) end-mod-point)
         ;;(if dbg (setq dbg (concat dbg (format "Pt %s  Vec %s   C%c Kwd'%s'\n" (point) vec (following-char) keywd))))
@@ -7225,16 +7735,16 @@ Return a array of [outputs inouts inputs wire reg assign const]."
           (or (search-forward "*/")
               (error "%s: Unmatched /* */, at char %d" (verilog-point-text) (point))))
          ((looking-at "(\\*")
-          (forward-char 2)
-          (or (looking-at "\\s-*)")   ; It's an "always @ (*)"
-              (search-forward "*)")
+          ;; To advance past either "(*)" or "(* ... *)" don't forward past first *
+          (forward-char 1)
+          (or (search-forward "*)")
               (error "%s: Unmatched (* *), at char %d" (verilog-point-text) (point))))
          ((eq ?\" (following-char))
           (or (re-search-forward "[^\\]\"" nil t)       ;; don't forward-char first, since we look for a non backslash first
               (error "%s: Unmatched quotes, at char %d" (verilog-point-text) (point))))
          ((eq ?\; (following-char))
           (setq vec nil  io nil  expect-signal nil  newsig nil  paren 0  rvalue nil
-                v2kargs-ok nil  in-modport nil)
+                v2kargs-ok nil  in-modport nil  ign-prop nil)
           (forward-char 1))
          ((eq ?= (following-char))
           (setq rvalue t  newsig nil)
@@ -7290,16 +7800,15 @@ Return a array of [outputs inouts inputs wire reg assign const]."
                 ((equal keywd "parameter")
                  (setq vec nil  enum nil  rvalue nil  signed nil  typedefed nil  multidim nil  sig-paren paren
                        expect-signal 'sigs-gparam  io t  modport nil))
-                ((member keywd '("wire" "tri" "tri0" "tri1" "triand" "trior" "wand" "wor"))
-                 (unless io (setq vec nil  enum nil  rvalue nil  signed nil  typedefed nil  multidim nil  sig-paren paren
-                                  expect-signal 'sigs-wire  modport nil)))
-                ((member keywd '("reg" "trireg"
+                ((member keywd '("wire"
+                                 "tri" "tri0" "tri1" "triand" "trior" "wand" "wor"
+                                 "reg" "trireg"
                                  "byte" "shortint" "int" "longint" "integer" "time"
                                  "bit" "logic"
                                  "shortreal" "real" "realtime"
                                  "string" "event" "chandle"))
                  (unless io (setq vec nil  enum nil  rvalue nil  signed nil  typedefed nil  multidim nil  sig-paren paren
-                                  expect-signal 'sigs-reg  modport nil)))
+                                  expect-signal 'sigs-var  modport nil)))
                 ((equal keywd "assign")
                  (setq vec nil  enum nil  rvalue nil  signed nil  typedefed nil  multidim nil  sig-paren paren
                        expect-signal 'sigs-assign  modport nil))
@@ -7307,11 +7816,14 @@ Return a array of [outputs inouts inputs wire reg assign const]."
                                  "localparam" "genvar"))
                  (unless io (setq vec nil  enum nil  rvalue nil  signed nil  typedefed nil  multidim nil  sig-paren paren
                                   expect-signal 'sigs-const  modport nil)))
-                ((equal keywd "signed")
-                 (setq signed "signed"))
+                ((member keywd '("signed" "unsigned"))
+                 (setq signed keywd))
+                ((member keywd '("assert" "assume" "cover" "expect" "restrict"))
+                 (setq ign-prop t))
                 ((member keywd '("class" "clocking" "covergroup" "function"
                                  "property" "randsequence" "sequence" "task"))
-                 (setq functask (1+ functask)))
+                 (unless ign-prop
+                   (setq functask (1+ functask))))
                 ((member keywd '("endclass" "endclocking" "endgroup" "endfunction"
                                  "endproperty" "endsequence" "endtask"))
                  (setq functask (1- functask)))
@@ -7354,8 +7866,8 @@ Return a array of [outputs inouts inputs wire reg assign const]."
       (verilog-decls-new (nreverse sigs-out)
                          (nreverse sigs-inout)
                          (nreverse sigs-in)
-                         (nreverse sigs-wire)
-                         (nreverse sigs-reg)
+                         (nreverse sigs-var)
+                         nil
                          (nreverse sigs-assign)
                          (nreverse sigs-const)
                          (nreverse sigs-gparam)
@@ -7442,8 +7954,7 @@ Return a array of [outputs inouts inputs wire reg assign const]."
                             multidim nil)
                            sigs-intf)))
               ((setq portdata (and verilog-read-sub-decls-in-interfaced
-                                   (or (assoc port (verilog-decls-get-regs submoddecls))
-                                       (assoc port (verilog-decls-get-wires submoddecls)))))
+                                   (assoc port (verilog-decls-get-vars submoddecls))))
                (setq sigs-intfd
                      (cons (verilog-sig-new
                             sig
@@ -7556,7 +8067,8 @@ Inserts the list of signals found, using submodi to look up each port."
                   submoddecls comment port
                   (buffer-substring
                    (point) (1- (progn (search-backward "(") ; start at (
-                                      (forward-sexp 1) (point)))))))) ; expr
+                                      (verilog-forward-sexp-ign-cmt 1)
+                                      (point)))))))) ; expr
         ;;
         (forward-line 1)))))
 
@@ -7573,8 +8085,9 @@ Inserts the list of signals found."
                (or (search-forward "*/")
                    (error "%s: Unmatched /* */, at char %d" (verilog-point-text) (point))))
               ((looking-at "(\\*")
-               (or (looking-at "(\\*\\s-*)")   ; It's a "always @ (*)"
-                   (search-forward "*)")
+               ;; To advance past either "(*)" or "(* ... *)" don't forward past first *
+               (forward-char 1)
+               (or (search-forward "*)")
                    (error "%s: Unmatched (* *), at char %d" (verilog-point-text) (point))))
               ;; On pins, parse and advance to next pin
               ;; Looking at pin, but *not* an // Output comment, or ) to end the inst
@@ -7612,11 +8125,11 @@ Outputs comments above subcell signals, for example:
           st-point end-inst-point
           ;; below 3 modified by verilog-read-sub-decls-line
           sigs-out sigs-inout sigs-in sigs-intf sigs-intfd)
-      (verilog-beg-of-defun)
-      (while (verilog-re-search-forward "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-mod-point t)
+      (verilog-beg-of-defun-quick)
+      (while (verilog-re-search-forward-quick "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-mod-point t)
         (save-excursion
           (goto-char (match-beginning 0))
-          (unless (verilog-inside-comment-p)
+          (unless (verilog-inside-comment-or-string-p)
             ;; Attempt to snarf a comment
             (let* ((submod (verilog-read-inst-module))
                    (inst (verilog-read-inst-name))
@@ -7629,7 +8142,8 @@ Outputs comments above subcell signals, for example:
                       submoddecls (verilog-decls-new nil nil nil nil nil nil nil nil nil)
                       comment (concat inst " of " submod))
                 (verilog-backward-open-paren)
-                (setq end-inst-point (save-excursion (forward-sexp 1) (point))
+                (setq end-inst-point (save-excursion (verilog-forward-sexp-ign-cmt 1)
+                                                     (point))
                       st-point (point))
                 (forward-char 1)
                 (verilog-read-sub-decls-gate submoddecls comment submod end-inst-point))
@@ -7639,7 +8153,8 @@ Outputs comments above subcell signals, for example:
                   (setq submoddecls (verilog-modi-get-decls submodi)
                         verilog-read-sub-decls-gate-ios nil)
                   (verilog-backward-open-paren)
-                  (setq end-inst-point (save-excursion (forward-sexp 1) (point))
+                  (setq end-inst-point (save-excursion (verilog-forward-sexp-ign-cmt 1)
+                                                       (point))
                         st-point (point))
                   ;; This could have used a list created by verilog-auto-inst
                   ;; However I want it to be runnable even on user's manually added signals
@@ -7677,10 +8192,10 @@ For example if declare A A (.B(SIG)) then B will be included in the list."
       (verilog-backward-open-paren)
       (while (re-search-forward "\\.\\([^(,) \t\n\f]*\\)\\s-*" end-mod-point t)
         (setq pin (match-string 1))
-        (unless (verilog-inside-comment-p)
+        (unless (verilog-inside-comment-or-string-p)
           (setq pins (cons (list pin) pins))
           (when (looking-at "(")
-            (forward-sexp 1))))
+            (verilog-forward-sexp-ign-cmt 1))))
       (vector pins))))
 
 (defun verilog-read-arg-pins ()
@@ -7691,7 +8206,7 @@ For example if declare A A (.B(SIG)) then B will be included in the list."
       (verilog-backward-open-paren)
       (while (re-search-forward "\\([a-zA-Z0-9$_.%`]+\\)" end-mod-point t)
         (setq pin (match-string 1))
-        (unless (verilog-inside-comment-p)
+        (unless (verilog-inside-comment-or-string-p)
           (setq pins (cons (list pin) pins))))
       (vector pins))))
 
@@ -7707,7 +8222,7 @@ For example if declare A A (.B(SIG)) then B will be included in the list."
         (search-forward "(" end-mod-point)
         (setq tpl-end-pt (save-excursion
                            (backward-char 1)
-                           (forward-sexp 1)   ;; Moves to paren that closes argdecl's
+                           (verilog-forward-sexp-cmt 1)   ;; Moves to paren that closes argdecl's
                            (backward-char 1)
                            (point)))
         (while (re-search-forward "\\s-*\\([\"a-zA-Z0-9$_.%`]+\\)\\s-*,*" tpl-end-pt t)
@@ -7720,6 +8235,7 @@ For example if declare A A (.B(SIG)) then B will be included in the list."
 (defun verilog-read-auto-lisp-present ()
   "Set `verilog-cache-has-lisp' if any AUTO_LISP in this buffer."
   (save-excursion
+    (goto-char (point-min))
     (setq verilog-cache-has-lisp (re-search-forward "\\<AUTO_LISP(" nil t))))
 
 (defun verilog-read-auto-lisp (start end)
@@ -7732,7 +8248,7 @@ Must call `verilog-read-auto-lisp-present' before this function."
       (while (re-search-forward "\\<AUTO_LISP(" end t)
         (backward-char)
         (let* ((beg-pt (prog1 (point)
-                         (forward-sexp 1)))     ;; Closing paren
+                         (verilog-forward-sexp-cmt 1))) ;; Closing paren
                (end-pt (point)))
           (eval-region beg-pt end-pt nil))))))
 
@@ -7741,9 +8257,10 @@ Must call `verilog-read-auto-lisp-present' before this function."
   ;; Do not remove the eval-when-compile
   ;; - we want a error when we are debugging this code if they are refed.
   (defvar sigs-in)
-  (defvar sigs-out)
+  (defvar sigs-out-d)
+  (defvar sigs-out-i)
+  (defvar sigs-out-unk)
   (defvar sigs-temp)
-  (defvar uses-delayed)
   (defvar vector-skip-list))
 
 (defun verilog-read-always-signals-recurse
@@ -7764,8 +8281,9 @@ IGNORE-NEXT is true to ignore next token, fake from inside case statement."
         (or (search-forward "*/")
             (error "%s: Unmatched /* */, at char %d" (verilog-point-text) (point))))
        ((looking-at "(\\*")
-        (or (looking-at "(\\*\\s-*)")   ; It's a "always @ (*)"
-            (search-forward "*)")
+        ;; To advance past either "(*)" or "(* ... *)" don't forward past first *
+        (forward-char 1)
+        (or (search-forward "*)")
             (error "%s: Unmatched (* *), at char %d" (verilog-point-text) (point))))
        (t (setq keywd (buffer-substring-no-properties
                        (point)
@@ -7817,9 +8335,16 @@ IGNORE-NEXT is true to ignore next token, fake from inside case statement."
                    (setq ignore-next t rvalue nil)))
             (forward-char 1))
            ((equal keywd "=")
-            (if (and (eq (char-before) ?< )
-                     (not rvalue))
-                (setq uses-delayed 1))
+            (when got-sig
+              ;;(if dbg (setq dbg (concat dbg (format "\t\tequal got-sig=%S got-list=%s\n" got-sig got-list))))
+              (set got-list (cons got-sig (symbol-value got-list)))
+              (setq got-sig nil))
+            (when (not rvalue)
+              (if (eq (char-before) ?< )
+                  (setq sigs-out-d (append sigs-out-d sigs-out-unk)
+                        sigs-out-unk nil)
+                (setq sigs-out-i (append sigs-out-i sigs-out-unk)
+                      sigs-out-unk nil)))
             (setq ignore-next nil rvalue t)
             (forward-char 1))
            ((equal keywd "?")
@@ -7865,7 +8390,7 @@ IGNORE-NEXT is true to ignore next token, fake from inside case statement."
                      )
                    (setq got-list (cond (temp-next 'sigs-temp)
                                         (rvalue 'sigs-in)
-                                        (t 'sigs-out))
+                                        (t 'sigs-out-unk))
                          got-sig (if (or (not keywd)
                                          (assoc keywd (symbol-value got-list)))
                                      nil (list keywd nil nil))
@@ -7889,17 +8414,18 @@ IGNORE-NEXT is true to ignore next token, fake from inside case statement."
   "Parse always block at point and return list of (outputs inout inputs)."
   (save-excursion
     (let* (;;(dbg "")
-           sigs-out sigs-temp sigs-in
-           uses-delayed)        ;; Found signal/rvalue; push if not function
+           sigs-out-d sigs-out-i sigs-out-unk sigs-temp sigs-in)
       (search-forward ")")
       (verilog-read-always-signals-recurse nil nil nil)
+      (setq sigs-out-i (append sigs-out-i sigs-out-unk)
+            sigs-out-unk nil)
       ;;(if dbg (with-current-buffer (get-buffer-create "*vl-dbg*")) (delete-region (point-min) (point-max)) (insert dbg) (setq dbg ""))
       ;; Return what was found
-      (verilog-alw-new sigs-out sigs-temp sigs-in uses-delayed))))
+      (verilog-alw-new sigs-out-d sigs-out-i sigs-temp sigs-in))))
 
 (defun verilog-read-instants ()
   "Parse module at point and return list of ( ( file instance ) ... )."
-  (verilog-beg-of-defun)
+  (verilog-beg-of-defun-quick)
   (let* ((end-mod-point (verilog-get-end-of-defun t))
          (state nil)
          (instants-list nil))
@@ -7930,7 +8456,7 @@ list of ( (signal_name connection_name)... )."
   (save-excursion
     ;; Find beginning
     (let ((tpl-regexp "\\([0-9]+\\)")
-          (lineno 0)
+          (lineno -1)  ; -1 to offset for the AUTO_TEMPLATE's newline
           (templateno 0)
           (pt (point))
           tpl-sig-list tpl-wild-list tpl-end-pt rep)
@@ -7962,22 +8488,27 @@ list of ( (signal_name connection_name)... )."
              ;; Parse lines in the template
              (when verilog-auto-inst-template-numbers
                (save-excursion
-                 (goto-char (point-min))
-                 (while (search-forward "AUTO_TEMPLATE" nil t)
-                   (setq templateno (1+ templateno)))))
+                 (let ((pre-pt (point)))
+                   (goto-char (point-min))
+                   (while (search-forward "AUTO_TEMPLATE" pre-pt t)
+                     (setq templateno (1+ templateno)))
+                   (while (< (point) pre-pt)
+                     (forward-line 1)
+                     (setq lineno (1+ lineno))))))
              (setq tpl-end-pt (save-excursion
                                 (backward-char 1)
-                                (forward-sexp 1)   ;; Moves to paren that closes argdecl's
+                                (verilog-forward-sexp-cmt 1)   ;; Moves to paren that closes argdecl's
                                 (backward-char 1)
                                 (point)))
              ;;
              (while (< (point) tpl-end-pt)
                (cond ((looking-at "\\s-*\\.\\([a-zA-Z0-9`_$]+\\)\\s-*(\\(.*\\))\\s-*\\(,\\|)\\s-*;\\)")
-                      (setq tpl-sig-list (cons (list
-                                                (match-string-no-properties 1)
-                                                (match-string-no-properties 2)
-                                                templateno lineno)
-                                               tpl-sig-list))
+                      (setq tpl-sig-list
+                            (cons (list
+                                   (match-string-no-properties 1)
+                                   (match-string-no-properties 2)
+                                   templateno lineno)
+                                  tpl-sig-list))
                       (goto-char (match-end 0)))
                      ;; Regexp form??
                      ((looking-at
@@ -8000,7 +8531,8 @@ list of ( (signal_name connection_name)... )."
                       (setq lineno (1+ lineno))
                       (goto-char (match-end 0)))
                      ((looking-at "//")
-                      (search-forward "\n"))
+                      (search-forward "\n")
+                      (setq lineno (1+ lineno)))
                      ((looking-at "/\\*")
                       (forward-char 2)
                       (or (search-forward "*/")
@@ -8086,7 +8618,7 @@ warning message, you need to add to your .emacs file:
         (while (re-search-forward "^\\s-*`include\\s-+\\([^ \t\n\f]+\\)" nil t)
           (let ((inc (verilog-string-replace-matches
                       "\"" "" nil nil (match-string-no-properties 1))))
-            (unless (verilog-inside-comment-p)
+            (unless (verilog-inside-comment-or-string-p)
               (verilog-read-defines inc recurse t)))))
       ;; Read `defines
       ;; note we don't use verilog-re... it's faster this way, and that
@@ -8100,14 +8632,15 @@ warning message, you need to add to your .emacs file:
       ;; Hack: Read parameters
       (goto-char (point-min))
       (while (re-search-forward
-              "^\\s-*\\(parameter\\|localparam\\)\\(\\s-*\\[[^]]*\\]\\)?\\s-+" nil t)
+              "^\\s-*\\(parameter\\|localparam\\)\\(\\s-*\\[[^]]*\\]\\)?\\s-*" nil t)
         (let (enumname)
           ;; The primary way of getting defines is verilog-read-decls
           ;; However, that isn't called yet for included files, so we'll add another scheme
           (if (looking-at "[^\n]*synopsys\\s +enum\\s +\\([a-zA-Z0-9_]+\\)")
               (setq enumname (match-string-no-properties 1)))
           (forward-comment 999)
-          (while (looking-at "\\s-*,?\\s-*\\([a-zA-Z0-9_$]+\\)\\s-*=\\s-*\\([^;,]*\\),?\\s-*")
+          (while (looking-at (concat "\\s-*,?\\s-*\\(?:/[/*].*?$\\)?\\s-*\\([a-zA-Z0-9_$]+\\)"
+                                     "\\s-*=\\s-*\\([^;,]*\\),?\\s-*\\(/[/*].*?$\\)?\\s-*"))
             (verilog-set-define (match-string-no-properties 1)
                                 (match-string-no-properties 2) origbuf enumname)
             (goto-char (match-end 0))
@@ -8278,11 +8811,11 @@ Some macros and such are also found and included.  For dinotrace.el."
                                  verilog-library-files
                                  verilog-library-flags)))
   ;; Allow user to customize
-  (run-hooks 'verilog-before-getopt-flags-hook)
+  (verilog-run-hooks 'verilog-before-getopt-flags-hook)
   ;; Process arguments
   (verilog-getopt verilog-library-flags)
   ;; Allow user to customize
-  (run-hooks 'verilog-getopt-flags-hook))
+  (verilog-run-hooks 'verilog-getopt-flags-hook))
 
 (defun verilog-add-list-unique (varref object)
   "Append to VARREF list the given OBJECT,
@@ -8387,7 +8920,7 @@ Allows version control to check out the file if need be."
              (while (and
                      ;; It may be tempting to look for verilog-defun-re,
                      ;; don't, it slows things down a lot!
-                     (verilog-re-search-forward-quick "\\<\\(module\\|interface\\)\\>" nil t)
+                     (verilog-re-search-forward-quick "\\<\\(module\\|interface\\|program\\)\\>" nil t)
                      (setq type (match-string-no-properties 0))
                      (verilog-re-search-forward-quick "[(;]" nil t))
                (if (equal module (verilog-read-module-name))
@@ -8804,13 +9337,12 @@ if non-nil."
 
 ;; Combined
 (defun verilog-decls-get-signals (decls)
+  "Return all declared signals, excluding 'assign' statements."
   (append
    (verilog-decls-get-outputs decls)
    (verilog-decls-get-inouts decls)
    (verilog-decls-get-inputs decls)
-   (verilog-decls-get-wires decls)
-   (verilog-decls-get-regs decls)
-   (verilog-decls-get-assigns decls)
+   (verilog-decls-get-vars decls)
    (verilog-decls-get-consts decls)
    (verilog-decls-get-gparams decls)))
 
@@ -8826,10 +9358,8 @@ if non-nil."
   (verilog-modi-cache-add modi 'verilog-read-decls 1 sig-list))
 (defsubst verilog-modi-cache-add-inputs (modi sig-list)
   (verilog-modi-cache-add modi 'verilog-read-decls 2 sig-list))
-(defsubst verilog-modi-cache-add-wires (modi sig-list)
+(defsubst verilog-modi-cache-add-vars (modi sig-list)
   (verilog-modi-cache-add modi 'verilog-read-decls 3 sig-list))
-(defsubst verilog-modi-cache-add-regs (modi sig-list)
-  (verilog-modi-cache-add modi 'verilog-read-decls 4 sig-list))
 
 (defun verilog-signals-from-signame (signame-list)
   "Return signals in standard form from SIGNAME-LIST, a simple list of signal names."
@@ -8843,7 +9373,7 @@ if non-nil."
 (defun verilog-auto-re-search-do (search-for func)
   "Search for the given auto text regexp SEARCH-FOR, and perform FUNC where it occurs."
   (goto-char (point-min))
-  (while (verilog-re-search-forward search-for nil t)
+  (while (verilog-re-search-forward-quick search-for nil t)
     (funcall func)))
 
 (defun verilog-insert-one-definition (sig type indent-pt)
@@ -8867,10 +9397,31 @@ with appropriate INDENT-PT indentation."
   (when (verilog-sig-memory sig)
     (insert " " (verilog-sig-memory sig))))
 
-(defun verilog-insert-definition (sigs direction indent-pt v2k &optional dont-sort)
-  "Print out a definition for a list of SIGS of the given DIRECTION,
+(defun verilog-insert-definition (modi sigs direction indent-pt v2k &optional dont-sort)
+  "Print out a definition for MODI's list of SIGS of the given DIRECTION,
 with appropriate INDENT-PT indentation.  If V2K, use Verilog 2001 I/O
-format.  Sort unless DONT-SORT.  DIRECTION is normally wire/reg/output."
+format.  Sort unless DONT-SORT.  DIRECTION is normally wire/reg/output.
+When MODI is non-null, also add to modi-cache, for tracking."
+  (when modi
+    (cond ((equal direction "wire")
+           (verilog-modi-cache-add-vars modi sigs))
+          ((equal direction "reg")
+           (verilog-modi-cache-add-vars modi sigs))
+          ((equal direction "output")
+           (verilog-modi-cache-add-outputs modi sigs)
+           (when verilog-auto-declare-nettype
+             (verilog-modi-cache-add-vars modi sigs)))
+          ((equal direction "input")
+           (verilog-modi-cache-add-inputs modi sigs)
+           (when verilog-auto-declare-nettype
+             (verilog-modi-cache-add-vars modi sigs)))
+          ((equal direction "inout")
+           (verilog-modi-cache-add-inouts modi sigs)
+           (when verilog-auto-declare-nettype
+             (verilog-modi-cache-add-vars modi sigs)))
+          ((equal direction "interface"))
+          (t
+           (error "Unsupported verilog-insert-definition direction: %s" direction))))
   (or dont-sort
       (setq sigs (sort (copy-alist sigs) `verilog-signals-sort-compare)))
   (while sigs
@@ -8878,12 +9429,18 @@ format.  Sort unless DONT-SORT.  DIRECTION is normally wire/reg/output."
       (verilog-insert-one-definition
        sig
        ;; Want "type x" or "output type x", not "wire type x"
-       (cond ((verilog-sig-type sig)
+       (cond ((or (verilog-sig-type sig)
+                  verilog-auto-wire-type)
               (concat
-               (if (not (member direction '("wire" "interface")))
-                   (concat direction " "))
-               (verilog-sig-type sig)))
-             (t direction))
+               (when (member direction '("input" "output" "inout"))
+                 (concat direction " "))
+               (or (verilog-sig-type sig)
+                  verilog-auto-wire-type)))
+             ((and verilog-auto-declare-nettype
+                   (member direction '("input" "output" "inout")))
+              (concat direction " " verilog-auto-declare-nettype))
+             (t
+              direction))
        indent-pt)
       (insert (if v2k "," ";"))
       (if (or (not (verilog-sig-comment sig))
@@ -8914,7 +9471,7 @@ Presumes that any newlines end a list element."
   ;; We can't just search backward for ) as it might be inside another expression.
   ;; Also want "`ifdef X   input foo   `endif" to just leave things to the human to deal with
   (save-excursion
-    (verilog-backward-syntactic-ws)
+    (verilog-backward-syntactic-ws-quick)
     (when (and (not (save-excursion ;; Not beginning (, or existing ,
                       (backward-char 1)
                       (looking-at "[(,]")))
@@ -8931,7 +9488,7 @@ This repairs those mis-inserted by a AUTOARG."
   (save-excursion
     (verilog-forward-close-paren)
     (backward-char 1)
-    (verilog-backward-syntactic-ws)
+    (verilog-backward-syntactic-ws-quick)
     (backward-char 1)
     (when (looking-at ",")
       (delete-char 1))))
@@ -8978,27 +9535,68 @@ This repairs those mis-inserted by a AUTOARG."
                (t nil)))))
 ;;(verilog-make-width-expression "`A:`B")
 
-(defun verilog-simplify-range-expression (range-exp)
-  "Return a simplified range expression with constants eliminated from RANGE-EXP."
-  (let ((out range-exp)
-        (last-pass ""))
-    (while (not (equal last-pass out))
-      (setq last-pass out)
-      (while (string-match "(\\<\\([0-9A-Z-az_]+\\)\\>)" out)
-        (setq out (replace-match "\\1" nil nil out)))
-      (while (string-match "\\<\\([0-9]+\\)\\>\\s *\\+\\s *\\<\\([0-9]+\\)\\>" out)
-        (setq out (replace-match
-                   (int-to-string (+ (string-to-number (match-string 1 out))
-                                     (string-to-number (match-string 2 out))))
-                   nil nil out)))
-      (while (string-match "\\<\\([0-9]+\\)\\>\\s *\\-\\s *\\<\\([0-9]+\\)\\>" out)
-        (setq out (replace-match
-                   (int-to-string (- (string-to-number (match-string 1 out))
-                                     (string-to-number (match-string 2 out))))
-                   nil nil out))))
-    out))
-;;(verilog-simplify-range-expression "1")
-;;(verilog-simplify-range-expression "(((16)+1)-3)")
+(defun verilog-simplify-range-expression (expr)
+  "Return a simplified range expression with constants eliminated from EXPR."
+  ;; Note this is always called with brackets; ie [z] or [z:z]
+  (if (not (string-match "[---+*()]" expr))
+      expr ;; short-circuit
+    (let ((out expr)
+          (last-pass ""))
+      (while (not (equal last-pass out))
+        (setq last-pass out)
+        ;; Prefix regexp needs beginning of match, or some symbol of
+        ;; lesser or equal precedence.  We assume the [:]'s exist in expr.
+        ;; Ditto the end.
+        (while (string-match
+                (concat "\\([[({:*+-]\\)"  ; - must be last
+                        "(\\<\\([0-9A-Za-z_]+\\))"
+                        "\\([])}:*+-]\\)")
+                out)
+          (setq out (replace-match "\\1\\2\\3" nil nil out)))
+        ;; For precedence do * before +/-
+        (while (string-match
+                (concat "\\([[({:*+-]\\)"
+                        "\\([0-9]+\\)\\s *\\([*]\\)\\s *\\([0-9]+\\)"
+                        "\\([])}:*+-]\\)")
+                out)
+          (setq out (replace-match
+                     (concat (match-string 1 out)
+                             (int-to-string (* (string-to-number (match-string 2 out))
+                                               (string-to-number (match-string 4 out))))
+                             (match-string 5 out))
+                     nil nil out)))
+        (while (string-match
+                (concat "\\([[({:+-]\\)" ; No * here as higher prec
+                        "\\([0-9]+\\)\\s *\\([---+]\\)\\s *\\([0-9]+\\)"
+                        "\\([])}:+-]\\)")
+                out)
+          (let ((pre (match-string 1 out))
+                (lhs (string-to-number (match-string 2 out)))
+                (rhs (string-to-number (match-string 4 out)))
+                (post (match-string 5 out))
+                val)
+            (when (equal pre "-")
+              (setq lhs (- lhs)))
+            (setq val (if (equal (match-string 3 out) "-")
+                          (- lhs rhs)
+                        (+ lhs rhs))
+                  out (replace-match
+                       (concat (if (and (equal pre "-")
+                                        (< val 0))
+                                   "" ;; Not "--20" but just "-20"
+                                 pre)
+                               (int-to-string val)
+                               post)
+                       nil nil out)) )))
+      out)))
+;;(verilog-simplify-range-expression "[1:3]") ;; 1
+;;(verilog-simplify-range-expression "[(1):3]") ;; 1
+;;(verilog-simplify-range-expression "[(((16)+1)+1+(1+1))]")  ;;20
+;;(verilog-simplify-range-expression "[(2*3+6*7)]") ;; 48
+;;(verilog-simplify-range-expression "[(FOO*4-1*2)]") ;; FOO*4-2
+;;(verilog-simplify-range-expression "[(FOO*4+1-1)]") ;; FOO*4+0
+;;(verilog-simplify-range-expression "[(func(BAR))]") ;; func(BAR)
+;;(verilog-simplify-range-expression "[FOO-1+1-1+1]") ;; FOO-0
 
 (defun verilog-typedef-name-p (variable-name)
   "Return true if the VARIABLE-NAME is a type definition."
@@ -9011,15 +9609,17 @@ This repairs those mis-inserted by a AUTOARG."
 
 (defun verilog-delete-autos-lined ()
   "Delete autos that occupy multiple lines, between begin and end comments."
+  ;; The newline must not have a comment property, so we must
+  ;; delete the end auto's newline, not the first newline
+  (forward-line 1)
   (let ((pt (point)))
-    (forward-line 1)
     (when (and
            (looking-at "\\s-*// Beginning")
            (search-forward "// End of automatic" nil t))
       ;; End exists
       (end-of-line)
-      (delete-region pt (point))
-      (forward-line 1))))
+      (forward-line 1)
+      (delete-region pt (point)))))
 
 (defun verilog-delete-empty-auto-pair ()
   "Delete begin/end auto pair at point, if empty."
@@ -9066,11 +9666,11 @@ Ignore other open bracket with matching close bracket."
 
 (defun verilog-delete-to-paren ()
   "Delete the automatic inst/sense/arg created by autos.
-Deletion stops at the matching end parenthesis."
+Deletion stops at the matching end parenthesis, outside comments."
   (delete-region (point)
                  (save-excursion
                    (verilog-backward-open-paren)
-                   (forward-sexp 1)   ;; Moves to paren that closes argdecl's
+                   (verilog-forward-sexp-ign-cmt 1)   ;; Moves to paren that closes argdecl's
                    (backward-char 1)
                    (point))))
 
@@ -9078,7 +9678,8 @@ Deletion stops at the matching end parenthesis."
   "Return if a .* AUTOINST is safe to delete or expand.
 It was created by the AUTOS themselves, or by the user."
   (and verilog-auto-star-expand
-       (looking-at "[ \t\n\f,]*\\([)]\\|// \\(Outputs\\|Inouts\\|Inputs\\|Interfaces\\)\\)")))
+       (looking-at
+        (concat "[ \t\n\f,]*\\([)]\\|// " verilog-inst-comment-re "\\)"))))
 
 (defun verilog-delete-auto-star-all ()
   "Delete a .* AUTOINST, if it is safe."
@@ -9110,7 +9711,7 @@ removed."
           (save-excursion
             (while (progn
                      (forward-line -1)
-                     (looking-at "\\s *//\\s *\\(Outputs\\|Inouts\\|Inputs\\|Interfaces\\)\n"))
+                     (looking-at (concat "\\s *//\\s *" verilog-inst-comment-re "\n")))
               (delete-region (match-beginning 0) (match-end 0))))
           ;; If it is simple, we can put the ); on the same line as the last text
           (let ((rtn-pt (point)))
@@ -9139,18 +9740,13 @@ called before and after this function, respectively."
     (verilog-save-no-change-functions
      (verilog-save-scan-cache
       ;; Allow user to customize
-      (run-hooks 'verilog-before-delete-auto-hook)
+      (verilog-run-hooks 'verilog-before-delete-auto-hook)
 
       ;; Remove those that have multi-line insertions, possibly with parameters
+      ;; We allow anything beginning with AUTO, so that users can add their own
+      ;; patterns
       (verilog-auto-re-search-do
-       (concat "/\\*"
-               (eval-when-compile
-                 (verilog-regexp-words
-                  `("AUTOASCIIENUM" "AUTOCONCATCOMMENT" "AUTODEFINEVALUE"
-                    "AUTOINOUT" "AUTOINOUTCOMP" "AUTOINOUTMODULE"
-                    "AUTOINPUT" "AUTOINSERTLISP" "AUTOOUTPUT" "AUTOOUTPUTEVERY"
-                    "AUTOREG" "AUTOREGINPUT" "AUTORESET" "AUTOTIEOFF"
-                    "AUTOUNUSED" "AUTOWIRE")))
+       (concat "/\\*AUTO[A-Za-z0-9_]+"
                ;; Optional parens or quoted parameter or .* for (((...)))
                "\\(\\|([^)]*)\\|(\"[^\"]*\")\\).*?"
                "\\*/")
@@ -9169,11 +9765,11 @@ called before and after this function, respectively."
                                  'verilog-delete-auto-star-all)
       ;; Remove template comments ... anywhere in case was pasted after AUTOINST removed
       (goto-char (point-min))
-      (while (re-search-forward "\\s-*// \\(Templated\\|Implicit \\.\\*\\)[ \tLT0-9]*$" nil t)
+      (while (re-search-forward "\\s-*// \\(Templated\\|Implicit \\.\\*\\)\\([ \tLT0-9]*\\| LHS: .*\\)?$" nil t)
         (replace-match ""))
 
       ;; Final customize
-      (run-hooks 'verilog-delete-auto-hook)))))
+      (verilog-run-hooks 'verilog-delete-auto-hook)))))
 
 ;;
 ;; Auto inject
@@ -9235,7 +9831,7 @@ Typing \\[verilog-inject-auto] will make this into:
         (when (not (re-search-forward "/\\*AUTOARG\\*/" endmodp t))
           (verilog-re-search-forward-quick ";" nil t)
           (backward-char 1)
-          (verilog-backward-syntactic-ws)
+          (verilog-backward-syntactic-ws-quick)
           (backward-char 1) ; Moves to paren that closes argdecl's
           (when (looking-at ")")
             (verilog-insert "/*AUTOARG*/")))))))
@@ -9251,9 +9847,9 @@ Typing \\[verilog-inject-auto] will make this into:
              pre-sigs
              got-sigs)
         (backward-char 1)
-        (forward-sexp 1)
+        (verilog-forward-sexp-ign-cmt 1)
         (backward-char 1) ;; End )
-        (when (not (verilog-re-search-backward "/\\*\\(AUTOSENSE\\|AS\\)\\*/" start-pt t))
+        (when (not (verilog-re-search-backward-quick "/\\*\\(AUTOSENSE\\|AS\\)\\*/" start-pt t))
           (setq pre-sigs (verilog-signals-from-signame
                           (verilog-read-signals start-pt (point)))
                 got-sigs (verilog-auto-sense-sigs moddecls nil))
@@ -9277,12 +9873,12 @@ Typing \\[verilog-inject-auto] will make this into:
         (forward-char 1)
         (let ((indent-pt (+ (current-column)))
               (end-pt (save-excursion (verilog-forward-close-paren) (point))))
-          (cond ((verilog-re-search-forward "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-pt t)
+          (cond ((verilog-re-search-forward-quick "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-pt t)
                  (goto-char end-pt)) ;; Already there, continue search with next instance
                 (t
                  ;; Delete identical interconnect
                  (let ((case-fold-search nil))  ;; So we don't convert upper-to-lower, etc
-                   (while (verilog-re-search-forward "\\.\\s *\\([a-zA-Z0-9`_\$]+\\)*\\s *(\\s *\\1\\s *)\\s *" end-pt t)
+                   (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_\$]+\\)*\\s *(\\s *\\1\\s *)\\s *" end-pt t)
                      (delete-region (match-beginning 0) (match-end 0))
                      (setq end-pt (- end-pt (- (match-end 0) (match-beginning 0)))) ;; Keep it correct
                      (while (or (looking-at "[ \t\n\f,]+")
@@ -9298,6 +9894,131 @@ Typing \\[verilog-inject-auto] will make this into:
                  (verilog-insert-indent "/*AUTOINST*/")))))))))
 
 ;;
+;; Auto diff
+;;
+
+(defun verilog-diff-buffers-p (b1 b2 &optional whitespace)
+  "Return nil if buffers B1 and B2 have same contents.
+Else, return point in B1 that first mismatches.
+If optional WHITESPACE true, ignore whitespace."
+  (save-excursion
+    (let* ((case-fold-search nil)  ;; compare-buffer-substrings cares
+           (p1 (with-current-buffer b1 (goto-char (point-min))))
+           (p2 (with-current-buffer b2 (goto-char (point-min))))
+           (maxp1 (with-current-buffer b1 (point-max)))
+           (maxp2 (with-current-buffer b2 (point-max)))
+           (op1 -1) (op2 -1) 
+           progress size)
+      (while (not (and (eq p1 op1) (eq p2 op2)))
+        ;; If both windows have whitespace optionally skip over it.
+        (when whitespace
+          ;; skip-syntax-* doesn't count \n
+          (with-current-buffer b1
+            (goto-char p1)
+            (skip-chars-forward " \t\n\r\f\v")
+            (setq p1 (point)))
+          (with-current-buffer b2
+            (goto-char p2)
+            (skip-chars-forward " \t\n\r\f\v")
+            (setq p2 (point))))
+        (setq size (min (- maxp1 p1) (- maxp2 p2)))
+        (setq progress (compare-buffer-substrings b2 p2 (+ size p2)
+                                                  b1 p1 (+ size p1)))
+        (setq progress (if (zerop progress) size (1- (abs progress))))
+        (setq op1 p1  op2 p2
+              p1 (+ p1 progress)
+              p2 (+ p2 progress)))
+      ;; Return value
+      (if (and (eq p1 maxp1) (eq p2 maxp2))
+          nil p1))))
+
+(defun verilog-diff-file-with-buffer (f1 b2 &optional whitespace show)
+  "View the differences between file F1 and buffer B2.
+This requires the external program `diff-command' to be in your `exec-path',
+and uses `diff-switches' in which you may want to have \"-u\" flag.
+Ignores WHITESPACE if t, and writes output to stdout if SHOW."
+  ;; Similar to `diff-buffer-with-file' but works on XEmacs, and doesn't
+  ;; call `diff' as `diff' has different calling semantics on different
+  ;; versions of Emacs.
+  (if (not (file-exists-p f1))
+      (message "Buffer %s has no associated file on disc" (buffer-name b2))
+    (with-temp-buffer "*Verilog-Diff*"
+      (let ((outbuf (current-buffer))
+            (f2 (make-temp-file "vm-diff-auto-")))
+        (unwind-protect
+            (progn
+              (with-current-buffer b2
+                (save-restriction
+                  (widen)
+                  (write-region (point-min) (point-max) f2 nil 'nomessage)))
+              (call-process diff-command nil outbuf t
+                            diff-switches ;; User may want -u in diff-switches
+                            (if whitespace "-b" "")
+                            f1 f2)
+              ;; Print out results.  Alternatively we could have call-processed
+              ;; ourself, but this way we can reuse diff switches
+              (when show
+                (with-current-buffer outbuf (message "%s" (buffer-string))))))
+        (sit-for 0)
+        (when (file-exists-p f2)
+          (delete-file f2))))))
+
+(defun verilog-diff-report (b1 b2 diffpt)
+  "Report differences detected with `verilog-diff-auto'.
+Differences are between buffers B1 and B2, starting at point
+DIFFPT.  This function is called via `verilog-diff-function'."
+  (let ((name1 (with-current-buffer b1 (buffer-file-name))))
+    (message "%%Warning: %s:%d: Difference in AUTO expansion found"
+             name1 (with-current-buffer b1 (1+ (count-lines (point-min) (point)))))
+    (cond (noninteractive
+           (verilog-diff-file-with-buffer name1 b2 t t))
+          (t
+           (ediff-buffers b1 b2)))))
+
+(defun verilog-diff-auto ()
+  "Expand AUTOs in a temporary buffer and indicate any changes.
+Whitespace differences are ignored to determine identicalness, but
+once a difference is detected, whitespace differences may be shown.
+
+To call this from the command line, see \\[verilog-batch-diff-auto].
+
+The action on differences is selected with
+`verilog-diff-function'.  The default is `verilog-diff-report'
+which will report an error and run `ediff' in interactive mode,
+or `diff' in batch mode."
+  (interactive)
+  (let ((b1 (current-buffer)) b2 diffpt
+        (name1 (buffer-file-name))
+        (newname "*Verilog-Diff*"))
+    (save-excursion
+      (when (get-buffer newname)
+        (kill-buffer newname))
+      (setq b2 (let (buffer-file-name)  ;; Else clone is upset
+                 (clone-buffer newname)))
+      (with-current-buffer b2
+        ;; auto requires the filename, but can't have same filename in two
+        ;; buffers; so override both b1 and b2's names
+        (let ((buffer-file-name name1))
+          (unwind-protect
+              (progn
+                (with-current-buffer b1 (setq buffer-file-name nil))
+                (verilog-auto)
+                (when (not verilog-auto-star-save)
+                  (verilog-delete-auto-star-implicit)))
+            ;; Restore name if unwind
+            (with-current-buffer b1 (setq buffer-file-name name1)))))
+      ;;
+      (setq diffpt (verilog-diff-buffers-p b1 b2 t))
+      (cond ((not diffpt)
+             (unless noninteractive (message "AUTO expansion identical"))
+             (kill-buffer newname)) ;; Nice to cleanup after oneself
+            (t
+             (funcall verilog-diff-function b1 b2 diffpt)))
+      ;; Return result of compare
+      diffpt)))
+
+
+;;
 ;; Auto save
 ;;
 
@@ -9483,14 +10204,19 @@ If PAR-VALUES replace final strings with these parameter values."
                        (concat "\\<" (nth 0 (car check-values)) "\\>")
                        (concat "(" (nth 1 (car check-values)) ")")
                        t t vl-bits)
+              vl-mbits (verilog-string-replace-matches
+                        (concat "\\<" (nth 0 (car check-values)) "\\>")
+                        (concat "(" (nth 1 (car check-values)) ")")
+                        t t vl-mbits)
               check-values (cdr check-values)))
-      (setq vl-bits (verilog-simplify-range-expression vl-bits))) ; Not in the loop for speed
+      (setq vl-bits (verilog-simplify-range-expression vl-bits)
+            vl-mbits (verilog-simplify-range-expression vl-mbits)
+            vl-width (verilog-make-width-expression vl-bits))) ; Not in the loop for speed
     ;; Default net value if not found
     (setq tpl-net (concat port
                           (if vl-modport (concat "." vl-modport) "")
                           (if (verilog-sig-multidim port-st)
-                              (concat "/*" (verilog-sig-multidim-string port-st)
-                                      vl-bits "*/")
+                              (concat "/*" vl-mbits vl-bits "*/")
                             (concat vl-bits))))
     ;; Find template
     (cond (tpl-ass          ; Template of exact port name
@@ -9536,20 +10262,37 @@ If PAR-VALUES replace final strings with these parameter values."
     (cond (tpl-ass
            (indent-to (+ (if (< verilog-auto-inst-column 48) 24 16)
                          verilog-auto-inst-column))
-           (if verilog-auto-inst-template-numbers
-               (verilog-insert " // Templated"
-                               " T" (int-to-string (nth 2 tpl-ass))
-                               " L" (int-to-string (nth 3 tpl-ass)))
-             (verilog-insert " // Templated")))
+           ;; verilog-insert requires the complete comment in one call - including the newline
+           (cond ((equal verilog-auto-inst-template-numbers `lhs)
+                  (verilog-insert " // Templated"
+                                  " LHS: " (nth 0 tpl-ass)
+                                  "\n"))
+                 (verilog-auto-inst-template-numbers
+                  (verilog-insert " // Templated"
+                                  " T" (int-to-string (nth 2 tpl-ass))
+                                  " L" (int-to-string (nth 3 tpl-ass))
+                                  "\n"))
+                 (t
+                  (verilog-insert " // Templated\n"))))
           (for-star
            (indent-to (+ (if (< verilog-auto-inst-column 48) 24 16)
                          verilog-auto-inst-column))
-           (verilog-insert " // Implicit .\*"))) ;For some reason the . or * must be escaped...
-    (insert "\n")))
+           (verilog-insert " // Implicit .\*\n")) ;For some reason the . or * must be escaped...
+          (t
+           (insert "\n")))))
 ;;(verilog-auto-inst-port (list "foo" "[5:0]") 10 (list (list "foo" "a@\"(% (+ @ 1) 4)\"a")) "3")
 ;;(x "incom[@\"(+ (* 8 @) 7)\":@\"(* 8 @)\"]")
 ;;(x ".out (outgo[@\"(concat (+ (* 8 @) 7) \\\":\\\" ( * 8 @))\"]));")
 
+(defun verilog-auto-inst-port-list (sig-list indent-pt tpl-list tpl-num for-star par-values)
+  "For `verilog-auto-inst' print a list of ports using `verilog-auto-inst-port'."
+  (when verilog-auto-inst-sort
+    (setq sig-list (sort (copy-alist sig-list) `verilog-signals-sort-compare)))
+  (mapc (lambda (port)
+          (verilog-auto-inst-port port indent-pt
+                                  tpl-list tpl-num for-star par-values))
+        sig-list))
+
 (defun verilog-auto-inst-first ()
   "Insert , etc before first ever port in this instant, as part of \\[verilog-auto-inst]."
   ;; Do we need a trailing comma?
@@ -9558,7 +10301,7 @@ If PAR-VALUES replace final strings with these parameter values."
   ;; Insert first port on new line
   (insert "\n")  ;; Must insert before search, so point will move forward if insert comma
   (save-excursion
-    (verilog-re-search-backward "[^ \t\n\f]" nil nil)
+    (verilog-re-search-backward-quick "[^ \t\n\f]" nil nil)
     (when (looking-at ")\\|\\*")  ;; Generally don't insert, unless we are fairly sure
       (forward-char 1)
       (insert ","))))
@@ -9592,6 +10335,9 @@ If `verilog-auto-star-expand' is set, also expand SystemVerilog .* ports,
 and delete them before saving unless `verilog-auto-star-save' is set.
 See `verilog-auto-star' for more information.
 
+The pins are printed in declaration order or alphabetically,
+based on the `verilog-auto-inst-sort' variable.
+
 Limitations:
   Module names must be resolvable to filenames by adding a
   `verilog-library-extensions', and being found in the same directory, or
@@ -9719,6 +10465,22 @@ Templates:
             .NotInTemplate      (NotInTemplate),
             .ptl_bus            (ptl_busnew[3:0]),  // Templated
             ....
+
+
+Multiple Module Templates:
+
+  The same template lines can be applied to multiple modules with
+  the syntax as follows:
+
+        /* InstModuleA AUTO_TEMPLATE
+           InstModuleB AUTO_TEMPLATE
+           InstModuleC AUTO_TEMPLATE
+           InstModuleD AUTO_TEMPLATE (
+                .ptl_bus        (ptl_busnew[]),
+                );
+        */
+
+  Note there is only one AUTO_TEMPLATE opening parenthesis.
 
 @ Templates:
 
@@ -9899,18 +10661,15 @@ For more information see the \\[verilog-faq] and forums at URL
         ;; Find submodule's signals and dump
         (let ((sig-list (and (equal (verilog-modi-get-type submodi) "interface")
                              (verilog-signals-not-in
-                              (append (verilog-decls-get-wires submoddecls)
-                                      (verilog-decls-get-regs submoddecls))
+                              (verilog-decls-get-vars submoddecls)
                               skip-pins)))
               (vl-dir "interfaced"))
           (when sig-list
             (when (not did-first) (verilog-auto-inst-first) (setq did-first t))
             ;; Note these are searched for in verilog-read-sub-decls.
             (verilog-insert-indent "// Interfaced\n")
-            (mapc (lambda (port)
-                    (verilog-auto-inst-port port indent-pt
-                                            tpl-list tpl-num for-star par-values))
-                  sig-list)))
+            (verilog-auto-inst-port-list sig-list indent-pt
+                                         tpl-list tpl-num for-star par-values)))
         (let ((sig-list (verilog-signals-not-in
                          (verilog-decls-get-interfaces submoddecls)
                          skip-pins))
@@ -9919,10 +10678,8 @@ For more information see the \\[verilog-faq] and forums at URL
             (when (not did-first) (verilog-auto-inst-first) (setq did-first t))
             ;; Note these are searched for in verilog-read-sub-decls.
             (verilog-insert-indent "// Interfaces\n")
-            (mapc (lambda (port)
-                    (verilog-auto-inst-port port indent-pt
-                                            tpl-list tpl-num for-star par-values))
-                  sig-list)))
+            (verilog-auto-inst-port-list sig-list indent-pt
+                                         tpl-list tpl-num for-star par-values)))
         (let ((sig-list (verilog-signals-not-in
                          (verilog-decls-get-outputs submoddecls)
                          skip-pins))
@@ -9930,10 +10687,8 @@ For more information see the \\[verilog-faq] and forums at URL
           (when sig-list
             (when (not did-first) (verilog-auto-inst-first) (setq did-first t))
             (verilog-insert-indent "// Outputs\n")
-            (mapc (lambda (port)
-                    (verilog-auto-inst-port port indent-pt
-                                            tpl-list tpl-num for-star par-values))
-                  sig-list)))
+            (verilog-auto-inst-port-list sig-list indent-pt
+                                         tpl-list tpl-num for-star par-values)))
         (let ((sig-list (verilog-signals-not-in
                          (verilog-decls-get-inouts submoddecls)
                          skip-pins))
@@ -9941,10 +10696,8 @@ For more information see the \\[verilog-faq] and forums at URL
           (when sig-list
             (when (not did-first) (verilog-auto-inst-first) (setq did-first t))
             (verilog-insert-indent "// Inouts\n")
-            (mapc (lambda (port)
-                    (verilog-auto-inst-port port indent-pt
-                                            tpl-list tpl-num for-star par-values))
-                  sig-list)))
+            (verilog-auto-inst-port-list sig-list indent-pt
+                                         tpl-list tpl-num for-star par-values)))
         (let ((sig-list (verilog-signals-not-in
                          (verilog-decls-get-inputs submoddecls)
                          skip-pins))
@@ -9952,10 +10705,8 @@ For more information see the \\[verilog-faq] and forums at URL
           (when sig-list
             (when (not did-first) (verilog-auto-inst-first) (setq did-first t))
             (verilog-insert-indent "// Inputs\n")
-            (mapc (lambda (port)
-                    (verilog-auto-inst-port port indent-pt
-                                            tpl-list tpl-num for-star par-values))
-                  sig-list)))
+            (verilog-auto-inst-port-list sig-list indent-pt
+                                         tpl-list tpl-num for-star par-values)))
         ;; Kill extra semi
         (save-excursion
           (cond (did-first
@@ -10058,10 +10809,8 @@ Templates:
             (when (not did-first) (verilog-auto-inst-first) (setq did-first t))
             ;; Note these are searched for in verilog-read-sub-decls.
             (verilog-insert-indent "// Parameters\n")
-            (mapc (lambda (port)
-                    (verilog-auto-inst-port port indent-pt
-                                            tpl-list tpl-num nil nil))
-                  sig-list)))
+            (verilog-auto-inst-port-list sig-list indent-pt
+                                         tpl-list tpl-num nil nil)))
         ;; Kill extra semi
         (save-excursion
           (cond (did-first
@@ -10076,7 +10825,8 @@ Templates:
 (defun verilog-auto-reg ()
   "Expand AUTOREG statements, as part of \\[verilog-auto].
 Make reg statements for any output that isn't already declared,
-and isn't a wire output from a block.
+and isn't a wire output from a block.  `verilog-auto-wire-type'
+may be used to change the datatype of the declarations.
 
 Limitations:
   This ONLY detects outputs of AUTOINSTants (see `verilog-read-sub-decls').
@@ -10111,8 +10861,7 @@ Typing \\[verilog-auto] will make this into:
            (modsubdecls (verilog-modi-get-sub-decls modi))
            (sig-list (verilog-signals-not-in
                       (verilog-decls-get-outputs moddecls)
-                      (append (verilog-decls-get-wires moddecls)
-                              (verilog-decls-get-regs moddecls)
+                      (append (verilog-decls-get-vars moddecls)
                               (verilog-decls-get-assigns moddecls)
                               (verilog-decls-get-consts moddecls)
                               (verilog-decls-get-gparams moddecls)
@@ -10122,8 +10871,7 @@ Typing \\[verilog-auto] will make this into:
       (forward-line 1)
       (when sig-list
         (verilog-insert-indent "// Beginning of automatic regs (for this module's undeclared outputs)\n")
-        (verilog-insert-definition sig-list "reg" indent-pt nil)
-        (verilog-modi-cache-add-regs modi sig-list)
+        (verilog-insert-definition modi sig-list "reg" indent-pt nil)
         (verilog-insert-indent "// End of automatics\n")))))
 
 (defun verilog-auto-reg-input ()
@@ -10173,18 +10921,40 @@ Typing \\[verilog-auto] will make this into:
                       (verilog-signals-not-in
                        (append (verilog-subdecls-get-inputs modsubdecls)
                                (verilog-subdecls-get-inouts modsubdecls))
-                       (verilog-decls-get-signals moddecls)))))
+                       (append (verilog-decls-get-signals moddecls)
+                               (verilog-decls-get-assigns moddecls))))))
       (forward-line 1)
       (when sig-list
         (verilog-insert-indent "// Beginning of automatic reg inputs (for undeclared instantiated-module inputs)\n")
-        (verilog-insert-definition sig-list "reg" indent-pt nil)
-        (verilog-modi-cache-add-regs modi sig-list)
+        (verilog-insert-definition modi sig-list "reg" indent-pt nil)
         (verilog-insert-indent "// End of automatics\n")))))
 
+(defun verilog-auto-logic ()
+  "Expand AUTOLOGIC statements, as part of \\[verilog-auto].
+Make wire statements using the SystemVerilog logic keyword.
+This is currently equivelent to:
+
+    /*AUTOWIRE*/
+
+with the below at the bottom of the file
+
+    // Local Variables:
+    // verilog-auto-logic-type:\"logic\"
+    // End:
+
+In the future AUTOLOGIC may declare additional identifiers,
+while AUTOWIRE will not."
+  (save-excursion
+    (unless verilog-auto-wire-type
+      (set (make-local-variable 'verilog-auto-wire-type)
+           "logic"))
+    (verilog-auto-wire)))
+
 (defun verilog-auto-wire ()
   "Expand AUTOWIRE statements, as part of \\[verilog-auto].
 Make wire statements for instantiations outputs that aren't
-already declared.
+already declared. `verilog-auto-wire-type' may be used to change
+the datatype of the declarations.
 
 Limitations:
   This ONLY detects outputs of AUTOINSTants (see `verilog-read-sub-decls'),
@@ -10240,15 +11010,13 @@ Typing \\[verilog-auto] will make this into:
       (forward-line 1)
       (when sig-list
         (verilog-insert-indent "// Beginning of automatic wires (for undeclared instantiated-module outputs)\n")
-        (verilog-insert-definition sig-list "wire" indent-pt nil)
-        (verilog-modi-cache-add-wires modi sig-list)
+        (verilog-insert-definition modi sig-list "wire" indent-pt nil)
         (verilog-insert-indent "// End of automatics\n")
-        (when nil       ;; Too slow on huge modules, plus makes everyone's module change
-          (beginning-of-line)
-          (setq pnt (point))
-          (verilog-pretty-declarations quiet)
-          (goto-char pnt)
-          (verilog-pretty-expr t "//"))))))
+        ;; We used to optionally call verilog-pretty-declarations and
+        ;; verilog-pretty-expr here, but it's too slow on huge modules,
+        ;; plus makes everyone's module change. Finally those call
+        ;; syntax-ppss which is broken when change hooks are disabled.
+        ))))
 
 (defun verilog-auto-output (&optional with-params)
   "Expand AUTOOUTPUT statements, as part of \\[verilog-auto].
@@ -10304,7 +11072,7 @@ same expansion will result from only extracting outputs starting with ov:
     (let* ((indent-pt (current-indentation))
            (regexp (and with-params
                         (nth 0 (verilog-read-auto-params 1))))
-           (v2k  (verilog-in-paren))
+           (v2k  (verilog-in-paren-quick))
            (modi (verilog-modi-current))
            (moddecls (verilog-modi-get-decls modi))
            (modsubdecls (verilog-modi-get-sub-decls modi))
@@ -10323,8 +11091,7 @@ same expansion will result from only extracting outputs starting with ov:
       (when v2k (verilog-repair-open-comma))
       (when sig-list
         (verilog-insert-indent "// Beginning of automatic outputs (from unused autoinst outputs)\n")
-        (verilog-insert-definition sig-list "output" indent-pt v2k)
-        (verilog-modi-cache-add-outputs modi sig-list)
+        (verilog-insert-definition modi sig-list "output" indent-pt v2k)
         (verilog-insert-indent "// End of automatics\n"))
       (when v2k (verilog-repair-close-comma)))))
 
@@ -10363,7 +11130,7 @@ Typing \\[verilog-auto] will make this into:
   (save-excursion
     ;;Point must be at insertion point
     (let* ((indent-pt (current-indentation))
-           (v2k  (verilog-in-paren))
+           (v2k  (verilog-in-paren-quick))
            (modi (verilog-modi-current))
            (moddecls (verilog-modi-get-decls modi))
            (sig-list (verilog-signals-combine-bus
@@ -10374,8 +11141,7 @@ Typing \\[verilog-auto] will make this into:
       (when v2k (verilog-repair-open-comma))
       (when sig-list
         (verilog-insert-indent "// Beginning of automatic outputs (every signal)\n")
-        (verilog-insert-definition sig-list "output" indent-pt v2k)
-        (verilog-modi-cache-add-outputs modi sig-list)
+        (verilog-insert-definition modi sig-list "output" indent-pt v2k)
         (verilog-insert-indent "// End of automatics\n"))
       (when v2k (verilog-repair-close-comma)))))
 
@@ -10432,7 +11198,7 @@ same expansion will result from only extracting inputs starting with i:
     (let* ((indent-pt (current-indentation))
            (regexp (and with-params
                         (nth 0 (verilog-read-auto-params 1))))
-           (v2k  (verilog-in-paren))
+           (v2k  (verilog-in-paren-quick))
            (modi (verilog-modi-current))
            (moddecls (verilog-modi-get-decls modi))
            (modsubdecls (verilog-modi-get-sub-decls modi))
@@ -10440,8 +11206,7 @@ same expansion will result from only extracting inputs starting with i:
                       (verilog-subdecls-get-inputs modsubdecls)
                       (append (verilog-decls-get-inputs moddecls)
                               (verilog-decls-get-inouts moddecls)
-                              (verilog-decls-get-wires moddecls)
-                              (verilog-decls-get-regs moddecls)
+                              (verilog-decls-get-vars moddecls)
                               (verilog-decls-get-consts moddecls)
                               (verilog-decls-get-gparams moddecls)
                               (verilog-subdecls-get-interfaced modsubdecls)
@@ -10456,8 +11221,7 @@ same expansion will result from only extracting inputs starting with i:
       (when v2k (verilog-repair-open-comma))
       (when sig-list
         (verilog-insert-indent "// Beginning of automatic inputs (from unused autoinst inputs)\n")
-        (verilog-insert-definition sig-list "input" indent-pt v2k)
-        (verilog-modi-cache-add-inputs modi sig-list)
+        (verilog-insert-definition modi sig-list "input" indent-pt v2k)
         (verilog-insert-indent "// End of automatics\n"))
       (when v2k (verilog-repair-close-comma)))))
 
@@ -10514,7 +11278,7 @@ same expansion will result from only extracting inouts starting with i:
     (let* ((indent-pt (current-indentation))
            (regexp (and with-params
                         (nth 0 (verilog-read-auto-params 1))))
-           (v2k  (verilog-in-paren))
+           (v2k  (verilog-in-paren-quick))
            (modi (verilog-modi-current))
            (moddecls (verilog-modi-get-decls modi))
            (modsubdecls (verilog-modi-get-sub-decls modi))
@@ -10534,18 +11298,18 @@ same expansion will result from only extracting inouts starting with i:
       (when v2k (verilog-repair-open-comma))
       (when sig-list
         (verilog-insert-indent "// Beginning of automatic inouts (from unused autoinst inouts)\n")
-        (verilog-insert-definition sig-list "inout" indent-pt v2k)
-        (verilog-modi-cache-add-inouts modi sig-list)
+        (verilog-insert-definition modi sig-list "inout" indent-pt v2k)
         (verilog-insert-indent "// End of automatics\n"))
       (when v2k (verilog-repair-close-comma)))))
 
-(defun verilog-auto-inout-module (&optional complement)
+(defun verilog-auto-inout-module (&optional complement all-in)
   "Expand AUTOINOUTMODULE statements, as part of \\[verilog-auto].
 Take input/output/inout statements from the specified module and insert
 into the current module.  This is useful for making null templates and
 shell modules which need to have identical I/O with another module.
 Any I/O which are already defined in this module will not be redefined.
-For the complement of this function, see `verilog-auto-inout-comp'.
+For the complement of this function, see `verilog-auto-inout-comp',
+and to make monitors with all inputs, see `verilog-auto-inout-in'.
 
 Limitations:
   If placed inside the parenthesis of a module declaration, it creates
@@ -10610,22 +11374,29 @@ against the previous example's module:
       ;; Note this may raise an error
       (when (setq submodi (verilog-modi-lookup submod t))
         (let* ((indent-pt (current-indentation))
-               (v2k  (verilog-in-paren))
+               (v2k  (verilog-in-paren-quick))
                (modi (verilog-modi-current))
                (moddecls (verilog-modi-get-decls modi))
                (submoddecls (verilog-modi-get-decls submodi))
                (sig-list-i  (verilog-signals-not-in
-                             (if complement
-                                 (verilog-decls-get-outputs submoddecls)
-                               (verilog-decls-get-inputs submoddecls))
+                             (cond (all-in
+                                    (append
+                                     (verilog-decls-get-inputs submoddecls)
+                                     (verilog-decls-get-inouts submoddecls)
+                                     (verilog-decls-get-outputs submoddecls)))
+                                   (complement
+                                    (verilog-decls-get-outputs submoddecls))
+                                   (t (verilog-decls-get-inputs submoddecls)))
                              (append (verilog-decls-get-inputs moddecls))))
                (sig-list-o  (verilog-signals-not-in
-                             (if complement
-                                 (verilog-decls-get-inputs submoddecls)
-                               (verilog-decls-get-outputs submoddecls))
+                             (cond (all-in nil)
+                                   (complement
+                                    (verilog-decls-get-inputs submoddecls))
+                                   (t (verilog-decls-get-outputs submoddecls)))
                              (append (verilog-decls-get-outputs moddecls))))
                (sig-list-io (verilog-signals-not-in
-                             (verilog-decls-get-inouts submoddecls)
+                             (cond (all-in nil)
+                                   (t (verilog-decls-get-inouts submoddecls)))
                              (append (verilog-decls-get-inouts moddecls))))
                (sig-list-if (verilog-signals-not-in
                              (verilog-decls-get-interfaces submoddecls)
@@ -10647,13 +11418,10 @@ against the previous example's module:
           (when (or sig-list-i sig-list-o sig-list-io)
             (verilog-insert-indent "// Beginning of automatic in/out/inouts (from specific module)\n")
             ;; Don't sort them so a upper AUTOINST will match the main module
-            (verilog-insert-definition sig-list-o  "output" indent-pt v2k t)
-            (verilog-insert-definition sig-list-io "inout" indent-pt v2k t)
-            (verilog-insert-definition sig-list-i  "input" indent-pt v2k t)
-            (verilog-insert-definition sig-list-if "interface" indent-pt v2k t)
-            (verilog-modi-cache-add-inputs modi sig-list-i)
-            (verilog-modi-cache-add-outputs modi sig-list-o)
-            (verilog-modi-cache-add-inouts modi sig-list-io)
+            (verilog-insert-definition modi sig-list-o  "output" indent-pt v2k t)
+            (verilog-insert-definition modi sig-list-io "inout" indent-pt v2k t)
+            (verilog-insert-definition modi sig-list-i  "input" indent-pt v2k t)
+            (verilog-insert-definition modi sig-list-if "interface" indent-pt v2k t)
             (verilog-insert-indent "// End of automatics\n"))
           (when v2k (verilog-repair-close-comma)))))))
 
@@ -10707,7 +11475,58 @@ signals matching the regular expression will be included.  For example the
 same expansion will result from only extracting signals starting with i:
 
            /*AUTOINOUTCOMP(\"ExampMain\",\"^i\")*/"
-  (verilog-auto-inout-module t))
+  (verilog-auto-inout-module t nil))
+
+(defun verilog-auto-inout-in ()
+  "Expand AUTOINOUTIN statements, as part of \\[verilog-auto].
+Take input/output/inout statements from the specified module and
+insert them as all inputs into the current module.  This is
+useful for making monitor modules which need to see all signals
+as inputs based on another module.  Any I/O which are already
+defined in this module will not be redefined.  See also
+`verilog-auto-inout-module'.
+
+Limitations:
+  If placed inside the parenthesis of a module declaration, it creates
+  Verilog 2001 style, else uses Verilog 1995 style.
+
+  Concatenation and outputting partial busses is not supported.
+
+  Module names must be resolvable to filenames.  See `verilog-auto-inst'.
+
+  Signals are not inserted in the same order as in the original module,
+  though they will appear to be in the same order to a AUTOINST
+  instantiating either module.
+
+An example:
+
+        module ExampShell (/*AUTOARG*/);
+           /*AUTOINOUTIN(\"ExampMain\")*/
+        endmodule
+
+        module ExampMain (i,o,io);
+          input i;
+          output o;
+          inout io;
+        endmodule
+
+Typing \\[verilog-auto] will make this into:
+
+        module ExampShell (/*AUTOARG*/i,o,io);
+           /*AUTOINOUTIN(\"ExampMain\")*/
+           // Beginning of automatic in/out/inouts (from specific module)
+           input i;
+           input io;
+           input o;
+           // End of automatics
+        endmodule
+
+You may also provide an optional regular expression, in which case only
+signals matching the regular expression will be included.  For example the
+same expansion will result from only extracting signals starting with i:
+
+           /*AUTOINOUTCOMP(\"ExampMain\",\"^i\")*/"
+  (verilog-auto-inout-module nil t))
 
 (defun verilog-auto-insert-lisp ()
   "Expand AUTOINSERTLISP statements, as part of \\[verilog-auto].
@@ -10756,7 +11575,7 @@ text:
                                        (forward-char)
                                        (point)))        ;; Closing paren
            (cmd-beg-pt (save-excursion (goto-char cmd-end-pt)
-                                       (backward-sexp 1)
+                                       (backward-sexp 1)  ;; Inside comment
                                        (point))) ;; Beginning paren
            (cmd (buffer-substring-no-properties cmd-beg-pt cmd-end-pt)))
       (forward-line 1)
@@ -10776,7 +11595,9 @@ text:
          (sig-list (verilog-signals-not-params
                     (verilog-signals-not-in (verilog-alw-get-inputs sigss)
                                             (append (and (not verilog-auto-sense-include-inputs)
-                                                         (verilog-alw-get-outputs sigss))
+                                                         (verilog-alw-get-outputs-delayed sigss))
+                                                    (and (not verilog-auto-sense-include-inputs)
+                                                         (verilog-alw-get-outputs-immediate sigss))
                                                     (verilog-alw-get-temps sigss)
                                                     (verilog-decls-get-consts moddecls)
                                                     (verilog-decls-get-gparams moddecls)
@@ -10840,7 +11661,7 @@ operator.  (This was added to the language in part due to AUTOSENSE!)
   (save-excursion
     ;; Find beginning
     (let* ((start-pt (save-excursion
-                       (verilog-re-search-backward "(" nil t)
+                       (verilog-re-search-backward-quick "(" nil t)
                        (point)))
            (indent-pt (save-excursion
                         (or (and (goto-char start-pt) (1+ (current-column)))
@@ -10848,9 +11669,7 @@ operator.  (This was added to the language in part due to AUTOSENSE!)
            (modi (verilog-modi-current))
            (moddecls (verilog-modi-get-decls modi))
            (sig-memories (verilog-signals-memory
-                          (append
-                           (verilog-decls-get-regs moddecls)
-                           (verilog-decls-get-wires moddecls))))
+                          (verilog-decls-get-vars moddecls)))
            sig-list not-first presense-sigs)
       ;; Read signals in always, eliminate outputs from sense list
       (setq presense-sigs (verilog-signals-from-signame
@@ -10863,11 +11682,11 @@ operator.  (This was added to the language in part due to AUTOSENSE!)
           (if (not (eq tlen (length sig-list))) (verilog-insert " /*memory or*/ "))))
       (if (and presense-sigs  ;; Add a "or" if not "(.... or /*AUTOSENSE*/"
                (save-excursion (goto-char (point))
-                               (verilog-re-search-backward "[a-zA-Z0-9$_.%`]+" start-pt t)
-                               (verilog-re-search-backward "\\s-" start-pt t)
+                               (verilog-re-search-backward-quick "[a-zA-Z0-9$_.%`]+" start-pt t)
+                               (verilog-re-search-backward-quick "\\s-" start-pt t)
                                (while (looking-at "\\s-`endif")
-                                 (verilog-re-search-backward "[a-zA-Z0-9$_.%`]+" start-pt t)
-                                 (verilog-re-search-backward "\\s-" start-pt t))
+                                 (verilog-re-search-backward-quick "[a-zA-Z0-9$_.%`]+" start-pt t)
+                                 (verilog-re-search-backward-quick "\\s-" start-pt t))
                                (not (looking-at "\\s-or\\b"))))
           (setq not-first t))
       (setq sig-list (sort sig-list `verilog-signals-sort-compare))
@@ -10889,9 +11708,13 @@ registers set elsewhere in the always block.
 Limitations:
   AUTORESET will not clear memories.
 
-  AUTORESET uses <= if there are any <= assignments in the block,
+  AUTORESET uses <= if the signal has a <= assignment in the block,
   else it uses =.
 
+  If <= is used, all = assigned variables are ignored if
+  `verilog-auto-reset-blocking-in-non' is nil; they are presumed
+  to be temporaries.
+
 /*AUTORESET*/ presumes that any signals mentioned between the previous
 begin/case/if statement and the AUTORESET comment are being reset manually
 and should not be automatically reset.  This includes omitting any signals
@@ -10927,12 +11750,12 @@ Typing \\[verilog-auto] will make this into:
             /*AUTORESET*/
             // Beginning of autoreset for uninitialized flops
             a <= 0;
-            b <= 0;
+            b = 0;   // if `verilog-auto-reset-blocking-in-non' true
             // End of automatics
         end
         else begin
             a <= in_a;
-            b <= in_b;
+            b  = in_b;
             c <= in_c;
         end
     end"
@@ -10944,22 +11767,24 @@ Typing \\[verilog-auto] will make this into:
            (modi (verilog-modi-current))
            (moddecls (verilog-modi-get-decls modi))
            (all-list (verilog-decls-get-signals moddecls))
-           sigss sig-list prereset-sigs assignment-str)
+           sigss sig-list dly-list prereset-sigs)
       ;; Read signals in always, eliminate outputs from reset list
       (setq prereset-sigs (verilog-signals-from-signame
                            (save-excursion
                              (verilog-read-signals
                               (save-excursion
-                                (verilog-re-search-backward "\\(@\\|\\<begin\\>\\|\\<if\\>\\|\\<case\\>\\)" nil t)
+                                (verilog-re-search-backward-quick "\\(@\\|\\<begin\\>\\|\\<if\\>\\|\\<case\\>\\)" nil t)
                                 (point))
                               (point)))))
       (save-excursion
-        (verilog-re-search-backward "@" nil t)
+        (verilog-re-search-backward-quick "@" nil t)
         (setq sigss (verilog-read-always-signals)))
-      (setq assignment-str (if (verilog-alw-get-uses-delayed sigss)
-                               (concat " <= " verilog-assignment-delay)
-                             " = "))
-      (setq sig-list (verilog-signals-not-in (verilog-alw-get-outputs sigss)
+      (setq dly-list (verilog-alw-get-outputs-delayed sigss))
+      (setq sig-list (verilog-signals-not-in (append
+                                              (verilog-alw-get-outputs-delayed sigss)
+                                              (when (or (not (verilog-alw-get-uses-delayed sigss))
+                                                        verilog-auto-reset-blocking-in-non)
+                                                (verilog-alw-get-outputs-immediate sigss)))
                                              (append
                                               (verilog-alw-get-temps sigss)
                                               prereset-sigs)))
@@ -10967,17 +11792,18 @@ Typing \\[verilog-auto] will make this into:
       (when sig-list
         (insert "\n");
         (verilog-insert-indent "// Beginning of autoreset for uninitialized flops\n");
-        (indent-to indent-pt)
         (while sig-list
           (let ((sig (or (assoc (verilog-sig-name (car sig-list)) all-list) ;; As sig-list has no widths
                          (car sig-list))))
+            (indent-to indent-pt)
             (insert (verilog-sig-name sig)
-                    assignment-str
+                    (if (assoc (verilog-sig-name sig) dly-list)
+                        (concat " <= " verilog-assignment-delay)
+                      " = ")
                     (verilog-sig-tieoff sig (not verilog-auto-reset-widths))
                     ";\n")
-            (indent-to indent-pt)
             (setq sig-list (cdr sig-list))))
-        (verilog-insert "// End of automatics")))))
+        (verilog-insert-indent "// End of automatics")))))
 
 (defun verilog-auto-tieoff ()
   "Expand AUTOTIEOFF statements, as part of \\[verilog-auto].
@@ -10996,6 +11822,9 @@ them to a one.
 You can add signals you do not want included in AUTOTIEOFF with
 `verilog-auto-tieoff-ignore-regexp'.
 
+`verilog-auto-wire-type' may be used to change the datatype of
+the declarations.
+
 An example of making a stub for another module:
 
     module ExampStub (/*AUTOINST*/);
@@ -11031,8 +11860,7 @@ Typing \\[verilog-auto] will make this into:
            (modsubdecls (verilog-modi-get-sub-decls modi))
            (sig-list (verilog-signals-not-in
                       (verilog-decls-get-outputs moddecls)
-                      (append (verilog-decls-get-wires moddecls)
-                              (verilog-decls-get-regs moddecls)
+                      (append (verilog-decls-get-vars moddecls)
                               (verilog-decls-get-assigns moddecls)
                               (verilog-decls-get-consts moddecls)
                               (verilog-decls-get-gparams moddecls)
@@ -11045,10 +11873,14 @@ Typing \\[verilog-auto] will make this into:
         (forward-line 1)
         (verilog-insert-indent "// Beginning of automatic tieoffs (for this module's unterminated outputs)\n")
         (setq sig-list (sort (copy-alist sig-list) `verilog-signals-sort-compare))
-        (verilog-modi-cache-add-wires modi sig-list)  ; Before we trash list
+        (verilog-modi-cache-add-vars modi sig-list)  ; Before we trash list
         (while sig-list
           (let ((sig (car sig-list)))
-            (verilog-insert-one-definition sig "wire" indent-pt)
+            (cond ((equal verilog-auto-tieoff-declaration "assign")
+                   (indent-to indent-pt)
+                   (insert "assign " (verilog-sig-name sig)))
+                  (t
+                   (verilog-insert-one-definition sig verilog-auto-tieoff-declaration indent-pt)))
             (indent-to (max 48 (+ indent-pt 40)))
             (insert "= " (verilog-sig-tieoff sig)
                     ";\n")
@@ -11151,24 +11983,28 @@ comment.  The comment must be between the keyword and the symbol.
 \(Annoying, but that's what Synopsys's dc_shell FSM reader requires.)
 
 Next, registers which that enum applies to are also tagged with the same
-enum.  Synopsys also suggests labeling state vectors, but `verilog-mode'
-doesn't care.
+enum.
 
 Finally, a AUTOASCIIENUM command is used.
 
   The first parameter is the name of the signal to be decoded.
-  If and only if the first parameter width is 2^(number of states
-  in enum) and does NOT match the width of the enum, the signal
-  is assumed to be a one hot decode.  Otherwise, it's a normal
-  encoded state vector.
 
   The second parameter is the name to store the ASCII code into.  For the
   signal foo, I suggest the name _foo__ascii, where the leading _ indicates
   a signal that is just for simulation, and the magic characters _ascii
   tell viewers like Dinotrace to display in ASCII format.
 
-  The final optional parameter is a string which will be removed from the
-  state names.
+  The third optional parameter is a string which will be removed
+  from the state names. It defaults to "" which removes nothing.
+
+  The fourth optional parameter is \"onehot\" to force one-hot
+  decoding. If unspecified, if and only if the first parameter
+  width is 2^(number of states in enum) and does NOT match the
+  width of the enum, the signal is assumed to be a one hot
+  decode.  Otherwise, it's a normal encoded state vector.
+
+  `verilog-auto-wire-type' may be used to change the datatype of
+  the declarations.
 
 An example:
 
@@ -11202,10 +12038,13 @@ Typing \\[verilog-auto] will make this into:
         end
         // End of automatics"
   (save-excursion
-    (let* ((params (verilog-read-auto-params 2 3))
+    (let* ((params (verilog-read-auto-params 2 4))
            (undecode-name (nth 0 params))
            (ascii-name (nth 1 params))
-           (elim-regexp (nth 2 params))
+           (elim-regexp (and (nth 2 params)
+                             (not (equal (nth 2 params) ""))
+                             (nth 2 params)))
+           (one-hot-flag (nth 3 params))
            ;;
            (indent-pt (current-indentation))
            (modi (verilog-modi-current))
@@ -11213,11 +12052,10 @@ Typing \\[verilog-auto] will make this into:
            ;;
            (sig-list-consts (append (verilog-decls-get-consts moddecls)
                                     (verilog-decls-get-gparams moddecls)))
-           (sig-list-all  (append (verilog-decls-get-regs moddecls)
+           (sig-list-all  (append (verilog-decls-get-vars moddecls)
                                   (verilog-decls-get-outputs moddecls)
                                   (verilog-decls-get-inouts moddecls)
-                                  (verilog-decls-get-inputs moddecls)
-                                  (verilog-decls-get-wires moddecls)))
+                                  (verilog-decls-get-inputs moddecls)))
            ;;
            (undecode-sig (or (assoc undecode-name sig-list-all)
                              (error "%s: Signal %s not found in design" (verilog-point-text) undecode-name)))
@@ -11229,13 +12067,15 @@ Typing \\[verilog-auto] will make this into:
                            (error "%s: No state definitions for %s" (verilog-point-text) undecode-enum))
                        nil))
            ;;
-           (one-hot (and ;; width(enum) != width(sig)
-                     (or (not (verilog-sig-bits (car enum-sigs)))
-                         (not (equal (verilog-sig-width (car enum-sigs))
-                                     (verilog-sig-width undecode-sig))))
-                     ;; count(enums) == width(sig)
-                     (equal (number-to-string (length enum-sigs))
-                            (verilog-sig-width undecode-sig))))
+           (one-hot (or
+                     (string-match "onehot" (or one-hot-flag ""))
+                     (and ;; width(enum) != width(sig)
+                      (or (not (verilog-sig-bits (car enum-sigs)))
+                          (not (equal (verilog-sig-width (car enum-sigs))
+                                      (verilog-sig-width undecode-sig))))
+                      ;; count(enums) == width(sig)
+                      (equal (number-to-string (length enum-sigs))
+                             (verilog-sig-width undecode-sig)))))
            (enum-chars 0)
            (ascii-chars 0))
       ;;
@@ -11252,13 +12092,11 @@ Typing \\[verilog-auto] will make this into:
       (verilog-insert-indent "// Beginning of automatic ASCII enum decoding\n")
       (let ((decode-sig-list (list (list ascii-name (format "[%d:0]" (- (* ascii-chars 8) 1))
                                          (concat "Decode of " undecode-name) nil nil))))
-        (verilog-insert-definition decode-sig-list "reg" indent-pt nil)
-        (verilog-modi-cache-add-regs modi decode-sig-list))
+        (verilog-insert-definition modi decode-sig-list "reg" indent-pt nil))
       ;;
       (verilog-insert-indent "always @(" undecode-name ") begin\n")
       (setq indent-pt (+ indent-pt verilog-indent-level))
-      (indent-to indent-pt)
-      (insert "case ({" undecode-name "})\n")
+      (verilog-insert-indent "case ({" undecode-name "})\n")
       (setq indent-pt (+ indent-pt verilog-case-indent))
       ;;
       (let ((tmp-sigs enum-sigs)
@@ -11271,7 +12109,9 @@ Typing \\[verilog-auto] will make this into:
            (concat
             (format chrfmt
                     (concat (if one-hot "(")
-                            (if one-hot (verilog-sig-width undecode-sig))
+                            ;; Use enum-sigs length as that's numeric
+                            ;; verilog-sig-width undecode-sig might not be.
+                            (if one-hot (number-to-string (length enum-sigs)))
                             ;; We use a shift instead of var[index]
                             ;; so that a non-one hot value will show as error.
                             (if one-hot "'b1<<")
@@ -11326,6 +12166,8 @@ following the /*AUTO...*/ command.
 
 Use \\[verilog-delete-auto] to remove the AUTOs.
 
+Use \\[verilog-diff-auto] to see differences in AUTO expansion.
+
 Use \\[verilog-inject-auto] to insert AUTOs for the first time.
 
 Use \\[verilog-faq] for a pointer to frequently asked questions.
@@ -11348,11 +12190,14 @@ Or fix indentation with:
 Likewise, you can delete or inject AUTOs with:
         emacs --batch  <filenames.v>  -f verilog-batch-delete-auto
         emacs --batch  <filenames.v>  -f verilog-batch-inject-auto
+Or check if AUTOs have the same expansion
+        emacs --batch  <filenames.v>  -f verilog-batch-diff-auto
 
 Using \\[describe-function], see also:
     `verilog-auto-arg'          for AUTOARG module instantiations
     `verilog-auto-ascii-enum'   for AUTOASCIIENUM enumeration decoding
-    `verilog-auto-inout-comp'  for AUTOINOUTCOMP copy complemented i/o
+    `verilog-auto-inout-comp'   for AUTOINOUTCOMP copy complemented i/o
+    `verilog-auto-inout-in'     for AUTOINOUTIN inputs for all i/o
     `verilog-auto-inout-module' for AUTOINOUTMODULE copying i/o from elsewhere
     `verilog-auto-inout'        for AUTOINOUT making hierarchy inouts
     `verilog-auto-input'        for AUTOINPUT making hierarchy inputs
@@ -11360,6 +12205,7 @@ Using \\[describe-function], see also:
     `verilog-auto-inst'         for AUTOINST instantiation pins
     `verilog-auto-star'         for AUTOINST .* SystemVerilog pins
     `verilog-auto-inst-param'   for AUTOINSTPARAM instantiation params
+    `verilog-auto-logic'        for AUTOLOGIC declaring logic signals
     `verilog-auto-output'       for AUTOOUTPUT making hierarchy outputs
     `verilog-auto-output-every' for AUTOOUTPUTEVERY making all outputs
     `verilog-auto-reg'          for AUTOREG registers
@@ -11402,10 +12248,13 @@ Wilson Snyder (wsnyder@wsnyder.org)."
          (verilog-save-no-change-functions
           (verilog-save-scan-cache
            (save-excursion
+             ;; Wipe cache; otherwise if we AUTOed a block above this one,
+             ;; we'll misremember we have generated IOs, confusing AUTOOUTPUT
+             (setq verilog-modi-cache-list nil)
              ;; If we're not in verilog-mode, change syntax table so parsing works right
              (unless (eq major-mode `verilog-mode) (verilog-mode))
              ;; Allow user to customize
-             (run-hooks 'verilog-before-auto-hook)
+             (verilog-run-hooks 'verilog-before-auto-hook)
              ;; Try to save the user from needing to revert-file to reread file local-variables
              (verilog-auto-reeval-locals)
              (verilog-read-auto-lisp-present)
@@ -11445,6 +12294,7 @@ Wilson Snyder (wsnyder@wsnyder.org)."
                ;; first in/outs from other files
                (verilog-auto-re-search-do "/\\*AUTOINOUTMODULE([^)]*)\\*/" 'verilog-auto-inout-module)
                (verilog-auto-re-search-do "/\\*AUTOINOUTCOMP([^)]*)\\*/" 'verilog-auto-inout-comp)
+               (verilog-auto-re-search-do "/\\*AUTOINOUTIN([^)]*)\\*/" 'verilog-auto-inout-in)
                ;; next in/outs which need previous sucked inputs first
                (verilog-auto-re-search-do "/\\*AUTOOUTPUT\\((\"[^\"]*\")\\)\\*/"
                                           (lambda () (verilog-auto-output t)))
@@ -11458,6 +12308,7 @@ Wilson Snyder (wsnyder@wsnyder.org)."
                ;; Then tie off those in/outs
                (verilog-auto-re-search-do "/\\*AUTOTIEOFF\\*/" 'verilog-auto-tieoff)
                ;; Wires/regs must be after inputs/outputs
+               (verilog-auto-re-search-do "/\\*AUTOLOGIC\\*/" 'verilog-auto-logic)
                (verilog-auto-re-search-do "/\\*AUTOWIRE\\*/" 'verilog-auto-wire)
                (verilog-auto-re-search-do "/\\*AUTOREG\\*/" 'verilog-auto-reg)
                (verilog-auto-re-search-do "/\\*AUTOREGINPUT\\*/" 'verilog-auto-reg-input)
@@ -11471,7 +12322,10 @@ Wilson Snyder (wsnyder@wsnyder.org)."
                (when verilog-auto-inst-template-numbers
                  (verilog-auto-templated-rel))))
              ;;
-             (run-hooks 'verilog-auto-hook)
+             (verilog-run-hooks 'verilog-auto-hook)
+             ;;
+             (when verilog-auto-delete-trailing-whitespace
+               (verilog-delete-trailing-whitespace))
              ;;
              (set (make-local-variable 'verilog-auto-update-tick) (buffer-chars-modified-tick))
              ;;
@@ -11502,10 +12356,12 @@ Wilson Snyder (wsnyder@wsnyder.org)."
     (define-key map "i" 'verilog-sk-initial)
     (define-key map "j" 'verilog-sk-fork)
     (define-key map "m" 'verilog-sk-module)
+    (define-key map "o" 'verilog-sk-ovm-class)
     (define-key map "p" 'verilog-sk-primitive)
     (define-key map "r" 'verilog-sk-repeat)
     (define-key map "s" 'verilog-sk-specify)
     (define-key map "t" 'verilog-sk-task)
+    (define-key map "u" 'verilog-sk-uvm-class)
     (define-key map "w" 'verilog-sk-while)
     (define-key map "x" 'verilog-sk-casex)
     (define-key map "z" 'verilog-sk-casez)
@@ -11531,7 +12387,7 @@ Wilson Snyder (wsnyder@wsnyder.org)."
 ;; may want to consider moving the binding to another key in your .emacs
 ;; file.
 ;;
-;(define-key verilog-mode-map "\C-ct" verilog-template-map)
+;; Note \C-c and letter are reserved for users
 (define-key verilog-mode-map "\C-c\C-t" verilog-template-map)
 
 ;;; ---- statement skeletons ------------------------------------------
@@ -11571,7 +12427,7 @@ Wilson Snyder (wsnyder@wsnyder.org)."
   "output: " str)
 
 (define-skeleton verilog-sk-prompt-msb
-  "Prompt for least significant bit specification."
+  "Prompt for most significant bit specification."
   "msb:" str & ?: & '(verilog-sk-prompt-lsb) | -1 )
 
 (define-skeleton verilog-sk-prompt-lsb
@@ -11616,6 +12472,38 @@ See also `verilog-header' for an alternative format."
   > _ \n
   > (- verilog-indent-level-behavioral) "endmodule" (progn (electric-verilog-terminate-line) nil))
 
+;;; ------------------------------------------------------------------------
+;;; Define a default OVM class, with macros and new()
+;;; ------------------------------------------------------------------------
+
+(define-skeleton verilog-sk-ovm-class
+  "Insert a class definition"
+  ()
+  > "class " (setq name (skeleton-read "Name: ")) " extends " (skeleton-read "Extends: ") ";" \n
+  > _ \n
+  > "`ovm_object_utils_begin(" name ")" \n
+  > (- verilog-indent-level) " `ovm_object_utils_end" \n
+  > _ \n
+  > "function new(name=\"" name "\");" \n
+  > "super.new(name);" \n
+  > (- verilog-indent-level) "endfunction" \n
+  > _ \n
+  > "endclass" (progn (electric-verilog-terminate-line) nil))
+
+(define-skeleton verilog-sk-uvm-class
+  "Insert a class definition"
+  ()
+  > "class " (setq name (skeleton-read "Name: ")) " extends " (skeleton-read "Extends: ") ";" \n
+  > _ \n
+  > "`uvm_object_utils_begin(" name ")" \n
+  > (- verilog-indent-level) " `uvm_object_utils_end" \n
+  > _ \n
+  > "function new(name=\"" name "\");" \n
+  > "super.new(name);" \n
+  > (- verilog-indent-level) "endfunction" \n
+  > _ \n
+  > "endclass" (progn (electric-verilog-terminate-line) nil))
+
 (define-skeleton verilog-sk-primitive
   "Insert a task definition."
   ()
@@ -11918,10 +12806,10 @@ Clicking on the middle-mouse button loads them in a buffer (as in dired)."
             ;; This scanner is syntax-fragile, so don't get bent
             (when verilog-highlight-modules
               (condition-case nil
-                  (while (verilog-re-search-forward "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-point t)
+                  (while (verilog-re-search-forward-quick "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-point t)
                     (save-excursion
                       (goto-char (match-beginning 0))
-                      (unless (verilog-inside-comment-p)
+                      (unless (verilog-inside-comment-or-string-p)
                         (verilog-read-inst-module-matcher)   ;; sets match 0
                         (let* ((ov (make-overlay (match-beginning 0) (match-end 0))))
                           (overlay-put ov 'start-closed 't)
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 65cdb600d74..c8bdc271f5f 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -366,7 +366,7 @@ See also `ps-mule-font-info-database-bdf'.")
 ;; character is printed by which FONT-SPEC.  It has one extra slot
 ;; whose value is an alist of the form:
 ;;      (CHARSET . FONT-SPEC)
-;; FONT-SPEC is a vecotr of the form:
+;; FONT-SPEC is a vector of the form:
 ;;      (ID FONT-SRC FONT-NAME ENCODING EXTRA)
 (defvar ps-mule-font-spec-tables nil)
 
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 6d05e6db586..cb19197d16d 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6658,7 +6658,7 @@ If FACE is not a valid face name, use default face."
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "afb9022f2e1e366c51672aa11a3bd76f")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "98fcbceecff2ac603ba35672b99b5278")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 8ddc8d41429..13b6a1d2315 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -363,7 +363,7 @@ recently executed command not bound to an input event\"."
 
 ;; OK, there's one situation left where that doesn't work correctly: when the
 ;; most recent self-insertion provoked an auto-fill.  The problem is that
-;; unravelling the undo information after an auto-fill is too hard, since all
+;; unraveling the undo information after an auto-fill is too hard, since all
 ;; kinds of stuff can get in there as a result of comment prefixes etc.  It'd
 ;; be possible to advise do-auto-fill to record the most recent
 ;; self-insertion before it does its thing, but that's a performance hit on
diff --git a/lisp/replace.el b/lisp/replace.el
index 4ea3f747caa..a46f62ae139 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1663,7 +1663,7 @@ with the `noescape' argument set.
                               t t)))
 
 (defun replace-loop-through-replacements (data count)
-  ;; DATA is a vector contaning the following values:
+  ;; DATA is a vector containing the following values:
   ;;   0 next-rotate-count
   ;;   1 repeat-count
   ;;   2 next-replacement
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index 2d8c6e0964d..ded76f9fbcb 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -179,7 +179,8 @@ been set up by `rfn-eshadow-setup-minibuffer'."
       (let ((goal (substitute-in-file-name (minibuffer-contents)))
             (mid (overlay-end rfn-eshadow-overlay))
             (start (minibuffer-prompt-end))
-            (end (point-max)))
+            (end (point-max))
+            (non-essential t))
         (unless
             ;; Catch the common case where the shadow does not need to move.
             (and mid
diff --git a/lisp/server.el b/lisp/server.el
index bc989c55ed1..e02f63a8268 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -685,7 +685,14 @@ Server mode runs a process that accepts commands from the
 
 (defun server-eval-and-print (expr proc)
   "Eval EXPR and send the result back to client PROC."
-  (let ((v (eval (car (read-from-string expr)))))
+  ;; While we're running asynchronously (from a process filter), it is likely
+  ;; that the emacsclient command was run in response to a user
+  ;; action, so the user probably knows that Emacs is processing this
+  ;; emacsclient request, so if we get a C-g it's likely that the user
+  ;; intended it to interrupt us rather than interrupt whatever Emacs
+  ;; was doing before it started handling the process filter.
+  ;; Hence `with-local-quit' (bug#6585).
+  (let ((v (with-local-quit (eval (car (read-from-string expr))))))
     (when proc
       (with-temp-buffer
         (let ((standard-output (current-buffer)))
diff --git a/lisp/ses.el b/lisp/ses.el
index cdc58e12d00..6c9d0a7a50d 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1143,7 +1143,7 @@ preceding cell has spilled over."
         (setq x (concat text (if (< maxcol ses--numcols) " " "\n")))
         ;; We use set-text-properties to prevent a wacky print function from
         ;; inserting rogue properties, and to ensure that the keymap property is
-        ;; inherited (is it a bug that only unpropertied strings actually
+        ;; inherited (is it a bug that only unpropertized strings actually
         ;; inherit from surrounding text?)
         (set-text-properties 0 (length x) nil x)
         (insert-and-inherit x)
@@ -1371,7 +1371,7 @@ first reference is found."
     result-so-far)
 
 (defsubst ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr)
-  "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and
+  "Relocate one symbol SYM, which corresponds to ROWCOL (a cons of ROW and
 COL).  Cells starting at (STARTROW,STARTCOL) are being shifted
 by (ROWINCR,COLINCR)."
   (let ((row (car rowcol))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 30642e8f2f7..b8a734784be 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -2101,7 +2101,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )."
       ;; If the shown files variable has extra directories, then
       ;; it is our responsibility to redraw them all
       ;; Luckily, the nature of inserting items into this list means
-      ;; that by reversing it, we can easilly go in the right order
+      ;; that by reversing it, we can easily go in the right order
       (let ((sf (cdr (reverse speedbar-shown-directories))))
         (setq speedbar-shown-directories
               (list (expand-file-name default-directory)))
diff --git a/lisp/subr.el b/lisp/subr.el
index 6d652f55b29..36937e8f370 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3792,7 +3792,7 @@ The properties used on SYMBOL are `composefunc', `sendfunc',
 ;;                            MIN-CHANGE
 ;;                            MIN-TIME])
 ;;
-;; This weirdeness is for optimization reasons: we want
+;; This weirdness is for optimization reasons: we want
 ;; `progress-reporter-update' to be as fast as possible, so
 ;; `(car reporter)' is better than `(aref reporter 0)'.
 ;;
diff --git a/lisp/term.el b/lisp/term.el
index dc5ae29ffd2..484bc36363e 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -40,10 +40,10 @@
 ;; overhead this has became so small that IMHO is surely outweighted by
 ;; the benefits you get but, as usual, YMMV
 ;;
-;; Important caveat, when deciding the cursor/'grey keys' keycodes I had to
+;; Important caveat, when deciding the cursor/'gray keys' keycodes I had to
 ;; make a choice: on my Linux box this choice allows me to run all the
 ;; ncurses applications without problems but make these keys
-;; uncomprehensible to all the cursesX programs.  Your mileage may vary so
+;; incomprehensible to all the cursesX programs.  Your mileage may vary so
 ;; you may consider changing the default 'emulation'.  Just search for this
 ;; piece of code and modify it as you like:
 ;;
@@ -910,7 +910,7 @@ is buffer-local."
   (setq term-raw-escape-map
         (copy-keymap (lookup-key (current-global-map) "\C-x")))
 
-  ;; Added nearly all the 'grey keys' -mm
+  ;; Added nearly all the 'gray keys' -mm
 
   (if (featurep 'xemacs)
       (define-key term-raw-map [button2] 'term-mouse-paste)
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index c13d22dde71..63c8840621c 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -281,11 +281,11 @@ have been processed."
 ;; The ordering of the colors is chosen for the user's convenience in
 ;; `list-colors-display', which displays the reverse of this list.
 ;; Roughly speaking, `list-colors-display' orders by (i) named shades
-;; of grey with hue 0.0, sorted by value (ii) named colors with
+;; of gray with hue 0.0, sorted by value (ii) named colors with
 ;; saturation 1.0, sorted by hue, (iii) named non-white colors with
 ;; saturation less than 1.0, sorted by hue, (iv) other named shades of
 ;; white, (v) numbered colors sorted by hue, and (vi) numbered shades
-;; of grey.
+;; of gray.
 
 (declare-function ns-list-colors "nsfns.m" (&optional frame))
 
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 10c1c19e0c4..b639af7cda0 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -492,7 +492,7 @@ unless the current buffer is a scratch buffer."
                                command-line-default-directory)))
          (file (find-file-noselect f))
          (bufwin1 (get-buffer-window file 'visible))
-         (bufwin2 (get-buffer-window "*scratch*" 'visibile)))
+         (bufwin2 (get-buffer-window "*scratch*" 'visible)))
     (cond
      (bufwin1
       (select-frame (window-frame bufwin1))
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 232d42efc94..0efabc2135a 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -3215,7 +3215,7 @@ X1, Y1.  An endpoint is a cons pair, (ENDPOINT-X . ENDPOINT-Y)."
 ;;         2|     |
 ;;         3+-----+
 ;;
-;;   We will then pop (0,0) and remove the left-most vertival line while
+;;   We will then pop (0,0) and remove the left-most vertical line while
 ;;   pushing the lower left corner (0,3) on the stack, and so on until
 ;;   the entire rectangle is vaporized.
 ;;
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index c9b1c44eb91..8df2e81c723 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1451,12 +1451,12 @@ Set this variable before loading BibTeX mode."
 (defvar bibtex-field-braces-opt nil
   "Optimized value of `bibtex-field-braces-alist'.
 Created by `bibtex-field-re-init'.
-It is a an alist with elements (FIELD . REGEXP).")
+It is an alist with elements (FIELD . REGEXP).")
 
 (defvar bibtex-field-strings-opt nil
   "Optimized value of `bibtex-field-strings-alist'.
 Created by `bibtex-field-re-init'.
-It is a an alist with elements (FIELD RULE1 RULE2 ...),
+It is an alist with elements (FIELD RULE1 RULE2 ...),
 where each RULE is (REGEXP . TO-STR).")
 
 (defvar bibtex-pop-previous-search-point nil
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 1127e6a5d20..40d682c3d93 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -185,7 +185,7 @@ not align (only setting space according to `conf-assignment-space')."
      (2 'font-lock-constant-face nil t))
     ;; section { ... } (do this last because some assign ...{...)
     ("^[ \t]*\\([^=:\n]+?\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
-  "Keywords to hilight in Conf mode.")
+  "Keywords to highlight in Conf mode.")
 
 (defvar conf-javaprop-font-lock-keywords
   '(;; var=val
@@ -197,7 +197,7 @@ not align (only setting space according to `conf-assignment-space')."
      (5 'font-lock-variable-name-face nil t)
      (6 'font-lock-constant-face nil t)
      (7 'font-lock-variable-name-face nil t)))
-  "Keywords to hilight in Conf Java Properties mode.")
+  "Keywords to highlight in Conf Java Properties mode.")
 
 (defvar conf-space-keywords-alist
   '(("\\`/etc/gpm/" . "key\\|name\\|foreground\\|background\\|border\\|head")
@@ -240,7 +240,7 @@ This variable is best set in the file local variables, or through
      (1 'font-lock-variable-name-face))
     ;; section { ... } (do this last because some assign ...{...)
     ("^[ \t]*\\([^:\n]+\\)[ \t\n]*{[^{}]*?$" 1 'font-lock-type-face prepend))
-  "Keywords to hilight in Conf Colon mode.")
+  "Keywords to highlight in Conf Colon mode.")
 
 (defvar conf-assignment-sign ?=
   "Sign used for assignments (char or string).")
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 52f6e5b4889..b8614b16f82 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -469,7 +469,7 @@ Point is moved to just past the fill prefix on the first line."
 
   (goto-char from)
   (if enable-multibyte-characters
-      ;; Delete unnecessay newlines surrounded by words.  The
+      ;; Delete unnecessary newlines surrounded by words.  The
       ;; character category `|' means that we can break a line at the
       ;; character.  And, char-table
       ;; `fill-nospace-between-words-table' tells how to concatenate
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index d54debcec4c..6b4c1a2940d 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -466,7 +466,7 @@ See also `flyspell-duplicate-distance'."
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-mode ...                                                */
 ;;*---------------------------------------------------------------------*/
-;;;###autoload(defvar flyspell-mode nil)
+;;;###autoload(defvar flyspell-mode nil "Non-nil if Flyspell mode is enabled.")
 ;;;###autoload
 (define-minor-mode flyspell-mode
   "Toggle on-the-fly spell checking (Flyspell mode).
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 704fad4fb3b..d0967d63740 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2399,7 +2399,8 @@ Optional REFRESH will unhighlighted then highlight, using block cursor
            (setq start (1+ start))))    ; On block non-refresh, inc start.
   (let ((modified (buffer-modified-p))  ; don't allow this fn to modify buffer
         (buffer-read-only nil)          ; Allow highlighting read-only buffers.
-        (text (buffer-substring-no-properties start end)) ; Save hilight region
+        (text (buffer-substring-no-properties start end))
+                                        ; Save highlight region.
         (inhibit-quit t)                ; inhibit interrupt processing here.
         (buffer-undo-list t))           ; don't clutter the undo list.
     (goto-char end)
@@ -3977,7 +3978,7 @@ Both should not be used to define a buffer-local dictionary."
 ; LocalWords:  Francais Nederlands charset autoloaded popup nonmenu regexp num
 ; LocalWords:  AMStex hspace includeonly nocite epsfig displaymath eqnarray reg
 ; LocalWords:  minipage modeline pers dict unhighlight buf grep sync prev inc
-; LocalWords:  fn hilight oldot NB AIX msg init read's bufs pt cmd Quinlan eg
+; LocalWords:  fn oldot NB AIX msg init read's bufs pt cmd Quinlan eg
 ; LocalWords:  uuencoded unidiff sc nn VM SGML eval IspellPersDict unsplitable
 ; LocalWords:  lns XEmacs HTML casechars Multibyte
 
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index b4e15fd2776..f4f10f1d1e0 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -570,13 +570,13 @@ Useful for large TOC's."
    nil t)
   (beginning-of-line))
 (defun reftex-select-next-heading (&optional arg)
-  "Move to next table of contentes line."
+  "Move to next table of contents line."
   (interactive "p")
   (end-of-line)
   (re-search-forward "^ " nil t arg)
   (beginning-of-line))
 (defun reftex-select-previous-heading (&optional arg)
-  "Move to previous table of contentes line."
+  "Move to previous table of contents line."
   (interactive "p")
   (re-search-backward "^ " nil t arg))
 (defun reftex-select-quit ()
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 81e92487eb0..64dffe78d50 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -2716,7 +2716,7 @@ general but you do not like the details."
        (rst-define-level-faces)))
 
 ;; Faces for displaying items on several levels; these definitions define
-;; different shades of grey where the lightest one (i.e. least contrasting) is
+;; different shades of gray where the lightest one (i.e. least contrasting) is
 ;; used for level 1
 (defcustom rst-level-face-max 6
   "Maximum depth of levels for which section title faces are defined."
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 08a45b6b302..65f6d98ef79 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -173,19 +173,19 @@
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize'              |Recognize all tables in the       |
 ;; |`table-unrecognize'            |current buffer and                |
-;; |                               |activate/inactivate them.         |
+;; |                               |activate/deactivate them.         |
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize-region'       |Recognize all the cells in a      |
-;; |`table-unrecognize-region'     |region and activate/inactivate    |
+;; |`table-unrecognize-region'     |region and activate/deactivate    |
 ;; |                               |them.                             |
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize-table'        |Recognize all the cells in a      |
 ;; |`table-unrecognize-table'      |single table and                  |
-;; |                               |activate/inactivate them.         |
+;; |                               |activate/deactivate them.         |
 ;; +-------------------------------+----------------------------------+
 ;; |`table-recognize-cell'         |Recognize a cell.  Find a cell    |
 ;; |`table-unrecognize-cell'       |which contains the current point  |
-;; |                               |and activate/inactivate that cell.|
+;; |                               |and activate/deactivate that cell.|
 ;; +-------------------------------+----------------------------------+
 ;; |`table-forward-cell'           |Move point to the next Nth cell in|
 ;; |                               |a table.                          |
@@ -3856,7 +3856,7 @@ companion command to `table-capture' this way.
 ;;;###autoload
 (defun table-release ()
   "Convert a table into plain text by removing the frame from a table.
-Remove the frame from a table and inactivate the table.  This command
+Remove the frame from a table and deactivate the table.  This command
 converts a table into plain text without frames.  It is a companion to
 `table-capture' which does the opposite process."
   (interactive)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index c4892ce572c..34bd24fba3a 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2254,7 +2254,7 @@ Only applies the FSPEC to the args part of FORMAT."
     ;; Remove those commands whose input was considered stable for
     ;; some other command (typically if (t . "%.pdf") is inactive
     ;; then we're using pdflatex and the fact that the dvi file
-    ;; is inexistent doesn't matter).
+    ;; is nonexistent doesn't matter).
     (let ((tmp nil))
       (dolist (cmd cmds)
         (unless (member (nth 1 cmd) unchanged-in)
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 094885bb0d0..a337d6f9f40 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -518,7 +518,7 @@ if large.  You can use `Info-split' to do this manually."
 
 ;;; Handle paragraph filling
 
-;; Keep as concatinated lists for ease of maintenance
+;; Keep as concatenated lists for ease of maintenance
 
 (defvar texinfo-no-refill-regexp
   (concat
@@ -4238,7 +4238,7 @@ the @ifeq command."
 Must be used only with -batch, and kills Emacs on completion.
 Each file will be processed even if an error occurred previously.
 For example, invoke
-  \"emacs -batch -funcall batch-texinfo-format $docs/ ~/*.texinfo\"."
+  \"emacs -batch -l texinfmt -f batch-texinfo-format $docs/ ~/*.texinfo\"."
   (if (not noninteractive)
       (error "batch-texinfo-format may only be used -batch"))
   (let ((version-control t)
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index be1a12b499b..2e651484008 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -182,7 +182,7 @@ LEFT and RIGHT are the elements to compare."
                 (equal (car x) (car y)))
       (setq x (cdr x))
       (setq y (cdr y)))
-    ;; Try to make a comparision that is useful for presentation (this
+    ;; Try to make a comparison that is useful for presentation (this
     ;; could be made nicer perhaps):
     (let ((cx (car x))
           (cy (car y)))
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 47f006eebda..48d2caf35f4 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1977,7 +1977,7 @@
 
         * lisp/url-gw.el (url-gw-inhibit-code-conversion): Remove.
         (url-open-stream): Bind coding-system-for{read,write} when setting
-        up the connexion.  Don't call url-gw-inhibit-code-conversion.
+        up the connection.  Don't call url-gw-inhibit-code-conversion.
 
 2001-05-24  William M. Perry  <wmperry@gnu.org>
 
@@ -2516,4 +2516,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index 063eb414579..3444b230e8d 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -257,7 +257,7 @@ The tree will be printed no closer than column COLUMN."
 
 (defun cvs-tree-merge (tree1 tree2)
   "Merge tags trees TREE1 and TREE2 into one.
-BEWARE:  because of stability issues, this is not a symetric operation."
+BEWARE:  because of stability issues, this is not a symmetric operation."
   (assert (and (listp tree1) (listp tree2)))
   (cond
    ((null tree1) tree2)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 9f0fa584b0d..8f4b59f9e53 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -146,7 +146,7 @@ when editing big diffs)."
                ;; but not all since they may hide useful M-<foo> global
                ;; bindings when editing.
                (set-keymap-parent map diff-mode-shared-map)
-               (dolist (key '("A" "r" "R" "g" "q" "W"))
+               (dolist (key '("A" "r" "R" "g" "q" "W" "z"))
                  (define-key map key nil))
                map))
     ;; From compilation-minor-mode.
@@ -815,9 +815,11 @@ PREFIX is only used internally: don't use it."
             (diff-find-file-name old noprompt (match-string 1)))
        ;; if all else fails, ask the user
        (unless noprompt
-         (let ((file (read-file-name (format "Use file %s: "
-                                             (or (first fs) ""))
-                                     nil (first fs) t (first fs))))
+         (let ((file (expand-file-name (or (first fs) ""))))
+           (setq file
+                 (read-file-name (format "Use file %s: " file)
+                                 (file-name-directory file) file t
+                                 (file-name-nondirectory file)))
            (set (make-local-variable 'diff-remembered-files-alist)
                 (cons (cons fs file) diff-remembered-files-alist))
            file))))))
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index ddd9371b060..ee7837b29a3 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -50,7 +50,7 @@ For help on a specific command:  Click Button 2 over it; or
 (defconst ediff-long-help-message-compare3
   "
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      |    #c -ignore case        |
@@ -64,7 +64,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-compare2
   "
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      |    #c -ignore case        |
@@ -78,7 +78,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-narrow2
   "
 p,DEL -previous diff |     | -vert/horiz split   |a/b -copy A/B's region to B/A
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      |    #c -ignore case        |  % -narrow/widen buffs
@@ -92,7 +92,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-word-mode
   "
 p,DEL -previous diff |     | -vert/horiz split   | xy -copy buf X's region to Y
-n,SPC -next diff     |     h -hilighting         | rx -restore buf X's old diff
+n,SPC -next diff     |     h -highlighting       | rx -restore buf X's old diff
     j -jump to diff  |                           |
    gx -goto X's point|    % -narrow/widen buffs  |  ! -recompute diffs
   C-l -recenter      |    #c -ignore case        |
@@ -106,7 +106,7 @@ Normally, not a user option.  See `ediff-help-message' for details.")
 (defconst ediff-long-help-message-merge
   "
 p,DEL -previous diff |     | -vert/horiz split   |  x -copy buf X's region to C
-n,SPC -next diff     |     h -hilighting         |  r -restore buf C's old diff
+n,SPC -next diff     |     h -highlighting       |  r -restore buf C's old diff
     j -jump to diff  |     @ -auto-refinement    |  * -refine current region
    gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
   C-l -recenter      | #f/#h -focus/hide regions |  + -combine diff regions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 5d7d2451422..b1c6e367ef7 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -2635,7 +2635,7 @@ delete this buffer in another session as well."
     ))
 
 ;; Kill the variant buffer, according to user directives (ask, kill
-;; unconditionaly, keep)
+;; unconditionally, keep)
 ;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor
 (defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants)
   ;; if this is indirect buffer, kill it and substitute with direct buf
@@ -3811,7 +3811,7 @@ Ediff Control Panel to restore highlighting."
          ;; later, and nconc above will break it. Either this or use slow
          ;; append instead of nconc
          (selected-buffers (ediff-get-selected-buffers))
-         (prefered-buffer (car all-buffers))
+         (preferred-buffer (car all-buffers))
          visible-dired-buffers
          (excl-buff-name-list
           (mapcar
@@ -3841,7 +3841,7 @@ Ediff Control Panel to restore highlighting."
              (cond ((member (buffer-name x) excl-buff-name-list) nil)
                    ((memq x selected-buffers) x)
                    ((not (ediff-get-visible-buffer-window x)) nil)
-                   ((eq x prefered-buffer) x)
+                   ((eq x preferred-buffer) x)
                    ;; if prev selected buffer is dired, look only at
                    ;; dired.
                    ((eq use-dired-major-mode 'yes)
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index f6340392dc2..477cd472289 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -493,7 +493,8 @@ It is expected to call the function.")
     (define-key m [examine]
       `(menu-item ,(purecopy "Examine Directory") cvs-examine
                   :help ,(purecopy "Examine the current state of a workarea")))
-    (fset 'cvs-global-menu m)))
+    (fset 'cvs-global-menu m))
+  "Global menu used by PCL-CVS.")
 
 
 ;; cvs-1.10 and above can take file arguments in other directories
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index f6b6a56f31c..c5c0ce73b3a 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -124,7 +124,8 @@ Use the current Bzr root directory as the ROOT argument to
 ;; Used in the autoloaded vc-bzr-registered; see below.
 ;;;###autoload
 (defconst vc-bzr-admin-checkout-format-file
-  (concat vc-bzr-admin-dirname "/checkout/format"))
+  (concat vc-bzr-admin-dirname "/checkout/format")
+  "Name of the format file in a .bzr directory.")
 (defconst vc-bzr-admin-dirstate
   (concat vc-bzr-admin-dirname "/checkout/dirstate"))
 (defconst vc-bzr-admin-branch-format-file
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 6a76359b5f7..7d6c3caf7ff 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -189,7 +189,8 @@ See also variable `vc-cvs-sticky-date-format-string'."
 ;;; State-querying functions
 ;;;
 
-;;;###autoload (defun vc-cvs-registered (f)
+;;;###autoload(defun vc-cvs-registered (f)
+;;;###autoload   "Return non-nil if file F is registered with CVS."
 ;;;###autoload   (when (file-readable-p (expand-file-name
 ;;;###autoload                    "CVS/Entries" (file-name-directory f)))
 ;;;###autoload       (load "vc-cvs")
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 0fc7ba96fb7..f49ad09b5d7 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -59,9 +59,10 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (setq vc-handled-backends (delq 'Mtn vc-handled-backends)))
 
 ;;;###autoload
-(defconst vc-mtn-admin-dir "_MTN")
+(defconst vc-mtn-admin-dir "_MTN" "Name of the monotone directory.")
 ;;;###autoload
-(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format"))
+(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format")
+  "Name of the monotone directory's format file.")
 
 ;;;###autoload (defun vc-mtn-registered (file)
 ;;;###autoload   (if (vc-find-root file vc-mtn-admin-format)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index ed2bac17217..eea1a992094 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -181,7 +181,7 @@
 ;; * working-revision (file)
 ;;
 ;;   Return the working revision of FILE.  This is the revision fetched
-;;   by the last checkout or upate, not necessarily the same thing as the
+;;   by the last checkout or update, not necessarily the same thing as the
 ;;   head or tip revision.  Should return "0" for a file added but not yet
 ;;   committed.
 ;;
diff --git a/lisp/version.el b/lisp/version.el
index d28a3004585..aa4e22469c5 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,4 +1,4 @@
-;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
+;;; version.el --- record version number of Emacs
 
 ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2011
 ;;   Free Software Foundation, Inc.
@@ -40,7 +40,8 @@ This variable first existed in version 19.23.")
 (defconst emacs-build-time (current-time) "\
 Time at which Emacs was dumped out.")
 
-(defconst emacs-build-system (system-name))
+(defconst emacs-build-system (system-name) "\
+Name of the system on which Emacs was built.")
 
 (defun emacs-version (&optional here) "\
 Return string describing the version of Emacs that is running.
@@ -83,8 +84,9 @@ to the system configuration; look at `system-configuration' instead."
     (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
                       " $\n")))
 
-;;Local variables:
-;;version-control: never
-;;End:
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; End:
 
 ;;; version.el ends here
diff --git a/lisp/view.el b/lisp/view.el
index 6955fbdfad8..a5349445964 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -311,10 +311,9 @@ file: Users may suspend viewing in order to modify the buffer.
 Exiting View mode will then discard the user's edits.  Setting
 EXIT-ACTION to `kill-buffer-if-not-modified' avoids this."
   (interactive "bView buffer: ")
-  (if (with-current-buffer buffer
-        (and (eq (get major-mode 'mode-class)
-                 'special)
-             (null buffer-file-name)))
+  (if (eq (with-current-buffer buffer
+            (get major-mode 'mode-class))
+          'special)
       (progn
         (switch-to-buffer buffer)
         (message "Not using View mode because the major mode is special"))
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 20361d32450..1f54b8577c3 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -384,7 +384,7 @@ bit output with no translation."
 ;;   ;; If Unicode Windows charset is not defined, use ansi fonts.
 ;;   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
 
-;; Prefered names
+;; Preferred names
 (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950)
 (w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936)
 (w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)
diff --git a/lisp/wdired.el b/lisp/wdired.el
index cc99bd40628..b9c07d15ae8 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -32,7 +32,7 @@
 ;; the files in a "dired" buffer? Now you can do this.  All the power
 ;; of Emacs commands are available to renaming files!
 ;;
-;; This package provides a function that makes the filenames of a a
+;; This package provides a function that makes the filenames of a
 ;; dired buffer editable, by changing the buffer mode (which inhibits
 ;; all of the commands of dired mode). Here you can edit the names of
 ;; one or more files and directories, and when you press C-c C-c, the
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 53a35b4f0b3..57f51e21fbb 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -623,8 +623,12 @@ and `newline'."
 (defface whitespace-newline
   '((((class color) (background dark))
      (:foreground "darkgray" :bold nil))
-    (((class color) (background light))
+    (((class color) (min-colors 88) (background light))
      (:foreground "lightgray" :bold nil))
+    ;; Displays with 16 colors use lightgray as background, so using a
+    ;; lightgray foreground makes the newline mark invisible.
+    (((class color) (background light))
+     (:foreground "brown" :bold nil))
     (t (:underline t :bold nil)))
   "Face used to visualize NEWLINE char mapping.
 
diff --git a/lisp/window.el b/lisp/window.el
index 2885c3a5c70..69276a839bd 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -170,7 +170,7 @@ Applications should never rebind this variable.  To resize a
 window to a height less than the one specified here, an
 application should instead call `window-resize' with a non-nil
 IGNORE argument.  In order to have `split-window' make a window
-shorter, explictly specify the SIZE argument of that function."
+shorter, explicitly specify the SIZE argument of that function."
   :type 'integer
   :version "24.1"
   :group 'windows)
@@ -190,7 +190,7 @@ Applications should never rebind this variable.  To resize a
 window to a width less than the one specified here, an
 application should instead call `window-resize' with a non-nil
 IGNORE argument.  In order to have `split-window' make a window
-narrower, explictly specify the SIZE argument of that function."
+narrower, explicitly specify the SIZE argument of that function."
   :type 'integer
   :version "24.1"
   :group 'windows)
@@ -4515,6 +4515,12 @@ Return WINDOW."
       (set-window-dedicated-p window dedicated))
     (window--display-buffer-1 window)))
 
+;; FIXME: Not implemented.
+;; FIXME: By the way, there could be more levels of dedication:
+;; - `barely' dedicated doesn't prevent reuse of the window, only records that
+;;   the window hasn't been used for something else yet.
+;; - `softly' dedicated only allows reuse when asked explicitly.
+;; - `strongly' never allows reuse.
 (defvar display-buffer-mark-dedicated nil
   "If non-nil, `display-buffer' marks the windows it creates as dedicated.
 The actual non-nil value of this variable will be copied to the
@@ -4522,7 +4528,7 @@ The actual non-nil value of this variable will be copied to the
 
 (defun window-normalize-buffer-to-display (buffer-or-name)
   "Normalize BUFFER-OR-NAME argument for buffer display functions.
-If BUFFER-OR-NAME is nil, return the curent buffer.  Else, if a
+If BUFFER-OR-NAME is nil, return the current buffer.  Else, if a
 buffer specified by BUFFER-OR-NAME exists, return that buffer.
 If no such buffer exists, create a buffer with the name
 BUFFER-OR-NAME and return that buffer."
@@ -4786,9 +4792,10 @@ terminal if either of those variables is non-nil."
       (window--display-buffer-1 window))))
 
 (defun display-buffer--special-action (buffer)
-  "Try to display BUFFER using `special-display-function'.
-Call `special-display-p' on BUFFER's name, and if that returns
-non-nil, call `special-display-function' on BUFFER."
+  "Return special display action for BUFFER, if any.
+If `special-display-p' returns non-nil for BUFFER, return an
+appropriate display action involving `special-display-function'.
+See `display-buffer' for the format of display actions."
   (and special-display-function
        ;; `special-display-p' returns either t or a list of frame
        ;; parameters to pass to `special-display-function'.
@@ -4944,10 +4951,7 @@ the buffer.
 
 NORECORD, if non-nil means do not put this buffer at the front of
 the list of recently selected ones."
-  (pop-to-buffer buffer
-                 '(display-buffer-same-window
-                   (inhibit-same-window . nil))
-                 norecord))
+  (pop-to-buffer buffer display-buffer--same-window-action norecord))
 
 (defun read-buffer-to-switch (prompt)
   "Read the name of a buffer to switch to, prompting with PROMPT.
@@ -5012,21 +5016,23 @@ Return the buffer switched to."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer: ") nil 'force-same-window))
   (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
-    (if (null force-same-window)
-        (pop-to-buffer buffer display-buffer--same-window-action norecord)
-      (cond
-       ;; Don't call set-window-buffer if it's not needed since it
-       ;; might signal an error (e.g. if the window is dedicated).
-       ((eq buffer (window-buffer)))
-       ((window-minibuffer-p)
-        (error "Cannot switch buffers in minibuffer window"))
-       ((eq (window-dedicated-p) t)
-        (error "Cannot switch buffers in a dedicated window"))
-       (t (set-window-buffer nil buffer)))
-
-      (unless norecord
-        (select-window (selected-window)))
-      (set-buffer buffer))))
+    (cond
+     ;; Don't call set-window-buffer if it's not needed since it
+     ;; might signal an error (e.g. if the window is dedicated).
+     ((eq buffer (window-buffer)))
+     ((window-minibuffer-p)
+      (if force-same-window
+          (error "Cannot switch buffers in minibuffer window")
+        (pop-to-buffer buffer norecord)))
+     ((eq (window-dedicated-p) t)
+      (if force-same-window
+          (error "Cannot switch buffers in a dedicated window")
+        (pop-to-buffer buffer norecord)))
+     (t (set-window-buffer nil buffer)))
+
+    (unless norecord
+      (select-window (selected-window)))
+    (set-buffer buffer)))
 
 (defun switch-to-buffer-other-window (buffer-or-name &optional norecord)
   "Select the buffer specified by BUFFER-OR-NAME in another window.
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 7e3538aec04..b83517ad1f9 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1156,9 +1156,9 @@ lw_get_widget_value_for_widget (widget_instance *instance, Widget w)
 /* To forbid recursive calls */
 static Boolean lwlib_updating;
 
-/* This function can be used as a an XtCallback for the widgets that get
-  modified to update other instances of the widgets.  Closure should be the
-  widget_instance. */
+/* This function can be used as an XtCallback for the widgets that get
+   modified to update other instances of the widgets.  Closure should be the
+   widget_instance. */
 void
 lw_internal_update_other_instances (Widget widget,
                                     XtPointer closure,
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index ce00e82cdd4..6cbeadc0bba 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -59,7 +59,7 @@
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
 /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
-/^#undef VERSION/s/^.*$/#define VERSION "24.0.91"/
+/^#undef VERSION/s/^.*$/#define VERSION "24.0.92"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
 /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index ca5b0671268..61a8a28f3a9 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
@@ -553,7 +553,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
         <key>CFBundleExecutable</key>
         <string>Emacs</string>
         <key>CFBundleGetInfoString</key>
-        <string>Emacs 24.0.91 Copyright (C) 2011 Free Software Foundation, Inc.</string>
+        <string>Emacs 24.0.92 Copyright (C) 2011 Free Software Foundation, Inc.</string>
         <key>CFBundleIconFile</key>
         <string>Emacs.icns</string>
         <key>CFBundleIdentifier</key>
@@ -566,7 +566,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
         <string>APPL</string>
         <!-- This should be the emacs version number. -->
         <key>CFBundleShortVersionString</key>
-        <string>24.0.91</string>
+        <string>24.0.92</string>
         <key>CFBundleSignature</key>
         <string>EMAx</string>
         <!-- This SHOULD be a build number. -->
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
index 21e4dd977ca..438a6103f5e 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "Version 24.0.91";
-CFBundleGetInfoString = "Emacs version 24.0.91, NS Windowing";
+CFBundleShortVersionString = "Version 24.0.92";
+CFBundleGetInfoString = "Emacs version 24.0.92, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index 5ccb7b38a5b..1b8926e9ef6 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Version=24.0.91
+Version=24.0.92
 Categories=GNUstep
 Name=Emacs
 Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
index 7212ef41f41..9747ed25a2a 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -2,7 +2,7 @@
     ApplicationDescription = "GNU Emacs for GNUstep / OS X";
     ApplicationIcon = emacs.tiff;
     ApplicationName = Emacs;
-    ApplicationRelease = "24.0.91";
+    ApplicationRelease = "24.0.92";
     Authors = (
         "Adrian Robert (GNUstep)",
         "Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
     );
     Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 24.0.91, NS Windowing";
+    FullVersionID = "Emacs 24.0.92, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8de94033196..859123c1a86 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,23 @@
+2011-11-27  Fabrice Popineau  <fabrice.popineau@supelec.fr>  (tiny change)
+
+        * inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs.
+        (UINT64_MAX) [_WIN64]: Fix definition.
+        (uintmax_t, intmax_t): Fix definitions.
+
+        * inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide
+        correct definitions.
+
+        * config.nt (HAVE_DECL_STRTOLL): Define.
+        (va_copy) [_WIN64]: Provide a better definition.
+
+2011-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * configure.bat: Fix typos.
+
+2011-11-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * INSTALL: Elaborate on debugging fatal errors.
+
 2011-11-15  Eli Zaretskii  <eliz@gnu.org>
 
         * README.W32: Update the GTK Windows download URL for libpng.
@@ -1784,7 +1804,7 @@
 
 1998-12-08  Geoff Voelker  <voelker@cs.washington.edu>
 
-        * makefile.nt: Do string comparision of _NMAKE_VER.
+        * makefile.nt: Do string comparison of _NMAKE_VER.
 
 1998-12-02  Geoff Voelker  <voelker@cs.washington.edu>
 
diff --git a/nt/INSTALL b/nt/INSTALL
index bb621dceb6b..9947cd86a34 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -599,6 +599,30 @@
   the debugger, and you will be able to debug the cause of the fatal
   error.
 
+  The single most important thing to find out when Emacs aborts or
+  crashes is where did that happen in the Emacs code.  This is called
+  "backtrace".
+
+  Emacs on Windows uses more than one thread.  When Emacs aborts due
+  to a fatal error, the current thread may not be the application
+  thread running Emacs code.  Therefore, to produce a meaningful
+  backtrace from a debugger, you need to instruct it to show the
+  backtrace for every thread.  With GDB, you do it like this:
+
+   (gdb) thread apply all backtrace
+
+  To run Emacs under a debugger to begin with, simply start it from
+  the debugger.  With GDB, chdir to the `src' directory (if you have
+  the source tree) or to a directory with the `.gdbinit' file (if you
+  don't have the source tree), and type these commands:
+
+    C:\whatever\src> gdb x:\path\to\emacs.exe
+    (gdb) run <ARGUMENTS TO EMACS>
+
+  Thereafter, use Emacs as usual; you can minimize the debugger
+  window, if you like.  The debugger will take control if and when
+  Emacs crashes.
+
   Emacs functions implemented in C use a naming convention that reflects
   their names in lisp.  The names of the C routines are the lisp names
   prefixed with 'F', and with dashes converted to underscores.  For
diff --git a/nt/config.nt b/nt/config.nt
index 3a06a9f5b7a..c77faccb3b4 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -303,6 +303,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
+/* Define to 1 if you have the declaration of `strtoll', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRTOLL 1
+
 /* Define to 1 if you have the declaration of `strtoull', and to 0 if you
    don't. */
 #define HAVE_DECL_STRTOULL 1
@@ -324,7 +328,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PACKAGE "emacs"
 
 /* Version number of package */
-#define VERSION "24.0.91"
+#define VERSION "24.0.92"
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
@@ -353,8 +357,8 @@ typedef unsigned short mode_t;
 /* A va_copy replacement for MSVC.  */
 #ifdef _MSC_VER
 # ifdef _WIN64
-#  ifndef va_copy
-#   error "va_copy is needed, but not defined!"
+#  ifndef va_copy               /* Need to be checked (?) */
+#   define va_copy(d,s) ((d) = (s))
 #  endif
 # else  /* not _WIN64 */
 #  define va_copy(d,s) ((d) = (s))
diff --git a/nt/configure.bat b/nt/configure.bat
index 45d966fc34d..c503900274e 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -155,7 +155,7 @@ echo.   --without-jpeg          do not use JPEG library even if it is installed
 echo.   --without-gif           do not use GIF library even if it is installed

 echo.   --without-tiff          do not use TIFF library even if it is installed

 echo.   --without-xpm           do not use XPM library even if it is installed

-echo.   --without-gnutls        do not use GNUTLS library even if it is installed

+echo.   --without-gnutls        do not use GnuTLS library even if it is installed

 echo.   --with-svg              use the RSVG library (experimental)

 echo.   --distfiles             path to files for make dist, e.g. libXpm.dll

 if "%use_extensions%" == "0" goto end

@@ -563,7 +563,7 @@ set HAVE_GNUTLS=
 goto :tlsDone

 

 :haveTls

-echo ...GNUTLS header available, building with GNUTLS support.

+echo ...GnuTLS header available, building with GnuTLS support.

 set HAVE_GNUTLS=1

 

 :tlsDone

diff --git a/nt/emacs.rc b/nt/emacs.rc
index 9f7fc6f14aa..479a228bb69 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,0,91,0
- PRODUCTVERSION 24,0,91,0
+ FILEVERSION 24,0,92,0
+ PRODUCTVERSION 24,0,92,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -25,12 +25,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Free Software Foundation\0"
             VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
-            VALUE "FileVersion", "24, 0, 91, 0\0"
+            VALUE "FileVersion", "24, 0, 92, 0\0"
             VALUE "InternalName", "Emacs\0"
             VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
             VALUE "OriginalFilename", "emacs.exe"
             VALUE "ProductName", "Emacs\0"
-            VALUE "ProductVersion", "24, 0, 91, 0\0"
+            VALUE "ProductVersion", "24, 0, 92, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 6de1daeb959..b653e1fb952 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,0,91,0
- PRODUCTVERSION 24,0,91,0
+ FILEVERSION 24,0,92,0
+ PRODUCTVERSION 24,0,92,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Free Software Foundation\0"
             VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
-            VALUE "FileVersion", "24, 0, 91, 0\0"
+            VALUE "FileVersion", "24, 0, 92, 0\0"
             VALUE "InternalName", "EmacsClient\0"
             VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
             VALUE "OriginalFilename", "emacsclientw.exe"
             VALUE "ProductName", "EmacsClient\0"
-            VALUE "ProductVersion", "24, 0, 91, 0\0"
+            VALUE "ProductVersion", "24, 0, 92, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/nt/inc/inttypes.h b/nt/inc/inttypes.h
index 3e8b55ab98e..ba26cc1115d 100644
--- a/nt/inc/inttypes.h
+++ b/nt/inc/inttypes.h
@@ -24,7 +24,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include_next <inttypes.h>
 #else  /* !__MINGW32__ */
 #include "stdint.h"
+#ifdef _WIN64
 #define strtoumax _strtoui64
+#define strtoimax _strtoi64
+#else
+#define strtoumax strtoul
+#define strtoimax strtol
+#endif
 #endif  /* !__MINGW32__ */
 
 #endif
diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h
index fa2e06f3da9..4eda1c5a688 100644
--- a/nt/inc/stdint.h
+++ b/nt/inc/stdint.h
@@ -29,7 +29,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef _WIN64
 typedef __int64 intptr_t;
-#define UINT64_MAX 18446744073709551615
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+#define UINT64_MAX (18446744073709551615i64)
 #define UINT64_MIN 0
 /* "i64" is the non-standard suffix used by MSVC for 64-bit constants.  */
 #define INT64_MAX 9223372036854775807i64
@@ -39,6 +41,8 @@ typedef __int64 intptr_t;
 #define UINTMAX_MIN UINT64_MIN
 #define INTMAX_MAX INT64_MAX
 #define INTMAX_MIN INT64_MIN
+#define uintmax_t unsigned __int64
+#define intmax_t __int64
 #else
 typedef int intptr_t;
 typedef unsigned int uint32_t;
@@ -51,10 +55,10 @@ typedef unsigned int uint32_t;
 #define UINTMAX_MIN UINT32_MIN
 #define INTMAX_MAX INT32_MAX
 #define INTMAX_MIN INT32_MIN
+#define uintmax_t unsigned long
+#define intmax_t long
 #endif
 
-#define uintmax_t unsigned __int64
-#define intmax_t __int64
 #define PTRDIFF_MAX INTPTR_MAX
 
 #endif  /* !__GNUC__ */
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 194f0759bbf..a474e34eaa5 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -22,7 +22,7 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out

 #        (and remove or replace this comment).

 

-VERSION         = 24.0.91

+VERSION         = 24.0.92

 

 TMP_DIST_DIR    = emacs-$(VERSION)

 

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index fef8a3b6b25..2f1c85aa1a2 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -78,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  *                      3)      The application has enabled asynchronous event
  *                              queuing mode.  In this mode all foreign events
- *                              will be queued up untill XMenuActivate
+ *                              will be queued up until XMenuActivate
  *                              terminates; at which time they will be
  *                              returned to the X event queue.  As long as
  *                              AEQ mode is enabled any asynchronous event
diff --git a/src/.gdbinit b/src/.gdbinit
index 80415abe40d..2051475bea0 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -311,9 +311,8 @@ define prowx
   printf "y=%d x=%d pwid=%d", $row->y, $row->x, $row->pixel_width
   printf " a+d=%d+%d=%d", $row->ascent, $row->height-$row->ascent, $row->height
   printf " phys=%d+%d=%d", $row->phys_ascent, $row->phys_height-$row->phys_ascent, $row->phys_height
-  printf " vis=%d", $row->visible_height
-  printf "  L=%d T=%d R=%d", $row->used[0], $row->used[1], $row->used[2]
-  printf "\n"
+  printf " vis=%d\n", $row->visible_height
+  printf "used=(LMargin=%d,Text=%d,RMargin=%d) Hash=%d\n", $row->used[0], $row->used[1], $row->used[2], $row->hash
   printf "start=%d end=%d", $row->start.pos.charpos, $row->end.pos.charpos
   if ($row->enabled_p)
     printf " ENA"
diff --git a/src/ChangeLog b/src/ChangeLog
index a0f83560603..6a13bd87264 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,160 @@
+2011-12-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * widget.c (update_wm_hints): Return if wmshell is null.
+        (widget_update_wm_size_hints): New function.
+
+        * widget.h (widget_update_wm_size_hints): Declare.
+
+        * xterm.c (x_wm_set_size_hint): If USE_X_TOOLKIT, call
+        widget_update_wm_size_hints (Bug#10104).
+
+2011-12-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_invisible_prop): If the invisible text ends just
+        before a newline, prepare the bidi iterator for consuming the
+        newline, and keep the current paragraph direction.  (Bug#10183)
+        (redisplay_window): Don't let `margin' become negative.  (Bug#10192)
+
+2011-12-02  Juri Linkov  <juri@jurta.org>
+
+        * search.c (Fword_search_regexp): New Lisp function created from
+        `wordify'.  Change type of arg `lax' from `int' to `Lisp_Object'.
+        (Fword_search_backward, Fword_search_forward)
+        (Fword_search_backward_lax, Fword_search_forward_lax):
+        Use `Fword_search_regexp' instead of `wordify'.  Doc fix.
+        (syms_of_search): Define `Sword_search_regexp'.  (Bug#10145)
+
+2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents): Move after-change-function call
+        to before the "handled:" label, since all "goto handled" appear in
+        cases where the *-change-functions have already been properly called
+        (bug#10117).
+
+2011-12-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * keyboard.c (interrupt_signal): Don't call kill-emacs when
+        waiting for input.  (Bug#10169)
+
+2011-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix): Remove the assertion that
+        verifies glyph row's hash code--we have just reallocated the
+        glyphs, so their contents can be complete garbage.  (Bug#10164)
+
+2011-11-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check.
+
+2011-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
+        attributes are tested _before_ calling verify_row_hash, to protect
+        against GCC re-ordering of the tests.  (Bug#10164)
+
+2011-11-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (struct x_output): net_wm_state_hidden_seen is new.
+
+        * xterm.c (handle_one_xevent): Only set async_visible and friends
+        if net_wm_state_hidden_seen is non-zero (Bug#10002)
+        (get_current_wm_state):  Set net_wm_state_hidden_seen to 1 if
+        _NET_WM_STATE_HIDDEN is in NET_WM_STATE.
+
+2011-11-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove GCPRO-related macros that exist only to avoid shadowing locals.
+        * lisp.h (GCPRO1_VAR, GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR)
+        (GCPRO6_VAR, UNGCPRO_VAR): Remove.  See
+        <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+        All uses changed to use GCPRO1 etc.
+        (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6, UNGCPRO):
+        Revert to old implementation (i.e., before 2011-03-11).
+
+2011-11-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispnew.c (scrolling_window): Truncate overlaps in copy destination
+        of scroll runs so as to avoid assigning disabled bogus rows and
+        unnecessary graphics copy operations.
+
+2011-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define.
+        (snprintf) [_MSC_VER]: Redirect to _snprintf.
+        (strtoll) [_MSC_VER]: Redirect to _strtoi64.
+        (malloc, free, realloc, calloc): Redirect to e_* only when
+        compiling Emacs.
+
+        * lisp.h (GCTYPEBITS): Move before first use.
+        (ALIGN_GCTYPEBITS) [_MSC_VER]: Define.
+        (DECL_ALIGN) [_MSC_VER]: Use it, as MSVC doesn't like bit ops in
+        this macro definition.
+
+        * s/ms-w32.h (tzname): Redirect to _tzname for all values of
+        _MSC_VER.
+
+2011-11-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_create_frame_widgets): Call
+        gtk_window_set_has_resize_grip (FALSE) if that function is
+        present with Gtk+ 2.0.
+
+2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Finsert_file_contents): Undo previous change; see
+        <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+
+2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Rename locals to avoid shadowing.
+        * fileio.c (Finsert_file_contents):
+        Rename inner 'gcpro1' to 'inner_gcpro1' to avoid shadowing.
+        * process.c (wait_reading_process_output):
+        Rename inner 'proc' to 'p' to avoid shadowing.
+        Indent for consistency with usual Emacs style.
+
+2011-11-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_window): If cursor row is not fully visible
+        after recentering, and scroll-conservatively is set to a large
+        number, scroll window by a few more lines to make the cursor fully
+        visible and out of scroll-margin.  (Bug#10105)
+        (start_display): Don't move to the next line if the display should
+        start at a newline that is part of a display vector or an overlay
+        string.  (Bug#10119)
+
+2011-11-24  Juri Linkov  <juri@jurta.org>
+
+        * image.c (imagemagick_load_image): Move `MagickSetResolution' down
+        after the `MagickPingImage' call.  (Bug#10112)
+
+2011-11-23  Chong Yidong  <cyd@gnu.org>
+
+        * window.c (Fcoordinates_in_window_p): Accept only live windows.
+
+2011-11-23  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffer.c (Fkill_buffer): Run replace_buffer_in_windows before
+        making another buffer current.  (Bug#10114)
+
+2011-11-23  Glenn Morris  <rgm@gnu.org>
+
+        * font.c (font_find_for_lface) [HAVE_NS]: Ignore case.  (Bug#2526)
+
+2011-11-23  Chong Yidong  <cyd@gnu.org>
+
+        * xdisp.c (compute_stop_pos): Check validity of end_charpos before
+        using it (Bug#5984).
+
+2011-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode-
+        and header-lines, as they don't have one computed for them.
+        (Bug#10098)
+
+        * .gdbinit (prow): Make displayed values more self-explaining.
+        Add row's hash code.
+
 2011-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * process.c (wait_reading_process_output): Fix asynchrounous
@@ -7075,7 +7232,7 @@
 
 2011-04-08  T.V. Raman  <tv.raman.tv@gmail.com>  (tiny change)
 
-        * xml.c (parse_region): Avoid creating spurious whiespace nodes.
+        * xml.c (parse_region): Avoid creating spurious whitespace nodes.
 
 2011-04-08  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -7691,7 +7848,7 @@
         * keyboard.c (Fcommand_execute, Fsuspend_emacs, safe_run_hooks_1):
         Use Frun_hooks.
         (command_loop_1): Use Frun_hooks.  Call safe_run_hooks
-        unconditionnaly since it does the check itself.
+        unconditionally since it does the check itself.
 
 2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -8575,7 +8732,7 @@
         (xg_set_widget_bg): New function.
         (delete_cb): New function.
         (xg_create_frame_widgets): Connect delete-event to delete_cb.
-        Call xg_set_widget_bg.  Only set backgrund pixmap for ! HAVE_GTK3
+        Call xg_set_widget_bg.  Only set background pixmap for ! HAVE_GTK3
         (xg_set_background_color): Call xg_set_widget_bg.
         (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
         (xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3.
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 99ab02577d5..7d2f48a03ea 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -1003,7 +1003,7 @@
         (syms_of_xdisp): DEFVAR_LISP and initialize it.  Update doc string
         to describe new value `grow-only', and use of C-l.
         (display_tool_bar_line): Only use default face for border below
-        toolbar if not grow-only (to get acceptable visual appearence).
+        toolbar if not grow-only (to get acceptable visual appearance).
         Explicitly set visible_height for empty toolbar lines.
         (redisplay_tool_bar): Handle `grow-only' setting.  Check and clear
         minimize_tool_bar_window_p flag.
@@ -4346,7 +4346,7 @@
 
         * textprop.c (Fremove_list_of_text_properties):
         Ensure modify_region is called only when buffer is modified and that
-        signal_after_change is allways called in that case.
+        signal_after_change is always called in that case.
 
         * print.c (PRINTFINISH): Call signal_after_change.
 
@@ -5084,7 +5084,7 @@
 
 2006-02-26  Chong Yidong  <cyd@stupidchicken.com>
 
-        * xterm.h, xterm.c (x_uncatch_errors): Delete unneccessary argument.
+        * xterm.h, xterm.c (x_uncatch_errors): Delete unnecessary argument.
 
         * xterm.c (x_load_font, x_term_init, XTmouse_position)
         (handle_one_xevent, x_connection_closed, x_list_fonts):
@@ -12087,7 +12087,7 @@
         (merge_face_heights): Eliminate GCPRO arg.  All callers changed.
 
         * keyboard.c (command_loop_1): Change Vtransient_mark_mode
-        before deciding whether to inactivate mark.
+        before deciding whether to deactivate mark.
 
 2004-11-06  Lars Brinkhoff  <lars@nocrew.org>
 
@@ -23013,7 +23013,7 @@
         (try_window_id): Likewise.
         (redisplay_window): New local var buffer_unchanged_p.
 
-        * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_houglass.
+        * keyboard.c (cmd_error) [HAVE_X_WINDOWS]: Maybe call cancel_hourglass.
 
         * process.c (create_process): Test USG_SUBTTY_WORKS.
         (process_send_signal): Clean up handling of GID.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 07d4f4ec116..7c46dea675c 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -966,7 +966,7 @@
         ($(BLD)/editfns.$(O)): Depend on ../lib/strftime.h.
         ($(BLD)/print.$(O)): Depend on ../lib/ftoastr.h and ../lib/intprops.h.
 
-        * deps.mk: Update for recent changes: gnutls support, gnulib
+        * deps.mk: Update for recent changes: GnuTLS support, gnulib
         imports, addition of globals.h.
 
         * makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on
@@ -2191,7 +2191,7 @@
 2010-12-16  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (ns_draw_window_cursor): If the cursor color is the
-        same as the background, use the face forground as cursor.
+        same as the background, use the face foreground as cursor.
 
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
 
@@ -3268,7 +3268,7 @@
 2010-10-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnutls.c (emacs_gnutls_write): If we're trying to write before
-        gnutls is ready, return EAGAIN as the errno.
+        GnuTLS is ready, return EAGAIN as the errno.
 
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -3585,12 +3585,12 @@
         * process.c (make_process): Set the gnutls_p field to zero by
         default.
         (read_process_output): Always call the gnutls_read function if the
-        stream is a gnutls stream.
+        stream is a GnuTLS stream.
         (send_process): Ditto for writes.
 
         * gnutls.c (emacs_gnutls_write, emacs_gnutls_read): Refuse to read
         or write anything until the state is GNUTLS_STAGE_READY.
-        (Fgnutls_boot): Mark the stream as being a gnutls stream.
+        (Fgnutls_boot): Mark the stream as being a GnuTLS stream.
 
 2010-09-29  Eli Zaretskii  <eliz@gnu.org>
 
@@ -11805,7 +11805,7 @@
         * coding.c (encode_coding_utf_16): Fix checking of a Unicode
         character.
 
-        * cmds.c (Fself_insert_command): Avoid unnecessay
+        * cmds.c (Fself_insert_command): Avoid unnecessary
         unibyte->multibyte conversion.  (Bug#4240)  (Bug#4037)
 
 2009-08-26  Dan Nicolaescu  <dann@ics.uci.edu>
@@ -22234,7 +22234,7 @@
         * lisp.h (Fdelete_terminal): Declare.
 
         * charset.h (CHECK_CHARSET, CHECK_CHARSET_GET_ID)
-        (CHECK_CHARSET_GET_ATTR): Don't use the inexistent return value of
+        (CHECK_CHARSET_GET_ATTR): Don't use the nonexistent return value of
         wrong_type_argument.
 
 2008-02-22  Kenichi Handa  <handa@ni.aist.go.jp>
@@ -27366,7 +27366,7 @@
 
         * ccl.c: Include "character.h".
         (Qccl, Qcclp): New variables.
-        (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
+        (CCL_WRITE_CHAR): Always treat the arg CH as a character even if
         it's less than 256.
         (CCL_WRITE_MULTIBYTE_CHAR): Delete.
         (CCL_WRITE_STRING, CCL_READ_CHAR): Adjust for the change of SRC
@@ -31330,7 +31330,7 @@
 
 2007-05-12  Chong Yidong  <cyd@stupidchicken.com>
 
-        * image.c (pbm_load): Correctly check image size for greyscale pbm.
+        * image.c (pbm_load): Correctly check image size for grayscale pbm.
 
         * xterm.c (XTread_socket): Yet Another Uncaught X Error Crash (YAUXEC).
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cbf867829c7..34906e505da 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -3271,7 +3271,7 @@
         [not HAVE_X11] (x_set_border_pixel): Use gray_width and
         gray_height, instead of assuming that the bitmap is 16x16.
         (x_make_gc): Instead of creating a pixmap and then calling
-        XPutImage to make it into a grey stipple, just call
+        XPutImage to make it into a gray stipple, just call
         XCreatePixmapFromBitmapData to do it all at once.
 
         * xterm.c (x_text_icon): Move the request for font information
@@ -14880,7 +14880,7 @@
 
 1989-08-09  Joseph Arceneaux  (jla@spiff)
 
-        * ../oldXMenu/Makefile: Removed all the unneccessary X stuff.
+        * ../oldXMenu/Makefile: Removed all the unnecessary X stuff.
 
 1989-08-07  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
 
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index af97d0de7b4..74141f6813a 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -718,7 +718,7 @@
         (init_ntproc) [HAVE_SOCKETS]: Only load winsock library on startup
         if PRELOAD_WINSOCK is set in environment (or registry).
 
-        * ntproc.c (Fwin32_has_winsock, Fwin32_unload_winsock)
+        * ntproc.c (Fwin32_has_winsock, Fwin32_unload_winsock)
         [HAVE_SOCKETS]: New functions.
         (syms_of_ntproc) [HAVE_SOCKETS]: defsubr them.
 
@@ -845,7 +845,7 @@
         (timer_id): Renamed to mouse_button_timer.
         (saved_mouse_move_msg, mouse_move_timer): New variables.
         (win_msg_worker): Delete WM_TIMER code.
-        (win32_wnd_proc): Handle WM_TIMER events here. Use separate timers
+        (win32_wnd_proc): Handle WM_TIMER events here.  Use separate timers
         for mouse down and mouse move (including scroll bar drag) events.
         Add new handling code for WM_VSCROLL and WM_MOUSEMOVE events.
         Only filter WM_MOUSEMOVE events when a button is held down.
@@ -1100,17 +1100,17 @@
 
         (nt_sleep): Renamed to sys_sleep.
 
-        (rename): Renamed to sys_rename. Always rename to a temporary name
+        (rename): Renamed to sys_rename.  Always rename to a temporary name
         first on Windows 95.  Unlink new name first if necessary.
 
         (dir_finding): Variable deleted.
         (dir_is_fat, dir_pathname): New variables.
 
-        (openddir): Fail if dir_find_handle is in use. Save directory name
+        (openddir): Fail if dir_find_handle is in use.  Save directory name
         in dir_pathname, and set dir_is_fat appropriately.
         (closedir, readdir): Use dir_find_handle in place of dir_finding.
         (readdir): Copy directory name from dir_pathname on first
-        call. Use IS_DIRECTORY_SEP instead of IS_ANY_SEP.  Force filename
+        call.  Use IS_DIRECTORY_SEP instead of IS_ANY_SEP.  Force filename
         to be lower case on FAT volumes.
 
         (getpwuid): Move struct passwd initialization to init_user_info,
@@ -1141,7 +1141,7 @@
         (get_emacs_configuration): Detect Windows flavor (Windows 95 or
         NT) at run-time.  Change OS name for Windows 95 to be "win95".
 
-        (fd_info): New variable. Array of extra info for file descriptors
+        (fd_info): New variable.  Array of extra info for file descriptors
         needed for pipe/socket support.
 
         (utc_base_ft, utc_base, init): New internal variables used for
@@ -1206,7 +1206,7 @@
         * ntinevt.c (win32_kdb_patch_key): Initialize isdead.
         (key_event) [HAVE_NTGUI]: Use Windows key code.
 
-        * ntproc.c: Include config.h after CRT headers. Include fcntl.h.
+        * ntproc.c: Include config.h after CRT headers.  Include fcntl.h.
         (child_process, MAX_CHILDREN, CHILD_ACTIVE): Moved to nt.h.
         (DebugPrint): New macro.
         (new_child): Create input event structures for child processes.
@@ -2580,7 +2580,7 @@
         (win32_fill_rect, dumpglyphs, do_line_dance, x_draw_box):
         Use Get/ReleaseFrameDC.
         (win32_update_begin): Regenerate palette if required.
-        (w32_read_socket): Use FALSE. Handle WM_PALETTECHANGED.
+        (w32_read_socket): Use FALSE.  Handle WM_PALETTECHANGED.
         (win32_term_init): Use GetDC directly.
         Enable palette in display structure.
         Predefine white and black.
@@ -4501,7 +4501,7 @@
         * msdos.c (putchar): Call internal_flush instead of _flsbuf.
         (DO_TERMSCRIPT): New macro to support open-termscript.
         (internal_flush): Corrected handling of flush in middle of
-        escape sequences. Handle screen width > 127.
+        escape sequences.  Handle screen width > 127.
         (flush_escape): New function for use by internal_flush.
         (sys_select): New MS-DOS specific version with us timing.
         (EMACSCOLORS): New environment variable.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index e21af17657f..2f3ee45a1ac 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -5409,7 +5409,7 @@
 
 1998-11-10  Gerd Moellmann  <gerd@gnu.org>
 
-        * xrdb.c (x_load_resources): Add grey background colors as
+        * xrdb.c (x_load_resources): Add gray background colors as
         defaults for menus, scroll bars, and dialogs.
 
         * insdel.c (prepare_to_modify_buffer): Move setting
@@ -8018,7 +8018,7 @@
 
         * xterm.c (x_scroll_run): Renamed from do_line_dance.
 
-        * xdisp.c (redisplay_window): For window-based redisplay, alway
+        * xdisp.c (redisplay_window): For window-based redisplay, always
         try try_window_id.
 
         * xterm.c (struct glyph_string): New member two_byte_p that is
@@ -12766,7 +12766,7 @@
 
 1998-12-08  Geoff Voelker  <voelker@cs.washington.edu>
 
-        * makefile.nt: Do string comparision of _NMAKE_VER.
+        * makefile.nt: Do string comparison of _NMAKE_VER.
 
 1998-12-06  Eli Zaretskii  <eliz@mescaline.gnu.org>
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 6f007992bef..6e3a8d8ab3b 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -3479,7 +3479,7 @@
         a workaround for SunOS 4's cc.
         (CCL_CALL_FOR_MAP_INSTRUCTION): Use "if (1)..." not "do {...".
         (CCL_SUCCESS, CCL_SUSPEND, CCL_INVALID_CMD): Likewise.
-        (ccl_driver) <CCL_ReadMultibyteChar2>: Remove unnecessay "do"
+        (ccl_driver) <CCL_ReadMultibyteChar2>: Remove unnecessary "do"
         statement.
 
 2001-01-23  Gerd Moellmann  <gerd@gnu.org>
diff --git a/src/buffer.c b/src/buffer.c
index a327a1650f1..a482493fac7 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1526,7 +1526,13 @@ with SIGHUP.  */)
       UNGCPRO;
     }
 
-  /* Make this buffer not be current.
+  /* Run replace_buffer_in_windows before making another buffer current
+     since set-window-buffer-start-and-point will refuse to make another
+     buffer current if the selected window does not show the current
+     buffer.  (Bug#10114) */
+  replace_buffer_in_windows (buffer);
+
+     /* Make this buffer not be current.
      In the process, notice if this is the sole visible buffer
      and give up if so.  */
   if (b == current_buffer)
@@ -1566,7 +1572,6 @@ with SIGHUP.  */)
 
   /* These may run Lisp code and into infinite loops (if someone
      insisted on circular lists) so allow quitting here.  */
-  replace_buffer_in_windows (buffer);
   frames_discard_buffer (buffer);
 
   clear_charpos_cache (b);
@@ -1626,7 +1631,7 @@ with SIGHUP.  */)
 
   /* Reset the local variables, so that this buffer's local values
      won't be protected from GC.  They would be protected
-     if they happened to remain encached in their symbols.
+     if they happened to remain cached in their symbols.
      This gets rid of them for certain.  */
   swap_out_buffer_local_variables (b);
   reset_buffer_local_variables (b, 1);
@@ -2481,7 +2486,7 @@ swap_out_buffer_local_variables (struct buffer *b)
       Lisp_Object sym = XCAR (XCAR (alist));
       eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED);
       /* Need not do anything if some other buffer's binding is
-         now encached.  */
+         now cached.  */
       if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
         {
           /* Symbol is set up for this buffer's old local value:
diff --git a/src/callint.c b/src/callint.c
index 61ab4a3963e..80e24f6c8ee 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -78,7 +78,7 @@ c -- Character (no input method is used).
 C -- Command name: symbol with interactive function definition.
 d -- Value of point as number.  Does not do I/O.
 D -- Directory name.
-e -- Parametrized event (i.e., one that's a list) that invoked this command.
+e -- Parameterized event (i.e., one that's a list) that invoked this command.
      If used more than once, the Nth `e' returns the Nth parameterized event.
      This skips events that are integers or symbols.
 f -- Existing file name.
diff --git a/src/ccl.c b/src/ccl.c
index 84d7a6a25ff..b7228a4d1cd 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -561,7 +561,7 @@ static Lisp_Object Vccl_program_table;
    If VALn is lambda, move to the next map set like reaching to the
    end of the current map set.
 
-   If VALn is a symbol, call the CCL program refered by it.
+   If VALn is a symbol, call the CCL program referred by it.
    Then, use reg[rrr] as a mapped value except for -1, -2 and -3.
    Such special values are regarded as nil, t, and lambda respectively.
 
diff --git a/src/charset.c b/src/charset.c
index b6921a762b6..3c15f1bee54 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -166,9 +166,9 @@ static struct
      maximum character of the current charset.  */
   int min_char, max_char;
 
-  /* A Unicode character correspoinding to the code indice 0 (i.e. the
+  /* A Unicode character corresponding to the code index 0 (i.e. the
      minimum code-point) of the current charset, or -1 if the code
-     indice 0 is not a Unicode character.  This is checked when
+     index 0 is not a Unicode character.  This is checked when
      table.encoder[CHAR] is zero.  */
   int zero_index_char;
 
diff --git a/src/cm.h b/src/cm.h
index 8f23990ce55..dbf0820b94c 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -66,7 +66,7 @@ struct cm
                                    location */
     unsigned int cm_autolf:1;   /* \r performs a \r\n (rn) */
 
-    /* Parametrized capabilities.  This needs to be a struct since
+    /* Parameterized capabilities.  This needs to be a struct since
        the costs are accessed through pointers.  */
 
 #if 0
diff --git a/src/dired.c b/src/dired.c
index acc81a6ed9d..2b5f3b40641 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -229,11 +229,11 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m
           int len;
           int wanted = 0;
           Lisp_Object name, finalname;
-          struct gcpro inner_gcpro1, inner_gcpro2;
+          struct gcpro gcpro1, gcpro2;
 
           len = NAMLEN (dp);
           name = finalname = make_unibyte_string (dp->d_name, len);
-          GCPRO2_VAR (finalname, name, inner_gcpro);
+          GCPRO2 (finalname, name);
 
           /* Note: DECODE_FILE can GC; it should protect its argument,
              though.  */
@@ -289,23 +289,23 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full, Lisp_Object m
                   /* Construct an expanded filename for the directory entry.
                      Use the decoded names for input to Ffile_attributes.  */
                   Lisp_Object decoded_fullname, fileattrs;
-                  struct gcpro innermost_gcpro1, innermost_gcpro2;
+                  struct gcpro gcpro1, gcpro2;
 
                   decoded_fullname = fileattrs = Qnil;
-                  GCPRO2_VAR (decoded_fullname, fileattrs, innermost_gcpro);
+                  GCPRO2 (decoded_fullname, fileattrs);
 
                   /* Both Fexpand_file_name and Ffile_attributes can GC.  */
                   decoded_fullname = Fexpand_file_name (name, directory);
                   fileattrs = Ffile_attributes (decoded_fullname, id_format);
 
                   list = Fcons (Fcons (finalname, fileattrs), list);
-                  UNGCPRO_VAR (innermost_gcpro);
+                  UNGCPRO;
                 }
               else
                 list = Fcons (finalname, list);
             }
 
-          UNGCPRO_VAR (inner_gcpro);
+          UNGCPRO;
         }
     }
 
@@ -673,11 +673,11 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v
       if (!NILP (predicate))
         {
           Lisp_Object val;
-          struct gcpro inner_gcpro1;
+          struct gcpro gcpro1;
 
-          GCPRO1_VAR (name, inner_gcpro);
+          GCPRO1 (name);
           val = call1 (predicate, name);
-          UNGCPRO_VAR (inner_gcpro);
+          UNGCPRO;
 
           if (NILP (val))
             continue;
diff --git a/src/dispextern.h b/src/dispextern.h
index a45c5cc138f..ec66dcb4220 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -409,7 +409,7 @@ struct glyph
   {
     /* Metrics of a partial glyph of an image (type == IMAGE_GLYPH).  */
     struct glyph_slice img;
-    /* Start and end indices of glyphs of a graphme cluster of a
+    /* Start and end indices of glyphs of a grapheme cluster of a
        composition (type == COMPOSITE_GLYPH).  */
     struct { int from, to; } cmp;
     /* Pixel offsets for upper and lower part of the acronym.  */
diff --git a/src/dispnew.c b/src/dispnew.c
index b920693688c..e21f565fb3a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -612,7 +612,6 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
                   row->glyphs[LAST_AREA]
                     = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
                 }
-              xassert (!row->enabled_p || verify_row_hash (row));
               ++row;
             }
         }
@@ -3580,12 +3579,11 @@ update_window (struct window *w, int force_p)
 
       rif->update_window_begin_hook (w);
       yb = window_text_bottom_y (w);
-
-      /* If window has a header line, update it before everything else.
-         Adjust y-positions of other rows by the header line height.  */
       row = desired_matrix->rows;
       end = row + desired_matrix->nrows - 1;
 
+      /* Take note of the header line, if there is one.  We will
+         update it below, after updating all of the window's lines.  */
       if (row->mode_line_p)
         {
           header_line_row = row;
@@ -3630,6 +3628,8 @@ update_window (struct window *w, int force_p)
 
       /* Update the rest of the lines.  */
       for (; row < end && (force_p || !input_pending); ++row)
+        /* scrolling_window resets the enabled_p flag of the rows it
+           reuses from current_matrix.  */
         if (row->enabled_p)
           {
             int vpos = MATRIX_ROW_VPOS (row, desired_matrix);
@@ -4564,18 +4564,69 @@ scrolling_window (struct window *w, int header_line_p)
           {
             rif->clear_window_mouse_face (w);
             rif->scroll_run_hook (w, r);
+          }
+
+        /* Truncate runs that copy to where we copied to, and
+           invalidate runs that copy from where we copied to.  */
+        for (j = nruns - 1; j > i; --j)
+          {
+            struct run *p = runs[j];
+            int truncated_p = 0;
 
-            /* Invalidate runs that copy from where we copied to.  */
-            for (j = i + 1; j < nruns; ++j)
+            if (p->nrows > 0
+                && p->desired_y < r->desired_y + r->height
+                && p->desired_y + p->height > r->desired_y)
               {
-                struct run *p = runs[j];
+                if (p->desired_y < r->desired_y)
+                  {
+                    p->nrows = r->desired_vpos - p->desired_vpos;
+                    p->height = r->desired_y - p->desired_y;
+                    truncated_p = 1;
+                  }
+                else
+                  {
+                    int nrows_copied = (r->desired_vpos + r->nrows
+                                        - p->desired_vpos);
+
+                    if (p->nrows <= nrows_copied)
+                      p->nrows = 0;
+                    else
+                      {
+                        int height_copied = (r->desired_y + r->height
+                                             - p->desired_y);
+
+                        p->current_vpos += nrows_copied;
+                        p->desired_vpos += nrows_copied;
+                        p->nrows -= nrows_copied;
+                        p->current_y += height_copied;
+                        p->desired_y += height_copied;
+                        p->height -= height_copied;
+                        truncated_p = 1;
+                      }
+                  }
+              }
 
-                if ((p->current_y >= r->desired_y
+            if (r->current_y != r->desired_y
+                /* The condition below is equivalent to
+                   ((p->current_y >= r->desired_y
                      && p->current_y < r->desired_y + r->height)
-                    || (p->current_y + p->height >= r->desired_y
+                    || (p->current_y + p->height > r->desired_y
                         && (p->current_y + p->height
-                            < r->desired_y + r->height)))
-                  p->nrows = 0;
+                            <= r->desired_y + r->height)))
+                   because we have 0 < p->height <= r->height.  */
+                && p->current_y < r->desired_y + r->height
+                && p->current_y + p->height > r->desired_y)
+              p->nrows = 0;
+
+            /* Reorder runs by copied pixel lines if truncated.  */
+            if (truncated_p && p->nrows > 0)
+              {
+                int k = nruns - 1;
+
+                while (runs[k]->nrows == 0 || runs[k]->height < p->height)
+                  k--;
+                memmove (runs + j, runs + j + 1, (k - j) * sizeof (*runs));
+                runs[k] = p;
               }
           }
 
@@ -4590,7 +4641,14 @@ scrolling_window (struct window *w, int header_line_p)
             to_overlapped_p = to->overlapped_p;
             from->redraw_fringe_bitmaps_p = from->fringe_bitmap_periodic_p;
             assign_row (to, from);
-            to->enabled_p = 1, from->enabled_p = 0;
+            /* The above `assign_row' actually does swap, so if we had
+               an overlap in the copy destination of two runs, then
+               the second run would assign a previously disabled bogus
+               row.  But thanks to the truncation code in the
+               preceding for-loop, we no longer have such an overlap,
+               and thus the assigned row should always be enabled.  */
+            xassert (to->enabled_p);
+            from->enabled_p = 0;
             to->overlapped_p = to_overlapped_p;
           }
       }
diff --git a/src/fileio.c b/src/fileio.c
index 7e75e6285f0..c0f6c1d2e8e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1553,7 +1553,7 @@ those `/' is discarded.  */)
   if (p)
     /* Start over with the new string, so we check the file-name-handler
        again.  Important with filenames like "/home/foo//:/hello///there"
-       which whould substitute to "/:/hello///there" rather than "/there".  */
+       which would substitute to "/:/hello///there" rather than "/there".  */
     return Fsubstitute_in_file_name
       (make_specified_string (p, -1, endp - p, multibyte));
 
@@ -4100,6 +4100,16 @@ variable `last-coding-system-used' to the coding system actually used.  */)
     adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
                          inserted);
 
+  /* Call after-change hooks for the inserted text, aside from the case
+     of normal visiting (not with REPLACE), which is done in a new buffer
+     "before" the buffer is changed.  */
+  if (inserted > 0 && total > 0
+      && (NILP (visit) || !NILP (replace)))
+    {
+      signal_after_change (PT, 0, inserted);
+      update_compositions (PT, PT, CHECK_BORDER);
+    }
+
   /* Now INSERTED is measured in characters.  */
 
  handled:
@@ -4270,16 +4280,6 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       unbind_to (count1, Qnil);
     }
 
-  /* Call after-change hooks for the inserted text, aside from the case
-     of normal visiting (not with REPLACE), which is done in a new buffer
-     "before" the buffer is changed.  */
-  if (inserted > 0 && total > 0
-      && (NILP (visit) || !NILP (replace)))
-    {
-      signal_after_change (PT, 0, inserted);
-      update_compositions (PT, PT, CHECK_BORDER);
-    }
-
   if (!NILP (visit)
       && current_buffer->modtime == -1)
     {
diff --git a/src/font.c b/src/font.c
index 9559c65e7ed..35f5703e32e 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3160,14 +3160,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
   else
     {
       Lisp_Object alters
-        = Fassoc_string (val, Vface_alternative_font_family_alist,
-                         /* Font family names are case-sensitive under NS. */
-#ifndef HAVE_NS
-                         Qt
-#else
-                         Qnil
-#endif
-                         );
+        = Fassoc_string (val, Vface_alternative_font_family_alist, Qt);
 
       if (! NILP (alters))
         {
diff --git a/src/fontset.c b/src/fontset.c
index 9697f62ea72..7592521cc7d 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -631,7 +631,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa
             {
               /* Something strange happened, perhaps because of a
                  Font-backend problem.  Too avoid crashing, record
-                 that this spec is unsable.  It may be better to find
+                 that this spec is unusable.  It may be better to find
                  another font of the same spec, but currently we don't
                  have such an API.  */
               RFONT_DEF_SET_FACE (rfont_def, -1);
diff --git a/src/fringe.c b/src/fringe.c
index 25fecca2334..da896e07b76 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -35,7 +35,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Logical bitmaps are used internally to denote things like
    'end-of-buffer', 'left-truncation', 'overlay-arrow', etc.
 
-   Physical bitmaps specify the visual appearence of the bitmap,
+   Physical bitmaps specify the visual appearance of the bitmap,
    e.g. 'bottom-left-angle', 'left-arrow', 'left-triangle', etc.
    User defined bitmaps are physical bitmaps.
 
@@ -928,7 +928,7 @@ update_window_fringes (struct window *w, int keep_current_p)
   int top_ind_rn, bot_ind_rn;
   int top_ind_min_y, bot_ind_max_y;
 
-  /* top_ind_rn is set to a nonnegative value whenver
+  /* top_ind_rn is set to a nonnegative value whenever
      row->indicate_bob_p is set, so it's OK that top_row_ends_at_zv_p
      is not initialized here.  Similarly for bot_ind_rn,
      row->indicate_eob_p and bot_row_ends_at_zv_p.  */
diff --git a/src/ftfont.c b/src/ftfont.c
index 5c540f9bf82..c48346b0147 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1462,7 +1462,7 @@ ftfont_get_bitmap (struct font *font, unsigned int code, struct font_bitmap *bit
        : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V ? 8
        : -1);
   if (bitmap->bits_per_pixel < 0)
-    /* We don't suport that kind of pixel mode.  */
+    /* We don't support that kind of pixel mode.  */
     return -1;
   bitmap->rows = ft_face->glyph->bitmap.rows;
   bitmap->width = ft_face->glyph->bitmap.width;
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 7e6f5c3164d..bc71685819e 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1100,6 +1100,14 @@ xg_create_frame_widgets (FRAME_PTR f)
   else
     wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
+  /* gtk_window_set_has_resize_grip is a Gtk+ 3.0 function but Ubuntu
+     has backported it to Gtk+ 2.0 and they add the resize grip for
+     Gtk+ 2.0 applications also.  But it has a bug that makes Emacs loop
+     forever, so disable the grip.  */
+#if GTK_MAJOR_VERSION < 3 && defined (HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP)
+  gtk_window_set_has_resize_grip (GTK_WINDOW (wtop), FALSE);
+#endif
+
   xg_set_screen (wtop, f);
 
   wvbox = gtk_vbox_new (FALSE, 0);
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 2dfb3a5ed6c..7cc2d21f9c4 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -98,7 +98,7 @@ extern GtkWidget *xg_create_widget (const char *type,
                                     struct _widget_value *val,
                                     GCallback select_cb,
                                     GCallback deactivate_cb,
-                                    GCallback hightlight_cb);
+                                    GCallback highlight_cb);
 
 extern void xg_modify_menubar_widgets (GtkWidget *menubar,
                                        FRAME_PTR f,
@@ -106,7 +106,7 @@ extern void xg_modify_menubar_widgets (GtkWidget *menubar,
                                        int deep_p,
                                        GCallback select_cb,
                                        GCallback deactivate_cb,
-                                       GCallback hightlight_cb);
+                                       GCallback highlight_cb);
 
 extern int xg_update_frame_menubar (FRAME_PTR f);
 
diff --git a/src/image.c b/src/image.c
index 8b61c7eefbc..81907d8e580 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7618,7 +7618,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
   image = image_spec_value (img->spec, QCindex, NULL);
   ino = INTEGERP (image) ? XFASTINT (image) : 0;
   ping_wand = NewMagickWand ();
-  MagickSetResolution (ping_wand, 2, 2);
+
   if (filename != NULL)
     {
       status = MagickPingImage (ping_wand, filename);
@@ -7628,6 +7628,8 @@ imagemagick_load_image (struct frame *f, struct image *img,
       status = MagickPingImageBlob (ping_wand, contents, size);
     }
 
+  MagickSetResolution (ping_wand, 2, 2);
+
   if (! (0 <= ino && ino < MagickGetNumberImages (ping_wand)))
     {
       image_error ("Invalid image number `%s' in image `%s'",
diff --git a/src/keyboard.c b/src/keyboard.c
index bee91c6b5cf..656634b8d31 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3001,7 +3001,7 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps,
     {
       Lisp_Object keys;
       int key_count, key_count_reset;
-      struct gcpro inner_gcpro1;
+      struct gcpro gcpro1;
       int count = SPECPDL_INDEX ();
 
       /* Save the echo status.  */
@@ -3029,7 +3029,7 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps,
         keys = Fcopy_sequence (this_command_keys);
       else
         keys = Qnil;
-      GCPRO1_VAR (keys, inner_gcpro);
+      GCPRO1 (keys);
 
       /* Clear out this_command_keys.  */
       this_command_key_count = 0;
@@ -3067,7 +3067,7 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps,
       if (saved_immediate_echo)
         echo_now ();
 
-      UNGCPRO_VAR (inner_gcpro);
+      UNGCPRO;
 
       /* The input method can return no events.  */
       if (! CONSP (tem))
@@ -9069,9 +9069,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
   int junk;
 #endif
 
-  struct gcpro outer_gcpro1;
+  struct gcpro gcpro1;
 
-  GCPRO1_VAR (fake_prefixed_keys, outer_gcpro);
+  GCPRO1 (fake_prefixed_keys);
   raw_keybuf_count = 0;
 
   last_nonmenu_event = Qnil;
@@ -9367,7 +9367,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
           if (EQ (key, Qt))
             {
               unbind_to (count, Qnil);
-              UNGCPRO_VAR (outer_gcpro);
+              UNGCPRO;
               return -1;
             }
 
@@ -10065,7 +10065,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
       add_command_key (keybuf[t]);
     }
 
-  UNGCPRO_VAR (outer_gcpro);
+  UNGCPRO;
   return t;
 }
 
@@ -10874,7 +10874,7 @@ interrupt_signal (int signalnum)	/* If we don't have an argument, some */
       /* If there are no frames there, let's pretend that we are a
          well-behaving UN*X program and quit.  We cannot do that while
          GC is in progress, though.  */
-      if (!gc_in_progress)
+      if (!gc_in_progress && !waiting_for_input)
         Fkill_emacs (Qnil);
       else
         Vquit_flag = Qt;
diff --git a/src/lisp.h b/src/lisp.h
index 2056b7caff8..6b19396111c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -163,14 +163,23 @@ extern int suppress_checking EXTERNALLY_VISIBLE;
 /* First, try and define DECL_ALIGN(type,var) which declares a static
    variable VAR of type TYPE with the added requirement that it be
    TYPEBITS-aligned.  */
+
+#ifndef GCTYPEBITS
+#define GCTYPEBITS 3
+#endif
+
 #ifndef NO_DECL_ALIGN
 # ifndef DECL_ALIGN
 #  if HAVE_ATTRIBUTE_ALIGNED
 #   define DECL_ALIGN(type, var) \
      type __attribute__ ((__aligned__ (1 << GCTYPEBITS))) var
 #  elif defined(_MSC_VER)
+#   define ALIGN_GCTYPEBITS 8
+#   if (1 << GCTYPEBITS) != ALIGN_GCTYPEBITS
+#    error ALIGN_GCTYPEBITS is wrong!
+#   endif
 #   define DECL_ALIGN(type, var) \
-     type __declspec(align(1 << GCTYPEBITS)) var
+     type __declspec(align(ALIGN_GCTYPEBITS)) var
 #  else
      /* What directives do other compilers use?  */
 #  endif
@@ -300,10 +309,6 @@ enum Lisp_Fwd_Type
     Lisp_Fwd_Kboard_Obj,        /* Fwd to a Lisp_Object field of kboards.  */
   };
 
-#ifndef GCTYPEBITS
-#define GCTYPEBITS 3
-#endif
-
 /* These values are overridden by the m- file on some machines.  */
 #ifndef VALBITS
 #define VALBITS (BITS_PER_EMACS_INT - GCTYPEBITS)
@@ -324,7 +329,7 @@ union Lisp_Object
 
     struct
       {
-        /* Use explict signed, the signedness of a bit-field of type
+        /* Use explicit signed, the signedness of a bit-field of type
            int is implementation defined.  */
         signed EMACS_INT val  : VALBITS;
         ENUM_BF (Lisp_Type) type : GCTYPEBITS;
@@ -349,7 +354,7 @@ union Lisp_Object
     struct
       {
         ENUM_BF (Lisp_Type) type : GCTYPEBITS;
-        /* Use explict signed, the signedness of a bit-field of type
+        /* Use explicit signed, the signedness of a bit-field of type
            int is implementation defined.  */
         signed EMACS_INT val  : VALBITS;
       } s;
@@ -2222,143 +2227,127 @@ struct gcpro
                           || GC_MARK_STACK == GC_MARK_STACK_CHECK_GCPROS)
 
 
-#define GCPRO1(var) \
-  GCPRO1_VAR (var, gcpro)
-#define GCPRO2(var1, var2) \
-  GCPRO2_VAR (var1, var2, gcpro)
-#define GCPRO3(var1, var2, var3) \
-  GCPRO3_VAR (var1, var2, var3, gcpro)
-#define GCPRO4(var1, var2, var3, var4) \
-  GCPRO4_VAR (var1, var2, var3, var4, gcpro)
-#define GCPRO5(var1, var2, var3, var4, var5) \
-  GCPRO5_VAR (var1, var2, var3, var4, var5, gcpro)
-#define GCPRO6(var1, var2, var3, var4, var5, var6) \
-  GCPRO6_VAR (var1, var2, var3, var4, var5, var6, gcpro)
-#define UNGCPRO UNGCPRO_VAR (gcpro)
-
 #if GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS
 
 /* Do something silly with gcproN vars just so gcc shuts up.  */
 /* You get warnings from MIPSPro...  */
 
-#define GCPRO1_VAR(var, gcpro) ((void) gcpro##1)
-#define GCPRO2_VAR(var1, var2, gcpro) \
-  ((void) gcpro##2, (void) gcpro##1)
-#define GCPRO3_VAR(var1, var2, var3, gcpro) \
-  ((void) gcpro##3, (void) gcpro##2, (void) gcpro##1)
-#define GCPRO4_VAR(var1, var2, var3, var4, gcpro) \
-  ((void) gcpro##4, (void) gcpro##3, (void) gcpro##2, (void) gcpro##1)
-#define GCPRO5_VAR(var1, var2, var3, var4, var5, gcpro) \
-  ((void) gcpro##5, (void) gcpro##4, (void) gcpro##3, (void) gcpro##2, \
-   (void) gcpro##1)
-#define GCPRO6_VAR(var1, var2, var3, var4, var5, var6, gcpro) \
-  ((void) gcpro##6, (void) gcpro##5, (void) gcpro##4, (void) gcpro##3, \
-   (void) gcpro##2, (void) gcpro##1)
-#define UNGCPRO_VAR(gcpro) ((void) 0)
+#define GCPRO1(varname) ((void) gcpro1)
+#define GCPRO2(varname1, varname2) ((void) gcpro2, (void) gcpro1)
+#define GCPRO3(varname1, varname2, varname3) \
+  ((void) gcpro3, (void) gcpro2, (void) gcpro1)
+#define GCPRO4(varname1, varname2, varname3, varname4) \
+  ((void) gcpro4, (void) gcpro3, (void) gcpro2, (void) gcpro1)
+#define GCPRO5(varname1, varname2, varname3, varname4, varname5) \
+  ((void) gcpro5, (void) gcpro4, (void) gcpro3, (void) gcpro2, (void) gcpro1)
+#define GCPRO6(varname1, varname2, varname3, varname4, varname5, varname6) \
+  ((void) gcpro6, (void) gcpro5, (void) gcpro4, (void) gcpro3, (void) gcpro2, \
+   (void) gcpro1)
+#define UNGCPRO ((void) 0)
 
 #else /* GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS */
 
 #ifndef DEBUG_GCPRO
 
-#define GCPRO1_VAR(var1, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcprolist = &gcpro##1; }
-
-#define GCPRO2_VAR(var1, var2, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcprolist = &gcpro##2; }
-
-#define GCPRO3_VAR(var1, var2, var3, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcprolist = &gcpro##3; }
-
-#define GCPRO4_VAR(var1, var2, var3, var4, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
-  gcprolist = &gcpro##4; }
-
-#define GCPRO5_VAR(var1, var2, var3, var4, var5, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
-  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
-  gcprolist = &gcpro##5; }
-
-#define GCPRO6_VAR(var1, var2, var3, var4, var5, var6, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
-  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
-  gcpro##6 .next = &gcpro##5; gcpro##6 .var = &var6; gcpro##6 .nvars = 1; \
-  gcprolist = &gcpro##6; }
-
-#define UNGCPRO_VAR(gcpro) (gcprolist = gcpro##1 .next)
+#define GCPRO1(varname) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname; gcpro1.nvars = 1; \
+  gcprolist = &gcpro1; }
+
+#define GCPRO2(varname1, varname2) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcprolist = &gcpro2; }
+
+#define GCPRO3(varname1, varname2, varname3) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcprolist = &gcpro3; }
+
+#define GCPRO4(varname1, varname2, varname3, varname4) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \
+  gcprolist = &gcpro4; }
+
+#define GCPRO5(varname1, varname2, varname3, varname4, varname5) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \
+  gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \
+  gcprolist = &gcpro5; }
+
+#define GCPRO6(varname1, varname2, varname3, varname4, varname5, varname6) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \
+  gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \
+  gcpro6.next = &gcpro5; gcpro6.var = &varname6; gcpro6.nvars = 1; \
+  gcprolist = &gcpro6; }
+
+#define UNGCPRO (gcprolist = gcpro1.next)
 
 #else
 
 extern int gcpro_level;
 
-#define GCPRO1_VAR(var1, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##1 .level = gcpro_level++; \
-  gcprolist = &gcpro##1; }
-
-#define GCPRO2_VAR(var1, var2, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##1 .level = gcpro_level; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##2 .level = gcpro_level++; \
-  gcprolist = &gcpro##2; }
-
-#define GCPRO3_VAR(var1, var2, var3, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##1 .level = gcpro_level; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcpro##3 .level = gcpro_level++; \
-  gcprolist = &gcpro##3; }
-
-#define GCPRO4_VAR(var1, var2, var3, var4, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##1 .level = gcpro_level; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
-  gcpro##4 .level = gcpro_level++; \
-  gcprolist = &gcpro##4; }
-
-#define GCPRO5_VAR(var1, var2, var3, var4, var5, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##1 .level = gcpro_level; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
-  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
-  gcpro##5 .level = gcpro_level++; \
-  gcprolist = &gcpro##5; }
-
-#define GCPRO6_VAR(var1, var2, var3, var4, var5, var6, gcpro) \
- {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
-  gcpro##1 .level = gcpro_level; \
-  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
-  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
-  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
-  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
-  gcpro##6 .next = &gcpro##5; gcpro##6 .var = &var6; gcpro##6 .nvars = 1; \
-  gcpro##6 .level = gcpro_level++; \
-  gcprolist = &gcpro##6; }
-
-#define UNGCPRO_VAR(gcpro) \
- ((--gcpro_level != gcpro##1 .level) \
-  ? (abort (), 0) \
-  : ((gcprolist = gcpro##1 .next), 0))
+#define GCPRO1(varname) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname; gcpro1.nvars = 1; \
+  gcpro1.level = gcpro_level++; \
+  gcprolist = &gcpro1; }
+
+#define GCPRO2(varname1, varname2) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro1.level = gcpro_level; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro2.level = gcpro_level++; \
+  gcprolist = &gcpro2; }
+
+#define GCPRO3(varname1, varname2, varname3) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro1.level = gcpro_level; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcpro3.level = gcpro_level++; \
+  gcprolist = &gcpro3; }
+
+#define GCPRO4(varname1, varname2, varname3, varname4) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro1.level = gcpro_level; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \
+  gcpro4.level = gcpro_level++; \
+  gcprolist = &gcpro4; }
+
+#define GCPRO5(varname1, varname2, varname3, varname4, varname5) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro1.level = gcpro_level; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \
+  gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \
+  gcpro5.level = gcpro_level++; \
+  gcprolist = &gcpro5; }
+
+#define GCPRO6(varname1, varname2, varname3, varname4, varname5, varname6) \
+ {gcpro1.next = gcprolist; gcpro1.var = &varname1; gcpro1.nvars = 1; \
+  gcpro1.level = gcpro_level; \
+  gcpro2.next = &gcpro1; gcpro2.var = &varname2; gcpro2.nvars = 1; \
+  gcpro3.next = &gcpro2; gcpro3.var = &varname3; gcpro3.nvars = 1; \
+  gcpro4.next = &gcpro3; gcpro4.var = &varname4; gcpro4.nvars = 1; \
+  gcpro5.next = &gcpro4; gcpro5.var = &varname5; gcpro5.nvars = 1; \
+  gcpro6.next = &gcpro5; gcpro6.var = &varname6; gcpro6.nvars = 1; \
+  gcpro6.level = gcpro_level++; \
+  gcprolist = &gcpro6; }
+
+#define UNGCPRO                                 \
+ ((--gcpro_level != gcpro1.level)               \
+  ? (abort (), 0)                               \
+  : ((gcprolist = gcpro1.next), 0))
 
 #endif /* DEBUG_GCPRO */
 #endif /* GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS */
diff --git a/src/lread.c b/src/lread.c
index f1f6f0cbd78..cdbd09d2f89 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1917,7 +1917,7 @@ which is the input stream for reading characters.
 This function does not move point.  */)
   (Lisp_Object start, Lisp_Object end, Lisp_Object printflag, Lisp_Object read_function)
 {
-  /* FIXME: Do the eval-sexp-add-defvars danse!  */
+  /* FIXME: Do the eval-sexp-add-defvars dance!  */
   int count = SPECPDL_INDEX ();
   Lisp_Object tem, cbuf;
 
diff --git a/src/msdos.c b/src/msdos.c
index 4c08c5b29e0..64e9d72c784 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1558,7 +1558,7 @@ IT_set_terminal_window (struct frame *f, int foo)
 {
 }
 
-/* Remember the screen colors of the curent frame, to serve as the
+/* Remember the screen colors of the current frame, to serve as the
    default colors for newly-created frames.  */
 DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors,
        Smsdos_remember_default_colors, 1, 1, 0,
diff --git a/src/nsgui.h b/src/nsgui.h
index 5cc2eee3230..99c64cd4cde 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -65,7 +65,7 @@ typedef struct _XCharStruct
   int descent;
 } XCharStruct;
 
-/* Fake tructure from Xlib.h to represent two-byte characters.  */
+/* Fake structure from Xlib.h to represent two-byte characters.  */
 #ifndef __OBJC__
 typedef unsigned short unichar;
 #endif
@@ -202,4 +202,3 @@ typedef struct _NSRect  { NSPoint origin; NSSize size; } NSRect;
 #define PWinGravity     (1L << 9) /* program specified window gravity */
 
 #endif  /* __NSGUI_H__ */
-
diff --git a/src/nsterm.m b/src/nsterm.m
index c5b28d57ac5..5e19a397c34 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -559,7 +559,7 @@ ns_constrain_all_frames (void)
         {
           NSView *view = FRAME_NS_VIEW (f);
           /* This no-op will trigger the default window placing
-           * constriant system. */
+           * constraint system. */
           f->output_data.ns->dont_constrain = 0;
           [[view window] setFrameOrigin:[[view window] frame].origin];
         }
@@ -3075,7 +3075,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r)
 
   /* If there is no mask, the background won't be seen,
      so draw a rectangle on the image for the cursor.
-     Do this for all images, getting trancparency right is not reliable.  */
+     Do this for all images, getting transparency right is not reliable.  */
   if (s->hl == DRAW_CURSOR)
     {
       int thickness = abs (s->img->relief);
diff --git a/src/process.c b/src/process.c
index a02ba44ae71..05c4be27550 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3474,7 +3474,7 @@ usage: (make-network-process &rest ARGS)  */)
 
   {
     /* Setup coding systems for communicating with the network stream.  */
-    struct gcpro inner_gcpro1;
+    struct gcpro gcpro1;
     /* Qt denotes we have not yet called Ffind_operation_coding_system.  */
     Lisp_Object coding_systems = Qt;
     Lisp_Object fargs[5], val;
@@ -3502,9 +3502,9 @@ usage: (make-network-process &rest ARGS)  */)
           {
             fargs[0] = Qopen_network_stream, fargs[1] = name,
               fargs[2] = buffer, fargs[3] = host, fargs[4] = service;
-            GCPRO1_VAR (proc, inner_gcpro);
+            GCPRO1 (proc);
             coding_systems = Ffind_operation_coding_system (5, fargs);
-            UNGCPRO_VAR (inner_gcpro);
+            UNGCPRO;
           }
         if (CONSP (coding_systems))
           val = XCAR (coding_systems);
@@ -3535,9 +3535,9 @@ usage: (make-network-process &rest ARGS)  */)
               {
                 fargs[0] = Qopen_network_stream, fargs[1] = name,
                   fargs[2] = buffer, fargs[3] = host, fargs[4] = service;
-                GCPRO1_VAR (proc, inner_gcpro);
+                GCPRO1 (proc);
                 coding_systems = Ffind_operation_coding_system (5, fargs);
-                UNGCPRO_VAR (inner_gcpro);
+                UNGCPRO;
               }
           }
         if (CONSP (coding_systems))
@@ -3717,7 +3717,7 @@ DEFUN ("network-interface-info", Fnetwork_interface_info, Snetwork_interface_inf
        doc: /* Return information about network interface named IFNAME.
 The return value is a list (ADDR BCAST NETMASK HWADDR FLAGS),
 where ADDR is the layer 3 address, BCAST is the layer 3 broadcast address,
-NETMASK is the layer 3 network mask, HWADDR is the layer 2 addres, and
+NETMASK is the layer 3 network mask, HWADDR is the layer 2 address, and
 FLAGS is the current flags of the interface.  */)
   (Lisp_Object ifname)
 {
@@ -4630,26 +4630,29 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
                      the gnutls library -- 2.12.14 has been confirmed
                      to need it.  See
                      http://comments.gmane.org/gmane.emacs.devel/145074 */
-                  struct Lisp_Process *proc;
                   for (channel = 0; channel < MAXDESC; ++channel)
-                    {
-                      if (! NILP (chan_process[channel]) &&
-                          (proc = XPROCESS (chan_process[channel])) != NULL &&
-                          proc->gnutls_p &&
-                          proc->infd &&
-                          emacs_gnutls_record_check_pending (proc->gnutls_state) > 0)
-                        {
-                          nfds++;
-                          FD_SET (proc->infd, &Available);
-                        }
-                    }
+                    if (! NILP (chan_process[channel]))
+                      {
+                        struct Lisp_Process *p =
+                          XPROCESS (chan_process[channel]);
+                        if (p && p->gnutls_p && p->infd
+                            && ((emacs_gnutls_record_check_pending
+                                 (p->gnutls_state))
+                                > 0))
+                          {
+                            nfds++;
+                            FD_SET (p->infd, &Available);
+                          }
+                      }
                 }
               else
                 {
                   /* Check this specific channel. */
-                  if (wait_proc->gnutls_p && /* Check for valid process.  */
+                  if (wait_proc->gnutls_p /* Check for valid process.  */
                       /* Do we have pending data?  */
-                      emacs_gnutls_record_check_pending (wait_proc->gnutls_state) > 0)
+                      && ((emacs_gnutls_record_check_pending
+                           (wait_proc->gnutls_state))
+                          > 0))
                     {
                       nfds = 1;
                       /* Set to Available.  */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index fb0882860d1..cc19765aba6 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -267,6 +267,8 @@ struct sigaction {
 #define getpid    _getpid
 #ifdef _MSC_VER
 typedef int pid_t;
+#define snprintf  _snprintf
+#define strtoll   _strtoi64
 #endif
 #define isatty    _isatty
 #define logb      _logb
@@ -275,15 +277,17 @@ typedef int pid_t;
 #define popen     _popen
 #define pclose    _pclose
 #define umask     _umask
+#ifndef _MSC_VER
 #define utimbuf   _utimbuf
+#endif
 #define strdup    _strdup
 #define strupr    _strupr
 #define strnicmp  _strnicmp
 #define stricmp   _stricmp
 #define tzset     _tzset
 
-#if !defined (_MSC_VER) || (_MSC_VER < 1400)
 #define tzname    _tzname
+#if !defined (_MSC_VER) || (_MSC_VER < 1400)
 #undef  utime
 #define utime     _utime
 #endif
@@ -335,7 +339,7 @@ extern char *get_emacs_configuration_options (void);
 #define _WINSOCK_H
 
 /* Defines size_t and alloca ().  */
-#if (defined(_MSC_VER) && defined(emacs)) || defined(USE_CRT_DLL)
+#ifdef emacs
 #define malloc e_malloc
 #define free   e_free
 #define realloc e_realloc
diff --git a/src/search.c b/src/search.c
index a6a0fddb137..811ac74e194 100644
--- a/src/search.c
+++ b/src/search.c
@@ -83,11 +83,10 @@ static struct re_registers search_regs;
    Qnil if no searching has been done yet.  */
 static Lisp_Object last_thing_searched;
 
-/* error condition signaled when regexp compile_pattern fails */
-
+/* Error condition signaled when regexp compile_pattern fails.  */
 static Lisp_Object Qinvalid_regexp;
 
-/* Error condition used for failing searches */
+/* Error condition used for failing searches.  */
 static Lisp_Object Qsearch_failed;
 
 static void set_search_regs (EMACS_INT, EMACS_INT);
@@ -2078,13 +2077,16 @@ set_search_regs (EMACS_INT beg_byte, EMACS_INT nbytes)
   XSETBUFFER (last_thing_searched, current_buffer);
 }
 
-/* Given STRING, a string of words separated by word delimiters,
-   compute a regexp that matches those exact words separated by
-   arbitrary punctuation.  If LAX is nonzero, the end of the string
-   need not match a word boundary unless it ends in whitespace.  */
-
-static Lisp_Object
-wordify (Lisp_Object string, int lax)
+DEFUN ("word-search-regexp", Fword_search_regexp, Sword_search_regexp, 1, 2, 0,
+       doc: /* Return a regexp which matches words, ignoring punctuation.
+Given STRING, a string of words separated by word delimiters,
+compute a regexp that matches those exact words separated by
+arbitrary punctuation.  If LAX is non-nil, the end of the string
+need not match a word boundary unless it ends in whitespace.
+
+Used in `word-search-forward', `word-search-backward',
+`word-search-forward-lax', `word-search-backward-lax'.  */)
+  (Lisp_Object string, Lisp_Object lax)
 {
   register unsigned char *o;
   register EMACS_INT i, i_byte, len, punct_count = 0, word_count = 0;
@@ -2125,7 +2127,7 @@ wordify (Lisp_Object string, int lax)
     }
 
   adjust = - punct_count + 5 * (word_count - 1)
-    + ((lax && !whitespace_at_end) ? 2 : 4);
+    + ((!NILP (lax) && !whitespace_at_end) ? 2 : 4);
   if (STRING_MULTIBYTE (string))
     val = make_uninit_multibyte_string (len + adjust,
                                         SBYTES (string)
@@ -2162,7 +2164,7 @@ wordify (Lisp_Object string, int lax)
       prev_c = c;
     }
 
-  if (!lax || whitespace_at_end)
+  if (NILP (lax) || whitespace_at_end)
     {
       *o++ = '\\';
       *o++ = 'b';
@@ -2217,10 +2219,14 @@ An optional second argument bounds the search; it is a buffer position.
 The match found must not extend before that position.
 Optional third argument, if t, means if fail just return nil (no error).
   If not nil and not t, move to limit of search and return nil.
-Optional fourth argument is repeat count--search for successive occurrences.  */)
+Optional fourth argument is repeat count--search for successive occurrences.
+
+Relies on the function `word-search-regexp' to convert a sequence
+of words in STRING to a regexp used to search words without regard
+to punctuation.  */)
   (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror, Lisp_Object count)
 {
-  return search_command (wordify (string, 0), bound, noerror, count, -1, 1, 0);
+  return search_command (Fword_search_regexp (string, Qnil), bound, noerror, count, -1, 1, 0);
 }
 
 DEFUN ("word-search-forward", Fword_search_forward, Sword_search_forward, 1, 4,
@@ -2231,10 +2237,14 @@ An optional second argument bounds the search; it is a buffer position.
 The match found must not extend after that position.
 Optional third argument, if t, means if fail just return nil (no error).
   If not nil and not t, move to limit of search and return nil.
-Optional fourth argument is repeat count--search for successive occurrences.  */)
+Optional fourth argument is repeat count--search for successive occurrences.
+
+Relies on the function `word-search-regexp' to convert a sequence
+of words in STRING to a regexp used to search words without regard
+to punctuation.  */)
   (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror, Lisp_Object count)
 {
-  return search_command (wordify (string, 0), bound, noerror, count, 1, 1, 0);
+  return search_command (Fword_search_regexp (string, Qnil), bound, noerror, count, 1, 1, 0);
 }
 
 DEFUN ("word-search-backward-lax", Fword_search_backward_lax, Sword_search_backward_lax, 1, 4,
@@ -2249,10 +2259,14 @@ An optional second argument bounds the search; it is a buffer position.
 The match found must not extend before that position.
 Optional third argument, if t, means if fail just return nil (no error).
   If not nil and not t, move to limit of search and return nil.
-Optional fourth argument is repeat count--search for successive occurrences.  */)
+Optional fourth argument is repeat count--search for successive occurrences.
+
+Relies on the function `word-search-regexp' to convert a sequence
+of words in STRING to a regexp used to search words without regard
+to punctuation.  */)
   (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror, Lisp_Object count)
 {
-  return search_command (wordify (string, 1), bound, noerror, count, -1, 1, 0);
+  return search_command (Fword_search_regexp (string, Qt), bound, noerror, count, -1, 1, 0);
 }
 
 DEFUN ("word-search-forward-lax", Fword_search_forward_lax, Sword_search_forward_lax, 1, 4,
@@ -2267,10 +2281,14 @@ An optional second argument bounds the search; it is a buffer position.
 The match found must not extend after that position.
 Optional third argument, if t, means if fail just return nil (no error).
   If not nil and not t, move to limit of search and return nil.
-Optional fourth argument is repeat count--search for successive occurrences.  */)
+Optional fourth argument is repeat count--search for successive occurrences.
+
+Relies on the function `word-search-regexp' to convert a sequence
+of words in STRING to a regexp used to search words without regard
+to punctuation.  */)
   (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror, Lisp_Object count)
 {
-  return search_command (wordify (string, 1), bound, noerror, count, 1, 1, 0);
+  return search_command (Fword_search_regexp (string, Qt), bound, noerror, count, 1, 1, 0);
 }
 
 DEFUN ("re-search-backward", Fre_search_backward, Sre_search_backward, 1, 4,
@@ -3132,7 +3150,7 @@ record_unwind_save_match_data (void)
                          Fmatch_data (Qnil, Qnil, Qnil));
 }
 
-/* Quote a string to inactivate reg-expr chars */
+/* Quote a string to deactivate reg-expr chars */
 
 DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0,
        doc: /* Return a regexp string which matches exactly STRING and nothing else.  */)
@@ -3229,6 +3247,7 @@ is to bind it with `let' around a small expression.  */);
   defsubr (&Sposix_string_match);
   defsubr (&Ssearch_forward);
   defsubr (&Ssearch_backward);
+  defsubr (&Sword_search_regexp);
   defsubr (&Sword_search_forward);
   defsubr (&Sword_search_backward);
   defsubr (&Sword_search_forward_lax);
diff --git a/src/term.c b/src/term.c
index 4a671d048c4..ae505f020f2 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3236,7 +3236,7 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\
   MultiLeft (tty) = tgetstr ("LE", address);
   MultiRight (tty) = tgetstr ("RI", address);
 
-  /* SVr4/ANSI color suppert.  If "op" isn't available, don't support
+  /* SVr4/ANSI color support.  If "op" isn't available, don't support
      color because we can't switch back to the default foreground and
      background.  */
   tty->TS_orig_pair = tgetstr ("op", address);
diff --git a/src/w32fns.c b/src/w32fns.c
index 434861320a5..7a17c108d4d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3711,7 +3711,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
       if (w32_system_caret_hwnd == NULL)
         {
           /* Use the default caret width, and avoid changing it
-             unneccesarily, as it confuses screen reader software.  */
+             unnecessarily, as it confuses screen reader software.  */
           w32_system_caret_hwnd = hwnd;
           CreateCaret (hwnd, NULL, 0,
                        w32_system_caret_height);
@@ -5011,7 +5011,8 @@ no value of TYPE (always string in the MS Windows case).  */)
    cursor.  Duplicated from xdisp.c, but cannot use the version there
    due to lack of atimers on w32.  */
 #define DEFAULT_HOURGLASS_DELAY 1
-/* Return non-zero if houglass timer has been started or hourglass is shown.  */
+/* Return non-zero if hourglass timer has been started or hourglass is
+   shown.  */
 /* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
             xdisp.c could be used. */
 
diff --git a/src/w32term.h b/src/w32term.h
index 02392133837..6c73daba601 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -209,7 +209,7 @@ extern int x_display_pixel_width (struct w32_display_info *);
    the information that is specific to W32 windows.  */
 
 /* Put some things in x_output for compatibility.
-   NTEMACS_TODO: Move all common things here to eliminate unneccesary
+   NTEMACS_TODO: Move all common things here to eliminate unnecessary
    diffs between X and w32 code.  */
 struct x_output
 {
diff --git a/src/widget.c b/src/widget.c
index 0582718948d..96bfd4787e9 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -476,6 +476,9 @@ update_wm_hints (EmacsFrame ew)
   int base_height;
   int min_rows = 0, min_cols = 0;
 
+  /* This happens when the frame is just created.  */
+  if (! wmshell) return;
+
 #if 0
   check_frame_size (ew->emacs_frame.frame, &min_rows, &min_cols);
 #endif
@@ -506,6 +509,14 @@ update_wm_hints (EmacsFrame ew)
                  NULL);
 }
 
+void
+widget_update_wm_size_hints (Widget widget)
+{
+  EmacsFrame ew = (EmacsFrame)widget;
+  update_wm_hints (ew);
+}
+
+
 #if 0
 
 static void
@@ -808,7 +819,7 @@ EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeome
   return result->request_mode ? XtGeometryAlmost : XtGeometryYes;
 }
 
-/* Special entrypoints */
+/* Special entry points */
 void
 EmacsFrameSetCharSize (Widget widget, int columns, int rows)
 {
diff --git a/src/widget.h b/src/widget.h
index f64f188e158..11041d54ad0 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -92,9 +92,9 @@ extern WidgetClass emacsFrameClass;
 
 extern struct _DisplayContext* display_context;
 
-/* Special entrypoints */
+/* Special entry points */
 void EmacsFrameSetCharSize (Widget, int, int);
 void widget_store_internal_border (Widget widget);
+void widget_update_wm_size_hints (Widget widget);
 
 #endif /* _EmacsFrame_h */
-
diff --git a/src/window.c b/src/window.c
index 728e811f304..86fcca25f2e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1054,6 +1054,7 @@ window_relative_x_coord (struct window *w, enum window_part part, int x)
 DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p,
        Scoordinates_in_window_p, 2, 2, 0,
        doc: /* Return non-nil if COORDINATES are in WINDOW.
+WINDOW must be a live window.
 COORDINATES is a cons of the form (X . Y), X and Y being distances
 measured in characters from the upper-left corner of the frame.
 \(0 . 0) denotes the character in the upper left corner of the
@@ -1075,7 +1076,7 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\
   int x, y;
   Lisp_Object lx, ly;
 
-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);
   w = XWINDOW (window);
   f = XFRAME (w->frame);
   CHECK_CONS (coordinates);
@@ -3089,7 +3090,7 @@ This function runs `window-scroll-functions' before running
             error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
           else
             /* WINDOW is weakly dedicated to its buffer, reset
-               dedicatedness.  */
+               dedication.  */
             w->dedicated = Qnil;
 
           call1 (Qrecord_window_buffer, window);
@@ -6303,7 +6304,7 @@ freeze_window_starts (struct frame *f, int freeze_p)
    ignore_positions non-zero means ignore non-matching scroll positions
    and the like.
 
-   This ignores a couple of things like the dedicatedness status of
+   This ignores a couple of things like the dedication status of
    window, combination_limit and the like.  This might have to be
    fixed.  */
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 7c415e485b5..530373a4436 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2851,8 +2851,14 @@ start_display (struct it *it, struct window *w, struct text_pos pos)
                   || (new_x == it->last_visible_x
                       && FRAME_WINDOW_P (it->f))))
             {
-              if (it->current.dpvec_index >= 0
-                  || it->current.overlay_string_index >= 0)
+              if ((it->current.dpvec_index >= 0
+                   || it->current.overlay_string_index >= 0)
+                  /* If we are on a newline from a display vector or
+                     overlay string, then we are already at the end of
+                     a screen line; no need to go to the next line in
+                     that case, as this line is not really continued.
+                     (If we do go to the next line, C-e will not DTRT.)  */
+                  && it->c != '\n')
                 {
                   set_iterator_to_next (it, 1);
                   move_it_in_display_line_to (it, -1, -1, 0);
@@ -3171,13 +3177,11 @@ compute_stop_pos (struct it *it)
   Lisp_Object object, limit, position;
   EMACS_INT charpos, bytepos;
 
-  /* If nowhere else, stop at the end.  */
-  it->stop_charpos = it->end_charpos;
-
   if (STRINGP (it->string))
     {
       /* Strings are usually short, so don't limit the search for
          properties.  */
+      it->stop_charpos = it->end_charpos;
       object = it->string;
       limit = Qnil;
       charpos = IT_STRING_CHARPOS (*it);
@@ -3187,6 +3191,12 @@ compute_stop_pos (struct it *it)
     {
       EMACS_INT pos;
 
+      /* If end_charpos is out of range for some reason, such as a
+         misbehaving display function, rationalize it (Bug#5984).  */
+      if (it->end_charpos > ZV)
+        it->end_charpos = ZV;
+      it->stop_charpos = it->end_charpos;
+
       /* If next overlay change is in front of the current stop pos
          (which is IT->end_charpos), stop there.  Note: value of
          next_overlay_change is point-max if no overlay change
@@ -4088,26 +4098,37 @@ handle_invisible_prop (struct it *it)
           if (it->bidi_p && newpos < ZV)
             {
               EMACS_INT bpos = CHAR_TO_BYTE (newpos);
-
-              if (FETCH_BYTE (bpos) == '\n'
-                  || (newpos > BEGV && FETCH_BYTE (bpos - 1) == '\n'))
+              int on_newline = FETCH_BYTE (bpos) == '\n';
+              int after_newline =
+                newpos <= BEGV || FETCH_BYTE (bpos - 1) == '\n';
+
+              /* If the invisible text ends on a newline or on a
+                 character after a newline, we can avoid the costly,
+                 character by character, bidi iteration to NEWPOS, and
+                 instead simply reseat the iterator there.  That's
+                 because all bidi reordering information is tossed at
+                 the newline.  This is a big win for modes that hide
+                 complete lines, like Outline, Org, etc.  */
+              if (on_newline || after_newline)
                 {
-                  /* If the invisible text ends on a newline or the
-                     character after a newline, we can avoid the
-                     costly, character by character, bidi iteration to
-                     newpos, and instead simply reseat the iterator
-                     there.  That's because all bidi reordering
-                     information is tossed at the newline.  This is a
-                     big win for modes that hide complete lines, like
-                     Outline, Org, etc.  (Implementation note: the
-                     call to reseat_1 is necessary, because it signals
-                     to the bidi iterator that it needs to reinit its
-                     internal information when the next element for
-                     display is requested.  */
                   struct text_pos tpos;
+                  bidi_dir_t pdir = it->bidi_it.paragraph_dir;
 
                   SET_TEXT_POS (tpos, newpos, bpos);
                   reseat_1 (it, tpos, 0);
+                  /* If we reseat on a newline, we need to prep the
+                     bidi iterator for advancing to the next character
+                     after the newline, keeping the current paragraph
+                     direction (so that PRODUCE_GLYPHS does TRT wrt
+                     prepending/appending glyphs to a glyph row).  */
+                  if (on_newline)
+                    {
+                      it->bidi_it.first_elt = 0;
+                      it->bidi_it.paragraph_dir = pdir;
+                      it->bidi_it.ch = '\n';
+                      it->bidi_it.nchars = 1;
+                      it->bidi_it.ch_len = 1;
+                    }
                 }
               else      /* Must use the slow method.  */
                 {
@@ -4116,11 +4137,11 @@ handle_invisible_prop (struct it *it)
                      non-base embedding level.  Therefore, we need to
                      skip invisible text using the bidi iterator,
                      starting at IT's current position, until we find
-                     ourselves outside the invisible text.  Skipping
-                     invisible text _after_ bidi iteration avoids
-                     affecting the visual order of the displayed text
-                     when invisible properties are added or
-                     removed.  */
+                     ourselves outside of the invisible text.
+                     Skipping invisible text _after_ bidi iteration
+                     avoids affecting the visual order of the
+                     displayed text when invisible properties are
+                     added or removed.  */
                   if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV)
                     {
                       /* If we were `reseat'ed to a new paragraph,
@@ -15614,8 +15635,8 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
         ? min (scroll_margin, WINDOW_TOTAL_LINES (w) / 4)
         : 0;
       EMACS_INT margin_pos = CHARPOS (startp);
-      int scrolling_up;
       Lisp_Object aggressive;
+      int scrolling_up;
 
       /* If there is a scroll margin at the top of the window, find
          its character position.  */
@@ -15657,7 +15678,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
               pt_offset = float_amount * WINDOW_BOX_TEXT_HEIGHT (w);
               if (pt_offset == 0 && float_amount > 0)
                 pt_offset = 1;
-              if (pt_offset)
+              if (pt_offset && margin > 0)
                 margin -= 1;
             }
           /* Compute how much to move the window start backward from
@@ -15777,6 +15798,25 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
           goto recenter;
         }
 
+      /* Users who set scroll-conservatively to a large number want
+         point just above/below the scroll margin.  If we ended up
+         with point's row partially visible, move the window start to
+         make that row fully visible and out of the margin.  */
+      if (scroll_conservatively > SCROLL_LIMIT)
+        {
+          int margin =
+            scroll_margin > 0
+            ? min (scroll_margin, WINDOW_TOTAL_LINES (w) / 4)
+            : 0;
+          int move_down = w->cursor.vpos >= WINDOW_TOTAL_LINES (w) / 2;
+
+          move_it_by_lines (&it, move_down ? margin + 1 : -(margin + 1));
+          clear_glyph_matrix (w->desired_matrix);
+          if (1 == try_window (window, it.current.pos,
+                               TRY_WINDOW_CHECK_MARGINS))
+            goto done;
+        }
+
       /* If centering point failed to make the whole line visible,
          put point at the top instead.  That has to make the whole line
          visible, if it can be done.  */
@@ -28871,7 +28911,8 @@ init_xdisp (void)
 
 /* Platform-independent portion of hourglass implementation. */
 
-/* Return non-zero if houglass timer has been started or hourglass is shown.  */
+/* Return non-zero if hourglass timer has been started or hourglass is
+   shown.  */
 int
 hourglass_started (void)
 {
diff --git a/src/xfaces.c b/src/xfaces.c
index 849ad6bbdf4..7e3ce4103d9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -66,7 +66,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    attributes (1st thru 5th) are updated from the spec.
 
    On the other hand, if one of the other font-related attributes are
-   specified, the correspoinding specs in this attribute is set to nil.
+   specified, the corresponding specs in this attribute is set to nil.
 
    15. A face name or list of face names from which to inherit attributes.
 
@@ -1223,7 +1223,7 @@ face_color_gray_p (struct frame *f, const char *color_name)
   int gray_p;
 
   if (defined_color (f, color_name, &color, 0))
-    gray_p = (/* Any color sufficiently close to black counts as grey.  */
+    gray_p = (/* Any color sufficiently close to black counts as gray.  */
               (color.red < 5000 && color.green < 5000 && color.blue < 5000)
               ||
               ((eabs (color.red - color.green)
diff --git a/src/xfns.c b/src/xfns.c
index c68149cce11..323b272e9f0 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3166,7 +3166,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
      to get the color reference counts right, so initialize them!  */
   {
     Lisp_Object black;
-    struct gcpro inner_gcpro1;
+    struct gcpro gcpro1;
 
     /* Function x_decode_color can signal an error.  Make
        sure to initialize color slots so that we won't try
@@ -3179,7 +3179,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
     f->output_data.x->mouse_pixel = -1;
 
     black = build_string ("black");
-    GCPRO1_VAR (black, inner_gcpro);
+    GCPRO1 (black);
     FRAME_FOREGROUND_PIXEL (f)
       = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
     FRAME_BACKGROUND_PIXEL (f)
@@ -3192,7 +3192,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
       = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
     f->output_data.x->mouse_pixel
       = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
-    UNGCPRO_VAR (inner_gcpro);
+    UNGCPRO;
   }
 
   /* Specify the parent under which to make this X window.  */
@@ -4620,7 +4620,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
      to get the color reference counts right, so initialize them!  */
   {
     Lisp_Object black;
-    struct gcpro inner_gcpro1;
+    struct gcpro gcpro1;
 
     /* Function x_decode_color can signal an error.  Make
        sure to initialize color slots so that we won't try
@@ -4633,7 +4633,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
     f->output_data.x->mouse_pixel = -1;
 
     black = build_string ("black");
-    GCPRO1_VAR (black, inner_gcpro);
+    GCPRO1 (black);
     FRAME_FOREGROUND_PIXEL (f)
       = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
     FRAME_BACKGROUND_PIXEL (f)
@@ -4646,7 +4646,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo,
       = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
     f->output_data.x->mouse_pixel
       = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
-    UNGCPRO_VAR (inner_gcpro);
+    UNGCPRO;
   }
 
   /* Set the name; the functions to which we pass f expect the name to
diff --git a/src/xterm.c b/src/xterm.c
index f750c00cea0..8171fe7738e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6123,7 +6123,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
       last_user_time = event.xproperty.time;
       f = x_top_window_to_frame (dpyinfo, event.xproperty.window);
       if (f && event.xproperty.atom == dpyinfo->Xatom_net_wm_state)
-        if (x_handle_net_wm_state (f, &event.xproperty) && f->iconified)
+        if (x_handle_net_wm_state (f, &event.xproperty) && f->iconified
+            && f->output_data.x->net_wm_state_hidden_seen)
           {
             /* Gnome shell does not iconify us when C-z is pressed.  It hides
                the frame.  So if our state says we aren't hidden anymore,
@@ -6133,6 +6134,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
             f->async_visible = 1;
             f->async_iconified = 0;
             f->output_data.x->has_been_visible = 1;
+            f->output_data.x->net_wm_state_hidden_seen = 0;
             inev.ie.kind = DEICONIFY_EVENT;
             XSETFRAME (inev.ie.frame_or_window, f);
           }
@@ -8494,7 +8496,10 @@ get_current_wm_state (struct frame *f,
     {
       Atom a = ((Atom*)tmp_data)[i];
       if (a == dpyinfo->Xatom_net_wm_state_hidden)
-        is_hidden = 1;
+        {
+          is_hidden = 1;
+          f->output_data.x->net_wm_state_hidden_seen = 1;
+        }
       else if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
         {
           if (*size_state == FULLSCREEN_HEIGHT)
@@ -9570,6 +9575,14 @@ x_wm_set_size_hint (struct frame *f, long flags, int user_position)
   XSizeHints size_hints;
   Window window = FRAME_OUTER_WINDOW (f);
 
+#ifdef USE_X_TOOLKIT
+  if (f->output_data.x->widget)
+    {
+      widget_update_wm_size_hints (f->output_data.x->widget);
+      return;
+    }
+#endif
+
   /* Setting PMaxSize caused various problems.  */
   size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */;
 
diff --git a/src/xterm.h b/src/xterm.h
index 1d2ce9a2d3c..4385b1a467d 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -632,6 +632,9 @@ struct x_output
      x_check_expected_move.  */
   int left_before_move;
   int top_before_move;
+
+  /* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame.  */
+  int net_wm_state_hidden_seen;
 };
 
 #define No_Cursor (None)
diff --git a/test/ChangeLog b/test/ChangeLog
index 04a70737d61..964238ae45b 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-03  Chong Yidong  <cyd@gnu.org>
+
+        * automated/compile-tests.el (compile-tests--test-regexps-data):
+        Increase column numbers by one to reflect change in how
+        compilation-message is recorded (Bug#10172).
+
 2011-11-22  Glenn Morris  <rgm@gnu.org>
 
         * rmailmm.el: New file, split from lisp/mail/rmailmm.el.
diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el
index 419cc0e9116..0203084bf38 100644
--- a/test/automated/compile-tests.el
+++ b/test/automated/compile-tests.el
@@ -41,7 +41,7 @@
      1 nil 17 "fplot.f")
     ;; Ada & Mpatrol
     ("foo.adb:61:11:  [...] in call to size declared at foo.ads:11"
-     1 10 61 "foo.adb")
+     1 11 61 "foo.adb")
     ("foo.adb:61:11:  [...] in call to size declared at foo.ads:11"
      52 nil 11 "foo.ads")
     ("     0x8008621 main+16 at error.c:17"
@@ -55,7 +55,7 @@
     ("[javac] /src/DataBaseTestCase.java:49: warning: finally clause cannot complete normally"
      13 nil 49 "/src/DataBaseTestCase.java")
     ("[jikes]  foo.java:3:5:7:9: blah blah"
-     14 (4 . 9) (3 . 7) "foo.java")
+     14 (5 . 10) (3 . 7) "foo.java")
     ;; bash
     ("a.sh: line 1: ls-l: command not found"
      1 nil 1 "a.sh")
@@ -70,9 +70,9 @@
      1 nil 68 "pong.c")
     ;; caml
     ("File \"foobar.ml\", lines 5-8, characters 20-155: blah blah"
-     1 (19 . 155) (5 . 8) "foobar.ml")
+     1 (20 . 156) (5 . 8) "foobar.ml")
     ("File \"F:\\ocaml\\sorting.ml\", line 65, characters 2-145:\nWarning 26: unused variable equ."
-     1 (1 . 145) 65 "F:\\ocaml\\sorting.ml")
+     1 (2 . 146) 65 "F:\\ocaml\\sorting.ml")
     ("File \"/usr/share/gdesklets/display/TargetGauge.py\", line 41, in add_children"
      1 nil 41 "/usr/share/gdesklets/display/TargetGauge.py")
     ("File \\lib\\python\\Products\\PythonScripts\\PythonScript.py, line 302, in _exec"
@@ -83,13 +83,13 @@
     ("\"foo.f\", line 3: Error: syntax error near end of statement"
      1 nil 3 "foo.f")
     ("\"vvouch.c\", line 19.5: 1506-046 (S) Syntax error."
-     1 4 19 "vvouch.c")
+     1 5 19 "vvouch.c")
     ("\"foo.c\", line 32 pos 1; (E) syntax error; unexpected symbol: \"lossage\""
-     1 0 32 "foo.c")
+     1 1 32 "foo.c")
     ("\"foo.adb\", line 2(11): warning: file name does not match ..."
-     1 10 2 "foo.adb")
+     1 11 2 "foo.adb")
     ("\"src/swapping.c\", line 30.34: 1506-342 (W) \"/*\" detected in comment."
-     1 33 30 "src/swapping.c")
+     1 34 30 "src/swapping.c")
     ;; cucumber
     ("Scenario: undefined step  # features/cucumber.feature:3"
      29 nil 3 "features/cucumber.feature")
@@ -115,7 +115,7 @@
     ("Warning near line 10 file arrayclash.f: Module contains no executable"
      1 nil 10 "arrayclash.f")
     ("Nonportable usage near line 31 col 9 file assign.f: mixed default and explicit"
-     24 8 31 "assign.f")
+     24 9 31 "assign.f")
     ;; iar
     ("\"foo.c\",3  Error[32]: Error message"
      1 nil 3 "foo.c")
@@ -123,11 +123,11 @@
      1 nil 3 "foo.c")
     ;; ibm
     ("foo.c(2:0) : informational EDC0804: Function foo is not referenced."
-     1 -1 2 "foo.c")
+     1 0 2 "foo.c")
     ("foo.c(3:8) : warning EDC0833: Implicit return statement encountered."
-     1 7 3 "foo.c")
+     1 8 3 "foo.c")
     ("foo.c(5:5) : error EDC0350: Syntax error."
-     1 4 5 "foo.c")
+     1 5 5 "foo.c")
     ;; irix
     ("ccom: Error: foo.c, line 2: syntax error"
      1 nil 2 "foo.c")
@@ -163,7 +163,7 @@
     ("In file included from /usr/include/c++/3.3/backward/warn.h:4,"
      1 nil 4 "/usr/include/c++/3.3/backward/warn.h")
     ("                 from /usr/include/c++/3.3/backward/iostream.h:31:0,"
-     1 -1 31 "/usr/include/c++/3.3/backward/iostream.h")
+     1 0 31 "/usr/include/c++/3.3/backward/iostream.h")
     ("                 from test_clt.cc:1:"
      1 nil 1 "test_clt.cc")
     ;; gnu
@@ -173,15 +173,15 @@
     ("foo/bar.py:8: FutureWarning message" 1 nil 8 "foo/bar.py")
     ("foo.py:8: RuntimeWarning message" 1 nil 8 "foo.py")
     ("foo.c:8:I: message" 1 nil 8 "foo.c")
-    ("foo.c:8.23: note: message" 1 22 8 "foo.c")
-    ("foo.c:8.23: info: message" 1 22 8 "foo.c")
-    ("foo.c:8:23:information: message" 1 22 8 "foo.c")
-    ("foo.c:8.23-45: Informational: message" 1 (22 . nil) (8 . 45) "foo.c")
+    ("foo.c:8.23: note: message" 1 23 8 "foo.c")
+    ("foo.c:8.23: info: message" 1 23 8 "foo.c")
+    ("foo.c:8:23:information: message" 1 23 8 "foo.c")
+    ("foo.c:8.23-45: Informational: message" 1 (23 . nil) (8 . 45) "foo.c")
     ("foo.c:8-23: message" 1 nil (8 . 23) "foo.c")
-    ("foo.c:8-45.3: message" 1 (nil . 3) (8 . 45) "foo.c")
-    ("foo.c:8.23-9.1: message" 1 (22 . 1) (8 . 9) "foo.c")
+    ("foo.c:8-45.3: message" 1 (nil . 4) (8 . 45) "foo.c")
+    ("foo.c:8.23-9.1: message" 1 (23 . 2) (8 . 9) "foo.c")
     ("jade:dbcommon.dsl:133:17:E: missing argument for function call"
-     1 16 133 "dbcommon.dsl")
+     1 17 133 "dbcommon.dsl")
     ("G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found."
      1 nil 54 "G:/cygwin/dev/build-myproj.xml")
     ("file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found."
@@ -189,8 +189,8 @@
     ("{standard input}:27041: Warning: end of file not at end of a line; newline inserted"
      1 nil 27041 "{standard input}")
     ;; lcc
-    ("E, file.cc(35,52) Illegal operation on pointers" 1 51 35 "file.cc")
-    ("W, file.cc(36,52) blah blah" 1 51 36 "file.cc")
+    ("E, file.cc(35,52) Illegal operation on pointers" 1 52 35 "file.cc")
+    ("W, file.cc(36,52) blah blah" 1 52 36 "file.cc")
     ;; makepp
     ("makepp: Scanning `/foo/bar.c'" 19 nil nil "/foo/bar.c")
     ("makepp: warning: bla bla `/foo/bar.c' and `/foo/bar.h'" 27 nil nil "/foo/bar.c")
@@ -198,7 +198,7 @@
     ("makepp: bla bla `/foo/bar.c' and `/foo/bar.h'" 35 nil nil "/foo/bar.h")
     ;; maven
     ("FooBar.java:[111,53] no interface expected here"
-     1 52 111 "FooBar.java")
+     1 53 111 "FooBar.java")
     ;; mips-1 mips-2
     ("TrimMask (255) in solomon.c may be indistinguishable from TrimMasks (93) in solomo.c due to truncation"
      11 nil 255 "solomon.c")
@@ -220,17 +220,17 @@
      1 nil 120 "..\src\ctrl\lister.c")
     ;; oracle
     ("Semantic error at line 528, column 5, file erosacqdb.pc:"
-     1 4 528 "erosacqdb.pc")
+     1 5 528 "erosacqdb.pc")
     ("Error at line 41, column 10 in file /usr/src/sb/ODBI_BHP.hpp"
-     1 9 41 "/usr/src/sb/ODBI_BHP.hpp")
+     1 10 41 "/usr/src/sb/ODBI_BHP.hpp")
     ("PCC-02150: error at line 49, column 27 in file /usr/src/sb/ODBI_dxfgh.pc"
-     1 26 49 "/usr/src/sb/ODBI_dxfgh.pc")
+     1 27 49 "/usr/src/sb/ODBI_dxfgh.pc")
     ("PCC-00003: invalid SQL Identifier at column name in line 12 of file /usr/src/sb/ODBI_BHP.hpp"
      1 nil 12 "/usr/src/sb/ODBI_BHP.hpp")
     ("PCC-00004: mismatched IF/ELSE/ENDIF block at line 27 in file /usr/src/sb/ODBI_BHP.hpp"
      1 nil 27 "/usr/src/sb/ODBI_BHP.hpp")
     ("PCC-02151: line 21 column 40 file /usr/src/sb/ODBI_BHP.hpp:"
-     1 39 21 "/usr/src/sb/ODBI_BHP.hpp")
+     1 40 21 "/usr/src/sb/ODBI_BHP.hpp")
     ;; perl
     ("syntax error at automake line 922, near \"':'\""
      14 nil 922 "automake")
@@ -262,9 +262,9 @@
      1 nil 10 "examples/test-unit.rb")
     ;; rxp
     ("Error: Mismatched end tag: expected </geroup>, got </group>\nin unnamed entity at line 71 char 8 of file:///home/reto/test/group.xml"
-     1 7 71 "/home/reto/test/group.xml")
+     1 8 71 "/home/reto/test/group.xml")
     ("Warning: Start tag for undeclared element geroup\nin unnamed entity at line 4 char 8 of file:///home/reto/test/group.xml"
-     1 7 4 "/home/reto/test/group.xml")
+     1 8 4 "/home/reto/test/group.xml")
     ;; sparc-pascal-file sparc-pascal-line sparc-pascal-example
     ("Thu May 14 10:46:12 1992  mom3.p:"
      1 nil nil "mom3.p")
@@ -274,10 +274,10 @@
     ("cc-1070 cc: WARNING File = linkl.c, Line = 38"
      13 nil 38 "linkl.c")
     ("cf90-113 f90comp: ERROR NSE, File = Hoved.f90, Line = 16, Column = 3"
-     18 2 16 "Hoved.f90")
+     18 3 16 "Hoved.f90")
     ;; sun-ada
     ("/home3/xdhar/rcds_rc/main.a, line 361, char 6:syntax error: \",\" inserted"
-     1 5 361 "/home3/xdhar/rcds_rc/main.a")
+     1 6 361 "/home3/xdhar/rcds_rc/main.a")
     ;; 4bsd
     ("/usr/src/foo/foo.c(8): warning: w may be used before set"
      1 nil 8 "/usr/src/foo/foo.c")
@@ -300,7 +300,7 @@
      1 nil 46 "t/foo.t")
     ;; weblint
     ("index.html (13:1) Unknown element <fdjsk>"
-     1 0 13 "index.html"))
+     1 1 13 "index.html"))
   "List of tests for `compilation-error-regexp-alist'.
 Each element has the form (STR POS COLUMN LINE FILENAME), where
 STR is an error string, POS is the position of the error in STR,
diff --git a/test/cedet/cedet-utests.el b/test/cedet/cedet-utests.el
index d161ae68fcb..f7eef05dd99 100644
--- a/test/cedet/cedet-utests.el
+++ b/test/cedet/cedet-utests.el
@@ -96,7 +96,7 @@
   "Non-nil when CEDET-utest is running all the tests.")
 
 (defun cedet-utest (&optional exit-on-error)
-  "Run the CEDET unittests.
+  "Run the CEDET unit tests.
 EXIT-ON-ERROR causes the test suite to exit on an error, instead
 of just logging the error."
   (interactive)
diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el
index ff62040129d..12fbc37a112 100644
--- a/test/cedet/semantic-utest.el
+++ b/test/cedet/semantic-utest.el
@@ -536,7 +536,7 @@ Pre-fill the buffer with CONTENTS."
 
 (defun semantic-utest-generic (testname filename contents name-contents names-removed killme insertme)
   "Generic unit test according to template.
-Should work for languages withouth .h files, python javascript java.
+Should work for languages without .h files, python javascript java.
 TESTNAME is the name of the test.
 FILENAME is the name of the file to create.
 CONTENTS is the contents of the file to test.
diff --git a/test/indent/octave.m b/test/indent/octave.m
index 5ce52ad7a19..4c2fa6c8435 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -19,7 +19,7 @@ function res = tcomp (fn)
   pop = x(:,1:10)(:);
     ## Here and below, we test if the indentation aligns with a previous
     ## fixindented line.  This is important so as to make it easier for the
-    ## user to verride some indentation somewhere, and also because it
+    ## user to override some indentation somewhere, and also because it
     ## reflects the fact that the indentation decision is taken with a minimum
     ## amount of work (i.e. in the present case, without having to walk back
     ## until the `function' line).