96 files changed, 1404 insertions, 683 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46d8ca44a0a..6a9b1808cdf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,273 @@
+2012-03-06  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+        * info.el (Info-insert-dir): Also try "dir.gz".
+
+2012-03-06  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-find-file):
+        Ignore non-readable or non-regular files.  (Bug#10928)
+
+        * files.el (locate-dominating-file): Doc fix.
+
+2012-03-06  Adam Spiers  <emacs@adamspiers.org>  (tiny change)
+
+        * calendar/calendar.el (calendar-set-mode-line):
+        `getenv' returns a string.  (Bug#10951)
+
+2012-03-05  Leo Liu  <sdl.web@gmail.com>
+
+        * simple.el (backward-delete-char-untabify): Constrain point to
+        field (Bug#10939).
+
+        * eshell/em-cmpl.el (eshell-cmpl-initialize): Fix shift-tab key.
+
+2012-03-05  Chong Yidong  <cyd@gnu.org>
+
+        * simple.el (count-words): If called from Lisp, return the word
+        count, for symmetry with `count-lines'.  Arglist changed.
+        (count-words--message): Args changed.  Consolidate counting code
+        from count-words and count-words-region.
+        (count-words-region): Caller changed.
+        (count-lines-region): Make it an obsolete alias.
+
+2012-03-04  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * saveplace.el (save-place-to-alist)
+        (save-place-ignore-files-regexp): Allow value nil to disable this
+        feature.
+
+2012-03-04  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (face-spec-reset-face): For the default face, reset the
+        attributes to default values (Bug#10748).
+
+2012-03-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/emacsbug.el (report-emacs-bug-hook): Fix up thinko in
+        previous patch: Check `message-send-mail-function', and not the
+        default function (bug#10897).
+
+2012-03-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        * notifications.el (notifications-on-action-signal)
+        (notifications-on-closed-signal): Check for unique service name of
+        incoming event.  Fix error in removing entry.
+        (top): Register for signals with wildcard service name.
+        (notifications-notify): Use daemon unique service name for map entries.
+
+2012-03-04  Chong Yidong  <cyd@gnu.org>
+
+        * cus-start.el: Make x-select-enable-clipboard-manager
+        customizable.
+
+2012-03-04  Glenn Morris  <rgm@gnu.org>
+
+        * abbrev.el (copy-abbrev-table, abbrev-table-p)
+        (abbrev-minor-mode-table-alist, define-abbrev, abbrev-insert)
+        (expand-abbrev, define-abbrev-table): Doc fixes.
+
+2012-03-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/emacsbug.el (report-emacs-bug-hook): Look at the value of
+        `message-default-send-mail-function' and not `send-mail-function'
+        when doing the prompting for `sendmail-query-once' before sending
+        in Message buffers (bug#10897).
+
+        * net/tls.el (open-tls-stream): Don't set the dont-query-on-exit flag.
+        This is inconsistent with all the other stream functions, which leave
+        the setting up to the higher levels (if so wanted) (bug#10931).
+
+2012-03-02  Alan Mackenzie  <acm@muc.de>
+
+        Depessimize the handling of very large macros.
+
+        * progmodes/cc-engine.el (c-macro-cache, c-macro-cache-start-pos):
+        (c-macro-cache-syntactic): New variables to implement a one
+        element macro cache.
+        (c-invalidate-macro-cache): New function.
+        (c-beginning-of-macro, c-end-of-macro, c-syntactic-end-of-macro):
+        Adapt to use the new cache.
+        (c-state-safe-place): Use better the cache of safe positions.
+        (c-state-semi-nonlit-pos-cache)
+        (c-state-semi-nonlit-pos-cache-limit):
+        New variables for...
+        (c-state-semi-safe-place): New function.  Here, in a macro is "safe".
+        (c-invalidate-state-cache-1): New stuff for c-state-semi-safe-place.
+        (c-in-literal, c-literal-limits, c-determine-limit-get-base): Use
+        c-state-semi-safe-place.
+
+        * progmodes/cc-langs.el (c-get-state-before-change-functions): Add
+        c-invalidate-macro-cache to the C, C++, Obj entries.
+
+2012-03-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * jka-compr.el (jka-compr-call-process): Apply
+        `file-accessible-directory-p' only when the default directory is
+        not remote.
+
+2012-03-01  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (file-equal-p): Fix docstring.  Avoid unnecessary
+        access of FILE2, if FILE1 does not exist.
+
+        * net/tramp-sh.el (tramp-remote-process-environment): Add "PAGER=\"\"".
+        Reported by Robert Lupton the Good <rhl@astro.princeton.edu>.
+
+        * vc/vc-git.el (vc-git--call): Enable `inhibit-null-byte-detection'.
+        Add "PAGER=" to `process-environment'.
+
+2012-03-01  Michael R. Mauger  <mmaug@yahoo.com>
+
+        * progmodes/sql.el: Bug fix
+        (sql-get-login-ext): Save login values in globals.
+        (sql-get-login): Use new version of `sql-get-login-ext'.
+        (sql-interactive-mode): Set global `sql-connection' to nil.
+        (sql-connect): Set global values for connection.
+        (sql-product-interactive): Save global values as buffer local.
+
+2012-02-29  Leo Liu  <sdl.web@gmail.com>
+
+        * abbrev.el (define-abbrevs): Reset sys to nil.
+
+2012-02-28  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * files.el (file-equal-p): Rename from `files-equal-p'.
+        Return nil when one or both files don't exist.
+        (file-subdir-of-p): Now only top directory must exists,
+        return nil if it doesn't.
+        (copy-directory): No need to test with `file-subdir-of-p' after
+        creating dir.
+        * net/tramp.el (tramp-file-name-for-operation): Rename `files-equal-p'
+        to `file-equal-p'.
+
+2012-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * shell.el (shell-mode):
+        * progmodes/vhdl-mode.el (wildcard-to-regexp, file-expand-wildcards):
+        * play/landmark.el (landmark-font-lock-face-O):
+        * play/handwrite.el (handwrite):
+        * play/gomoku.el (gomoku-O):
+        * net/browse-url.el (browse-url-browser-display):
+        * international/mule.el (define-charset):
+        * htmlfontify.el (hfy-etags-cmd, hfy-face-attr-for-class):
+        * filesets.el (filesets-find-file-delay):
+        * eshell/em-xtra.el (eshell-xtra):
+        * eshell/em-unix.el (eshell-grep):
+        * emulation/viper.el (viper-mode):
+        * emacs-lisp/regexp-opt.el (regexp-opt-group):
+        * emacs-lisp/easymenu.el (easy-menu-define):
+        * calendar/timeclock.el (timeclock-use-display-time):
+        * bs.el (bs-mode):
+        * bookmark.el (bookmark-save-flag):
+        Doc fix (standardize possessive apostrophe usage).
+
+2012-02-27  Chong Yidong  <cyd@gnu.org>
+
+        * emulation/viper-cmd.el (viper-intercept-ESC-key):
+        Fix key-binding lookup for ESC key (Bug#9146).
+
+        * font-lock.el (font-lock-specified-p): Rename from
+        font-lock-spec-present.  Callers changed.
+
+2012-02-27  Daniel Hackney  <dan@haxney.org>
+
+        * emacs-lisp/package.el (package-compute-transaction):
+        Handle holding a package version to t in package-load-list.
+
+2012-02-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-inodes, tramp-devices): Initialize with 0.
+        (tramp-get-inode, tramp-get-device): Use cached values.
+
+2012-02-26  Alan Mackenzie  <acm@muc.de>
+
+        Check there is a font-lock specification before doing initial
+        fontification.
+
+        * font-core.el (font-lock-mode): Move the conditional from
+        :after-hook to font-lock-initial-fontify.
+        (font-lock-default-function): Move the check for a specification
+        to font-lock-spec-present.
+
+        * font-lock.el (font-lock-initial-fontify): call ...
+        (font-lock-spec-present): New function.
+
+2012-02-26  Jim Blandy  <jimb@red-bean.com>
+
+        * progmodes/gdb-mi.el (gdb-mi-quote): New function.
+        (gdb-send): Apply it to the operand of the '-interpreter-exec
+        console' command, so that we can pass arguments with (say) quotes
+        in them.  Store exact string sent in gdb-debug-log (Bug#10765).
+
+2012-02-26  Chong Yidong  <cyd@gnu.org>
+
+        * help-fns.el (describe-function-1): Clarify description of
+        remapping (Bug#10844).
+
+        * files.el (files-equal-p): Doc fix.
+        (file-subdir-of-p): Doc fix.  Convert loop macro to plain Lisp,
+        and quit the loop once a mismatch is found.
+
+2012-02-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * bs.el (bs--show-with-configuration): Don't throw an error
+        if the window cannot be split; otherwise, subsequent calls to
+        bs-show fail, restoring a stale window config.  (Bug#10882)
+
+2012-02-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * term/ns-win.el (global-map): Bind ns-drag-file to
+        ns-find-file (Bug#5855, Bug#10050).
+
+2012-02-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * calendar/parse-time.el (parse-time-string): Allow extractor to
+        return nil.
+
+2012-02-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-file-name-for-operation):
+        Add `files-equal-p' and `file-subdir-of-p'.
+
+        * net/tramp-sh.el (tramp-sh-handle-copy-directory):
+        * net/tramp-smb.el (tramp-smb-handle-copy-directory):
+        Add COPY-CONTENTS argument.
+
+2012-02-25  Chong Yidong  <cyd@gnu.org>
+
+        Add custom groups for VC backends, for consistency with vc-bzr.
+
+        * vc/vc-arch.el (vc-arch):
+        * vc/vc-cvs.el (vc-cvs):
+        * vc/vc-git.el (vc-git):
+        * vc/vc-hg.el (vc-hg):
+        * vc/vc-mtn.el (vc-mtn):
+        * vc/vc-rcs.el (vc-rcs):
+        * vc/vc-sccs.el (vc-sccs):
+        * vc/vc-svn.el (vc-svn): New customization group (Bug#10871).
+        All relevant defcustoms reassigned.
+
+2012-02-25  Chong Yidong  <cyd@gnu.org>
+
+        * newcomment.el (comment-styles): Add autoload (Bug#10868).
+
+        * term/x-win.el (x-initialize-window-system): Reduce default for
+        x-selection-timeout to 5 seconds (Bug#8869).
+
+2012-02-24  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * files.el (file-subdir-of-p): Fix typo.
+
+2012-02-24  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * files.el (files-equal-p, file-subdir-of-p): New functions.
+        (copy-directory): Error when trying to copy a directory on itself.
+        Add missing copy-contents arg to tramp handler.
+        * dired-aux.el (dired-copy-file-recursive): Same.
+        (dired-create-files): Modify destination when source is equal to
+        dest when copying files.
+        Return also when dest is a subdir of source.  (Bug#10489)
+
 2012-02-24  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/ange-ftp.el (ange-ftp-parse-netrc): Suppress comment lines.
@@ -10,9 +280,9 @@
         the execution of the mode hooks.
 
         * font-lock.el (font-lock-initial-fontify): New function extracted
-        from font-lock-mode-interal.
+        from font-lock-mode-internal.
 
-        * font-core.el (font-lock-mode): call font-lock-initial-fontify in
+        * font-core.el (font-lock-mode): Call font-lock-initial-fontify in
         :after-hook.
 
 2012-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -378,7 +648,7 @@
         * mail/emacsbug.el (report-emacs-bug-hook): Query the user first
         about SMTP before checking the From header.
 
-        * mail/sendmail.el (sendmail-query-user-about-smtp): Refacored out
+        * mail/sendmail.el (sendmail-query-user-about-smtp): Refactor out
         into own function for reuse by emacsbug.el.
 
 2012-02-10  Leo Liu  <sdl.web@gmail.com>
@@ -392,7 +662,7 @@
         * emacs-lisp/package.el (package-refresh-contents)
         (package-menu-execute):
         * desktop.el (desktop-create-buffer):
-        * font-lock.el (lisp-font-lock-keywords-2): caller changed.
+        * font-lock.el (lisp-font-lock-keywords-2): Caller changed.
 
 2012-02-10  Glenn Morris  <rgm@gnu.org>
 
@@ -3290,7 +3560,7 @@
 
 2011-10-08  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
-        * lisp/eshell/eshell.el (eshell-command): Avoid using hooks.
+        * eshell/eshell.el (eshell-command): Avoid using hooks.
 
 2011-10-07  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index dd1d113d665..0b4e62f9e91 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -7234,7 +7234,7 @@
 
 2004-05-10  Miles Bader  <miles@gnu.org>
 
-        * lisp/progmodes/gud.el (gud-common-init): Only consider an existing
+        * progmodes/gud.el (gud-common-init): Only consider an existing
         buffer an error if the debugger process is actually running.
 
 2004-05-10  Juanma Barranquero  <lektu@terra.es>
@@ -7529,7 +7529,7 @@
 
 2004-05-03  Michael Mauger  <mmaug@yahoo.com>
 
-        * emacs/lisp/progmodes/sql.el (sql-xemacs-p, sql-emacs19-p)
+        * progmodes/sql.el (sql-xemacs-p, sql-emacs19-p)
         (sql-emacs20-p): Remove.
         (sql-mode-syntax-table): Use shared GNU Emacs/XEmacs syntax.
         (sql-builtin-face, sql-doc-face): Remove.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index f354050389e..bf7a24a5b67 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -779,9 +779,9 @@
 
 2011-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
 
-        * lisp/allout-widgets.el (allout-widgets-icons-light-subdir)
+        * allout-widgets.el (allout-widgets-icons-light-subdir)
         (allout-widgets-icons-dark-subdir): Track relocations of icons.
-        * lisp/allout.el: Remove commentary about remove encryption
+        * allout.el: Remove commentary about remove encryption
         passphrase mnemonic support and verification.
         (allout-encrypt-string): Recognize epg failure to decrypt gpg2
         armored text using gpg1, and indicate that the gpg version *might*
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 5bc0474c58b..4de10683352 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -8048,7 +8048,7 @@
 
 1994-07-23  enami tsugutomo  <enami@sys.ptg.sony.co.jp>
 
-        * lisp/add-log.el (add-log-current-defun): Skip doc string
+        * add-log.el (add-log-current-defun): Skip doc string
         correctly even if it ends with line that starts space.
 
 1994-07-22  Ed Reingold  <reingold@albert.gnu.ai.mit.edu>
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 425268909ea..9976c45b307 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -5859,8 +5859,7 @@
 
 1998-03-05  Sam Steingold  <sds@usa.net>
 
-        * lisp/simple.el (backward-delete-char-untabify-method):
-        New user option.
+        * simple.el (backward-delete-char-untabify-method): New user option.
         (backward-delete-char-untabify): Obey it.
         This implements "hungry" delete.
 
@@ -7798,10 +7797,10 @@
 
 1997-12-03  Kyle Jones  <kyle_jones@wonderworks.com>
 
-        * lisp/mail/sendmail.el (sendmail-send-it): Parse folded
-        Resent-To header properly; don't ignore folded lines.
+        * mail/sendmail.el (sendmail-send-it):
+        Parse folded Resent-To header properly; don't ignore folded lines.
 
-        * lisp/mail/mail-utils.el (mail-parse-comma-list):
+        * mail/mail-utils.el (mail-parse-comma-list):
         Treat newlines and tabs as whitespace.
 
 1997-12-03  Richard Stallman  <rms@gnu.org>
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 897c56f2b77..ccc9b473de3 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -3571,7 +3571,7 @@
 
 1999-08-15  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
 
-        * lisp/texinfmt.el: Handle @ifnottex.
+        * texinfmt.el: Handle @ifnottex.
 
 1999-08-15  Eli Zaretskii  <eliz@gnu.org>
 
@@ -8708,7 +8708,7 @@
 
 1998-10-21  Markus Rost  <rost@delysid.gnu.org>
 
-        * lisp/info.el (Info-next-menu-item): Stay on top of node.
+        * info.el (Info-next-menu-item): Stay on top of node.
 
         * mail/rmailout.el (rmail-output): Insert newline only if necessary.
 
@@ -9181,7 +9181,7 @@
         * gnus-art.el (gnus-article-x-face-too-ugly): Fix type.
         (gnus-saved-headers): Fix type.
 
-        * lisp/textmodes/fill.el (fill-individual-paragraphs-prefix):
+        * textmodes/fill.el (fill-individual-paragraphs-prefix):
         Avoid nil value of `two-lines-citation-part'.
 
 1998-09-30  Roman Belenov  <roman@nstl.nnov.ru>
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index ba90274edf0..b9b6cd5a03d 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -6100,7 +6100,7 @@
 
 2001-01-25  Dave Love  <fx@gnu.org>
 
-        * lisp/international/mule-diag.el (describe-char-after): Doc fix.
+        * international/mule-diag.el (describe-char-after): Doc fix.
         (describe-coding-system): Tweak the English text.
 
         * loadup.el: Preload international/ccl for utf-8.
@@ -15884,8 +15884,8 @@
 
 2000-07-16  John Wiegley  <johnw@gnu.org>
 
-        * lisp/align.el (align-newline-and-indent):
-        Adding new function.  for auto-aligning blocks of code on RET.
+        * align.el (align-newline-and-indent): Adding new function,
+        for auto-aligning blocks of code on RET.
         (align-region): Fixed badly formatted minibuffer message.
 
 2000-07-17  Kenichi Handa  <handa@etl.go.jp>
@@ -18753,8 +18753,7 @@
         (network-connection-mode-setup): New function, saves host and
         service information in local variables.
 
-        * lisp/locate.el:
-        (locate-word-at-point): Added this function.
+        * locate.el (locate-word-at-point): Added this function.
         (locate): Default to using locate-word-at-point as input
         Run dired-mode-hook
 
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index ade36f2f9a0..3845c4ce4e6 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -1,6 +1,6 @@
 ;;; abbrev.el --- abbrev mode commands for Emacs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1992, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 2001-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
@@ -81,7 +81,8 @@ be replaced by its expansion."
     (clear-abbrev-table (symbol-value tablesym))))
 
 (defun copy-abbrev-table (table)
-  "Make a new abbrev-table with the same abbrevs as TABLE."
+  "Make a new abbrev-table with the same abbrevs as TABLE.
+Does not copy property lists."
   (let ((new-table (make-abbrev-table)))
     (mapatoms
      (lambda (symbol)
@@ -191,7 +192,8 @@ the ones defined from the buffer now."
                       (not (eolp)))
           (setq name (read buf) count (read buf))
           (if (equal count '(sys))
-              (setq sys t count (read buf)))
+              (setq sys t count (read buf))
+            (setq sys nil))
           (setq exp (read buf))
           (skip-chars-backward " \t\n\f")
           (setq hook (if (not (eolp)) (read buf)))
@@ -446,6 +448,7 @@ PROPS is a list of properties."
     table))
 
 (defun abbrev-table-p (object)
+  "Return non-nil if OBJECT is an abbrev table."
   (and (vectorp object)
        (numberp (abbrev-table-get object :abbrev-table-modiff))))
 
@@ -471,7 +474,8 @@ for any particular abbrev defined in both.")
 (defvar abbrev-minor-mode-table-alist nil
   "Alist of abbrev tables to use for minor modes.
 Each element looks like (VARIABLE . ABBREV-TABLE);
-ABBREV-TABLE is active whenever VARIABLE's value is non-nil.")
+ABBREV-TABLE is active whenever VARIABLE's value is non-nil.
+ABBREV-TABLE can also be a list of abbrev tables.")
 
 (defvar fundamental-mode-abbrev-table
   (let ((table (make-abbrev-table)))
@@ -547,6 +551,12 @@ If EXPANSION is not a string (and not nil), the abbrev is a
  special one, which does not expand in the usual way but only
  runs HOOK.
 
+If HOOK is a non-nil symbol with a non-nil `no-self-insert' property,
+it can control whether the character that triggered abbrev expansion
+is inserted.  If such a HOOK returns non-nil, the character is not
+inserted.  If such a HOOK returns nil, then so does `abbrev-insert'
+\(and `expand-abbrev'), as if no abbrev expansion had taken place.
+
 PROPS is a property list.  The following properties are special:
 - `:count': the value for the abbrev's usage-count, which is incremented each
   time the abbrev is used (the default is zero).
@@ -745,7 +755,9 @@ If non-nil, NAME is the name by which this abbrev was found.
 If non-nil, WORDSTART is the place where to insert the abbrev.
 If WORDEND is non-nil, the abbrev replaces the previous text between
 WORDSTART and WORDEND.
-Return ABBREV if the expansion should be considered as having taken place."
+Return ABBREV if the expansion should be considered as having taken place.
+The return value can be influenced by a `no-self-insert' property;
+see `define-abbrev' for details."
   (unless name (setq name (symbol-name abbrev)))
   (unless wordstart (setq wordstart (point)))
   (unless wordend (setq wordend wordstart))
@@ -810,7 +822,8 @@ the abbrev symbol if expansion took place.")
 (defun expand-abbrev ()
   "Expand the abbrev before point, if there is an abbrev there.
 Effective when explicitly called even when `abbrev-mode' is nil.
-Returns the abbrev symbol, if expansion took place."
+Returns the abbrev symbol, if expansion took place.  (The actual
+return value is that of `abbrev-insert'.)"
   (interactive)
   (run-hooks 'pre-abbrev-expand-hook)
   (with-wrapper-hook abbrev-expand-functions ()
@@ -933,9 +946,11 @@ Properties with special meaning:
   abbreviations.
 - `:case-fixed' non-nil means that abbreviations are looked up without
   case-folding, and the expansion is not capitalized/upcased.
-- `:regexp' describes the form of abbrevs.  It defaults to \\=\\<\\(\\w+\\)\\W* which
-  means that an abbrev can only be a single word.  The submatch 1 is treated
-  as the potential name of an abbrev.
+- `:regexp' is a regular expression that specifies how to extract the
+  name of the abbrev before point.  The submatch 1 is treated
+  as the potential name of an abbrev.  If :regexp is nil, the default
+  behavior uses `backward-word' and `forward-word' to extract the name
+  of the abbrev, which can therefore only be a single word.
 - `:enable-function' can be set to a function of no argument which returns
   non-nil if and only if the abbrevs in this table should be used for this
   instance of `expand-abbrev'."
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 20a4e52810b..33b91fd7db2 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1,6 +1,6 @@
 ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
 
-;; Copyright (C) 1993-1997, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1997, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: Karl Fogel <kfogel@red-bean.com>
@@ -65,7 +65,7 @@
 --> t means save bookmarks when Emacs is killed.
 --> Otherwise, it should be a number that is the frequency with which
     the bookmark list is saved (i.e.: the number of times which
-    Emacs' bookmark list may be modified before it is automatically
+    Emacs's bookmark list may be modified before it is automatically
     saved.).  If it is a number, Emacs will also automatically save
     bookmarks when it is killed.
 
diff --git a/lisp/bs.el b/lisp/bs.el
index 2e0089d153f..64c1183b64d 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1,6 +1,6 @@
 ;;; bs.el --- menu for selecting and displaying buffers -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Maintainer: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Keywords: convenience
@@ -618,7 +618,7 @@ Used from `window-size-change-functions'."
 (put 'bs-mode 'mode-class 'special)
 
 (define-derived-mode bs-mode nil "Buffer-Selection-Menu"
-  "Major mode for editing a subset of Emacs' buffers.
+  "Major mode for editing a subset of Emacs's buffers.
 \\<bs-mode-map>
 Aside from two header lines each line describes one buffer.
 Move to a line representing the buffer you want to edit and select
@@ -1414,7 +1414,8 @@ for buffer selection."
         (bs--restore-window-config)
         (setq bs--window-config-coming-from (current-window-configuration))
         (when (> (window-height (selected-window)) 7)
-          (select-window (split-window-below))))
+          ;; Errors would mess with the window configuration (bug#10882).
+          (ignore-errors (select-window (split-window-below)))))
       (bs-show-in-buffer liste)
       (bs-message-without-log "%s" (bs--current-config-message)))))
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 24c284350a3..0c351c6072f 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2602,7 +2602,7 @@ If called by a mouse-event, pops up a menu with the result."
     ;; If no frame exists yet, we have no idea what width to use.
     (and (= width 10)
          (not window-system)
-         (setq width (or (getenv "COLUMNS") 80)))
+         (setq width (string-to-number (or (getenv "COLUMNS") "80"))))
     (setq mode-line-format
           (if buffer-file-name
               `("-" mode-line-modified
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index ab513517452..baf92065550 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -193,28 +193,29 @@ unknown are returned as nil."
                  (predicate (pop rule))
                  (parse-time-val))
             (when (and (not (nth (car slots) time)) ;not already set
-                       (setq parse-time-val (cond ((and (consp predicate)
-                                             (not (eq (car predicate)
-                                                      'lambda)))
-                                        (and (numberp parse-time-elt)
-                                             (<= (car predicate) parse-time-elt)
-                                             (<= parse-time-elt (cadr predicate))
-                                             parse-time-elt))
-                                       ((symbolp predicate)
-                                        (cdr (assoc parse-time-elt
-                                                    (symbol-value predicate))))
-                                       ((funcall predicate)))))
+                       (setq parse-time-val
+                             (cond ((and (consp predicate)
+                                         (not (eq (car predicate)
+                                                  'lambda)))
+                                    (and (numberp parse-time-elt)
+                                         (<= (car predicate) parse-time-elt)
+                                         (<= parse-time-elt (cadr predicate))
+                                         parse-time-elt))
+                                   ((symbolp predicate)
+                                    (cdr (assoc parse-time-elt
+                                                (symbol-value predicate))))
+                                   ((funcall predicate)))))
               (setq exit t)
               (while slots
-                (let ((new-val (and rule
-                                    (let ((this (pop rule)))
-                                      (if (vectorp this)
-                                          (parse-integer
-                                           parse-time-elt
-                                           (aref this 0) (aref this 1))
-                                        (funcall this))))))
-                  (rplaca (nthcdr (pop slots) time)
-                          (or new-val parse-time-val)))))))))
+                (let ((new-val (if rule
+                                   (let ((this (pop rule)))
+                                     (if (vectorp this)
+                                         (parse-integer
+                                          parse-time-elt
+                                          (aref this 0) (aref this 1))
+                                       (funcall this)))
+                                 parse-time-val)))
+                  (rplaca (nthcdr (pop slots) time) new-val))))))))
     time))
 
 (provide 'parse-time)
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 9b766e17d5c..7f9b46dfd82 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -1,6 +1,6 @@
 ;;; timeclock.el --- mode for keeping track of how much you work
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Created: 25 Mar 1999
@@ -150,7 +150,7 @@ This variable only has effect if set with \\[customize]."
 (defcustom timeclock-use-display-time t
   "If non-nil, use `display-time-hook' for doing modeline updates.
 The advantage of this is that one less timer has to be set running
-amok in Emacs' process space.  The disadvantage is that it requires
+amok in Emacs's process space.  The disadvantage is that it requires
 you to have `display-time' running.  If you don't want to use
 `display-time', but still want the modeline to show how much time is
 left, set this variable to nil.  Changing the value of this variable
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 361ccba10cc..4dc5fe4df21 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * semantic/db.el (semanticdb-search-results-table):
+        Doc fix (standardize possessive apostrophe usage).
+
 2012-02-09  Juanma Barranquero  <lekktu@gmail.com>
 
         * ede/auto.el (ede-directory-safe-p, ede-add-project-to-global-list):
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 1f07867bac5..0ed031019be 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1,6 +1,6 @@
 ;;; semantic.el --- Semantic buffer evaluator.
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax tools
@@ -623,7 +623,7 @@ was marked unparseable, then do nothing, and return the cache."
 
 ;;;; Parse the whole system.
      ((semantic-parse-tree-needs-rebuild-p)
-      ;; Use Emacs' built-in progress-reporter
+      ;; Use Emacs's built-in progress-reporter
       (let ((semantic--progress-reporter
              (and (>= (point-max) semantic-minimum-working-buffer-size)
                   (eq semantic-working-type 'percent)
@@ -762,7 +762,7 @@ This function returns semantic tags without overlays."
       ;; Designated to ignore.
       (setq stream (car nontermsym))
       (if stream
-          ;; Use Emacs' built-in progress reporter:
+          ;; Use Emacs's built-in progress reporter:
           (and (boundp 'semantic--progress-reporter)
                semantic--progress-reporter
                (eq semantic-working-type 'percent)
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index ce6f33f0d18..23410b1eb1b 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -1,6 +1,6 @@
 ;;; semantic/db-el.el --- Semantic database extensions for Emacs Lisp
 
-;;; Copyright (C) 2002-2012  Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
@@ -132,7 +132,7 @@ For Emacs Lisp system DB, there isn't one."
   "Convert one TAG, originating from Emacs OBJ, into standardized form.
 If Emacs cannot resolve this symbol to a particular file, then return nil."
   ;; Here's the idea.  For each tag, get the name, then use
-  ;; Emacs' `symbol-file' to get the source.  Once we have that,
+  ;; Emacs's `symbol-file' to get the source.  Once we have that,
   ;; we can use more typical semantic searching techniques to
   ;; get a regularly parsed tag.
   (let* ((type (cond ((semantic-tag-of-class-p tag 'function)
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index d6e4fff83c8..4e09f9fc3f2 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -1,6 +1,6 @@
 ;;; semantic/db.el --- Semantic tag database manager
 
-;; Copyright (C) 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
@@ -205,7 +205,7 @@ If one doesn't exist, create it."
    )
   "Table used for search results when there is no file or table association.
 Examples include search results from external sources such as from
-Emacs' own symbol table, or from external libraries.")
+Emacs's own symbol table, or from external libraries.")
 
 (defmethod semanticdb-refresh-table ((obj semanticdb-search-results-table) &optional force)
   "If the tag list associated with OBJ is loaded, refresh it.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index a5032cf99e7..a2ac7aa91e6 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -460,6 +460,8 @@ since it could result in memory overflow and make Emacs crash."
              (x-use-underline-position-properties display boolean "22.1")
              (x-underline-at-descent-line display boolean "22.1")
              (x-stretch-cursor display boolean "21.1")
+             ;; xselect.c
+             (x-select-enable-clipboard-manager killing boolean "24.1")
              ;; xsettings.c
              (font-use-system-font font-selection boolean "23.2")))
       this symbol group type standard version native-p rest prop propval
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 2d05be312eb..d6a4a7816d6 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1264,6 +1264,8 @@ Special value `always' suppresses confirmation."
 
 (defun dired-copy-file-recursive (from to ok-flag &optional
                                        preserve-time top recursive)
+  (when (file-subdir-of-p to from)
+    (error "Cannot copy `%s' into its subdirectory `%s'" from to))
   (let ((attrs (file-attributes from)))
     (if (and recursive
              (eq t (car attrs))
@@ -1430,10 +1432,30 @@ ESC or `q' to not overwrite any of the remaining files,
                   (cond  ((integerp marker-char) marker-char)
                          (marker-char (dired-file-marker from)) ; slow
                          (t nil))))
-            (when (and (file-directory-p from)
-                       (file-directory-p to)
-                       (eq file-creator 'dired-copy-file))
-              (setq to (file-name-directory to)))
+            ;; Handle the `dired-copy-file' file-creator specially
+            ;; When copying a directory to another directory or
+            ;; possibly to itself or one of its subdirectories.
+            ;; e.g "~/foo/" => "~/test/"
+            ;; or "~/foo/" =>"~/foo/"
+            ;; or "~/foo/ => ~/foo/bar/")
+            ;; In this case the 'name-constructor' have set the destination
+            ;; TO to "~/test/foo" because the old emacs23 behavior
+            ;; of `copy-directory' was to not create the subdirectory
+            ;; and instead copy the contents.
+            ;; With the new behavior of `copy-directory'
+            ;; (similar to the `cp' shell command) we don't
+            ;; need such a construction of the target directory,
+            ;; so modify the destination TO to "~/test/" instead of "~/test/foo/".
+            (let ((destname (file-name-directory to)))
+              (when (and (file-directory-p from)
+                         (file-directory-p to)
+                         (eq file-creator 'dired-copy-file))
+                (setq to destname))
+              ;; If DESTNAME and FROM are the same directory or
+              ;; If DESTNAME is a subdirectory of FROM, return error.
+              (and (file-subdir-of-p destname from)
+                   (error "Cannot copy `%s' into its subdirectory `%s'"
+                          from to)))
             (condition-case err
                 (progn
                   (funcall file-creator from to dired-overwrite-confirmed)
diff --git a/lisp/dired.el b/lisp/dired.el
index c087f65eaeb..57bf3c88322 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3732,7 +3732,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" "e77c506a0dd793230c5856a67e408fc6")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "cab9b84177ac3555c24cf8e870a64095")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index f12beed3271..22e0ade987d 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -1,4 +1,4 @@
-;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: utf-8;-*-
+;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8;-*-
 
 ;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
@@ -25,7 +25,7 @@
 ;;; Commentary:
 
 ;; Use M-x authors RET to create an *Authors* buffer that can used as
-;; or merged with Emacs' AUTHORS file.
+;; or merged with Emacs's AUTHORS file.
 
 ;;; Code:
 
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 2ced0e8a466..b3e54b415d8 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -99,7 +99,7 @@ KEYS is expanded with `substitute-command-keys' before it is used.
 
 KEYS is nil, a string or a vector; nil or a keyboard equivalent to this
 menu item.
-This is a hint that will considerably speed up Emacs' first display of
+This is a hint that will considerably speed up Emacs's first display of
 a menu.  Use `:key-sequence nil' when you know that this menu item has no
 keyboard equivalent.
 
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index be8eb77f170..9cbe29bf322 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -862,7 +862,7 @@ run.  DEBUGGER-ARGS are the arguments to `debugger'."
                   (make-ert-test-failed :condition condition
                                         :backtrace backtrace
                                         :infos infos))))
-         ;; Work around Emacs' heuristic (in eval.c) for detecting
+         ;; Work around Emacs's heuristic (in eval.c) for detecting
          ;; errors in the debugger.
          (incf num-nonmacro-input-events)
          ;; FIXME: We should probably implement more fine-grained
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index eed25ecfb85..4fd87209b38 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -26,7 +26,7 @@
 ;;; Commentary:
 
 ;; Ewoc Was Once Cookie
-;; But now it's Emacs' Widget for Object Collections
+;; But now it's Emacs's Widget for Object Collections
 
 ;; As the name implies this derives from the `cookie' package (part
 ;; of Elib).  The changes are pervasive though mostly superficial:
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d80454ba269..fd0eb029fc3 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;; Created: 10 Mar 2007
-;; Version: 0.9
+;; Version: 1.0
 ;; Keywords: tools
 
 ;; This file is part of GNU Emacs.
@@ -750,7 +750,8 @@ not included in this list."
               hold)
           (when (setq hold (assq next-pkg package-load-list))
             (setq hold (cadr hold))
-            (cond ((eq hold nil)
+            (cond ((eq hold t))
+                  ((eq hold nil)
                    (error "Required package '%s' is disabled"
                           (symbol-name next-pkg)))
                   ((null (stringp hold))
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index ac391fed2c2..6d12fe19277 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -143,7 +143,7 @@ This means the number of non-shy regexp grouping constructs
   "Return a regexp to match a string in the sorted list STRINGS.
 If PAREN non-nil, output regexp parentheses around returned regexp.
 If LAX non-nil, don't output parentheses if it doesn't require them.
-Merges keywords to avoid backtracking in Emacs' regexp matcher."
+Merges keywords to avoid backtracking in Emacs's regexp matcher."
   ;; The basic idea is to find the shortest common prefix or suffix, remove it
   ;; and recurse.  If there is no prefix, we divide the list into two so that
   ;; \(at least) one half will have at least a one-character common prefix.
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index a7cc40cea4b..9e7be0f670d 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,6 +1,6 @@
 ;;; cua-base.el --- emulate CUA key bindings
 
-;; Copyright (C) 1997-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience cua
@@ -116,7 +116,7 @@
 
 ;; CUA register support
 ;; --------------------
-;; Emacs' standard register support is also based on a separate set of
+;; Emacs's standard register support is also based on a separate set of
 ;; "register commands".
 ;;
 ;; CUA's register support is activated by providing a numeric
@@ -134,7 +134,7 @@
 
 ;; CUA rectangle support
 ;; ---------------------
-;; Emacs' normal rectangle support is based on interpreting the region
+;; Emacs's normal rectangle support is based on interpreting the region
 ;; between the mark and point as a "virtual rectangle", and using a
 ;; completely separate set of "rectangle commands" [C-x r ...] on the
 ;; region to copy, kill, fill a.s.o. the virtual rectangle.
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 305e3e73be0..eaf88ccdf85 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -1,6 +1,6 @@
 ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
 
-;; Copyright (C) 1993-1995, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
@@ -89,7 +89,7 @@
 ;;    details.
 
 ;;    Like TPU, Emacs uses multiple buffers.  Some buffers are used to hold
-;;    files you are editing; other "internal" buffers are used for Emacs' own
+;;    files you are editing; other "internal" buffers are used for Emacs's own
 ;;    purposes (like showing you help).  Here are some commands for dealing
 ;;    with buffers.
 
@@ -197,7 +197,7 @@
 
 ;;    ; Emacs uses Control-s and Control-q.  Problems can occur when using
 ;;    ; Emacs on terminals that use these codes for flow control (Xon/Xoff
-;;    ; flow control).  These lines disable Emacs' use of these characters.
+;;    ; flow control).  These lines disable Emacs's use of these characters.
 ;;    (global-unset-key "\C-s")
 ;;    (global-unset-key "\C-q")
 
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 503fd2c66d5..68f40349454 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1086,8 +1086,17 @@ as a Meta key and any number of multiple escapes are allowed."
 (defun viper-intercept-ESC-key ()
   "Function that implements ESC key in Viper emulation of Vi."
   (interactive)
-  (let ((cmd (or (key-binding (viper-envelop-ESC-key))
-                 (lambda () (interactive) (error "Viper bell")))))
+  ;; `key-binding' needs to be called in a context where Viper's
+  ;; minor-mode map(s) have been temporarily disabled so the ESC
+  ;; binding to viper-intercept-ESC-key doesn't hide the binding we're
+  ;; looking for (Bug#9146):
+  (let* ((event (viper-envelop-ESC-key))
+         (cmd (cond ((equal event viper-ESC-key)
+                     'viper-intercept-ESC-key)
+                    ((let ((emulation-mode-map-alists nil))
+                       (key-binding event)))
+                    (t
+                     (error "Viper bell")))))
 
     ;; call the actual function to execute ESC (if no other symbols followed)
     ;; or the key bound to the ESC sequence (if the sequence was issued
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 7cba5441c23..cdeef733bc5 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,6 +1,6 @@
 ;;; viper-util.el --- Utilities used by viper.el
 
-;; Copyright (C) 1994-1997, 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
@@ -295,7 +295,7 @@ Otherwise return the normal value."
     result))
 
 ;; Emacs used to count each multibyte character as several positions in the buffer,
-;; so we had to use Emacs' chars-in-region to count characters. Since 20.3,
+;; so we had to use Emacs's chars-in-region to count characters. Since 20.3,
 ;; Emacs counts multibyte characters as 1 position.  XEmacs has always been
 ;; counting each char as just one pos. So, now we can simply subtract beg from
 ;; end to determine the number of characters in a region.
@@ -1112,7 +1112,7 @@ Otherwise return the normal value."
        lis)))
 
 
-;; Smooths out the difference between Emacs' unread-command-events
+;; Smooths out the difference between Emacs's unread-command-events
 ;; and XEmacs unread-command-event.  Arg is a character, an event, a list of
 ;; events or a sequence of keys.
 ;;
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index d304a247bb8..12c186e234e 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -87,7 +87,7 @@
 ;;    facility in the original Vi.
 ;;    First, one can execute any Emacs command while defining a
 ;;    macro, not just the Vi commands.  Second, macros are defined in a
-;;    WYSYWYG mode, using an interface to Emacs' WYSIWYG style of defining
+;;    WYSYWYG mode, using an interface to Emacs's WYSIWYG style of defining
 ;;    macros.  Third, in Viper, one can define macros that are specific to
 ;;    a given buffer, a given major mode, or macros defined for all buffers.
 ;;    The same macro name can have several different definitions:
@@ -561,7 +561,7 @@ and improving upon much of it.
       use Emacs productively, you are advised to reach user level 3 or higher.
 
       At user level 2 or higher, ^X and ^C have Emacs, not Vi, bindings;
-      ^Z toggles Vi/Emacs states; ^G is Emacs' keyboard-quit (like ^C in Vi).
+      ^Z toggles Vi/Emacs states; ^G is Emacs's keyboard-quit (like ^C in Vi).
 
    2. Vi exit functions (e.g., :wq, ZZ) work on INDIVIDUAL files -- they
       do not cause Emacs to quit, except at user level 1 (for a novice).
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 4057d1eabc2..1fb3930091e 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,6 +1,6 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
 
-;; Copyright (C) 2002-2003, 2005-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
@@ -70,7 +70,7 @@ See `erc-encoding-coding-alist'."
 are placed.
 Note that this should end with a directory separator.")
 
-;; XEmacs' `replace-match' does not replace matching subexpressions in strings.
+;; XEmacs's `replace-match' does not replace matching subexpressions in strings.
 (defun erc-replace-match-subexpression-in-string
   (newtext string match subexp start &optional fixedcase literal)
   "Replace the subexpression SUBEXP of the last match in STRING with NEWTEXT.
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index f997d47f665..a5e1b6194c7 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -299,8 +299,7 @@ to writing a completion function."
   ;; jww (1999-10-19): Will this work on anything but X?
   (if (featurep 'xemacs)
       (define-key eshell-mode-map [iso-left-tab] 'pcomplete-reverse)
-    (define-key eshell-mode-map [(shift iso-lefttab)] 'pcomplete-reverse)
-    (define-key eshell-mode-map [(shift control ?i)] 'pcomplete-reverse))
+    (define-key eshell-mode-map [backtab] 'pcomplete-reverse))
   (define-key eshell-mode-map [(meta ??)] 'pcomplete-list))
 
 (defun eshell-completion-command-name ()
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 6ac53e30e86..1875506fe9d 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1,6 +1,6 @@
 ;;; em-unix.el --- UNIX command aliases
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -712,7 +712,7 @@ available..."
 
 (defun eshell-grep (command args &optional maybe-use-occur)
   "Generic service function for the various grep aliases.
-It calls Emacs' grep utility if the command is not redirecting output,
+It calls Emacs's grep utility if the command is not redirecting output,
 and if it's not part of a command pipeline.  Otherwise, it calls the
 external command."
   (if (and maybe-use-occur eshell-no-grep-available)
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 4f9b921d5ef..3dfb33d37e3 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -1,6 +1,6 @@
 ;;; em-xtra.el --- extra alias functions
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -32,7 +32,7 @@
 (eshell-defgroup eshell-xtra nil
   "This module defines some extra alias functions which are entirely
 optional.  They can be viewed as samples for how to write Eshell alias
-functions, or as aliases which make some of Emacs' behavior more
+functions, or as aliases which make some of Emacs's behavior more
 naturally accessible within Emacs."
   :tag "Extra alias functions"
   :group 'eshell-module)
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index e4478aefd6d..224451eacba 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -140,12 +140,12 @@
 ;;   paragraph wasn't discovered until two months after I wrote the
 ;;   text; it was not intentional).
 ;;
-;; @ Emacs' register and bookmarking facilities can be used for
+;; @ Emacs's register and bookmarking facilities can be used for
 ;;   remembering where you've been, and what you've seen -- to varying
 ;;   levels of persistence.  They could perhaps even be tied to
 ;;   specific "moments" during eshell execution, which would include
 ;;   the environment at that time, as well as other variables.
-;;   Although this would require functionality orthogonal to Emacs'
+;;   Although this would require functionality orthogonal to Emacs's
 ;;   own bookmarking facilities, the interface used could be made to
 ;;   operate very similarly.
 ;;
diff --git a/lisp/faces.el b/lisp/faces.el
index cd7f92bfad4..0011e0357a1 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1513,12 +1513,23 @@ If SPEC is nil, return nil."
 
 (defun face-spec-reset-face (face &optional frame)
   "Reset all attributes of FACE on FRAME to unspecified."
-  (unless (eq face 'default)
-    (let (reset-args)
-      (dolist (attr-and-name face-attribute-name-alist)
-        (push 'unspecified reset-args)
-        (push (car attr-and-name) reset-args))
-      (apply 'set-face-attribute face frame reset-args))))
+  (apply 'set-face-attribute face frame
+         (if (eq face 'default)
+             ;; For the default face, avoid making any attribute
+             ;; unspecifed.  Instead, set attributes to default values
+             ;; (see also realize_default_face in xfaces.c).
+             (append
+              '(:underline nil :overline nil :strike-through nil
+                :box nil :inverse-video nil :stipple nil :inherit nil)
+              (unless (display-graphic-p frame)
+                '(:family "default" :foundry "default" :width normal
+                  :height 1 :weight normal :slant normal
+                  :foreground "unspecified-fg"
+                  :background "unspecified-bg")))
+           ;; For all other faces, unspecify all attributes.
+           (apply 'append
+                  (mapcar (lambda (x) (list (car x) 'unspecified))
+                          face-attribute-name-alist)))))
 
 (defun face-spec-set (face spec &optional for-defface)
   "Set FACE's face spec, which controls its appearance, to SPEC.
diff --git a/lisp/files.el b/lisp/files.el
index 87218c9a6e8..fae834daefe 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -22,7 +22,7 @@
 
 ;;; Commentary:
 
-;; Defines most of Emacs's file- and directory-handling functions,
+;; Defines most of Emacs'ss file- and directory-handling functions,
 ;; including basic file visiting, backup generation, link handling,
 ;; ITS-id version control, load- and write-hook handling, and the like.
 
@@ -880,7 +880,10 @@ or mount points potentially requiring authentication as a different user.")
 (defun locate-dominating-file (file name)
   "Look up the directory hierarchy from FILE for a file named NAME.
 Stop at the first parent directory containing a file NAME,
-and return the directory.  Return nil if not found."
+and return the directory.  Return nil if not found.
+
+This function only tests if FILE exists.  If you care about whether
+it is readable, regular, etc., you should test the result."
   ;; We used to use the above locate-dominating-files code, but the
   ;; directory-files call is very costly, so we're much better off doing
   ;; multiple calls using the code in here.
@@ -907,6 +910,10 @@ and return the directory.  Return nil if not found."
                     ;;   (setq user (nth 2 (file-attributes file)))
                     ;;   (and prev-user (not (equal user prev-user))))
                     (string-match locate-dominating-stop-dir-regexp file)))
+      ;; FIXME? maybe this function should (optionally?)
+      ;; use file-readable-p instead.  In many cases, an unreadable
+      ;; FILE is no better than a non-existent one.
+      ;; See eg dir-locals-find-file.
       (setq try (file-exists-p (expand-file-name name file)))
       (cond (try (setq root file))
             ((equal file (setq file (file-name-directory
@@ -3566,8 +3573,14 @@ of no valid cache entry."
          (locals-file (locate-dominating-file file dir-locals-file-name))
          (dir-elt nil))
     ;; `locate-dominating-file' may have abbreviated the name.
-    (if locals-file
-        (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
+    (and locals-file
+         (setq locals-file (expand-file-name dir-locals-file-name locals-file))
+         ;; FIXME? is it right to silently ignore an unreadable file?
+         ;; Maybe we'd want to keep searching in that case.
+         ;; That is a locate-dominating-file issue.
+         (or (not (file-readable-p locals-file))
+             (not (file-regular-p locals-file)))
+         (setq locals-file nil))
     ;; Find the best cached value in `dir-locals-directory-cache'.
     (dolist (elt dir-locals-directory-cache)
       (when (and (eq t (compare-strings file nil (length (car elt))
@@ -4985,6 +4998,42 @@ given.  With a prefix argument, TRASH is nil."
                  directory 'full directory-files-no-dot-files-regexp)))
       (delete-directory-internal directory)))))
 
+(defun file-equal-p (file1 file2)
+  "Return non-nil if files FILE1 and FILE2 name the same file.
+If FILE1 or FILE2 does not exist, the return value is unspecified."
+  (let ((handler (or (find-file-name-handler file1 'file-equal-p)
+                     (find-file-name-handler file2 'file-equal-p))))
+    (if handler
+        (funcall handler 'file-equal-p file1 file2)
+      (let (f1-attr f2-attr)
+        (and (setq f1-attr (file-attributes (file-truename file1)))
+             (setq f2-attr (file-attributes (file-truename file2)))
+             (equal f1-attr f2-attr))))))
+
+(defun file-subdir-of-p (dir1 dir2)
+  "Return non-nil if DIR1 is a subdirectory of DIR2.
+A directory is considered to be a subdirectory of itself.
+Return nil if top directory DIR2 is not an existing directory."
+  (let ((handler (or (find-file-name-handler dir1 'file-subdir-of-p)
+                     (find-file-name-handler dir2 'file-subdir-of-p))))
+    (if handler
+        (funcall handler 'file-subdir-of-p dir1 dir2)
+      (when (file-directory-p dir2) ; Top dir must exist.
+        (setq dir1 (file-truename dir1)
+              dir2 (file-truename dir2))
+        (let ((ls1  (or (split-string dir1 "/" t) '("/")))
+              (ls2  (or (split-string dir2 "/" t) '("/")))
+              (root (if (string-match "\\`/" dir1) "/" ""))
+              (mismatch nil))
+          (while (and ls1 ls2 (not mismatch))
+            (if (string-equal (car ls1) (car ls2))
+                (setq root (concat root (car ls1) "/"))
+              (setq mismatch t))
+            (setq ls1 (cdr ls1)
+                  ls2 (cdr ls2)))
+          (unless mismatch
+            (file-equal-p root dir2)))))))
+
 (defun copy-directory (directory newname &optional keep-time parents copy-contents)
   "Copy DIRECTORY to NEWNAME.  Both args must be strings.
 This function always sets the file modes of the output files to match
@@ -5011,12 +5060,16 @@ directly into NEWNAME instead."
             (format "Copy directory %s to: " dir)
             default-directory default-directory nil nil)
            current-prefix-arg t nil)))
+  (when (file-subdir-of-p newname directory)
+    (error "Cannot copy `%s' into its subdirectory `%s'"
+           directory newname))
   ;; If default-directory is a remote directory, make sure we find its
   ;; copy-directory handler.
   (let ((handler (or (find-file-name-handler directory 'copy-directory)
                      (find-file-name-handler newname 'copy-directory))))
     (if handler
-        (funcall handler 'copy-directory directory newname keep-time parents)
+        (funcall handler 'copy-directory directory
+                 newname keep-time parents copy-contents)
 
       ;; Compute target name.
       (setq directory (directory-file-name (expand-file-name directory))
@@ -5214,7 +5267,7 @@ non-nil, it is called instead of rereading visited file contents."
                          (unlock-buffer)))
                    (widen)
                    (let ((coding-system-for-read
-                          ;; Auto-saved file should be read by Emacs'
+                          ;; Auto-saved file should be read by Emacs's
                           ;; internal coding.
                           (if auto-save-p 'auto-save-coding
                             (or coding-system-for-read
diff --git a/lisp/filesets.el b/lisp/filesets.el
index cecf14753f4..86ebe47580b 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,6 +1,6 @@
 ;;; filesets.el --- handle group of files
 
-;; Copyright (C) 2002-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 
 ;; Author: Thomas Link <sanobast-emacs@yahoo.de>
 ;; Maintainer: FSF
@@ -518,7 +518,7 @@ Caveat: Changes will take effect after rebuilding the menu."
 This is for calls via `filesets-find-or-display-file'
 or `filesets-find-file'.
 
-Set this to 0, if you don't use XEmacs' buffer tabs."
+Set this to 0, if you don't use XEmacs's buffer tabs."
   :set (function filesets-set-default)
   :type 'number
   :group 'filesets)
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 9b655319bc9..fc647a3727b 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -138,7 +138,7 @@ The above is the default behavior of `font-lock-mode'; you may specify
 your own function which is called when `font-lock-mode' is toggled via
 `font-lock-function'. "
   nil nil nil
-  :after-hook (if font-lock-mode (font-lock-initial-fontify))
+  :after-hook (font-lock-initial-fontify)
   ;; Don't turn on Font Lock mode if we don't have a display (we're running a
   ;; batch job) or if the buffer is invisible (the name starts with a space).
   (when (or noninteractive (eq (aref (buffer-name) 0) ?\s))
@@ -192,13 +192,7 @@ this function onto `change-major-mode-hook'."
 
   ;; Only do hard work if the mode has specified stuff in
   ;; `font-lock-defaults'.
-  (when (or font-lock-defaults
-            (if (boundp 'font-lock-keywords) font-lock-keywords)
-            (and mode
-                 (boundp 'font-lock-set-defaults)
-                 font-lock-set-defaults
-                 font-lock-major-mode
-                 (not (eq font-lock-major-mode major-mode))))
+  (when (font-lock-specified-p mode)
     (font-lock-mode-internal mode)))
 
 (defun turn-on-font-lock ()
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index a65a2c94c7d..4222791705b 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1,6 +1,6 @@
 ;;; font-lock.el --- Electric font lock mode
 
-;; Copyright (C) 1992-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1992-2012 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski
 ;;      Richard Stallman
@@ -67,7 +67,7 @@
 ;;
 ;; The syntactic keyword pass places `syntax-table' text properties in the
 ;; buffer according to the variable `font-lock-syntactic-keywords'.  It is
-;; necessary because Emacs' syntax table is not powerful enough to describe all
+;; necessary because Emacs's syntax table is not powerful enough to describe all
 ;; the different syntactic constructs required by the sort of people who decide
 ;; that a single quote can be syntactic or not depending on the time of day.
 ;; (What sort of person could decide to overload the meaning of a quote?)
@@ -629,17 +629,32 @@ Major/minor modes can set this variable if they know which option applies.")
   ;; Shut up the byte compiler.
   (defvar font-lock-face-attributes))   ; Obsolete but respected if set.
 
+(defun font-lock-specified-p (mode)
+  "Return non-nil if the current buffer is ready for fontification.
+The MODE argument, if non-nil, means Font Lock mode is about to
+be enabled."
+  (or font-lock-defaults
+      (and (boundp 'font-lock-keywords)
+           font-lock-keywords)
+      (and mode
+           (boundp 'font-lock-set-defaults)
+           font-lock-set-defaults
+           font-lock-major-mode
+           (not (eq font-lock-major-mode major-mode)))))
+
 (defun font-lock-initial-fontify ()
   ;; The first fontification after turning the mode on.  This must
   ;;  only be called after the mode hooks have been run.
-  (let ((max-size (font-lock-value-in-major-mode font-lock-maximum-size)))
-    (cond (font-lock-fontified
-           nil)
-          ((or (null max-size) (> max-size (buffer-size)))
-           (font-lock-fontify-buffer))
-          (font-lock-verbose
-           (message "Fontifying %s...buffer size greater than font-lock-maximum-size"
-                    (buffer-name))))))
+  (when (and font-lock-mode
+             (font-lock-specified-p t))
+    (let ((max-size (font-lock-value-in-major-mode font-lock-maximum-size)))
+      (cond (font-lock-fontified
+             nil)
+            ((or (null max-size) (> max-size (buffer-size)))
+             (font-lock-fontify-buffer))
+            (font-lock-verbose
+             (message "Fontifying %s...buffer size greater than font-lock-maximum-size"
+                      (buffer-name)))))))
 
 (defun font-lock-mode-internal (arg)
   ;; Turn on Font Lock mode.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e58b6cc7773..a4c1513926d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-04  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * gnus-msg.el (gnus-msg-mail): Call `message-mail' correctly when Gnus
+        isn't running (bug#10897).
+
+2012-02-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * shr.el (shr-column-specs): Protect against TDs with "width: 0%".
+
 2012-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * nntp.el (nntp-send-authinfo): Work for secure nntp entry in authinfo.
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 347f34b3228..975b83370ba 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -1,6 +1,6 @@
 ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
 
-;; Copyright (C) 2006-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib <reiner.steib@gmx.de>
 ;; Keywords: news
@@ -352,7 +352,7 @@ compatibility with versions of Emacs that lack the variable
                 dir (expand-file-name "../" dir))))
       (setq image-directory-load-path dir))
 
-    ;; If `image-directory-load-path' isn't Emacs' image directory,
+    ;; If `image-directory-load-path' isn't Emacs's image directory,
     ;; it's probably a user preference, so use it.  Then use a
     ;; relative setting if possible; otherwise, use
     ;; `image-directory-load-path'.
@@ -383,7 +383,7 @@ compatibility with versions of Emacs that lack the variable
               ;; Set it to nil if image is not found.
               (cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
                     ((file-exists-p (expand-file-name image d1ei)) d1ei)))))
-     ;; Use Emacs' image directory.
+     ;; Use Emacs's image directory.
      (image-directory-load-path
       (setq image-directory image-directory-load-path))
      (no-error
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 5178220af8f..bbd3c95265d 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1,6 +1,6 @@
 ;;; gnus-agent.el --- unplugged support for Gnus
 
-;; Copyright (C) 1997-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -602,7 +602,7 @@ manipulated as follows:
                   (make-mode-line-mouse-map mouse-button mouse-func)
                   'mouse-face
                   (if (and (featurep 'xemacs)
-                           ;; XEmacs' `facep' only checks for a face
+                           ;; XEmacs's `facep' only checks for a face
                            ;; object, not for a face name, so it's useless
                            ;; to check with `facep'.
                            (find-face 'modeline))
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index bf75f94c195..7c8d194f26b 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -478,7 +478,8 @@ Thank you for your help in stamping out bugs.
 
 ;;;###autoload
 (defun gnus-msg-mail (&optional to subject other-headers continue
-                                switch-action yank-action send-actions return-action)
+                                switch-action yank-action send-actions
+                                return-action)
   "Start editing a mail message to be sent.
 Like `message-mail', but with Gnus paraphernalia, particularly the
 Gcc: header for archiving purposes.
@@ -486,7 +487,8 @@ If Gnus isn't running, a plain `message-mail' setup is used
 instead."
   (interactive)
   (if (not (gnus-alive-p))
-      (message-mail)
+      (message-mail to subject other-headers continue
+                    nil yank-action send-actions return-action)
     (let ((buf (current-buffer))
           mail-buf)
       (gnus-setup-message 'message
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 8f06359ace8..f86b6f837a7 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -3028,7 +3028,7 @@ If ADAPT, return the home adaptive file instead."
                            (* (abs score)
                               gnus-score-decay-scale)))))))
     (if (and (featurep 'xemacs)
-             ;; XEmacs' floor can handle only the floating point
+             ;; XEmacs's floor can handle only the floating point
              ;; number below the half of the maximum integer.
              (> (abs n) (lsh -1 -2)))
         (string-to-number
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 09617384049..4a6da2d437c 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1,6 +1,6 @@
 ;;; mm-decode.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;      MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -1493,7 +1493,7 @@ be determined."
   (let ((image (mm-get-image handle)))
     (or (not image)
         (if (featurep 'xemacs)
-            ;; XEmacs' glyphs can actually tell us about their width, so
+            ;; XEmacs's glyphs can actually tell us about their width, so
             ;; let's be nice and smart about them.
             (or mm-inline-large-images
                 (and (<= (glyph-width image) (window-pixel-width))
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 0f60fdd756b..621aece8920 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1254,11 +1254,9 @@ If SEND-IF-FORCE, only send authinfo to the server if the
          (auth-info
           (nth 0 (auth-source-search
                   :max 1
-                  :host (list nntp-address
-                              (nnoo-current-server 'nntp))
-                  :port (or (cdr (assoc (format "%s" nntp-port-number)
-                                        '(("563" . ("563" "nntps" "snews")))))
-                            '("119" "nntp")))))
+                  :host (list nntp-address (nnoo-current-server 'nntp))
+                  :port `("119" "nntp" ,(format "%s" nntp-port-number)
+                          "563" "nntps" "snews"))))
          (auth-user (plist-get auth-info :user))
          (auth-force (plist-get auth-info :force))
          (auth-passwd (plist-get auth-info :secret))
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index dd0f1599c36..41f12243971 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -1364,10 +1364,10 @@ ones, in case fg and bg are nil."
             (when (memq (car column) '(td th))
               (let ((width (cdr (assq :width (cdr column)))))
                 (when (and width
-                           (string-match "\\([0-9]+\\)%" width))
-                  (aset columns i
-                        (/ (string-to-number (match-string 1 width))
-                           100.0))))
+                           (string-match "\\([0-9]+\\)%" width)
+                           (not (zerop (setq width (string-to-number
+                                                    (match-string 1 width))))))
+                  (aset columns i (/ width 100.0))))
               (setq i (1+ i)))))))
     columns))
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 0175ffa4d9a..ed52be6cc1e 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -482,12 +482,14 @@ suitable file is found, return nil."
                   (if (member (event-modifiers (aref key 0)) '(nil (shift)))
                       (push key non-modified-keys)))
                 (when remapped
-                  (princ "It is remapped to `")
+                  (princ "Its keys are remapped to `")
                   (princ (symbol-name remapped))
-                  (princ "'"))
+                  (princ "'.\n"))
 
                 (when keys
-                  (princ (if remapped ", which is bound to " "It is bound to "))
+                  (princ (if remapped
+                             "Without this remapping, it would be bound to "
+                           "It is bound to "))
                   ;; If lots of ordinary text characters run this command,
                   ;; don't mention them one by one.
                   (if (< (length non-modified-keys) 10)
diff --git a/lisp/help.el b/lisp/help.el
index a38211332c6..1a6aa9d13d2 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1,7 +1,6 @@
 ;;; help.el --- help commands for Emacs
 
-;; Copyright (C) 1985-1986, 1993-1994, 1998-2012
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
@@ -24,7 +23,7 @@
 
 ;;; Commentary:
 
-;; This code implements GNU Emacs' on-line help system, the one invoked by
+;; This code implements GNU Emacs's on-line help system, the one invoked by
 ;; `M-x help-for-help'.
 
 ;;; Code:
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 4c811d885d7..b94d4293fa7 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1,6 +1,6 @@
 ;;; htmlfontify.el --- htmlize a buffer/source tree with optional hyperlinks
 
-;; Copyright (C) 2002-2003, 2009-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2009-2012 Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Package: htmlfontify
@@ -376,7 +376,7 @@ commands in `hfy-etags-cmd-alist'."
   "The etags equivalent command to run in a source directory to generate a tags
 file for the whole source tree from there on down.  The command should emit
 the etags output on stdout.\n
-Two canned commands are provided - they drive Emacs' etags and
+Two canned commands are provided - they drive Emacs's etags and
 exuberant-ctags' etags respectively."
   :group 'htmlfontify
   :tag   "etags-command"
@@ -859,13 +859,13 @@ If CLASS is set, it must be a `defface' alist key [see below],
 in which case the first face specification returned by `hfy-combined-face-spec'
 which *doesn't* clash with CLASS is returned.\n
 \(A specification with a class of t is considered to match any class you
-specify - this matches Emacs' behavior when deciding on which face attributes
+specify - this matches Emacs's behavior when deciding on which face attributes
 to use, to the best of my understanding).\n
 If CLASS is nil, then you just get whatever `face-attr-construct' returns,
 ie the current specification in effect for FACE.\n
 *NOTE*: This function forces any face that is not 'default and which has
 no :inherit property to inherit from 'default (this is because 'default
-is magical in that Emacs' fonts behave as if they inherit implicitly from
+is magical in that Emacs's fonts behave as if they inherit implicitly from
 'default, but no such behavior exists in HTML/CSS).\n
 See also `hfy-display-class' for details of valid values for CLASS."
   (let ((face-spec
diff --git a/lisp/image.el b/lisp/image.el
index ab3f437a971..162cc8bb0ed 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1,6 +1,6 @@
 ;;; image.el --- image API
 
-;; Copyright (C) 1998-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: multimedia
@@ -163,7 +163,7 @@ compatibility with versions of Emacs that lack the variable
                 dir (expand-file-name "../" dir))))
       (setq image-directory-load-path dir))
 
-    ;; If `image-directory-load-path' isn't Emacs' image directory,
+    ;; If `image-directory-load-path' isn't Emacs's image directory,
     ;; it's probably a user preference, so use it. Then use a
     ;; relative setting if possible; otherwise, use
     ;; `image-directory-load-path'.
@@ -194,7 +194,7 @@ compatibility with versions of Emacs that lack the variable
               ;; Set it to nil if image is not found.
               (cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
                     ((file-exists-p (expand-file-name image d1ei)) d1ei)))))
-     ;; Use Emacs' image directory.
+     ;; Use Emacs's image directory.
      (image-directory-load-path
       (setq image-directory image-directory-load-path))
      (no-error
diff --git a/lisp/info.el b/lisp/info.el
index a8cb141114c..b7e2d1eedbe 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1165,6 +1165,12 @@ a case-insensitive match is tried."
                        (progn (setq file (expand-file-name "dir.info" truename))
                               (file-attributes file))
                        (progn (setq file (expand-file-name "DIR.INFO" truename))
+                              (file-attributes file))
+                       ;; Shouldn't really happen, but sometimes does,
+                       ;; eg on Debian systems with buggy packages;
+                       ;; so may as well try it.
+                       ;; http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00005.html
+                       (progn (setq file (expand-file-name "dir.gz" truename))
                               (file-attributes file)))))
                 (setq dirs-done
                       (cons truename
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index d4dd4e4cf24..7bf15009687 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1,6 +1,6 @@
 ;;; mule.el --- basic commands for multilingual environment
 
-;; Copyright (C) 1997-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1997-2012 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -165,7 +165,7 @@ compatibility.
 
 VALUE must be a nonnegative integer that can be used as an invalid
 code point of the charset.  If the minimum code is 0 and the maximum
-code is greater than Emacs' maximum integer value, `:invalid-code'
+code is greater than Emacs's maximum integer value, `:invalid-code'
 should not be omitted.
 
 `:code-offset'
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 8a8d7cdbb52..7e50ae57b19 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -203,6 +203,7 @@ to keep: LEN chars starting BEG chars from the beginning."
   ;; call-process barfs if default-directory is inaccessible.
   (let ((default-directory
           (if (and default-directory
+                   (not (file-remote-p default-directory))
                    (file-accessible-directory-p default-directory))
               default-directory
             (file-name-directory infile))))
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 9d5e69ba9d9..718c27499cf 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -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" (20229 34587))
+;;;;;;  "advice" "emacs-lisp/advice.el" (20277 28925))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action 'warn "\
@@ -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"
-;;;;;;  (20229 34587))
+;;;;;;  (20279 40897))
 ;;; Generated autoloads from allout.el
 
 (autoload 'allout-auto-activation-helper "allout" "\
@@ -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"
-;;;;;;  (20229 34587))
+;;;;;;  (20279 40897))
 ;;; 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" (20261 10951))
+;;;;;;  "net/ange-ftp.el" (20295 29120))
 ;;; Generated autoloads from net/ange-ftp.el
 
 (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
@@ -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" (20229 34587))
+;;;;;;  "ansi-color" "ansi-color.el" (20290 11197))
 ;;; 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" (20229 34587))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (20300 47034))
 ;;; Generated autoloads from progmodes/antlr-mode.el
 
 (autoload 'antlr-show-makefile-rules "antlr-mode" "\
@@ -1158,8 +1158,8 @@ Returns list of symbols and documentation found.
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20279
+;;;;;;  40897))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload 'archive-mode "arc-mode" "\
@@ -1486,7 +1486,7 @@ Special commands:
 ;;;***
 
 ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el"
-;;;;;;  (20236 48737))
+;;;;;;  (20279 40897))
 ;;; Generated autoloads from gnus/auth-source.el
 
 (defvar auth-source-cache-expiry 7200 "\
@@ -1792,7 +1792,7 @@ definition of \"random distance\".)
 ;;;***
 
 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20279 40897))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
 
@@ -1861,7 +1861,7 @@ For non-interactive use see also `benchmark-run' and
 ;;;***
 
 ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize)
-;;;;;;  "bibtex" "textmodes/bibtex.el" (20261 10951))
+;;;;;;  "bibtex" "textmodes/bibtex.el" (20276 64704))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload 'bibtex-initialize "bibtex" "\
@@ -2110,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" (20229 34587))
+;;;;;;  "bookmark.el" (20300 47034))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-r-map "b" 'bookmark-jump)
  (define-key ctl-x-r-map "m" 'bookmark-set)
@@ -2311,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" (20229 34587))
+;;;;;;  "browse-url" "net/browse-url.el" (20300 47034))
 ;;; Generated autoloads from net/browse-url.el
 
 (defvar browse-url-browser-function 'browse-url-default-browser "\
@@ -2380,9 +2380,11 @@ to use.
 \(fn EVENT)" t nil)
 
 (autoload 'browse-url-xdg-open "browse-url" "\
+Pass the specified URL to the \"xdg-open\" command.
+xdg-open is a desktop utility that calls your preferred web browser.
+The optional argument IGNORED is not used.
 
-
-\(fn URL &optional NEW-WINDOW)" t nil)
+\(fn URL &optional IGNORED)" t nil)
 
 (autoload 'browse-url-netscape "browse-url" "\
 Ask the Netscape WWW browser to load URL.
@@ -2641,7 +2643,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" (20229 34587))
+;;;;;;  "bs" "bs.el" (20300 47034))
 ;;; Generated autoloads from bs.el
 
 (autoload 'bs-cycle-next "bs" "\
@@ -2727,7 +2729,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" (20230 55355))
+;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (20276 33121))
 ;;; 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)
@@ -2869,7 +2871,7 @@ and corresponding effects.
 ;;;***
 
 ;;;### (autoloads (calendar-hebrew-list-yahrzeits) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20284 58812))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 
 (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\
@@ -2885,8 +2887,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" (20229
-;;;;;;  34587))
+;;;;;;  full-calc calc calc-dispatch) "calc" "calc/calc.el" (20279
+;;;;;;  40897))
 ;;; Generated autoloads from calc/calc.el
  (define-key ctl-x-map "*" 'calc-dispatch)
 
@@ -2993,8 +2995,8 @@ See the documentation for `calculator-mode' for more information.
 
 ;;;***
 
-;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20230
-;;;;;;  18463))
+;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20287
+;;;;;;  5356))
 ;;; Generated autoloads from calendar/calendar.el
 
 (autoload 'calendar "calendar" "\
@@ -3103,7 +3105,7 @@ Obsoletes `c-forward-into-nomenclature'.
 ;;;***
 
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (20264 31805))
+;;;;;;  (20279 40897))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3115,7 +3117,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" (20229 34587))
+;;;;;;  c-guess) "cc-guess" "progmodes/cc-guess.el" (20275 43867))
 ;;; Generated autoloads from progmodes/cc-guess.el
 
 (defvar c-guess-guessed-offsets-alist nil "\
@@ -3215,7 +3217,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"
-;;;;;;  (20247 64512))
+;;;;;;  (20293 38510))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -3443,7 +3445,7 @@ and exists only for compatibility reasons.
 
 ;;;***
 
-;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (20229 34587))
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (20279 40897))
 ;;; Generated autoloads from progmodes/cc-vars.el
 (put 'c-basic-offset 'safe-local-variable 'integerp)
 (put 'c-backslash-column 'safe-local-variable 'integerp)
@@ -4073,7 +4075,7 @@ a future Emacs interpreter will be able to use it.")
 ;;;***
 
 ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20279 40897))
 ;;; Generated autoloads from emacs-lisp/cl-indent.el
 
 (autoload 'common-lisp-indent-function "cl-indent" "\
@@ -4215,10 +4217,10 @@ 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"
-;;;;;;  (20229 34587))
+;;;;;;  (20290 11197))
 ;;; Generated autoloads from comint.el
 
-(defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
+(defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
 Functions to call after output is inserted into the buffer.
 One possible function is `comint-postoutput-scroll-to-bottom'.
 These functions get one argument, a string containing the text as originally
@@ -4347,8 +4349,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" (20265
-;;;;;;  7997))
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (20275
+;;;;;;  43867))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4528,7 +4530,7 @@ This is the value of `next-error-function' in Compilation buffers.
 ;;;***
 
 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20273 55691))
 ;;; Generated autoloads from completion.el
 
 (defvar dynamic-completion-mode nil "\
@@ -4541,7 +4543,10 @@ or call the function `dynamic-completion-mode'.")
 (custom-autoload 'dynamic-completion-mode "completion" nil)
 
 (autoload 'dynamic-completion-mode "completion" "\
-Enable dynamic word-completion.
+Toggle dynamic word-completion on or off.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
@@ -5069,7 +5074,7 @@ Major mode to edit Cascading Style Sheets.
 ;;;***
 
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -5129,7 +5134,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" (20259 55615))
+;;;;;;  "cus-edit" "cus-edit.el" (20271 46782))
 ;;; Generated autoloads from cus-edit.el
 
 (defvar custom-browse-sort-alphabetically nil "\
@@ -5445,8 +5450,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" (20229
-;;;;;;  34587))
+;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (20279
+;;;;;;  40897))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload 'customize-create-theme "cus-theme" "\
@@ -5489,7 +5494,7 @@ Mode used for cvs status output.
 ;;;***
 
 ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode)
-;;;;;;  "cwarn" "progmodes/cwarn.el" (20263 52669))
+;;;;;;  "cwarn" "progmodes/cwarn.el" (20273 55692))
 ;;; Generated autoloads from progmodes/cwarn.el
 
 (autoload 'cwarn-mode "cwarn" "\
@@ -5501,7 +5506,9 @@ Note, in addition to enabling this minor mode, the major mode must
 be included in the variable `cwarn-configuration'.  By default C and
 C++ modes are included.
 
-With ARG, turn CWarn mode on if and only if arg is positive.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
@@ -6051,7 +6058,7 @@ relevant to POS.
 ;;;### (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" (20229 34587))
+;;;;;;  "desktop.el" (20277 28925))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -6271,7 +6278,7 @@ Deuglify broken Outlook (Express) articles and redisplay.
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (20229 34587))
+;;;;;;  "calendar/diary-lib.el" (20287 5356))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload 'diary "diary-lib" "\
@@ -6358,7 +6365,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from vc/diff-mode.el
 
 (autoload 'diff-mode "diff-mode" "\
@@ -6402,7 +6409,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" (20259 55615))
+;;;;;;  dired dired-listing-switches) "dired" "dired.el" (20296 49978))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6524,7 +6531,7 @@ Keybindings:
 ;;;***
 
 ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20273 55691))
 ;;; Generated autoloads from dirtrack.el
 
 (autoload 'dirtrack-mode "dirtrack" "\
@@ -6757,8 +6764,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" (20229
-;;;;;;  34587))
+;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20279
+;;;;;;  40897))
 ;;; Generated autoloads from doc-view.el
 
 (autoload 'doc-view-mode-p "doc-view" "\
@@ -6842,7 +6849,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" (20264 40969))
+;;;;;;  "emacs-lisp/easy-mmode.el" (20294 38748))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
@@ -6853,6 +6860,14 @@ This defines the toggle command MODE and (by default) a control variable
 MODE (you can override this with the :variable keyword, see below).
 DOC is the documentation for the mode toggle command.
 
+The defined mode command takes one optional (prefix) argument.
+Interactively with no prefix argument it toggles the mode.
+With a prefix argument, it enables the mode if the argument is
+positive and otherwise disables it.  When called from Lisp, it
+enables the mode if the argument is omitted or nil, and toggles
+the mode if the argument is `toggle'.  If DOC is nil this
+function adds a basic doc-string stating these facts.
+
 Optional INIT-VALUE is the initial value of the mode's variable.
 Optional LIGHTER is displayed in the modeline when the mode is on.
 Optional KEYMAP is the default keymap bound to the mode keymap.
@@ -6890,6 +6905,8 @@ BODY contains code to execute each time the mode is enabled or disabled.
                 the new state, and sets it.  If you specify a :variable,
                 this function does not define a MODE variable (nor any of
                 the terms used in :variable).
+:after-hook     A single lisp form which is evaluated after the mode hooks
+                have been run.  It should not be quoted.
 
 For example, you could write
   (define-minor-mode foo-mode \"If enabled, foo on you!\"
@@ -6958,8 +6975,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" (20229
-;;;;;;  34587))
+;;;;;;  easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (20300
+;;;;;;  47034))
 ;;; Generated autoloads from emacs-lisp/easymenu.el
 
 (autoload 'easy-menu-define "easymenu" "\
@@ -7016,7 +7033,7 @@ KEYS is expanded with `substitute-command-keys' before it is used.
 
 KEYS is nil, a string or a vector; nil or a keyboard equivalent to this
 menu item.
-This is a hint that will considerably speed up Emacs' first display of
+This is a hint that will considerably speed up Emacs's first display of
 a menu.  Use `:key-sequence nil' when you know that this menu item has no
 keyboard equivalent.
 
@@ -7940,7 +7957,7 @@ Display Ediff's registry.
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "vc/ediff-util.el" (20229 34587))
+;;;;;;  "ediff-util" "vc/ediff-util.el" (20300 47034))
 ;;; Generated autoloads from vc/ediff-util.el
 
 (autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -8112,7 +8129,7 @@ Emacs Lisp mode) that support ElDoc.")
 ;;;***
 
 ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode)
-;;;;;;  "electric" "electric.el" (20229 34587))
+;;;;;;  "electric" "electric.el" (20275 12572))
 ;;; Generated autoloads from electric.el
 
 (defvar electric-indent-chars '(10) "\
@@ -8133,9 +8150,9 @@ With a prefix argument ARG, enable Electric Indent mode if ARG is
 positive, and disable it otherwise.  If called from Lisp, enable
 the mode if ARG is omitted or nil.
 
-Electric Indent mode is a global minor mode.  When enabled,
-reindentation is triggered whenever you insert a character listed
-in `electric-indent-chars'.
+This is a global minor mode.  When enabled, it reindents whenever
+the hook `electric-indent-functions' returns non-nil, or you
+insert a character from `electric-indent-chars'.
 
 \(fn &optional ARG)" t nil)
 
@@ -8158,6 +8175,8 @@ Electric Pair mode is a global minor mode.  When enabled, typing
 an open parenthesis automatically inserts the corresponding
 closing parenthesis.  (Likewise for brackets, etc.)
 
+See options `electric-pair-pairs' and `electric-pair-skip-self'.
+
 \(fn &optional ARG)" t nil)
 
 (defvar electric-layout-mode nil "\
@@ -8171,6 +8190,10 @@ or call the function `electric-layout-mode'.")
 
 (autoload 'electric-layout-mode "electric" "\
 Automatically insert newlines around some chars.
+With a prefix argument ARG, enable Electric Layout mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
+The variable `electric-layout-rules' says when and how to insert newlines.
 
 \(fn &optional ARG)" t nil)
 
@@ -8294,7 +8317,7 @@ Other values are interpreted as usual.
 ;;;***
 
 ;;;### (autoloads (report-emacs-bug-query-existing-bugs report-emacs-bug)
-;;;;;;  "emacsbug" "mail/emacsbug.el" (20259 55615))
+;;;;;;  "emacsbug" "mail/emacsbug.el" (20277 28925))
 ;;; Generated autoloads from mail/emacsbug.el
 
 (autoload 'report-emacs-bug "emacsbug" "\
@@ -8315,7 +8338,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" (20204 31303))
+;;;;;;  "vc/emerge.el" (20292 6362))
 ;;; Generated autoloads from vc/emerge.el
 
 (autoload 'emerge-files "emerge" "\
@@ -8376,13 +8399,18 @@ Emerge two RCS revisions of a file, with another revision as ancestor.
 ;;;***
 
 ;;;### (autoloads (enriched-decode enriched-encode enriched-mode)
-;;;;;;  "enriched" "textmodes/enriched.el" (20229 34587))
+;;;;;;  "enriched" "textmodes/enriched.el" (20273 55692))
 ;;; Generated autoloads from textmodes/enriched.el
 
 (autoload 'enriched-mode "enriched" "\
 Minor mode for editing text/enriched files.
 These are files with embedded formatting information in the MIME standard
 text/enriched format.
+
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
+
 Turning the mode on or off runs `enriched-mode-hook'.
 
 More information about Enriched mode is available in the file
@@ -8638,11 +8666,14 @@ 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" (20229 34587))
+;;;;;;  "epa-mail" "epa-mail.el" (20273 55691))
 ;;; Generated autoloads from epa-mail.el
 
 (autoload 'epa-mail-mode "epa-mail" "\
 A minor-mode for composing encrypted/clearsigned mails.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
@@ -8697,6 +8728,9 @@ or call the function `epa-global-mail-mode'.")
 
 (autoload 'epa-global-mail-mode "epa-mail" "\
 Minor mode to hook EasyPG into Mail mode.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
@@ -8801,7 +8835,7 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
 
 ;;;***
 
-;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (20229 34587))
+;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (20300 47034))
 ;;; Generated autoloads from erc/erc-compat.el
  (autoload 'erc-define-minor-mode "erc-compat")
 
@@ -8949,7 +8983,7 @@ system.
 
 ;;;***
 
-;;;### (autoloads nil "erc-join" "erc/erc-join.el" (20229 34587))
+;;;### (autoloads nil "erc-join" "erc/erc-join.el" (20274 22975))
 ;;; Generated autoloads from erc/erc-join.el
  (autoload 'erc-autojoin-mode "erc-join" nil t)
 
@@ -9229,7 +9263,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" (20229 34587))
+;;;;;;  "ert" "emacs-lisp/ert.el" (20300 47034))
 ;;; Generated autoloads from emacs-lisp/ert.el
 
 (autoload 'ert-deftest "ert" "\
@@ -9299,7 +9333,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20270 25925))
 ;;; Generated autoloads from emacs-lisp/ert-x.el
 
 (put 'ert-with-test-buffer 'lisp-indent-function 1)
@@ -9325,7 +9359,7 @@ Emacs shell interactive mode.
 ;;;***
 
 ;;;### (autoloads (eshell-command-result eshell-command eshell) "eshell"
-;;;;;;  "eshell/eshell.el" (20229 34587))
+;;;;;;  "eshell/eshell.el" (20300 47034))
 ;;; Generated autoloads from eshell/eshell.el
 
 (autoload 'eshell "eshell" "\
@@ -9854,7 +9888,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from net/eudc.el
 
 (autoload 'eudc-set-server "eudc" "\
@@ -9973,8 +10007,8 @@ Edit the hotlist of directory servers in a specialized buffer.
 
 ;;;***
 
-;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (20300
+;;;;;;  47034))
 ;;; Generated autoloads from emacs-lisp/ewoc.el
 
 (autoload 'ewoc-create "ewoc" "\
@@ -10165,8 +10199,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" (20229
-;;;;;;  34587))
+;;;;;;  face-remap-add-relative) "face-remap" "face-remap.el" (20273
+;;;;;;  55691))
 ;;; Generated autoloads from face-remap.el
 
 (autoload 'face-remap-add-relative "face-remap" "\
@@ -10264,8 +10298,10 @@ a top-level keymap, `text-scale-increase' or
 
 (autoload 'buffer-face-mode "face-remap" "\
 Minor mode for a buffer-specific default face.
-When enabled, the face specified by the variable
-`buffer-face-mode-face' is used to display the buffer text.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.  When enabled, the face specified by the
+variable `buffer-face-mode-face' is used to display the buffer text.
 
 \(fn &optional ARG)" t nil)
 
@@ -10306,7 +10342,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" (20172 54913))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (20300 47034))
 ;;; Generated autoloads from mail/feedmail.el
 
 (autoload 'feedmail-send-it "feedmail" "\
@@ -10360,7 +10396,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" (20229 34587))
+;;;;;;  find-file-at-point ffap-next) "ffap" "ffap.el" (20292 53022))
 ;;; Generated autoloads from ffap.el
 
 (autoload 'ffap-next "ffap" "\
@@ -10549,8 +10585,8 @@ Copy directory-local variables to the -*- line.
 
 ;;;***
 
-;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20300
+;;;;;;  47034))
 ;;; Generated autoloads from filesets.el
 
 (autoload 'filesets-init "filesets" "\
@@ -10955,13 +10991,14 @@ 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" (20229 34587))
+;;;;;;  flymake-mode) "flymake" "progmodes/flymake.el" (20273 55692))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload 'flymake-mode "flymake" "\
-Minor mode to do on-the-fly syntax checking.
-When called interactively, toggles the minor mode.
-With arg, turn Flymake mode on if and only if arg is positive.
+Toggle on-the-fly syntax checking.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
@@ -11316,7 +11353,7 @@ and choose the directory as the fortune-file.
 ;;;***
 
 ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el"
-;;;;;;  (20264 32142))
+;;;;;;  (20298 5305))
 ;;; Generated autoloads from progmodes/gdb-mi.el
 
 (defvar gdb-enable-debug nil "\
@@ -11461,13 +11498,15 @@ regular expression that can be used as an element of
 ;;;***
 
 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20273 55692))
 ;;; Generated autoloads from progmodes/glasses.el
 
 (autoload 'glasses-mode "glasses" "\
 Minor mode for making identifiers likeThis readable.
-When this mode is active, it tries to add virtual separators (like underscores)
-at places they belong to.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.  When this mode is active, it tries to
+add virtual separators (like underscores) at places they belong to.
 
 \(fn &optional ARG)" t nil)
 
@@ -11475,7 +11514,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from gnus/gmm-utils.el
 
 (autoload 'gmm-regexp-concat "gmm-utils" "\
@@ -11530,7 +11569,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" (20258 34747))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (20276 33121))
 ;;; Generated autoloads from gnus/gnus.el
 (when (fboundp 'custom-autoload)
  (custom-autoload 'gnus-select-method "gnus"))
@@ -11583,7 +11622,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" (20265 7997))
+;;;;;;  "gnus/gnus-agent.el" (20300 47034))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload 'gnus-unplugged "gnus-agent" "\
@@ -11674,7 +11713,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (20232 10689))
+;;;;;;  (20280 61753))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11892,7 +11931,7 @@ If gravatars are already displayed, remove them.
 ;;;***
 
 ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;;  "gnus-group" "gnus/gnus-group.el" (20232 10689))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (20266 28861))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload 'gnus-fetch-group "gnus-group" "\
@@ -11910,7 +11949,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-html-prefetch-images gnus-article-html) "gnus-html"
-;;;;;;  "gnus/gnus-html.el" (20229 34587))
+;;;;;;  "gnus/gnus-html.el" (20273 55604))
 ;;; Generated autoloads from gnus/gnus-html.el
 
 (autoload 'gnus-article-html "gnus-html" "\
@@ -12067,13 +12106,15 @@ 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" (20230 55355))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (20290 11197))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload 'gnus-msg-mail "gnus-msg" "\
 Start editing a mail message to be sent.
 Like `message-mail', but with Gnus paraphernalia, particularly the
 Gcc: header for archiving purposes.
+If Gnus isn't running, a plain `message-mail' setup is used
+instead.
 
 \(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-ACTION YANK-ACTION SEND-ACTIONS RETURN-ACTION)" t nil)
 
@@ -12093,7 +12134,7 @@ Like `message-reply'.
 
 ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon
 ;;;;;;  gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20279 40897))
 ;;; Generated autoloads from gnus/gnus-picon.el
 
 (autoload 'gnus-treat-from-picon "gnus-picon" "\
@@ -12188,7 +12229,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (20229 34587))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (20279 40897))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload 'gnus-registry-initialize "gnus-registry" "\
@@ -12244,7 +12285,7 @@ Update the format specification near point.
 ;;;***
 
 ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el"
-;;;;;;  (20259 55615))
+;;;;;;  (20286 14149))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -12255,7 +12296,7 @@ Declare back end NAME with ABILITIES as a Gnus back end.
 ;;;***
 
 ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el"
-;;;;;;  (20258 34747))
+;;;;;;  (20291 32066))
 ;;; Generated autoloads from gnus/gnus-sum.el
 
 (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -12294,7 +12335,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 ;;;***
 
 ;;;### (autoloads (gnutls-min-prime-bits) "gnutls" "net/gnutls.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20286 55781))
 ;;; Generated autoloads from net/gnutls.el
 
 (defvar gnutls-min-prime-bits nil "\
@@ -12310,7 +12351,7 @@ A value of nil says to use the default gnutls value.")
 
 ;;;***
 
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20229 34587))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20300 47034))
 ;;; Generated autoloads from play/gomoku.el
 
 (autoload 'gomoku "gomoku" "\
@@ -12337,8 +12378,8 @@ 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" (20229
-;;;;;;  34587))
+;;;;;;  goto-address-at-point) "goto-addr" "net/goto-addr.el" (20273
+;;;;;;  55692))
 ;;; Generated autoloads from net/goto-addr.el
 
 (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1")
@@ -12366,6 +12407,9 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
 
 (autoload 'goto-address-mode "goto-addr" "\
 Minor mode to buttonize URLs and e-mail addresses in the current buffer.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
@@ -12377,7 +12421,7 @@ Like `goto-address-mode', but only for comments and strings.
 ;;;***
 
 ;;;### (autoloads (gravatar-retrieve-synchronously gravatar-retrieve)
-;;;;;;  "gravatar" "gnus/gravatar.el" (20229 34587))
+;;;;;;  "gravatar" "gnus/gravatar.el" (20279 40897))
 ;;; Generated autoloads from gnus/gravatar.el
 
 (autoload 'gravatar-retrieve "gravatar" "\
@@ -12571,7 +12615,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" (20261 10951))
+;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20270 25925))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload 'gud-gdb "gud" "\
@@ -12659,8 +12703,8 @@ it if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (20300
+;;;;;;  47034))
 ;;; Generated autoloads from play/handwrite.el
 
 (autoload 'handwrite "handwrite" "\
@@ -12882,7 +12926,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" (20229 34587))
+;;;;;;  "help-fns" "help-fns.el" (20298 5305))
 ;;; Generated autoloads from help-fns.el
 
 (autoload 'describe-function "help-fns" "\
@@ -13368,7 +13412,7 @@ Several variables affect how the hiding is done:
 ;;;***
 
 ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el"
-;;;;;;  (20237 28610))
+;;;;;;  (20273 55692))
 ;;; 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))) "\
@@ -13401,6 +13445,10 @@ whitespace.  Case does not matter.")
 
 (autoload 'hs-minor-mode "hideshow" "\
 Minor mode to selectively hide/show code and comment blocks.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
+
 When hideshow minor mode is on, the menu bar is augmented with hideshow
 commands and the hideshow commands are enabled.
 The value '(hs . t) is added to `buffer-invisibility-spec'.
@@ -13692,7 +13740,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" (20229 34587))
+;;;;;;  "calendar/holidays.el" (20287 5356))
 ;;; Generated autoloads from calendar/holidays.el
 
 (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1")
@@ -13787,8 +13835,8 @@ See the documentation for `calendar-holidays' for details.")
 
 (define-obsolete-variable-alias 'bahai-holidays 'holiday-bahai-holidays "23.1")
 
-(defvar holiday-bahai-holidays (mapcar 'purecopy '((holiday-bahai-new-year) (holiday-bahai-ridvan) (holiday-fixed 5 23 "Declaration of the Bab") (holiday-fixed 5 29 "Ascension of Baha'u'llah") (holiday-fixed 7 9 "Martyrdom of the Bab") (holiday-fixed 10 20 "Birth of the Bab") (holiday-fixed 11 12 "Birth of Baha'u'llah") (if calendar-bahai-all-holidays-flag (append (holiday-fixed 11 26 "Day of the Covenant") (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha"))))) "\
-Baha'i holidays.
+(defvar holiday-bahai-holidays (mapcar 'purecopy '((holiday-bahai-new-year) (holiday-bahai-ridvan) (holiday-fixed 5 23 "Declaration of the Báb") (holiday-fixed 5 29 "Ascension of Bahá'u'lláh") (holiday-fixed 7 9 "Martyrdom of the Báb") (holiday-fixed 10 20 "Birth of the Báb") (holiday-fixed 11 12 "Birth of Bahá'u'lláh") (if calendar-bahai-all-holidays-flag (append (holiday-fixed 11 26 "Day of the Covenant") (holiday-fixed 11 28 "Ascension of `Abdu'l-Bahá"))))) "\
+Bahá'í holidays.
 See the documentation for `calendar-holidays' for details.")
 
 (custom-autoload 'holiday-bahai-holidays "holidays" t)
@@ -13852,7 +13900,7 @@ Convert HTML to plain text in the current buffer.
 ;;;***
 
 ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer)
-;;;;;;  "htmlfontify" "htmlfontify.el" (20237 28610))
+;;;;;;  "htmlfontify" "htmlfontify.el" (20300 47034))
 ;;; Generated autoloads from htmlfontify.el
 
 (autoload 'htmlfontify-buffer "htmlfontify" "\
@@ -14076,8 +14124,8 @@ buffer `*icalendar-errors*'.
 
 ;;;***
 
-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20294
+;;;;;;  38748))
 ;;; Generated autoloads from icomplete.el
 
 (defvar icomplete-mode nil "\
@@ -14300,8 +14348,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" (20229
-;;;;;;  34587))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20268
+;;;;;;  33259))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -14442,7 +14490,6 @@ in a separate window.
 \\[ido-toggle-regexp] Toggle regexp searching.
 \\[ido-toggle-prefix] Toggle between substring and prefix matching.
 \\[ido-toggle-case] Toggle case-sensitive searching of file names.
-\\[ido-toggle-vc] Toggle version control for this file.
 \\[ido-toggle-literal] Toggle literal reading of this file.
 \\[ido-completion-help] Show list of matching files in separate window.
 \\[ido-toggle-ignore] Toggle ignoring files listed in `ido-ignore-files'.
@@ -14573,13 +14620,17 @@ Switches to the buffer `*ielm*', or creates it if it does not exist.
 
 ;;;***
 
-;;;### (autoloads (iimage-mode) "iimage" "iimage.el" (20229 34587))
+;;;### (autoloads (iimage-mode) "iimage" "iimage.el" (20273 55691))
 ;;; Generated autoloads from iimage.el
 
 (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1")
 
 (autoload 'iimage-mode "iimage" "\
-Toggle inline image minor mode.
+Toggle Iimage mode on or off.
+With a prefix argument ARG, enable Iimage mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
+\\{iimage-mode-map}
 
 \(fn &optional ARG)" t nil)
 
@@ -14590,7 +14641,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from image.el
 
 (autoload 'image-type-from-data "image" "\
@@ -14988,7 +15039,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" (20229 34587))
+;;;;;;  image-mode) "image-mode" "image-mode.el" (20274 22975))
 ;;; Generated autoloads from image-mode.el
 
 (autoload 'image-mode "image-mode" "\
@@ -16353,7 +16404,7 @@ If kbd macro currently being defined end it before activating it.
 ;;;***
 
 ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias 'landmark-repeat 'landmark-test-run)
@@ -16715,8 +16766,8 @@ uses the current buffer.
 
 ;;;***
 
-;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (20279
+;;;;;;  40897))
 ;;; Generated autoloads from vc/log-view.el
 
 (autoload 'log-view-mode "log-view" "\
@@ -16850,7 +16901,7 @@ for further customization of the printer command.
 ;;;***
 
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20273 55604))
 ;;; Generated autoloads from ls-lisp.el
 
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -17375,7 +17426,7 @@ Previous contents of that buffer are killed first.
 ;;;***
 
 ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20292 53022))
 ;;; Generated autoloads from man.el
 
 (defalias 'manual-entry 'man)
@@ -17485,7 +17536,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" (20229 34587))
+;;;;;;  "gnus/message.el" (20279 40897))
 ;;; 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)
@@ -18188,7 +18239,7 @@ body) or \"attachment\" (separate from the body).
 ;;;***
 
 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20291 32066))
 ;;; Generated autoloads from gnus/mml1991.el
 
 (autoload 'mml1991-encrypt "mml1991" "\
@@ -18819,8 +18870,8 @@ Open a network connection to HOST on PORT.
 
 ;;;***
 
-;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (netrc-credentials) "netrc" "net/netrc.el" (20279
+;;;;;;  40897))
 ;;; Generated autoloads from net/netrc.el
 
 (autoload 'netrc-credentials "netrc" "\
@@ -18929,7 +18980,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" (20229 34587))
+;;;;;;  "newcomment.el" (20296 49978))
 ;;; Generated autoloads from newcomment.el
 
 (defalias 'indent-for-comment 'comment-indent)
@@ -18990,6 +19041,48 @@ The function has no args.
 Applicable at least in modes for languages like fixed-format Fortran where
 comments always start in column zero.")
 
+(defconst comment-styles '((plain nil nil nil nil "Start in column 0 (do not indent), as in Emacs-20") (indent-or-triple nil nil nil multi-char "Start in column 0, but only for single-char starters") (indent nil nil nil t "Full comment per line, ends not aligned") (aligned nil t nil t "Full comment per line, ends aligned") (box nil t t t "Full comment per line, ends aligned, + top and bottom") (extra-line t nil t t "One comment for all lines, end on a line by itself") (multi-line t nil nil t "One comment for all lines, end on last commented line") (box-multi t t t t "One comment for all lines, + top and bottom")) "\
+Comment region style definitions.
+Each style is defined with a form (STYLE . (MULTI ALIGN EXTRA INDENT DOC)).
+DOC should succinctly describe the style.
+STYLE should be a mnemonic symbol.
+MULTI specifies that comments are allowed to span multiple lines.
+  e.g. in C it comments regions as
+     /* blabla
+      * bli */
+  rather than
+     /* blabla */
+     /* bli */
+  if `comment-end' is empty, this has no effect.
+
+ALIGN specifies that the `comment-end' markers should be aligned.
+  e.g. in C it comments regions as
+     /* blabla */
+     /* bli    */
+  rather than
+     /* blabla */
+     /* bli */
+  if `comment-end' is empty, this has no effect, unless EXTRA is also set,
+  in which case the comment gets wrapped in a box.
+
+EXTRA specifies that an extra line should be used before and after the
+  region to comment (to put the `comment-end' and `comment-start').
+  e.g. in C it comments regions as
+     /*
+      * blabla
+      * bli
+      */
+  rather than
+     /* blabla
+      * bli */
+  if the comment style is not multi line, this has no effect, unless ALIGN
+  is also set, in which case the comment gets wrapped in a box.
+
+INDENT specifies that the `comment-start' markers should not be put at the
+  left margin but at the current indentation of the region to comment.
+If INDENT is `multi-char', that means indent multi-character
+  comment starters, but not one-character comment starters.")
+
 (defvar comment-style 'indent "\
 Style to be used for `comment-region'.
 See `comment-styles' for a list of available styles.")
@@ -19243,7 +19336,7 @@ This command does not work if you use short group names.
 ;;;***
 
 ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20280 61753))
 ;;; Generated autoloads from gnus/nnml.el
 
 (autoload 'nnml-generate-nov-databases "nnml" "\
@@ -19689,7 +19782,7 @@ exported source code blocks by language.
 ;;;***
 
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20291 32066))
 ;;; Generated autoloads from progmodes/octave-inf.el
 
 (autoload 'inferior-octave "octave-inf" "\
@@ -19712,7 +19805,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20291 32066))
 ;;; Generated autoloads from progmodes/octave-mod.el
 
 (autoload 'octave-mode "octave-mod" "\
@@ -20638,7 +20731,7 @@ Show the raw feed buffer of a feed.
 ;;;***
 
 ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote"
-;;;;;;  "org/org-footnote.el" (20229 34587))
+;;;;;;  "org/org-footnote.el" (20282 42537))
 ;;; Generated autoloads from org/org-footnote.el
 
 (autoload 'org-footnote-action "org-footnote" "\
@@ -21552,7 +21645,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"
-;;;;;;  (20259 55615))
+;;;;;;  (20299 26170))
 ;;; Generated autoloads from emacs-lisp/package.el
 
 (defvar package-enable-at-startup t "\
@@ -21649,7 +21742,7 @@ matching parenthesis is highlighted in `show-paren-style' after
 ;;;***
 
 ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20296 49978))
 ;;; Generated autoloads from calendar/parse-time.el
 (put 'parse-time-rules 'risky-local-variable t)
 
@@ -21662,8 +21755,8 @@ unknown are returned as nil.
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20273
+;;;;;;  55692))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload 'pascal-mode "pascal" "\
@@ -22133,7 +22226,7 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20291 63109))
 ;;; Generated autoloads from textmodes/picture.el
 
 (autoload 'picture-mode "picture" "\
@@ -22183,7 +22276,7 @@ You can edit tabular text with these commands:
 
 You can manipulate text with these commands:
  Clear ARG columns after point without moving:    \\[picture-clear-column]
- Delete char at point:                            \\[delete-char]
+ Delete char at point:                            \\[picture-delete-char]
  Clear ARG columns backward:                      \\[picture-backward-clear-column]
  Clear ARG lines, advancing over them:            \\[picture-clear-line]
   (the cleared text is saved in the kill ring)
@@ -22265,7 +22358,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20270 25925))
 ;;; Generated autoloads from emacs-lisp/pp.el
 
 (autoload 'pp-to-string "pp" "\
@@ -22936,7 +23029,7 @@ See `proced-mode' for a description of features available in Proced buffers.
 ;;;***
 
 ;;;### (autoloads (run-prolog mercury-mode prolog-mode) "prolog"
-;;;;;;  "progmodes/prolog.el" (20229 34587))
+;;;;;;  "progmodes/prolog.el" (20293 40451))
 ;;; Generated autoloads from progmodes/prolog.el
 
 (autoload 'prolog-mode "prolog" "\
@@ -23233,7 +23326,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" (20261 10951))
+;;;;;;  run-python) "python" "progmodes/python.el" (20278 20028))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode))
@@ -23646,7 +23739,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
 
 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (20229 34587))
+;;;;;;  "net/rcirc.el" (20280 61753))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload 'rcirc "rcirc" "\
@@ -23676,13 +23769,16 @@ or call the function `rcirc-track-minor-mode'.")
 
 (autoload 'rcirc-track-minor-mode "rcirc" "\
 Global minor mode for tracking activity in rcirc buffers.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
 ;;;***
 
-;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (20229
-;;;;;;  34587))
+;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (20290
+;;;;;;  11197))
 ;;; Generated autoloads from net/rcompile.el
 
 (autoload 'remote-compile "rcompile" "\
@@ -24059,7 +24155,7 @@ of master file.
 ;;;***
 
 ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 
 (autoload 'regexp-opt "regexp-opt" "\
@@ -24303,7 +24399,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" (20259 55615))
+;;;;;;  "rmail" "mail/rmail.el" (20288 55881))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -24328,7 +24424,7 @@ Setting this variable has an effect only before reading a mail.")
 
 (custom-autoload 'rmail-user-mail-address-regexp "rmail" t)
 
-(defvaralias 'rmail-dont-reply-to-names 'mail-dont-reply-to-names)
+(define-obsolete-variable-alias 'rmail-dont-reply-to-names 'mail-dont-reply-to-names "24.1")
 
 (defvar rmail-default-dont-reply-to-names nil "\
 Regexp specifying part of the default value of `mail-dont-reply-to-names'.
@@ -24577,7 +24673,7 @@ Validation will be enabled if `rng-nxml-auto-validate-flag' is non-nil.
 ;;;***
 
 ;;;### (autoloads (rng-validate-mode) "rng-valid" "nxml/rng-valid.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20277 28925))
 ;;; Generated autoloads from nxml/rng-valid.el
 
 (autoload 'rng-validate-mode "rng-valid" "\
@@ -25210,21 +25306,23 @@ one window apply to all visible windows in the same frame.
 ;;;***
 
 ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20273 55692))
 ;;; Generated autoloads from scroll-lock.el
 
 (autoload 'scroll-lock-mode "scroll-lock" "\
 Buffer-local minor mode for pager-like scrolling.
-Keys which normally move point by line or paragraph will scroll
-the buffer by the respective amount of lines instead and point
-will be kept vertically fixed relative to window boundaries
-during scrolling.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.  When enabled, keys that normally move
+point by line or paragraph will scroll the buffer by the
+respective amount of lines instead and point will be kept
+vertically fixed relative to window boundaries during scrolling.
 
 \(fn &optional ARG)" t nil)
 
 ;;;***
 
-;;;### (autoloads nil "secrets" "net/secrets.el" (20229 34587))
+;;;### (autoloads nil "secrets" "net/secrets.el" (20300 47034))
 ;;; Generated autoloads from net/secrets.el
 (when (featurep 'dbusbind)
  (autoload 'secrets-show-secrets "secrets" nil t))
@@ -25232,7 +25330,7 @@ during scrolling.
 ;;;***
 
 ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic"
-;;;;;;  "cedet/semantic.el" (20229 34587))
+;;;;;;  "cedet/semantic.el" (20300 47034))
 ;;; Generated autoloads from cedet/semantic.el
 
 (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\
@@ -25286,7 +25384,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" (20238 49468))
+;;;;;;  "sendmail" "mail/sendmail.el" (20277 28925))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style 'default "\
@@ -25568,8 +25666,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" (20229
-;;;;;;  34587))
+;;;;;;  server-force-delete server-start) "server" "server.el" (20275
+;;;;;;  12606))
 ;;; Generated autoloads from server.el
 
 (put 'server-host 'risky-local-variable t)
@@ -25636,7 +25734,7 @@ only these files will be asked to be saved.
 
 ;;;***
 
-;;;### (autoloads (ses-mode) "ses" "ses.el" (20229 34587))
+;;;### (autoloads (ses-mode) "ses" "ses.el" (20279 40897))
 ;;; Generated autoloads from ses.el
 
 (autoload 'ses-mode "ses" "\
@@ -25655,7 +25753,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 
 (autoload 'sgml-mode "sgml-mode" "\
@@ -25876,7 +25974,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (20230 13182))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\
@@ -25924,12 +26022,14 @@ Otherwise, one argument `-i' is passed to the shell.
 
 ;;;***
 
-;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20259
-;;;;;;  55615))
+;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20298
+;;;;;;  5305))
 ;;; Generated autoloads from gnus/shr.el
 
 (autoload 'shr-insert-document "shr" "\
-
+Render the parsed document DOM into the current buffer.
+DOM should be a parse tree as generated by
+`libxml-parse-html-region' or similar.
 
 \(fn DOM)" nil nil)
 
@@ -26132,7 +26232,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" (20229 34587))
+;;;;;;  "smerge-mode" "vc/smerge-mode.el" (20273 55692))
 ;;; Generated autoloads from vc/smerge-mode.el
 
 (autoload 'smerge-ediff "smerge-mode" "\
@@ -26144,6 +26244,9 @@ buffer names.
 
 (autoload 'smerge-mode "smerge-mode" "\
 Minor mode to simplify editing output from the diff3 program.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 \\{smerge-mode-map}
 
 \(fn &optional ARG)" t nil)
@@ -26175,7 +26278,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" (20232 10689))
+;;;;;;  "mail/smtpmail.el" (20283 8297))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload 'smtpmail-send-it "smtpmail" "\
@@ -26585,7 +26688,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20303 23227))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload 'sql-add-product-keywords "sql" "\
@@ -27313,7 +27416,7 @@ See `subword-mode' for more information on Subword mode.
 ;;;***
 
 ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20273 55692))
 ;;; Generated autoloads from mail/supercite.el
 
 (autoload 'sc-cite-original "supercite" "\
@@ -28055,7 +28158,7 @@ Connect to the Emacs talk group from the current X display or tty frame.
 
 ;;;***
 
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20229 34587))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20273 55692))
 ;;; Generated autoloads from tar-mode.el
 
 (autoload 'tar-mode "tar-mode" "\
@@ -28702,7 +28805,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20273 55692))
 ;;; Generated autoloads from language/thai-util.el
 
 (autoload 'thai-compose-region "thai-util" "\
@@ -29156,7 +29259,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"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload 'timeclock-modeline-display "timeclock" "\
@@ -29256,7 +29359,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" (20229 34587))
+;;;;;;  "international/titdic-cnv.el" (20287 35000))
 ;;; Generated autoloads from international/titdic-cnv.el
 
 (autoload 'titdic-convert "titdic-cnv" "\
@@ -29379,7 +29482,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" (20229 34587))
+;;;;;;  "tool-bar" "tool-bar.el" (20279 40897))
 ;;; Generated autoloads from tool-bar.el
 
 (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\
@@ -29450,7 +29553,7 @@ holds a keymap.
 ;;;***
 
 ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el"
-;;;;;;  (20229 36384))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from emulation/tpu-edt.el
 
 (defvar tpu-edt-mode nil "\
@@ -29463,7 +29566,10 @@ or call the function `tpu-edt-mode'.")
 (custom-autoload 'tpu-edt-mode "tpu-edt" nil)
 
 (autoload 'tpu-edt-mode "tpu-edt" "\
-TPU/edt emulation.
+Toggle TPU/edt emulation on or off.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
@@ -29562,7 +29668,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" (20253 16827))
+;;;;;;  "net/tramp.el" (20300 47034))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-mode t "\
@@ -30113,7 +30219,7 @@ UNSAFEP-VARS is a list of symbols with local bindings.
 ;;;***
 
 ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url"
-;;;;;;  "url/url.el" (20229 34587))
+;;;;;;  "url/url.el" (20290 11197))
 ;;; Generated autoloads from url/url.el
 
 (autoload 'url-retrieve "url" "\
@@ -30141,8 +30247,10 @@ request; dynamic binding of other variables doesn't necessarily
 take effect.
 
 If SILENT, then don't message progress reports and the like.
+If INHIBIT-COOKIES, cookies will neither be stored nor sent to
+the server.
 
-\(fn URL CALLBACK &optional CBARGS SILENT)" nil nil)
+\(fn URL CALLBACK &optional CBARGS SILENT INHIBIT-COOKIES)" nil nil)
 
 (autoload 'url-retrieve-synchronously "url" "\
 Retrieve URL synchronously.
@@ -30197,7 +30305,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" (20229 34587))
+;;;;;;  "url-cache" "url/url-cache.el" (20273 2111))
 ;;; Generated autoloads from url/url-cache.el
 
 (autoload 'url-store-in-cache "url-cache" "\
@@ -30331,7 +30439,7 @@ accessible.
 ;;;***
 
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (20229 34587))
+;;;;;;  url-http) "url-http" "url/url-http.el" (20277 28925))
 ;;; Generated autoloads from url/url-http.el
 
 (autoload 'url-http "url-http" "\
@@ -30528,7 +30636,7 @@ Fetch a data URL (RFC 2397).
 ;;;***
 
 ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse"
-;;;;;;  "url/url-parse.el" (20229 34587))
+;;;;;;  "url/url-parse.el" (20273 55604))
 ;;; Generated autoloads from url/url-parse.el
 
 (autoload 'url-recreate-url "url-parse" "\
@@ -30557,16 +30665,17 @@ Setup variables that expose info about you and your system.
 ;;;***
 
 ;;;### (autoloads (url-queue-retrieve) "url-queue" "url/url-queue.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20291 32066))
 ;;; Generated autoloads from url/url-queue.el
 
 (autoload 'url-queue-retrieve "url-queue" "\
 Retrieve URL asynchronously and call CALLBACK with CBARGS when finished.
-Like `url-retrieve' (which see for details of the arguments), but
-controls the level of parallelism via the
-`url-queue-parallel-processes' variable.
+This is like `url-retrieve' (which see for details of the arguments),
+but with limits on the degree of parallelism.  The variable
+`url-queue-parallel-processes' sets the number of concurrent processes.
+The variable `url-queue-timeout' sets a timeout.
 
-\(fn URL CALLBACK &optional CBARGS SILENT)" nil nil)
+\(fn URL CALLBACK &optional CBARGS SILENT INHIBIT-COOKIES)" nil nil)
 
 ;;;***
 
@@ -30809,8 +30918,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" (20255
-;;;;;;  18260))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20275
+;;;;;;  43867))
 ;;; Generated autoloads from vc/vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -30934,6 +31043,7 @@ the variable `vc-BACKEND-header'.
 
 (autoload 'vc-merge "vc" "\
 Perform a version control merge operation.
+You must be visiting a version controlled file, or in a `vc-dir' buffer.
 On a distributed version control system, this runs a \"merge\"
 operation to incorporate changes from another branch onto the
 current branch, prompting for an argument list.
@@ -31016,6 +31126,7 @@ depending on the underlying version-control system.
 
 (autoload 'vc-pull "vc" "\
 Update the current fileset or branch.
+You must be visiting a version controlled file, or in a `vc-dir' buffer.
 On a distributed version control system, this runs a \"pull\"
 operation to update the current branch, prompting for an argument
 list if required.  Optional prefix ARG forces a prompt.
@@ -31123,7 +31234,7 @@ mode-specific menu.  `vc-annotate-color-map' and
 
 ;;;***
 
-;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20229 34587))
+;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20296 49978))
 ;;; Generated autoloads from vc/vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -31133,7 +31244,7 @@ mode-specific menu.  `vc-annotate-color-map' and
 
 ;;;***
 
-;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20229 34587))
+;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20300 47034))
 ;;; Generated autoloads from vc/vc-bzr.el
 
 (defconst vc-bzr-admin-dirname ".bzr" "\
@@ -31149,7 +31260,7 @@ Name of the format file in a .bzr directory.")
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20229 34587))
+;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20296 49978))
 ;;; Generated autoloads from vc/vc-cvs.el
 (defun vc-cvs-registered (f)
   "Return non-nil if file F is registered with CVS."
@@ -31208,7 +31319,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20229 34587))
+;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20303 23227))
 ;;; Generated autoloads from vc/vc-git.el
  (defun vc-git-registered (file)
   "Return non-nil if FILE is registered with git."
@@ -31219,7 +31330,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20229 34587))
+;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20296 49978))
 ;;; Generated autoloads from vc/vc-hg.el
  (defun vc-hg-registered (file)
   "Return non-nil if FILE is registered with hg."
@@ -31230,7 +31341,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20229 34587))
+;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20296 49978))
 ;;; Generated autoloads from vc/vc-mtn.el
 
 (defconst vc-mtn-admin-dir "_MTN" "\
@@ -31247,7 +31358,7 @@ Name of the monotone directory's format file.")
 ;;;***
 
 ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc/vc-rcs.el"
-;;;;;;  (20254 37696))
+;;;;;;  (20296 49978))
 ;;; Generated autoloads from vc/vc-rcs.el
 
 (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -31261,7 +31372,7 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
 
 ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc/vc-sccs.el"
-;;;;;;  (20254 37696))
+;;;;;;  (20296 49978))
 ;;; Generated autoloads from vc/vc-sccs.el
 
 (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -31278,7 +31389,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20229 34587))
+;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20296 49978))
 ;;; Generated autoloads from vc/vc-svn.el
  (defun vc-svn-registered (f)
   (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
@@ -31350,7 +31461,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20279 40897))
 ;;; Generated autoloads from progmodes/verilog-mode.el
 
 (autoload 'verilog-mode "verilog-mode" "\
@@ -31489,7 +31600,7 @@ Key bindings specific to `verilog-mode-map' are:
 ;;;***
 
 ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 
 (autoload 'vhdl-mode "vhdl-mode" "\
@@ -32392,7 +32503,7 @@ Turn on VIP emulation of VI.
 ;;;***
 
 ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el"
-;;;;;;  (20229 34587))
+;;;;;;  (20300 47034))
 ;;; Generated autoloads from emulation/viper.el
 
 (autoload 'toggle-viper-mode "viper" "\
@@ -32967,7 +33078,7 @@ cleaning up these problems.
 ;;;***
 
 ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse
-;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (20229 34587))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (20273 55693))
 ;;; Generated autoloads from wid-browse.el
 
 (autoload 'widget-browse-at "wid-browse" "\
@@ -32987,14 +33098,17 @@ Show widget browser for WIDGET in other window.
 
 (autoload 'widget-minor-mode "wid-browse" "\
 Minor mode for traversing widgets.
+With a prefix argument ARG, enable the mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil.
 
 \(fn &optional ARG)" t nil)
 
 ;;;***
 
 ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create
-;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20229
-;;;;;;  34587))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20271
+;;;;;;  46782))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload 'widgetp "wid-edit" "\
@@ -33621,7 +33735,7 @@ Zone out, completely.
 ;;;;;;  "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") (20265 8335 405119))
+;;;;;;  "w32-vars.el" "x-dnd.el") (20303 23285 822071))
 
 ;;;***
 
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 50fcfceee35..853321cba6f 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -394,7 +394,10 @@ and send the mail again%s."
     ;; Query the user for the SMTP method, so that we can skip
     ;; questions about From header validity if the user is going to
     ;; use mailclient, anyway.
-    (when (eq send-mail-function 'sendmail-query-once)
+    (when (or (and (derived-mode-p 'message-mode)
+                   (eq message-send-mail-function 'sendmail-query-once))
+              (and (not (derived-mode-p 'message-mode))
+                   (eq send-mail-function 'sendmail-query-once)))
       (sendmail-query-user-about-smtp)
       (when (derived-mode-p 'message-mode)
         (setq message-send-mail-function (message-default-send-mail-function))))
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index e45bbfe2ca0..039f3dca4a2 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -10,7 +10,7 @@
 
 ;;; Commentary:
 
-;; A replacement for parts of Emacs' sendmail.el (specifically,
+;; A replacement for parts of sendmail.el (specifically,
 ;; it's what handles your outgoing mail after you hit C-c C-c in mail
 ;; mode).  See below for a list of additional features, including the
 ;; ability to queue messages for later sending.  This replaces
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 97d9c4eb69d..4a93109e7a4 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -1,6 +1,6 @@
 ;;; mh-compat.el --- make MH-E compatible with various versions of Emacs
 
-;; Copyright (C) 2006-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -174,7 +174,7 @@ compatibility with versions of Emacs that lack the variable
                 dir (expand-file-name "../" dir))))
       (setq image-directory-load-path dir))
 
-    ;; If `image-directory-load-path' isn't Emacs' image directory,
+    ;; If `image-directory-load-path' isn't Emacs's image directory,
     ;; it's probably a user preference, so use it. Then use a
     ;; relative setting if possible; otherwise, use
     ;; `image-directory-load-path'.
@@ -205,7 +205,7 @@ compatibility with versions of Emacs that lack the variable
               ;; Set it to nil if image is not found.
               (cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
                     ((file-exists-p (expand-file-name image d1ei)) d1ei)))))
-     ;; Use Emacs' image directory.
+     ;; Use Emacs's image directory.
      (image-directory-load-path
       (setq image-directory image-directory-load-path))
      (no-error
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 89b1b03e264..490419a59a8 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1,6 +1,6 @@
 ;;; browse-url.el --- pass a URL to a WWW browser
 
-;; Copyright (C) 1995-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1995-2012 Free Software Foundation, Inc.
 
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
 ;; Maintainer: FSF
@@ -297,7 +297,7 @@ Defaults to the value of `browse-url-netscape-arguments' at the time
   :group 'browse-url)
 
 (defcustom browse-url-browser-display nil
-  "The X display for running the browser, if not same as Emacs'."
+  "The X display for running the browser, if not same as Emacs's."
   :type '(choice string (const :tag "Default" nil))
   :group 'browse-url)
 
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 275f5f0fcbe..3f24a78cbbe 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,6 +1,6 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
@@ -133,7 +133,7 @@
       (setq plist (cdr (cdr plist))))
     nil))
 
-;; Emacs' plist-get lacks third parameter
+;; Emacs's plist-get lacks third parameter
 (defun eudc-plist-get (plist prop &optional default)
   "Extract a value from a property list.
 PLIST is a property list, which is a list of the form
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 46f45c501d2..a79defed295 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -78,7 +78,7 @@
 ;;   (secrets-create-collection "my collection")
 
 ;; There exists a special collection called "session", which has the
-;; lifetime of the corresponding client session (aka Emacs'
+;; lifetime of the corresponding client session (aka Emacs's
 ;; lifetime).  It is created automatically when Emacs uses the Secret
 ;; Service interface, and it is deleted when Emacs is killed.
 ;; Therefore, it can be used to store and retrieve secret items
@@ -99,7 +99,7 @@
 
 ;; Secret items can be added or deleted to a collection.  In the
 ;; following examples, we use the special collection "session", which
-;; is bound to Emacs' lifetime.
+;; is bound to Emacs's lifetime.
 ;;
 ;;   (secrets-delete-item "session" "my item")
 ;;   (secrets-create-item "session" "my item" "geheim"
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 9b9eb6f8f2e..d232095444b 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -237,10 +237,6 @@ Fourth arg PORT is an integer specifying a port to connect to."
           (setq process (start-process
                          name buffer shell-file-name shell-command-switch
                          formatted-cmd))
-          (funcall (if (fboundp 'set-process-query-on-exit-flag)
-                       'set-process-query-on-exit-flag
-                     'process-kill-without-query)
-                   process nil)
           (while (and process
                       (memq (process-status process) '(open run))
                       (progn
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 38e19730a6d..1c23a6f20f3 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -543,7 +543,7 @@ as given in your `~/.profile'."
     ,(format "TERM=%s" tramp-terminal-type)
     "EMACS=t" ;; Deprecated.
     ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)
-    "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH="
+    "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=\"\""
     "autocorrect=" "correct=")
 
   "*List of environment variables to be set on the remote host.
@@ -1909,7 +1909,7 @@ tramp-sh-handle-file-name-all-completions: internal error accessing `%s': `%s'"
      'copy-file (list filename newname ok-if-already-exists keep-date)))))
 
 (defun tramp-sh-handle-copy-directory
-  (dirname newname &optional keep-date parents)
+  (dirname newname &optional keep-date parents copy-contents)
   "Like `copy-directory' for Tramp files."
   (let ((t1 (tramp-tramp-file-p dirname))
         (t2 (tramp-tramp-file-p newname)))
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index afce61cba83..d3f0d8afb12 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -288,7 +288,7 @@ pass to the OPERATION."
          (buffer-name))))))
 
 (defun tramp-smb-handle-copy-directory
-  (dirname newname &optional keep-date parents)
+  (dirname newname &optional keep-date parents copy-contents)
   "Like `copy-directory' for Tramp files.  KEEP-DATE is not handled."
   (setq dirname (expand-file-name dirname)
         newname (expand-file-name newname))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 851b11629f4..df0ac53a8f8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1650,7 +1650,7 @@ been set up by `rfn-eshadow-setup-minibuffer'."
 ;; applied might be not so efficient (Ange-FTP uses hashes). But
 ;; performance isn't the major issue given that file transfer will
 ;; take time.
-(defvar tramp-inodes nil
+(defvar tramp-inodes 0
   "Keeps virtual inodes numbers.")
 
 ;; Devices must distinguish physical file systems.  The device numbers
@@ -1658,7 +1658,7 @@ been set up by `rfn-eshadow-setup-minibuffer'."
 ;; So we use virtual device numbers, generated by Tramp.  Both Ange-FTP and
 ;; EFS use device number "-1".  In order to be different, we use device number
 ;; (-1 . x), whereby "x" is unique for a given (method user host).
-(defvar tramp-devices nil
+(defvar tramp-devices 0
   "Keeps virtual device numbers.")
 
 (defun tramp-default-file-modes (filename)
@@ -1809,6 +1809,8 @@ ARGS are the arguments OPERATION has been called with."
                   'file-newer-than-file-p 'make-symbolic-link 'rename-file
                   ;; Emacs 23+ only.
                   'copy-directory
+                  ;; Emacs 24+ only.
+                  'file-equal-p 'file-subdir-of-p
                   ;; XEmacs only.
                   'dired-make-relative-symlink
                   'vm-imap-move-mail 'vm-pop-move-mail 'vm-spool-move-mail))
@@ -3410,28 +3412,14 @@ the remote host use line-endings as defined in the variable
 (defun tramp-get-inode (vec)
   "Returns the virtual inode number.
 If it doesn't exist, generate a new one."
-  (let ((string (tramp-make-tramp-file-name
-                 (tramp-file-name-method vec)
-                 (tramp-file-name-user vec)
-                 (tramp-file-name-host vec)
-                 "")))
-    (unless (assoc string tramp-inodes)
-      (add-to-list 'tramp-inodes
-                   (list string (length tramp-inodes))))
-    (nth 1 (assoc string tramp-inodes))))
+  (with-file-property vec (tramp-file-name-localname vec) "inode"
+    (setq tramp-inodes (1+ tramp-inodes))))
 
 (defun tramp-get-device (vec)
   "Returns the virtual device number.
 If it doesn't exist, generate a new one."
-  (let ((string (tramp-make-tramp-file-name
-                 (tramp-file-name-method vec)
-                 (tramp-file-name-user vec)
-                 (tramp-file-name-host vec)
-                 "")))
-    (unless (assoc string tramp-devices)
-      (add-to-list 'tramp-devices
-                   (list string (length tramp-devices))))
-    (cons -1 (nth 1 (assoc string tramp-devices)))))
+  (with-connection-property (tramp-get-connection-process vec) "device"
+    (cons -1 (setq tramp-devices (1+ tramp-devices)))))
 
 (defun tramp-equal-remote (file1 file2)
   "Check, whether the remote parts of FILE1 and FILE2 are identical.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 41b5041ded5..ddb6c71d1a6 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -185,6 +185,7 @@ The `plain' comment style doubles this value.
 This should generally stay 0, except for a few modes like Lisp where
 it is 1 so that regions are commented with two or three semi-colons.")
 
+;;;###autoload
 (defconst comment-styles
   '((plain      nil nil nil nil
                 "Start in column 0 (do not indent), as in Emacs-20")
diff --git a/lisp/notifications.el b/lisp/notifications.el
index 9f7576b3f5d..1b75c2c5702 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -93,15 +93,16 @@
 
 (defun notifications-on-action-signal (id action)
   "Dispatch signals to callback functions from `notifications-on-action-map'."
-  (let ((entry (assoc id notifications-on-action-map)))
+  (let* ((unique-name (dbus-event-service-name last-input-event))
+         (entry (assoc (cons unique-name id) notifications-on-action-map)))
     (when entry
       (funcall (cadr entry) id action)
-      (remove entry 'notifications-on-action-map))))
+      (remove entry notifications-on-action-map))))
 
 (when (fboundp 'dbus-register-signal)
   (dbus-register-signal
    :session
-   notifications-service
+   nil
    notifications-path
    notifications-interface
    notifications-action-signal
@@ -111,17 +112,18 @@
   "Dispatch signals to callback functions from `notifications-on-closed-map'."
   ;; notification-daemon prior 0.4.0 does not send a reason.  So we
   ;; make it optional, and assume `undefined' as default.
-  (let ((entry (assoc id notifications-on-close-map))
-        (reason (or reason 4)))
+  (let* ((unique-name (dbus-event-service-name last-input-event))
+         (entry (assoc (cons unique-name id) notifications-on-close-map))
+         (reason (or reason 4)))
     (when entry
       (funcall (cadr entry)
                id (cadr (assoc reason notifications-closed-reason)))
-      (remove entry 'notifications-on-close-map))))
+      (remove entry notifications-on-close-map))))
 
 (when (fboundp 'dbus-register-signal)
   (dbus-register-signal
    :session
-   notifications-service
+   nil
    notifications-path
    notifications-interface
    notifications-closed-signal
@@ -277,13 +279,18 @@ used to manipulate the notification item with
                             (or hints '(:array :signature "{sv}"))
                             :int32 (or timeout -1)))
 
-    ;; Register close/action callback function
+    ;; Register close/action callback function.  We must also remember
+    ;; the daemon's unique name, because the daemon could have
+    ;; restarted.
     (let ((on-action (plist-get params :on-action))
-          (on-close (plist-get params :on-close)))
+          (on-close (plist-get params :on-close))
+          (unique-name (dbus-get-name-owner :session notifications-service)))
       (when on-action
-        (add-to-list 'notifications-on-action-map (list id on-action)))
+        (add-to-list 'notifications-on-action-map
+                     (list (cons unique-name id) on-action)))
       (when on-close
-        (add-to-list 'notifications-on-close-map (list id on-close))))
+        (add-to-list 'notifications-on-close-map
+                     (list (cons unique-name id) on-close))))
 
     ;; Return notification id
     id))
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index a8ab13bd528..6b6e81dfaba 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -1,6 +1,6 @@
 ;;; gomoku.el --- Gomoku game between you and Emacs
 
-;; Copyright (C) 1988, 1994, 1996, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 1996, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
 ;; Maintainer: FSF
@@ -161,7 +161,7 @@ One useful value to include is `turn-on-font-lock' to highlight the pieces."
 
 (defface gomoku-O
     '((((class color)) (:foreground "red" :weight bold)))
-  "Face to use for Emacs' O."
+  "Face to use for Emacs's O."
   :group 'gomoku)
 
 (defface gomoku-X
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index e2aec709b99..d2e307c0145 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1,6 +1,6 @@
 ;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*-
 
-;; Copyright (C) 1996, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>)
 ;; Created: October 21 1996
@@ -189,7 +189,7 @@ Variables: `handwrite-linespace'     (default 12)
     (setq next-line-add-newlines t)
     (switch-to-buffer ps-buf-name)
     (handwrite-insert-header buf-name)
-    (insert "%%Creator: GNU Emacs' handwrite version " emacs-version  "\n")
+    (insert "%%Creator: GNU Emacs's handwrite version " emacs-version  "\n")
     (handwrite-insert-preamble)
     (handwrite-insert-info)
     (handwrite-insert-font)
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index a769101ad0b..29bb8a40e8f 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -1,6 +1,6 @@
 ;;; landmark.el --- neural-network robot that learns landmarks
 
-;; Copyright (C) 1996-1997, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>)
 ;; Created: December 16, 1996 - first release to usenet
@@ -210,7 +210,7 @@
 
 (defface landmark-font-lock-face-O '((((class color)) :foreground "red")
                                (t :weight bold))
-  "Face to use for Emacs' O."
+  "Face to use for Emacs's O."
   :version "22.1"
   :group 'landmark)
 
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 634570cf3e4..9c9a8e09d49 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -1,6 +1,6 @@
 ;;; antlr-mode.el --- major mode for ANTLR grammar files
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: Christoph.Wedler@sap.com
 ;; Keywords: languages, ANTLR, code generator
@@ -961,7 +961,7 @@ group.  The string matched by the first group is highlighted with
          (antlr-re-search-forward
           "^\\(private\\|public\\|protected\\)\\>[ \t]*\\(\\(\\sw+[ \t]*\\(:\\)?\\)\\)?"
           limit))
-     (1 font-lock-type-face)            ; not XEmacs' java level-3 fruit salad
+     (1 font-lock-type-face)            ; not XEmacs's java level-3 fruit salad
      (3 (if (antlr-upcase-p (char-after (match-beginning 3)))
             antlr-tokendef-face
           antlr-ruledef-face) nil t)
@@ -1030,7 +1030,7 @@ not to confuse their context_cache.")
 (define-abbrev-table 'antlr-mode-abbrev-table ())
 
 (defvar antlr-slow-cache-enabling-symbol 'loudly
-;; Emacs' font-lock changes buffer's tick counter, therefore this value should
+;; Emacs's font-lock changes buffer's tick counter, therefore this value should
 ;; be a parameter of a font-lock function, but not any other variable of
 ;; functions which call `antlr-slow-syntactic-context'.
   "If value is a bound symbol, cache will be used even with text changes.
@@ -1113,7 +1113,7 @@ WARNING: this may alter `match-data'."
   (or (buffer-syntactic-context) (buffer-syntactic-context-depth))
   :EMACS
   (let ((orig (point)) diff state
-        ;; Arg, Emacs' (buffer-modified-tick) changes with font-lock.  Use
+        ;; Arg, Emacs's (buffer-modified-tick) changes with font-lock.  Use
         ;; hack that `loudly' is bound during font-locking => cache use will
         ;; increase from 7% to 99.99% during font-locking.
         (tick (or (boundp antlr-slow-cache-enabling-symbol)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 95b43e763d5..3b33ac894f2 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -219,6 +219,38 @@
                (point))))
     c-macro-start))
 
+;; One element macro cache to cope with continual movement within very large
+;; CPP macros.
+(defvar c-macro-cache nil)
+(make-variable-buffer-local 'c-macro-cache)
+;; Nil or cons of the bounds of the most recent CPP form probed by
+;; `c-beginning-of-macro', `c-end-of-macro' or `c-syntactic-end-of-macro'.
+;; The cdr will be nil if we know only the start of the CPP form.
+(defvar c-macro-cache-start-pos nil)
+(make-variable-buffer-local 'c-macro-cache-start-pos)
+;; The starting position from where we determined `c-macro-cache'.
+(defvar c-macro-cache-syntactic nil)
+(make-variable-buffer-local 'c-macro-cache-syntactic)
+;; non-nil iff `c-macro-cache' has both elements set AND the cdr is at a
+;; syntactic end of macro, not merely an apparent one.
+
+(defun c-invalidate-macro-cache (beg end)
+  ;; Called from a before-change function.  If the change region is before or
+  ;; in the macro characterised by `c-macro-cache' etc., nullify it
+  ;; appropriately.  BEG and END are the standard before-change-functions
+  ;; parameters.  END isn't used.
+  (cond
+   ((null c-macro-cache))
+   ((< beg (car c-macro-cache))
+    (setq c-macro-cache nil
+          c-macro-cache-start-pos nil
+          c-macro-cache-syntactic nil))
+   ((and (cdr c-macro-cache)
+         (< beg (cdr c-macro-cache)))
+    (setcdr c-macro-cache nil)
+    (setq c-macro-cache-start-pos beg
+          c-macro-cache-syntactic nil))))
+
 (defun c-beginning-of-macro (&optional lim)
   "Go to the beginning of a preprocessor directive.
 Leave point at the beginning of the directive and return t if in one,
@@ -226,19 +258,36 @@ otherwise return nil and leave point unchanged.
 
 Note that this function might do hidden buffer changes.  See the
 comment at the start of cc-engine.el for more info."
-  (when c-opt-cpp-prefix
-    (let ((here (point)))
-      (save-restriction
-        (if lim (narrow-to-region lim (point-max)))
-        (beginning-of-line)
-        (while (eq (char-before (1- (point))) ?\\)
-          (forward-line -1))
-        (back-to-indentation)
-        (if (and (<= (point) here)
-                 (looking-at c-opt-cpp-start))
-            t
-          (goto-char here)
-          nil)))))
+  (let ((here (point)))
+    (when c-opt-cpp-prefix
+      (if (and (car c-macro-cache)
+               (>= (point) (car c-macro-cache))
+               (or (and (cdr c-macro-cache)
+                        (<= (point) (cdr c-macro-cache)))
+                   (<= (point) c-macro-cache-start-pos)))
+          (unless (< (car c-macro-cache) (or lim (point-min)))
+            (progn (goto-char (max (or lim (point-min)) (car c-macro-cache)))
+                   (setq c-macro-cache-start-pos
+                         (max c-macro-cache-start-pos here))
+                   t))
+        (setq c-macro-cache nil
+              c-macro-cache-start-pos nil
+              c-macro-cache-syntactic nil)
+
+        (save-restriction
+          (if lim (narrow-to-region lim (point-max)))
+          (beginning-of-line)
+          (while (eq (char-before (1- (point))) ?\\)
+            (forward-line -1))
+          (back-to-indentation)
+          (if (and (<= (point) here)
+                   (looking-at c-opt-cpp-start))
+              (progn
+                (setq c-macro-cache (cons (point) nil)
+                      c-macro-cache-start-pos here)
+                t)
+            (goto-char here)
+            nil))))))
 
 (defun c-end-of-macro ()
   "Go to the end of a preprocessor directive.
@@ -248,12 +297,24 @@ done that the point is inside a cpp directive to begin with.
 
 Note that this function might do hidden buffer changes.  See the
 comment at the start of cc-engine.el for more info."
-  (while (progn
-           (end-of-line)
-           (when (and (eq (char-before) ?\\)
-                      (not (eobp)))
-             (forward-char)
-             t))))
+   (if (and (cdr c-macro-cache)
+            (<= (point) (cdr c-macro-cache))
+            (>= (point) (car c-macro-cache)))
+       (goto-char (cdr c-macro-cache))
+     (unless (and (car c-macro-cache)
+                  (<= (point) c-macro-cache-start-pos)
+                  (>= (point) (car c-macro-cache)))
+       (setq c-macro-cache nil
+             c-macro-cache-start-pos nil
+             c-macro-cache-syntactic nil))
+     (while (progn
+              (end-of-line)
+              (when (and (eq (char-before) ?\\)
+                         (not (eobp)))
+                (forward-char)
+                t)))
+     (when (car c-macro-cache)
+       (setcdr c-macro-cache (point)))))
 
 (defun c-syntactic-end-of-macro ()
   ;; Go to the end of a CPP directive, or a "safe" pos just before.
@@ -268,12 +329,15 @@ comment at the start of cc-engine.el for more info."
   ;; at the start of cc-engine.el for more info.
   (let* ((here (point))
          (there (progn (c-end-of-macro) (point)))
-         (s (parse-partial-sexp here there)))
-    (while (and (or (nth 3 s)    ; in a string
-                    (nth 4 s))   ; in a comment (maybe at end of line comment)
-                (> there here))  ; No infinite loops, please.
-      (setq there (1- (nth 8 s)))
-      (setq s (parse-partial-sexp here there)))
+         s)
+    (unless c-macro-cache-syntactic
+      (setq s (parse-partial-sexp here there))
+      (while (and (or (nth 3 s)  ; in a string
+                      (nth 4 s)) ; in a comment (maybe at end of line comment)
+                  (> there here))       ; No infinite loops, please.
+        (setq there (1- (nth 8 s)))
+        (setq s (parse-partial-sexp here there)))
+      (setq c-macro-cache-syntactic (car c-macro-cache)))
     (point)))
 
 (defun c-forward-over-cpp-define-id ()
@@ -2089,6 +2153,18 @@ comment at the start of cc-engine.el for more info."
 ;; reduced by buffer changes, and increased by invocations of
 ;; `c-state-literal-at'.
 
+(defvar c-state-semi-nonlit-pos-cache nil)
+(make-variable-buffer-local 'c-state-semi-nonlit-pos-cache)
+;; A list of buffer positions which are known not to be in a literal.  This is
+;; ordered with higher positions at the front of the list.  Only those which
+;; are less than `c-state-semi-nonlit-pos-cache-limit' are valid.
+
+(defvar c-state-semi-nonlit-pos-cache-limit 1)
+(make-variable-buffer-local 'c-state-semi-nonlit-pos-cache-limit)
+;; An upper limit on valid entries in `c-state-semi-nonlit-pos-cache'.  This is
+;; reduced by buffer changes, and increased by invocations of
+;; `c-state-literal-at'.  FIMXE!!!
+
 (defsubst c-state-pp-to-literal (from to)
   ;; Do a parse-partial-sexp from FROM to TO, returning either
   ;;     (STATE TYPE (BEG . END))     if TO is in a literal; or
@@ -2129,48 +2205,93 @@ comment at the start of cc-engine.el for more info."
     (widen)
     (save-excursion
       (let ((c c-state-nonlit-pos-cache)
-            pos npos lit macro-beg macro-end)
+            pos npos high-pos lit macro-beg macro-end)
         ;; Trim the cache to take account of buffer changes.
         (while (and c (> (car c) c-state-nonlit-pos-cache-limit))
           (setq c (cdr c)))
         (setq c-state-nonlit-pos-cache c)
 
         (while (and c (> (car c) here))
+          (setq high-pos (car c))
           (setq c (cdr c)))
         (setq pos (or (car c) (point-min)))
 
-        (while
-            ;; Add an element to `c-state-nonlit-pos-cache' each iteration.
-            (and
-             (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here)
+        (unless high-pos
+          (while
+              ;; Add an element to `c-state-nonlit-pos-cache' each iteration.
+              (and
+               (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here)
 
-             ;; Test for being in a literal.
-             (progn
-               (setq lit (car (cddr (c-state-pp-to-literal pos npos))))
-               (or (null lit)
-                   (prog1 (<= (cdr lit) here)
-                     (setq npos (cdr lit)))))
+               ;; Test for being in a literal.  If so, go to after it.
+               (progn
+                 (setq lit (car (cddr (c-state-pp-to-literal pos npos))))
+                 (or (null lit)
+                     (prog1 (<= (cdr lit) here)
+                       (setq npos (cdr lit)))))
 
-             ;; Test for being in a macro.
-             (progn
-               (goto-char npos)
-               (setq macro-beg
-                     (and (c-beginning-of-macro) (/= (point) npos) (point)))
-               (when macro-beg
-                 (c-syntactic-end-of-macro)
-                 (or (eobp) (forward-char))
-                 (setq macro-end (point)))
-               (or (null macro-beg)
-                   (prog1 (<= macro-end here)
-                     (setq npos macro-end)))))
-
-          (setq pos npos)
-          (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache)))
+               ;; Test for being in a macro.  If so, go to after it.
+               (progn
+                 (goto-char npos)
+                 (setq macro-beg
+                       (and (c-beginning-of-macro) (/= (point) npos) (point)))
+                 (when macro-beg
+                   (c-syntactic-end-of-macro)
+                   (or (eobp) (forward-char))
+                   (setq macro-end (point)))
+                 (or (null macro-beg)
+                     (prog1 (<= macro-end here)
+                       (setq npos macro-end)))))
+
+            (setq pos npos)
+            (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache)))
+          ;; Add one extra element above HERE so as to to avoid the previous
+          ;; expensive calculation when the next call is close to the current
+          ;; one.  This is especially useful when inside a large macro.
+          (setq c-state-nonlit-pos-cache (cons npos c-state-nonlit-pos-cache)))
 
         (if (> pos c-state-nonlit-pos-cache-limit)
             (setq c-state-nonlit-pos-cache-limit pos))
         pos))))
 
+(defun c-state-semi-safe-place (here)
+  ;; Return a buffer position before HERE which is "safe", i.e. outside any
+  ;; string or comment.  It may be in a macro.
+  (save-restriction
+    (widen)
+    (save-excursion
+      (let ((c c-state-semi-nonlit-pos-cache)
+            pos npos high-pos lit macro-beg macro-end)
+        ;; Trim the cache to take account of buffer changes.
+        (while (and c (> (car c) c-state-semi-nonlit-pos-cache-limit))
+          (setq c (cdr c)))
+        (setq c-state-semi-nonlit-pos-cache c)
+        
+        (while (and c (> (car c) here))
+          (setq high-pos (car c))
+          (setq c (cdr c)))
+        (setq pos (or (car c) (point-min)))
+        
+        (unless high-pos
+          (while
+              ;; Add an element to `c-state-semi-nonlit-pos-cache' each iteration.
+              (and
+               (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here)
+               
+               ;; Test for being in a literal.  If so, go to after it.
+               (progn
+                 (setq lit (car (cddr (c-state-pp-to-literal pos npos))))
+                 (or (null lit)
+                     (prog1 (<= (cdr lit) here)
+                       (setq npos (cdr lit))))))
+               
+            (setq pos npos)
+            (setq c-state-semi-nonlit-pos-cache
+                  (cons pos c-state-semi-nonlit-pos-cache))))
+
+        (if (> pos c-state-semi-nonlit-pos-cache-limit)
+            (setq c-state-semi-nonlit-pos-cache-limit pos))
+        pos))))
+
 (defun c-state-literal-at (here)
   ;; If position HERE is inside a literal, return (START . END), the
   ;; boundaries of the literal (which may be outside the accessible bit of the
@@ -2985,9 +3106,11 @@ comment at the start of cc-engine.el for more info."
   ;;
   ;; This function is called from c-after-change.
 
-  ;; The cache of non-literals:
+  ;; The caches of non-literals:
   (if (< here c-state-nonlit-pos-cache-limit)
       (setq c-state-nonlit-pos-cache-limit here))
+  (if (< here c-state-semi-nonlit-pos-cache-limit)
+      (setq c-state-semi-nonlit-pos-cache-limit here))
 
   ;; `c-state-cache':
   ;; Case 1: if `here' is in a literal containing point-min, everything
@@ -4230,7 +4353,7 @@ Note that this function might do hidden buffer changes.  See the
 comment at the start of cc-engine.el for more info."
   (save-restriction
     (widen)
-    (let* ((safe-place (c-state-safe-place (point)))
+    (let* ((safe-place (c-state-semi-safe-place (point)))
            (lit (c-state-pp-to-literal safe-place (point))))
       (or (cadr lit)
           (and detect-cpp
@@ -4254,7 +4377,7 @@ comment at the start of cc-engine.el for more info."
 
   (save-excursion
     (let* ((pos (point))
-           (lim (or lim (c-state-safe-place pos)))
+           (lim (or lim (c-state-semi-safe-place pos)))
            (pp-to-lit (save-restriction
                         (widen)
                         (c-state-pp-to-literal lim pos)))
@@ -4372,7 +4495,7 @@ comment at the start of cc-engine.el for more info."
   ;; Get a "safe place" approximately TRY-SIZE characters before START.
   ;; This doesn't preserve point.
   (let* ((pos (max (- start try-size) (point-min)))
-         (base (c-state-safe-place pos))
+         (base (c-state-semi-safe-place pos))
          (s (parse-partial-sexp base pos)))
     (if (or (nth 4 s) (nth 3 s))        ; comment or string
         (nth 8 s)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index fafbfb70552..493f3db0961 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -459,8 +459,10 @@ so that all identifiers are recognized as words.")
   ;; For documentation see the following c-lang-defvar of the same name.
   ;; The value here may be a list of functions or a single function.
   t nil
-  c++ '(c-extend-region-for-CPP c-before-change-check-<>-operators)
-  (c objc) 'c-extend-region-for-CPP
+  c++ '(c-extend-region-for-CPP
+        c-before-change-check-<>-operators
+        c-invalidate-macro-cache)
+  (c objc) '(c-extend-region-for-CPP c-invalidate-macro-cache)
   ;; java 'c-before-change-check-<>-operators
   awk 'c-awk-record-region-clear-NL)
 (c-lang-defvar c-get-state-before-change-functions
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 301714ec55f..0c45c3f5e5d 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1672,8 +1672,6 @@ static char *magick[] = {
   (if (not (string= "" string))
       (setq gdb-last-command string)
     (if gdb-last-command (setq string gdb-last-command)))
-  (if gdb-enable-debug
-      (push (cons 'mi-send (concat string "\n")) gdb-debug-log))
   (if (string-match "^-" string)
       ;; MI command
       (progn
@@ -1683,10 +1681,22 @@ static char *magick[] = {
     (if (string-match "\\\\$" string)
         (setq gdb-continuation (concat gdb-continuation string "\n"))
       (setq gdb-first-done-or-error t)
-      (process-send-string proc (concat "-interpreter-exec console \""
-                                        gdb-continuation string "\"\n"))
+      (let ((to-send (concat "-interpreter-exec console "
+                             (gdb-mi-quote string)
+                             "\n")))
+        (if gdb-enable-debug
+            (push (cons 'mi-send to-send) gdb-debug-log))
+        (process-send-string proc to-send))
       (setq gdb-continuation nil))))
 
+(defun gdb-mi-quote (string)
+  "Return STRING quoted properly as an MI argument.
+The string is enclosed in double quotes.
+All embedded quotes, newlines, and backslashes are preceded with a backslash."
+  (setq string (replace-regexp-in-string "\\([\"\\]\\)" "\\\\\\&" string))
+  (setq string (replace-regexp-in-string "\n" "\\n" string t t))
+  (concat "\"" string "\""))
+
 (defun gdb-input (command handler-function)
   "Send COMMAND to GDB via the MI interface.
 Run the function HANDLER-FUNCTION, with no arguments, once the command is
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index f5bfe526aae..56f42e31cf1 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2853,9 +2853,12 @@ appended to the SQLi buffer without disturbing your SQL buffer."
   "Read a password using PROMPT.  Optional DEFAULT is password to start with."
   (read-passwd prompt nil default))
 
-(defun sql-get-login-ext (prompt last-value history-var plist)
+(defun sql-get-login-ext (symbol prompt history-var plist)
   "Prompt user with extended login parameters.
 
+The global value of SYMBOL is the last value and the global value 
+of the SYMBOL is set based on the user's input.
+
 If PLIST is nil, then the user is simply prompted for a string
 value.
 
@@ -2868,38 +2871,41 @@ regexp pattern specified in its value.
 The `:completion' property prompts for a string specified by its
 value.  (The property value is used as the PREDICATE argument to
 `completing-read'.)"
-  (let* ((default (plist-get plist :default))
-         (prompt-def
-          (if default
-              (if (string-match "\\(\\):[ \t]*\\'" prompt)
-                  (replace-match (format " (default \"%s\")" default) t t prompt 1)
-                (replace-regexp-in-string "[ \t]*\\'"
-                                          (format " (default \"%s\") " default)
-                                          prompt t t))
-            prompt))
-         (use-dialog-box nil))
-    (cond
-     ((plist-member plist :file)
-      (expand-file-name
-       (read-file-name prompt
-                       (file-name-directory last-value) default t
-                       (file-name-nondirectory last-value)
-                       (when (plist-get plist :file)
-                         `(lambda (f)
-                            (string-match
-                             (concat "\\<" ,(plist-get plist :file) "\\>")
-                             (file-name-nondirectory f)))))))
-
-     ((plist-member plist :completion)
-      (completing-read prompt-def (plist-get plist :completion) nil t
-                       last-value history-var default))
-
-     ((plist-get plist :number)
-      (read-number prompt (or default last-value 0)))
-
-     (t
-      (let ((r (read-from-minibuffer prompt-def last-value nil nil history-var nil)))
-        (if (string= "" r) (or default "") r))))))
+  (set-default 
+   symbol
+   (let* ((default (plist-get plist :default))
+          (last-value (default-value symbol))
+          (prompt-def
+           (if default
+               (if (string-match "\\(\\):[ \t]*\\'" prompt)
+                   (replace-match (format " (default \"%s\")" default) t t prompt 1)
+                 (replace-regexp-in-string "[ \t]*\\'"
+                                           (format " (default \"%s\") " default)
+                                           prompt t t))
+             prompt))
+          (use-dialog-box nil))
+     (cond
+      ((plist-member plist :file)
+       (expand-file-name
+        (read-file-name prompt
+                        (file-name-directory last-value) default t
+                        (file-name-nondirectory last-value)
+                        (when (plist-get plist :file)
+                          `(lambda (f)
+                             (string-match
+                              (concat "\\<" ,(plist-get plist :file) "\\>")
+                              (file-name-nondirectory f)))))))
+
+      ((plist-member plist :completion)
+       (completing-read prompt-def (plist-get plist :completion) nil t
+                        last-value history-var default))
+
+      ((plist-get plist :number)
+       (read-number prompt (or default last-value 0)))
+
+      (t
+       (let ((r (read-from-minibuffer prompt-def last-value nil nil history-var nil)))
+         (if (string= "" r) (or default "") r)))))))
 
 (defun sql-get-login (&rest what)
   "Get username, password and database from the user.
@@ -2937,28 +2943,20 @@ function like this: (sql-get-login 'user 'password 'database)."
 
      (cond
       ((eq token 'user)         ; user
-       (setq sql-user
-             (sql-get-login-ext "User: " sql-user
-                                'sql-user-history plist)))
+       (sql-get-login-ext 'sql-user "User: " 'sql-user-history plist))
 
-      ((eq token 'password)             ; password
-       (setq sql-password
-             (sql-read-passwd "Password: " sql-password)))
+      ((eq token 'password)     ; password
+       (setq-default sql-password
+                     (sql-read-passwd "Password: " sql-password)))
 
-      ((eq token 'server)               ; server
-       (setq sql-server
-             (sql-get-login-ext "Server: " sql-server
-                                'sql-server-history plist)))
+      ((eq token 'server)       ; server
+       (sql-get-login-ext 'sql-server "Server: " 'sql-server-history plist))
 
-      ((eq token 'database)             ; database
-       (setq sql-database
-             (sql-get-login-ext "Database: " sql-database
-                                'sql-database-history plist)))
+      ((eq token 'database)     ; database
+       (sql-get-login-ext 'sql-database "Database: " 'sql-database-history plist))
 
       ((eq token 'port)         ; port
-       (setq sql-port
-             (sql-get-login-ext "Port: " sql-port
-                                nil (append '(:number t) plist)))))))
+       (sql-get-login-ext 'sql-port "Port: " nil (append '(:number t) plist))))))
    what))
 
 (defun sql-find-sqli-buffer (&optional product connection)
@@ -3841,6 +3839,7 @@ you entered, right above the output it created.
   (set (make-local-variable 'sql-server)     sql-server)
   (set (make-local-variable 'sql-port)       sql-port)
   (set (make-local-variable 'sql-connection) sql-connection)
+  (setq-default sql-connection nil)
   ;; Contains the name of database objects
   (set (make-local-variable 'sql-contains-names) t)
   ;; Keep track of existing object names
@@ -3935,43 +3934,50 @@ is specified in the connection settings."
           ;; Settings are defined
           (if connect-set
               ;; Set the desired parameters
-              (eval `(let*
-                         (,@(cdr connect-set)
-                          ;; :sqli-login params variable
-                          (param-var    (sql-get-product-feature sql-product
-                                                                 :sqli-login nil t))
-                          ;; :sqli-login params value
-                          (login-params (sql-get-product-feature sql-product
-                                                                 :sqli-login))
-                          ;; which params are in the connection
-                          (set-params   (mapcar
-                                         (lambda (v)
-                                           (cond
-                                            ((eq (car v) 'sql-user)     'user)
-                                            ((eq (car v) 'sql-password) 'password)
-                                            ((eq (car v) 'sql-server)   'server)
-                                            ((eq (car v) 'sql-database) 'database)
-                                            ((eq (car v) 'sql-port)     'port)
-                                            (t                          (car v))))
-                                         (cdr connect-set)))
-                          ;; the remaining params (w/o the connection params)
-                          (rem-params   (sql-for-each-login
-                                         login-params
-                                         (lambda (token plist)
-                                           (unless (member token set-params)
-                                                    (if plist
-                                                        (cons token plist)
-                                                      token))))))
-
-                       ;; Set the remaining parameters and start the
-                       ;; interactive session
-                       (eval `(let ((sql-connection ,connection)
-                                     (,param-var ',rem-params))
-                                (sql-product-interactive sql-product
-                                                         new-name)))))
+              (let (param-var login-params set-params rem-params)
+
+                ;; :sqli-login params variable
+                (setq param-var
+                      (sql-get-product-feature sql-product :sqli-login nil t))
+
+                ;; :sqli-login params value
+                (setq login-params
+                      (sql-get-product-feature sql-product :sqli-login))
+
+                ;; Params in the connection
+                (setq set-params
+                      (mapcar
+                       (lambda (v)
+                         (cond
+                          ((eq (car v) 'sql-user)     'user)
+                          ((eq (car v) 'sql-password) 'password)
+                          ((eq (car v) 'sql-server)   'server)
+                          ((eq (car v) 'sql-database) 'database)
+                          ((eq (car v) 'sql-port)     'port)
+                          (t                          (car v))))
+                       (cdr connect-set)))
+
+                ;; the remaining params (w/o the connection params)
+                (setq rem-params
+                      (sql-for-each-login login-params
+                       (lambda (token plist)
+                         (unless (member token set-params)
+                           (if plist (cons token plist) token)))))
+
+                ;; Set the parameters and start the interactive session
+                (mapc
+                 (lambda (vv)
+                   (set-default (car vv) (eval (cadr vv))))
+                 (cdr connect-set))
+                (setq-default sql-connection connection)
+
+                ;; Start the SQLi session with revised list of login parameters
+                (eval `(let ((,param-var ',rem-params))
+                         (sql-product-interactive sql-product new-name))))
 
             (message "SQL Connection <%s> does not exist" connection)
             nil)))
+
     (message "No SQL Connections defined")
     nil))
 
@@ -4101,9 +4107,14 @@ the call to \\[sql-product-interactive] with
 
               ;; Connect to database.
               (message "Login...")
-              (funcall (sql-get-product-feature product :sqli-comint-func)
-                       product
-                       (sql-get-product-feature product :sqli-options))
+              (let ((sql-user       (default-value 'sql-user))
+                    (sql-password   (default-value 'sql-password))
+                    (sql-server     (default-value 'sql-server))
+                    (sql-database   (default-value 'sql-database))
+                    (sql-port       (default-value 'sql-port)))
+                (funcall (sql-get-product-feature product :sqli-comint-func)
+                         product
+                         (sql-get-product-feature product :sqli-options)))
 
               ;; Set SQLi mode.
               (let ((sql-interactive-product product))
@@ -4113,7 +4124,7 @@ the call to \\[sql-product-interactive] with
               (setq new-sqli-buffer (current-buffer))
               (when new-name
                 (sql-rename-buffer new-name))
-              (set (make-local-variable 'sql-buffer) 
+              (set (make-local-variable 'sql-buffer)
                    (buffer-name new-sqli-buffer))
 
               ;; Set `sql-buffer' in the start buffer
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index d765a960470..c9bf638bb59 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1,6 +1,6 @@
 ;;; vhdl-mode.el --- major mode for editing VHDL code
 
-;; Copyright (C) 1992-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1992-2012 Free Software Foundation, Inc.
 
 ;; Authors:     Reto Zimmermann <reto@gnu.org>
 ;;              Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
@@ -2040,7 +2040,7 @@ Ignore byte-compiler warnings you might see."
 ;; `wildcard-to-regexp' is included only in XEmacs 21
 (unless (fboundp 'wildcard-to-regexp)
   (defun wildcard-to-regexp (wildcard)
-    "Simplified version of `wildcard-to-regexp' from Emacs' `files.el'."
+    "Simplified version of `wildcard-to-regexp' from Emacs's `files.el'."
     (let* ((i (string-match "[*?]" wildcard))
            (result (substring wildcard 0 i))
            (len (length wildcard)))
@@ -2087,7 +2087,7 @@ Ignore byte-compiler warnings you might see."
 ;; `file-expand-wildcards' undefined (XEmacs)
 (unless (fboundp 'file-expand-wildcards)
   (defun file-expand-wildcards (pattern &optional full)
-    "Taken from Emacs' `files.el'."
+    "Taken from Emacs's `files.el'."
     (let* ((nondir (file-name-nondirectory pattern))
            (dirpart (file-name-directory pattern))
            (dirs (if (and dirpart (string-match "[[*?]" dirpart))
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 9c3ce077b7a..43dad63a140 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -132,9 +132,10 @@ removable and network volumes."
 
 (defcustom save-place-ignore-files-regexp
   "\\(?:COMMIT_EDITMSG\\|hg-editor-[[:alnum:]]+\\.txt\\|svn-commit\\.tmp\\|bzr_log\\.[[:alnum:]]+\\)$"
-  "Regexp matching files for which no location should be recorded.
+  "Regexp matching files for which no position should be recorded.
 Useful for temporary file such as commit message files that are
-automatically created by the VCS."
+automatically created by the VCS.  If set to nil, this feature is
+disabled, i.e., the position is recorded for all files."
   :version "24.1"
   :type 'regexp :group 'save-place)
 
@@ -169,8 +170,9 @@ To save places automatically in all files, put this in your `.emacs' file:
   ;; will be saved again when Emacs is killed.
   (or save-place-loaded (load-save-place-alist-from-file))
   (when (and buffer-file-name
-             (not (string-match save-place-ignore-files-regexp
-                                buffer-file-name)))
+             (or (not save-place-ignore-files-regexp)
+                 (not (string-match save-place-ignore-files-regexp
+                                    buffer-file-name))))
     (let ((cell (assoc buffer-file-name save-place-alist))
           (position (if (not (eq major-mode 'hexl-mode))
                         (point)
diff --git a/lisp/shell.el b/lisp/shell.el
index 1ed43863452..7c5ce49a967 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,6 +1,6 @@
 ;;; shell.el --- specialized comint.el for running the shell -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988, 1993-1997, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993-1997, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;      Simon Marshall <simon@gnu.org>
@@ -471,7 +471,7 @@ to continue it.
 keep this buffer's default directory the same as the shell's working directory.
 While directory tracking is enabled, the shell's working directory is displayed
 by \\[list-buffers] or \\[mouse-buffer-menu] in the `File' field.
-\\[dirs] queries the shell and resyncs Emacs' idea of what the current
+\\[dirs] queries the shell and resyncs Emacs's idea of what the current
     directory stack is.
 \\[shell-dirtrack-mode] turns directory tracking on and off.
 \(The `dirtrack' package provides an alternative implementation of this
diff --git a/lisp/simple.el b/lisp/simple.el
index c968ac01b0d..45daf99f614 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -949,46 +949,51 @@ rather than line counts."
       (forward-line (1- line)))))
 
 (defun count-words-region (start end)
-  "Return the number of words between START and END.
+  "Count the number of words in the region.
 If called interactively, print a message reporting the number of
-lines, words, and characters in the region."
+lines, words, and chars in the region.
+If called from Lisp, return the number of words between positions
+START and END."
   (interactive "r")
-  (let ((words 0))
-    (save-excursion
-      (save-restriction
-        (narrow-to-region start end)
-        (goto-char (point-min))
-        (while (forward-word 1)
-          (setq words (1+ words)))))
-    (when (called-interactively-p 'interactive)
-      (count-words--message "Region"
-                            (count-lines start end)
-                            words
-                            (- end start)))
-    words))
-
-(defun count-words ()
-  "Display the number of lines, words, and characters in the buffer.
-In Transient Mark mode when the mark is active, display the
-number of lines, words, and characters in the region."
-  (interactive)
-  (if (use-region-p)
-      (call-interactively 'count-words-region)
-    (let* ((beg (point-min))
-           (end (point-max))
-           (lines (count-lines beg end))
-           (words (count-words-region beg end))
-           (chars (- end beg)))
-      (count-words--message "Buffer" lines words chars))))
-
-(defun count-words--message (str lines words chars)
-  (message "%s has %d line%s, %d word%s, and %d character%s."
-           str
-           lines (if (= lines 1) "" "s")
-           words (if (= words 1) "" "s")
-           chars (if (= chars 1) "" "s")))
-
-(defalias 'count-lines-region 'count-words-region)
+  (if (called-interactively-p 'any)
+      (count-words--message "Region" start end)
+    (count-words start end)))
+
+(defun count-words (start end)
+  "Count words between START and END.
+If called interactively, START and END are normally the start and
+end of the buffer; but if the region is active, START and END are
+the start and end of the region.  Print a message reporting the
+number of lines, words, and chars.
+
+If called from Lisp, return the number of words between START and
+END, without printing any message."
+  (interactive (list nil nil))
+  (cond ((not (called-interactively-p 'any))
+         (let ((words 0))
+           (save-excursion
+             (save-restriction
+               (narrow-to-region start end)
+               (goto-char (point-min))
+               (while (forward-word 1)
+                 (setq words (1+ words)))))
+           words))
+        ((use-region-p)
+         (call-interactively 'count-words-region))
+        (t
+         (count-words--message "Buffer" (point-min) (point-max)))))
+
+(defun count-words--message (str start end)
+  (let ((lines (count-lines start end))
+        (words (count-words start end))
+        (chars (- end start)))
+    (message "%s has %d line%s, %d word%s, and %d character%s."
+             str
+             lines (if (= lines 1) "" "s")
+             words (if (= words 1) "" "s")
+             chars (if (= chars 1) "" "s"))))
+
+(define-obsolete-function-alias 'count-lines-region 'count-words-region "24.1")
 
 (defun what-line ()
   "Print the current buffer line number and narrowed line number of point."
@@ -3458,8 +3463,10 @@ and KILLP is t if a prefix arg was specified."
                      ((eq backward-delete-char-untabify-method 'all)
                       " \t\n\r")))
          (n (if skip
-                (let ((wh (- (point) (save-excursion (skip-chars-backward skip)
-                                                     (point)))))
+                (let* ((oldpt (point))
+                       (wh (- oldpt (save-excursion
+                                      (skip-chars-backward skip)
+                                      (constrain-to-field nil oldpt)))))
                   (+ arg (if (zerop wh) 0 (1- wh))))
               arg)))
     ;; Avoid warning about delete-backward-char
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 2782d63b719..b681ec3440f 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -163,7 +163,7 @@ The properties returned may include `top', `left', `height', and `width'."
 (define-key global-map [ns-power-off] 'save-buffers-kill-emacs)
 (define-key global-map [ns-open-file] 'ns-find-file)
 (define-key global-map [ns-open-temp-file] [ns-open-file])
-(define-key global-map [ns-drag-file] 'ns-insert-file)
+(define-key global-map [ns-drag-file] 'ns-find-file)
 (define-key global-map [ns-drag-color] 'ns-set-foreground-at-mouse)
 (define-key global-map [S-ns-drag-color] 'ns-set-background-at-mouse)
 (define-key global-map [ns-drag-text] 'ns-insert-text)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 394e4d4fe48..21d49267b21 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1408,11 +1408,12 @@ Request data types in the order specified by `x-select-request-type'."
                 (cons '(reverse . t) default-frame-alist)))))
 
   ;; Set x-selection-timeout, measured in milliseconds.
-  (let ((res-selection-timeout
-         (x-get-resource "selectionTimeout" "SelectionTimeout")))
-    (setq x-selection-timeout 20000)
-    (if res-selection-timeout
-        (setq x-selection-timeout (string-to-number res-selection-timeout))))
+  (let ((res-selection-timeout (x-get-resource "selectionTimeout"
+                                               "SelectionTimeout")))
+    (setq x-selection-timeout
+          (if res-selection-timeout
+              (string-to-number res-selection-timeout)
+            5000)))
 
   ;; Don't let Emacs suspend under X.
   (add-hook 'suspend-hook 'x-win-suspend-error)
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 4e8f0a5a82c..09f6b6b7cf2 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -62,7 +62,7 @@
   :group 'sgml
   :type 'hook)
 
-;; As long as Emacs' syntax can't be complemented with predicates to context
+;; As long as Emacs's syntax can't be complemented with predicates to context
 ;; sensitively confirm the syntax of characters, we have to live with this
 ;; kludgy kind of tradeoff.
 (defvar sgml-specials '(?\")
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index ba4a2766526..16e33889c31 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1,6 +1,6 @@
 ;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*-
 
-;; Copyright (C) 1998-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: convenience patch diff vc
@@ -27,7 +27,7 @@
 ;; to the corresponding source file.
 
 ;; Inspired by Pavel Machek's patch-mode.el (<pavel@@atrey.karlin.mff.cuni.cz>)
-;; Some efforts were spent to have it somewhat compatible with XEmacs'
+;; Some efforts were spent to have it somewhat compatible with XEmacs's
 ;; diff-mode as well as with compilation-minor-mode
 
 ;; Bugs:
@@ -121,7 +121,7 @@ when editing big diffs)."
     ("{" . diff-file-prev)
     ("\C-m" . diff-goto-source)
     ([mouse-2] . diff-goto-source)
-    ;; From XEmacs' diff-mode.
+    ;; From XEmacs's diff-mode.
     ("W" . widen)
     ;;("." . diff-goto-source)          ;display-buffer
     ;;("f" . diff-goto-source)          ;find-file
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 87740cdc75a..78a2163f653 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3103,7 +3103,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
 ;; according to context.
 ;; If DEFAULT-FILE is set, it should be used as the default value.
 ;; If DEFAULT-DIR is non-nil, use it as the default directory.
-;; Otherwise, use the value of Emacs' variable `default-directory.'
+;; Otherwise, use the value of `default-directory.'
 (defun ediff-read-file-name (prompt default-dir default-file &optional no-dirs)
   ;; hack default-dir if it is not set
   (setq default-dir
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index 7502bc28c5f..052e6784b08 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -65,6 +65,11 @@
 ;;; Customization options
 ;;;
 
+(defgroup vc-arch nil
+  "VC Arch backend."
+  :version "24.1"
+  :group 'vc)
+
 ;; It seems Arch diff does not accept many options, so this is not
 ;; very useful.  It exists mainly so that the VC backends are all
 ;; consistent with regards to their treatment of diff switches.
@@ -76,7 +81,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "23.1"
-  :group 'vc)
+  :group 'vc-arch)
 
 (define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1")
 
@@ -87,7 +92,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
     (or (car candidates) "tla"))
   "Name of the Arch executable."
   :type 'string
-  :group 'vc)
+  :group 'vc-arch)
 
 ;; Clear up the cache to force vc-call to check again and discover
 ;; new functions when we reload this file.
@@ -377,7 +382,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
   '(("\\`.*--\\(.*--.*\\)--\\(v?\\).*-\\([0-9]+\\)\\'" . "\\2\\3[\\1]"))
   "Rewrite rules to shorten Arch's revision names on the mode-line."
   :type '(repeat (cons regexp string))
-  :group 'vc)
+  :group 'vc-arch)
 
 (defun vc-arch-mode-line-string (file)
   "Return string for placement in modeline by `vc-mode-line' for FILE."
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index e64f05130a3..9f35fc8f035 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -1,6 +1,6 @@
 ;;; vc-bzr.el --- VC backend for the bzr revision control system
 
-;; Copyright (C) 2006-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;;         Riccardo Murri <riccardo.murri@gmail.com>
@@ -56,7 +56,7 @@
 (put 'Bzr 'vc-functions nil)
 
 (defgroup vc-bzr nil
-  "VC bzr backend."
+  "VC Bazaar (bzr) backend."
   :version "22.2"
   :group 'vc)
 
@@ -431,7 +431,7 @@ If any error occurred in running `bzr status', then return nil."
             (skip-chars-forward " \n\t") ;Throw away spaces.
             (cons status
                   ;; "bzr" will output warnings and informational messages to
-                  ;; stderr; due to Emacs' `vc-do-command' (and, it seems,
+                  ;; stderr; due to Emacs's `vc-do-command' (and, it seems,
                   ;; `start-process' itself) limitations, we cannot catch stderr
                   ;; and stdout into different buffers.  So, if there's anything
                   ;; left in the buffer after removing the above status
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 720df27f442..2d8d132a249 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -59,6 +59,11 @@
 ;;; Customization options
 ;;;
 
+(defgroup vc-cvs nil
+  "VC CVS backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-cvs-global-switches nil
   "Global switches to pass to any CVS command."
   :type '(choice (const :tag "None" nil)
@@ -67,7 +72,7 @@
                          :value ("")
                          string))
   :version "22.1"
-  :group 'vc)
+  :group 'vc-cvs)
 
 (defcustom vc-cvs-register-switches nil
   "Switches for registering a file into CVS.
@@ -79,7 +84,7 @@ If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-cvs)
 
 (defcustom vc-cvs-diff-switches nil
   "String or list of strings specifying switches for CVS diff under VC.
@@ -89,13 +94,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-cvs)
 
 (defcustom vc-cvs-header '("\$Id\$")
   "Header keywords to be inserted by `vc-insert-headers'."
   :version "24.1"     ; no longer consult the obsolete vc-header-alist
   :type '(repeat string)
-  :group 'vc)
+  :group 'vc-cvs)
 
 (defcustom vc-cvs-use-edit t
   "Non-nil means to use `cvs edit' to \"check out\" a file.
@@ -103,7 +108,7 @@ This is only meaningful if you don't use the implicit checkout model
 \(i.e. if you have $CVSREAD set)."
   :type 'boolean
   :version "21.1"
-  :group 'vc)
+  :group 'vc-cvs)
 
 (defcustom vc-cvs-stay-local 'only-file
   "Non-nil means use local operations when possible for remote repositories.
@@ -131,7 +136,7 @@ by these regular expressions."
                                :tag "if it matches")
                        (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
   :version "23.1"
-  :group 'vc)
+  :group 'vc-cvs)
 
 (defcustom vc-cvs-sticky-date-format-string "%c"
   "Format string for mode-line display of sticky date.
@@ -139,7 +144,7 @@ Format is according to `format-time-string'.  Only used if
 `vc-cvs-sticky-tag-display' is t."
   :type '(string)
   :version "22.1"
-  :group 'vc)
+  :group 'vc-cvs)
 
 (defcustom vc-cvs-sticky-tag-display t
   "Specify the mode-line display of sticky tags.
@@ -178,7 +183,7 @@ displayed.  Date and time is displayed for sticky dates.
 See also variable `vc-cvs-sticky-date-format-string'."
   :type '(choice boolean function)
   :version "22.1"
-  :group 'vc)
+  :group 'vc-cvs)
 
 ;;;
 ;;; Internal variables
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 2715fdd142d..3ec32243796 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -109,6 +109,11 @@
   (require 'vc-dir)
   (require 'grep))
 
+(defgroup vc-git nil
+  "VC Git backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-git-diff-switches t
   "String or list of strings specifying switches for Git diff under VC.
 If nil, use the value of `vc-diff-switches'.  If t, use no switches."
@@ -117,13 +122,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "23.1"
-  :group 'vc)
+  :group 'vc-git)
 
 (defcustom vc-git-program "git"
   "Name of the Git executable (excluding any arguments)."
   :version "24.1"
   :type 'string
-  :group 'vc)
+  :group 'vc-git)
 
 (defcustom vc-git-root-log-format
   '("%d%h..: %an %ad %s"
@@ -143,7 +148,7 @@ format string (which is passed to \"git log\" via the argument
 matching the resulting Git log output, and KEYWORDS is a list of
 `font-lock-keywords' for highlighting the Log View buffer."
   :type '(list string string (repeat sexp))
-  :group 'vc
+  :group 'vc-git
   :version "24.1")
 
 (defvar vc-git-commits-coding-system 'utf-8
@@ -1103,8 +1108,11 @@ The difference to vc-do-command is that this function always invokes
 (defun vc-git--call (buffer command &rest args)
   ;; We don't need to care the arguments.  If there is a file name, it
   ;; is always a relative one.  This works also for remote
-  ;; directories.
-  (apply 'process-file vc-git-program nil buffer nil command args))
+  ;; directories.  We enable `inhibit-null-byte-detection', otherwise
+  ;; Tramp's eol conversion might be confused.
+  (let ((inhibit-null-byte-detection t)
+        (process-environment (cons "PAGER=" process-environment)))
+    (apply 'process-file vc-git-program nil buffer nil command args)))
 
 (defun vc-git--out-ok (command &rest args)
   (zerop (apply 'vc-git--call '(t nil) command args)))
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 30c91ad3111..f3ba009b8c2 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -116,13 +116,18 @@
 
 ;;; Customization options
 
+(defgroup vc-hg nil
+  "VC Mercurial (hg) backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-hg-global-switches nil
   "Global switches to pass to any Hg command."
   :type '(choice (const :tag "None" nil)
          (string :tag "Argument String")
          (repeat :tag "Argument List" :value ("") string))
   :version "22.2"
-  :group 'vc)
+  :group 'vc-hg)
 
 (defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u
   "String or list of strings specifying switches for Hg diff under VC.
@@ -132,12 +137,12 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "23.1"
-  :group 'vc)
+  :group 'vc-hg)
 
 (defcustom vc-hg-program "hg"
   "Name of the Mercurial executable (excluding any arguments)."
   :type 'string
-  :group 'vc)
+  :group 'vc-hg)
 
 (defcustom vc-hg-root-log-format
   '("{rev}:{tags}: {author|person} {date|shortdate} {desc|firstline}\\n"
@@ -153,7 +158,7 @@ REGEXP is a regular expression matching the resulting Mercurial
 output, and KEYWORDS is a list of `font-lock-keywords' for
 highlighting the Log View buffer."
   :type '(list string string (repeat sexp))
-  :group 'vc
+  :group 'vc-hg
   :version "24.1")
 
 
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index d0727d9c0dc..122743c3747 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -34,6 +34,11 @@
 
 (eval-when-compile (require 'cl) (require 'vc))
 
+(defgroup vc-mtn nil
+  "VC Monotone (mtn) backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-mtn-diff-switches t
   "String or list of strings specifying switches for monotone diff under VC.
 If nil, use the value of `vc-diff-switches'.  If t, use no switches."
@@ -42,13 +47,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "23.1"
-  :group 'vc)
+  :group 'vc-mtn)
 
 (define-obsolete-variable-alias 'vc-mtn-command 'vc-mtn-program "23.1")
 (defcustom vc-mtn-program "mtn"
   "Name of the monotone executable."
   :type 'string
-  :group 'vc)
+  :group 'vc-mtn)
 
 ;; Clear up the cache to force vc-call to check again and discover
 ;; new functions when we reload this file.
@@ -153,7 +158,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   "Rewrite rules to shorten Mtn's revision names on the mode-line."
   :type '(repeat (cons regexp string))
   :version "22.2"
-  :group 'vc)
+  :group 'vc-mtn)
 
 (defun vc-mtn-mode-line-string (file)
   "Return string for placement in modeline by `vc-mode-line' for FILE."
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index f2122b60ce1..7e10372f362 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -41,13 +41,18 @@
   (require 'cl)
   (require 'vc))
 
+(defgroup vc-rcs nil
+  "VC RCS backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-rcs-release nil
   "The release number of your RCS installation, as a string.
 If nil, VC itself computes this value when it is first needed."
   :type '(choice (const :tag "Auto" nil)
                  (string :tag "Specified")
                  (const :tag "Unknown" unknown))
-  :group 'vc)
+  :group 'vc-rcs)
 
 (defcustom vc-rcs-register-switches nil
   "Switches for registering a file in RCS.
@@ -59,7 +64,7 @@ If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-rcs)
 
 (defcustom vc-rcs-diff-switches nil
   "String or list of strings specifying switches for RCS diff under VC.
@@ -69,20 +74,20 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-rcs)
 
 (defcustom vc-rcs-header '("\$Id\$")
   "Header keywords to be inserted by `vc-insert-headers'."
   :type '(repeat string)
   :version "24.1"     ; no longer consult the obsolete vc-header-alist
-  :group 'vc)
+  :group 'vc-rcs)
 
 (defcustom vc-rcsdiff-knows-brief nil
   "Indicates whether rcsdiff understands the --brief option.
 The value is either `yes', `no', or nil.  If it is nil, VC tries
 to use --brief and sets this variable to remember whether it worked."
   :type '(choice (const :tag "Work out" nil) (const yes) (const no))
-  :group 'vc)
+  :group 'vc-rcs)
 
 ;;;###autoload
 (defcustom vc-rcs-master-templates
@@ -95,7 +100,7 @@ For a description of possible values, see `vc-check-master-templates'."
                          (choice string
                                  function)))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-rcs)
 
 
 ;;; Properties of the backend
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 31637f5490e..0df307eda85 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -47,6 +47,11 @@
 ;;   :type '(repeat directory)
 ;;   :group 'vc)
 
+(defgroup vc-sccs nil
+  "VC SCCS backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-sccs-register-switches nil
   "Switches for registering a file in SCCS.
 A string or list of strings passed to the checkin program by
@@ -57,7 +62,7 @@ If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-sccs)
 
 (defcustom vc-sccs-diff-switches nil
   "String or list of strings specifying switches for SCCS diff under VC.
@@ -67,13 +72,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-sccs)
 
 (defcustom vc-sccs-header '("%W%")
   "Header keywords to be inserted by `vc-insert-headers'."
   :type '(repeat string)
   :version "24.1"     ; no longer consult the obsolete vc-header-alist
-  :group 'vc)
+  :group 'vc-sccs)
 
 ;;;###autoload
 (defcustom vc-sccs-master-templates
@@ -86,7 +91,7 @@ For a description of possible values, see `vc-check-master-templates'."
                          (choice string
                                  function)))
   :version "21.1"
-  :group 'vc)
+  :group 'vc-sccs)
 
 
 ;;;
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index b8a6a326ec1..6c2367c7ba6 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -39,11 +39,16 @@
 ;;; Customization options
 ;;;
 
+(defgroup vc-svn nil
+  "VC Subversion (svn) backend."
+  :version "24.1"
+  :group 'vc)
+
 ;; FIXME there is also svnadmin.
 (defcustom vc-svn-program "svn"
   "Name of the SVN executable."
   :type 'string
-  :group 'vc)
+  :group 'vc-svn)
 
 (defcustom vc-svn-global-switches nil
   "Global switches to pass to any SVN command."
@@ -53,7 +58,7 @@
                          :value ("")
                          string))
   :version "22.1"
-  :group 'vc)
+  :group 'vc-svn)
 
 (defcustom vc-svn-register-switches nil
   "Switches for registering a file into SVN.
@@ -65,7 +70,7 @@ If t, use no switches."
                  (string :tag "Argument String")
                  (repeat :tag "Argument List" :value ("") string))
   :version "22.1"
-  :group 'vc)
+  :group 'vc-svn)
 
 (defcustom vc-svn-diff-switches
   t                        ;`svn' doesn't support common args like -c or -b.
@@ -81,13 +86,13 @@ If you want to force an empty list of arguments, use t."
                          :value ("")
                          string))
   :version "22.1"
-  :group 'vc)
+  :group 'vc-svn)
 
 (defcustom vc-svn-header '("\$Id\$")
   "Header keywords to be inserted by `vc-insert-headers'."
   :version "24.1"     ; no longer consult the obsolete vc-header-alist
   :type '(repeat string)
-  :group 'vc)
+  :group 'vc-svn)
 
 ;; We want to autoload it for use by the autoloaded version of
 ;; vc-svn-registered, but we want the value to be compiled at startup, not
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index aba14480fa9..aff2df3dc77 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -1,6 +1,6 @@
 ;;; w32-fns.el --- Lisp routines for 32-bit Windows
 
-;; Copyright (C) 1994, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
@@ -161,7 +161,7 @@ You should set this to t when using a non-system shell.\n\n"))))
 (add-hook 'before-init-hook 'set-default-process-coding-system)
 
 
-;;; Basic support functions for managing Emacs' locale setting
+;;; Basic support functions for managing Emacs's locale setting
 
 (defvar w32-valid-locales nil
   "List of locale ids known to be supported.")