merge trunk

40 files changed, 536 insertions, 264 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9d9ad4b03d..16c4983d385 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,116 @@
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * htmlfontify.el (hfy-post-html-hook):
+        * filesets.el (filesets-cache-fill-content-hook):
+        * arc-mode.el (archive-extract-hook):
+        * progmodes/cc-mode.el (c-prepare-bug-report-hook):
+        * net/rcirc.el (rcirc-sentinel-functions)
+        (rcirc-receive-message-functions, rcirc-activity-functions)
+        (rcirc-print-functions):
+        * net/dbus.el (dbus-event-error-functions):
+        * emacs-lisp/eieio.el (eieio-pre-method-execution-functions):
+        * emacs-lisp/checkdoc.el (checkdoc-style-functions)
+        (checkdoc-comment-style-functions): Don't use "-hooks" suffix.
+        * term/sun.el (sun-raw-prefix-hooks):
+        * mail/sendmail.el (mail-yank-hooks): Use make-obsolete-variable.
+
+2012-10-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-smb.el (tramp-smb-maybe-open-connection):
+        Set `tramp-chunksize' to 1.  This improves the performance.
+        (tramp-smb-wait-for-output): Add timeout to
+        `tramp-accept-process-output' calls.
+
+2012-10-23  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (font-list-limit): Define as an obsolete variable.
+
+        * startup.el (command-line):
+        * cus-start.el: Don't refer to font-list-limit.
+
+        * newcomment.el (comment-normalize-vars): Doc fix (Bug#12583).
+
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (internal-temp-output-buffer-show): Rename from
+        temp-output-buffer-show, since previously compiled files expect this name.
+
+2012-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * image.el (image-type-from-file-name): If multiple types match,
+        return the first one that is supported.  (Bug#9045)
+
+2012-10-22  Glenn Morris  <rgm@gnu.org>
+
+        * image.el (imagemagick-enabled-types): Doc fix.
+
+2012-10-22  Takafumi Arakaki  <aka.tkf@gmail.com>  (tiny change)
+
+        * progmodes/which-func.el (which-func-current): The hash-table may have
+        an explicit nil (bug#12338).
+
+2012-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el (electric-pair-delete-selection-self-insert-function):
+        Rename to electric-pair-will-use-region, return a boolean.
+        (electric-pair-mode): Adjust accordingly.  Don't require delsel.
+
+        * delsel.el (delete-selection-helper): Use a function instead of a hook.
+        (delete-selection-pre-hook): Use use-region-p.
+        (delete-selection-self-insert-function): Remove.
+        (self-insert-command): Obey self-insert-uses-region-functions.
+        (self-insert-iso): Revert to previous setting, since we don't actually
+        know what that command does.
+        (delete-selection-self-insert-hooks): Remove.
+
+2012-10-22  Simon Law  <sfllaw@sfllaw.ca>  (tiny change)
+
+        * delsel.el (delete-selection-helper): New function, extracted from
+        delete-selection-pre-hook.
+        (delete-selection-pre-hook): Use it.
+        (delete-selection-self-insert-function): New function.
+        (delete-selection-self-insert-hooks): New hook.
+        (self-insert-command, self-insert-iso): Use it.
+        * electric.el (electric-pair-syntax): New function, extracted from
+        electric-pair-post-self-insert-function.
+        (electric-pair-post-self-insert-function): Use it.
+        (electric-pair-delete-selection-self-insert-function): New function.
+        (electric-pair-mode): Require delsel and setup
+        delete-selection-self-insert-hooks (bug#11520).
+
+2012-10-20  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc.el (vc-diff-internal): Set up Diff mode even if there are
+        no changes to show (Bug#12586).
+
+        * eshell/esh-cmd.el (eshell-rewrite-for-command): Copy the body
+        list explicitly (Bug#12571).
+
+2012-10-20  Arne Jørgensen  <arne@arnested.dk>
+
+        * progmodes/flymake.el (flymake-create-temp-inplace):
+        Use file-truename.
+
+2012-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * loadup.el: Update comment about uncompiled Lisp files.  (Bug#12395)
+
+2012-10-20  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc-units.el (math-extract-units): Properly extract powers
+        of units.
+
+2012-10-20  Daniel Colascione  <dancol@dancol.org>
+
+        * frame.el (make-frame): Set x-display-name as we used to in order
+        to unbreak creating an X11 frame from an Emacs daemon started
+        without a display.
+
+2012-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (minibuffer-force-complete): Make the next completion use
+        the same completion-field (bug@12221).
+
 2012-10-19  Martin Rudalics  <rudalics@gmx.at>
 
         * emacs-lisp/debug.el (debug): Record height of debugger window
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index c04cd8dcf9d..cebd4302d0c 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -140,8 +140,10 @@ A local copy of the archive will be used when updating."
   :type 'regexp
   :group 'archive)
 
-(defcustom archive-extract-hooks nil
-  "Hooks to run when an archive member has been extracted."
+(define-obsolete-variable-alias 'archive-extract-hooks
+  'archive-extract-hook "24.3")
+(defcustom archive-extract-hook nil
+  "Hook run when an archive member has been extracted."
   :type 'hook
   :group 'archive)
 ;; ------------------------------
@@ -1078,7 +1080,7 @@ using `make-temp-file', and the generated name is returned."
               ;; We will write out the archive ourselves if it is
               ;; part of another archive.
               (remove-hook 'write-contents-functions 'archive-write-file t))
-            (run-hooks 'archive-extract-hooks)
+            (run-hooks 'archive-extract-hook)
             (if archive-read-only
                 (message "Note: altering this archive is not implemented."))))
         (archive-maybe-update t))
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 39f710f8322..58646ea114c 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1481,10 +1481,16 @@ If COMP or STD is non-nil, put that in the units table instead."
             (mapcar 'math-remove-units (cdr expr))))))
 
 (defun math-extract-units (expr)
-  (if (memq (car-safe expr) '(* /))
-      (cons (car expr)
-            (mapcar 'math-extract-units (cdr expr)))
-    (if (math-check-unit-name expr) expr 1)))
+  (cond
+   ((memq (car-safe expr) '(* /))
+    (cons (car expr)
+          (mapcar 'math-extract-units (cdr expr))))
+   ((and
+     (eq (car-safe expr) '^)
+     (math-check-unit-name (nth 1 expr)))
+    expr)
+   ((math-check-unit-name expr) expr)
+   (t 1)))
 
 (defun math-build-units-table-buffer (enter-buffer)
   (if (not (and math-units-table math-units-table-buffer-valid
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index e89e8ed258b..7656248cac5 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,14 +1,23 @@
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * semantic/db-file.el (semanticdb-save-database-functions):
+        * semantic/lex.el (semantic-lex-reset-functions):
+        * semantic/edit.el (semantic-change-functions)
+        (semantic-edits-new-change-functions)
+        (semantic-edits-delete-change-functions)
+        (semantic-edits-reparse-change-functions): Don't use "-hooks" suffix.
+
 2012-10-14  David Engster  <deng@randomsample.de>
 
-        * semantic.el (semantic-error-if-unparsed): New function.  Raise
-        error if buffer was not parsed by Semantic (bug #12045).
+        * semantic.el (semantic-error-if-unparsed): New function.
+        Raise error if buffer was not parsed by Semantic (bug #12045).
         (navigate-menu, edit-menu, cedet-menu-map): Enable Semantic items
         only if buffer was parsed.  Also, replace ':active' with ':enable'
         where necessary.
 
         * semantic/wisent/python.el
-        (semantic-python-get-system-include-path): Use
-        `python-shell-internal-send-string' if available to query Python
+        (semantic-python-get-system-include-path):
+        Use `python-shell-internal-send-string' if available to query Python
         for system paths.
 
         * semantic/senator.el (senator-next-tag, senator-previous-tag)
@@ -57,8 +66,8 @@
 2012-10-06  Chong Yidong  <cyd@gnu.org>
 
         * semantic/bovine/grammar.el:
-        * semantic/wisent/grammar.el: Move from admin/grammars.  Add
-        autoloads for bovine-grammar-mode and wisent-grammar-mode.
+        * semantic/wisent/grammar.el: Move from admin/grammars.
+        Add autoloads for bovine-grammar-mode and wisent-grammar-mode.
 
 2012-10-02  Chong Yidong  <cyd@gnu.org>
 
@@ -163,8 +172,8 @@
         (-scheme, -makefile-misc, ede-proj-target-makefile-program)
         (-makefile-archive, -makefile-shared-object)
         (ede-proj-target-makefile-info, -grammar): New autoloads.
-        (ede-proj-project): Inherit from eieio-persistent-read.  Specify
-        extension and header line.
+        (ede-proj-project): Inherit from eieio-persistent-read.
+        Specify extension and header line.
         (ede-proj-load, ede-proj-save): Replace with impl using
         eieio-persistent-read.
 
@@ -176,27 +185,27 @@
         (navigate-menu): Add menu item for Stickyfunc mode.
 
         * semantic/analyze/debug.el
-        (semantic-analyzer-debug-insert-include-summary): Before
-        dereferencing tableinner, make sure it has a value.
+        (semantic-analyzer-debug-insert-include-summary):
+        Before dereferencing tableinner, make sure it has a value.
 
         * semantic/analyze/refs.el
         (semantic-analyze-tag-references-default): When doing a lookup,
         specify noerror.
         (semantic--analyze-refs-full-lookup): Add optional noerror input
         argument.  Pass to to full-lookup-simple.
-        (semantic-analyze-refs-impl, semantic-analyze-refs-proto): Ignore
-        :typemodifiers during compare.
+        (semantic-analyze-refs-impl, semantic-analyze-refs-proto):
+        Ignore :typemodifiers during compare.
 
         * semantic/bovine/c.el (semantic-lex-cpp-define): Specify limits
         to looking back for comment chars.
         (semantic--tag-similar-names-p, semantic--tag-similar-names-p-default)
         (semantic--tag-attribute-similar-p): New.
         (semantic-c-describe-environment): Handle list value of ede-object.
-        (semantic-lex-c-preprocessor-symbol-map-builtin): Add
-        __attribute_pure__.
+        (semantic-lex-c-preprocessor-symbol-map-builtin):
+        Add __attribute_pure__.
 
-        * semantic/bovine/scm.el (semantic-format-tag-prototype): Add
-        parent and color argument.  Pass them through.
+        * semantic/bovine/scm.el (semantic-format-tag-prototype):
+        Add parent and color argument.  Pass them through.
 
         * semantic/complete.el (semantic-collector-calculate-completions):
         Search for more matches if new prefix is a substring of old one.
@@ -217,15 +226,15 @@
         the (%d tags) extra string.
         (semanticdb-project-database): Specify :type for table.
         (semanticdb-create-table-for-file): Specify file-truename.
-        (semanticdb-synchronize, semanticdb-partial-synchronize): Restore
-        code that refreshes references to include files.
+        (semanticdb-synchronize, semanticdb-partial-synchronize):
+        Restore code that refreshes references to include files.
 
         * semantic/decorate/include.el
         (semantic-decoration-on-fileless-includes): New face.
         (semantic-decoration-on-fileless-include-map)
         (semantic-decoration-on-fileless-include-menu): New variables.
-        (semantic-decoration-on-includes-highlight-default): Support
-        includes that have a table, but are not associated with a file.
+        (semantic-decoration-on-includes-highlight-default):
+        Support includes that have a table, but are not associated with a file.
         (semantic-decoration-fileless-include-describe)
         (semantic-decoration-fileless-include-menu): New functions.
         (semantic-decoration-all-include-summary): Add arrows to indicate
@@ -262,15 +271,15 @@
         * semantic/tag.el (semantic-create-tag-proxy)
         (semantic-tag-set-proxy, semantic-tag-resolve-proxy): New.
 
-        * semantic/util.el (semantic-describe-buffer): Add
-        semantic-new-buffer-fcn-was-run.
+        * semantic/util.el (semantic-describe-buffer):
+        Add semantic-new-buffer-fcn-was-run.
 
-        * semantic/wisent/java-tags.el (semantic-get-local-variables): Add
-        `this' to the local variable context.
+        * semantic/wisent/java-tags.el (semantic-get-local-variables):
+        Add `this' to the local variable context.
         (semantic-analyze-split-name, semantic-analyze-unsplit-name): New.
 
-        * semantic/wisent/python.el (semantic-python-expand-tag): New
-        function.
+        * semantic/wisent/python.el (semantic-python-expand-tag):
+        New function.
 
         * srecode/compile.el (srecode-compile-templates): Add "framework"
         special variable support.
@@ -280,7 +289,7 @@
         (srecode-semantic-handle-:cpp): New functions.
         (srecode-semantic-apply-tag-to-dict): Move from cpp-mode function
         to c-mode function.
-        (srecode-c-apply-templates): Renamed from srecode-cpp-apply-templates.
+        (srecode-c-apply-templates): Rename from srecode-cpp-apply-templates.
 
         * srecode/dictionary.el (initialize-instance): Remove bogus error
         condition.
@@ -293,8 +302,8 @@
 
         * srecode/mode.el (srecode-minor-mode): Support the m3 menu.
 
-        * srecode/semantic.el (srecode-semantic-insert-tag): Support
-        system includes.
+        * srecode/semantic.el (srecode-semantic-insert-tag):
+        Support system includes.
 
         * srecode/srt-mode.el (srecode-font-lock-keywords): Update.
 
@@ -325,8 +334,8 @@
         * ede/proj-comp.el (ede-proj-makefile-insert-rules): Fix insertion
         of phony rule.
 
-        * ede/proj-elisp.el (ede-proj-target-elisp): Remove
-        ede-emacs-preload-compiler.
+        * ede/proj-elisp.el (ede-proj-target-elisp):
+        Remove ede-emacs-preload-compiler.
         (ede-proj-makefile-insert-rules, ede-proj-makefile-dependencies):
         New methods.
         (ede-emacs-compiler): Add 'require' macro to variables and pattern
@@ -362,8 +371,8 @@
         (semantic-cpp-lexer): Add semantic-lex-c-ifdef.
         (semantic-expand-c-tag): Check if tag is non-nil before adding it
         to return list
-        (semantic-expand-c-extern-C, semantic-expand-c-complex-type): New
-        functions, copied from semantic-expand-c-tag.
+        (semantic-expand-c-extern-C, semantic-expand-c-complex-type):
+        New functions, copied from semantic-expand-c-tag.
         (semantic-find-tags-included): New override which also searches
         for include tags inside of namespaces.
         (semantic-c-dereference-typedef): Use semantic-tag-prototype-p.
@@ -371,16 +380,16 @@
 
         * semantic/bovine/el.el: Remove emacs-lisp-mode-hook.
 
-        * semantic/complete.el (semantic-complete-post-command-hook): Exit
-        completion when user has deleted all characters from the prefix.
+        * semantic/complete.el (semantic-complete-post-command-hook):
+        Exit completion when user has deleted all characters from the prefix.
         (semantic-displayor-focus-request): Return to previous window when
         focussing tags.
 
         * semantic/db-el.el (semanticdb-normalize-one-tag): Make obsolete.
         (semanticdb-elisp-sym->tag): Use help-function-arglist instead.
 
-        * semantic/db-file.el (semanticdb-create-database): Use
-        semantic-tag-version instead of just semantic-version as the
+        * semantic/db-file.el (semanticdb-create-database):
+        Use semantic-tag-version instead of just semantic-version as the
         initializer for the :semantic-tag-version slot.
 
         * semantic/db-find.el (semanticdb-find-tags-by-class-method):
@@ -394,11 +403,11 @@
         (semanticdb-save-current-db, semanticdb-save-all-db): Only emit
         message when running interactively.
 
-        * semantic/decorate/mode.el (semantic-decoration-mode): Activate
-        decoration of includes by default.
+        * semantic/decorate/mode.el (semantic-decoration-mode):
+        Activate decoration of includes by default.
 
-        * semantic/doc.el (semantic-doc-snarf-comment-for-tag): Remove
-        comment delimiter at the end of the text.
+        * semantic/doc.el (semantic-doc-snarf-comment-for-tag):
+        Remove comment delimiter at the end of the text.
 
         * semantic/ede-grammar.el (semantic-ede-proj-target-grammar):
         Change aux- and pre-load-packages.
@@ -412,16 +421,16 @@
         (ede-proj-makefile-insert-rules): Add target specific EMACSFLAGS
         to raise max-specpdl-size and max-lisp-eval-depth.
 
-        * semantic/find.el (semantic-find-tags-included): Make
-        overridable.
+        * semantic/find.el (semantic-find-tags-included):
+        Make overridable.
 
         * semantic/fw.el (semantic-alias-obsolete)
         (semantic-varalias-obsolete): Use byte-compile-warn.
         (semantic-find-file-noselect): Disable font lock by calling
         global-font-lock-mode.
 
-        * semantic/grammar.el (semantic-grammar-create-package): Fix
-        message.
+        * semantic/grammar.el (semantic-grammar-create-package):
+        Fix message.
         (semantic-grammar-batch-build-one-package): When generating
         parsers in batch-mode, ignore version control and make sure we do
         not use cached versions.
@@ -433,16 +442,16 @@
         (semantic-lex-spp-lex-text-string): Instead of only setting the
         lexer, call the major mode's setup function.
 
-        * semantic/scope.el (semantic-analyze-scoped-types-default): Use
-        semantic-tag-prototype-p.
+        * semantic/scope.el (semantic-analyze-scoped-types-default):
+        Use semantic-tag-prototype-p.
         (semantic-analyze-scope-nested-tags-default): Make sure we don't
         return tags we already have in scopetypes.
 
         * semantic/symref/filter.el
         (semantic-symref-test-count-hits-in-tag): Restore.
 
-        * semantic/wisent/comp.el (wisent-BITS-PER-WORD): Use
-        most-positive-fixnum if available.
+        * semantic/wisent/comp.el (wisent-BITS-PER-WORD):
+        Use most-positive-fixnum if available.
 
         * semantic/wisent/javascript.el (semantic-tag-protection)
         (semantic-analyze-scope-calculate-access)
@@ -477,8 +486,8 @@
 2012-10-01 Jan Moringen  <jan.moringen@uni-bielefeld.de>
 
         * semantic/idle.el
-        (semantic-idle-breadcrumbs--display-in-header-line): Escape
-        %-characters to avoid erroneous expansion in header line.
+        (semantic-idle-breadcrumbs--display-in-header-line):
+        Escape %-characters to avoid erroneous expansion in header line.
         (semantic-idle-breadcrumbs--display-in-mode-line): Likewise.
 
         * semantic/wisent/python.el (wisent-python-reconstitute-function-tag)
@@ -514,8 +523,8 @@
 
         * semantic/wisent/python.el (wisent-python-string-start-re)
         (wisent-python-string-re, wisent-python-forward-string)
-        (wisent-python-forward-line,wisent-python-lex-string): New
-        variables.
+        (wisent-python-forward-line,wisent-python-lex-string):
+        New variables.
         (wisent-python-forward-balanced-expression): New function.
 
 2012-10-01  Pete Beardmore  <elbeardmorez@msn.com>
@@ -528,16 +537,16 @@
         (semantic-displayor-tooltip-mode)
         (semantic-displayor-tooltip-initial-max-tags)
         (semantic-displayor-tooltip-max-tags): New defcustoms.
-        (semantic-displayor-tooltip): Use new variables as initforms.  Use
-        new slot `mode' instead of `force-show'.  Rename `max-tags' to
+        (semantic-displayor-tooltip): Use new variables as initforms.
+        Use new slot `mode' instead of `force-show'.  Rename `max-tags' to
         `max-tags-initial'.
         (semantic-displayor-show-request): Display completions according
         to new modes, and make variable names clearer.
         (semantic-displayor-tooltip::semantic-displayor-scroll-request):
         Use new max-tags-initial slot.
 
-        * semantic/idle.el (semantic-idle-local-symbol-highlight): Make
-        sure there actually is a tag at point.
+        * semantic/idle.el (semantic-idle-local-symbol-highlight):
+        Make sure there actually is a tag at point.
         (semantic-idle-completion-list-default): Report errors as messages
         if semantic-idle-scheduler-verbose-flag is non-nil.
 
@@ -548,13 +557,13 @@
 
 2012-10-01  Alex Ott  <alexott@gmail.com>
 
-        * semantic/idle.el (semantic-idle-scheduler-enabled-p): Fix
-        file-checking.
+        * semantic/idle.el (semantic-idle-scheduler-enabled-p):
+        Fix file-checking.
 
 2012-10-01  Darren Hoo  <darren.hoo@gmail.com>  (tiny change)
 
-        * semantic/db-find.el (semanticdb-find-default-throttle): Make
-        buffer-local.
+        * semantic/db-find.el (semanticdb-find-default-throttle):
+        Make buffer-local.
         (semanticdb-strip-find-results): Check for existing :filename
         attribute, so that file information from GNU Global is not lost.
 
@@ -1001,7 +1010,7 @@
         (ede-customize-forms-menu): Prevent error if there is no project.
         (ede-load-project-file): Set ede-constructing to the thing being
         constructed, instead of t.
-        (ede-project-force-load): Deleted.
+        (ede-project-force-load): Delete.
 
         * ede/base.el:
         * ede/auto.el:
@@ -1011,7 +1020,7 @@
         (autoconf-parameters-for-macro): Parse multiline parameters of
         macros.  Optionally ignore case and at bol for macro.
         (autoconf-parameter-strip): Use greedy match for newlines.
-        (autoconf-new-automake-string): Deleted.
+        (autoconf-new-automake-string): Delete.
         (autoconf-new-program): Use SRecode to fill an empty file.
 
         * ede/cpp-root.el (ede-create-lots-of-projects-under-dir):
@@ -1046,7 +1055,7 @@
         (project-am-scan-for-targets): Scan also over
         project-am-meta-type-alist.
         (ede-system-include-path): Simple implementation.
-        (ede-find-target): Deleted.  EDE core takes care of this.
+        (ede-find-target): Delete.  EDE core takes care of this.
         (ede-buffer-mine): Create the searched filename as relative.
         (project-am-load): Simplify, using autoconf-edit.
         (project-am-extract-package-info): Fix separators.
@@ -1063,7 +1072,7 @@
         (ede-proj-target-makefile-objectcode): Quote initforms.
         Support lex and yacc.
 
-        * ede/proj-prog.el (ede-proj-makefile-insert-rules): Removed.
+        * ede/proj-prog.el (ede-proj-makefile-insert-rules): Remove.
         (ede-proj-makefile-insert-variables): New, add LDDEPS.
         (ede-proj-makefile-insert-automake-post-variables): Add LDADD
         variable.  Use ldlibs-local slot.  Add a -l to ldlibs strings.
@@ -1158,7 +1167,7 @@
 
         * semantic/util.el (semantic-hack-search)
         (semantic-recursive-find-nonterminal-by-name)
-        (semantic-current-tag-interactive): Deleted.
+        (semantic-current-tag-interactive): Delete.
         (semantic-describe-buffer): Fix expand-nonterminal.
         Add lex-syntax-mods, type relation separator char, and command
         separation char.
@@ -1191,7 +1200,7 @@
         (semantic-idle-truncate-long-summaries): New option.
 
         * semantic/ia.el (semantic-ia-cache)
-        (semantic-ia-get-completions): Deleted.  Callers changed.
+        (semantic-ia-get-completions): Delete.  Callers changed.
         (semantic-ia-show-variants): New command.
         (semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
         (semantic-ia-show-summary): If there isn't anything to show, say so.
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 7b4a47bd260..4f8e93dc391 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -70,7 +70,9 @@ passes a list of predicates in `semanticdb-project-predicate-functions'."
   :group 'semanticdb
   :type nil)
 
-(defcustom semanticdb-save-database-hooks nil
+(define-obsolete-variable-alias 'semanticdb-save-database-hooks
+  'semanticdb-save-database-functions "24.3")
+(defcustom semanticdb-save-database-functions nil
   "Abnormal hook run after a database is saved.
 Each function is called with one argument, the object representing
 the database recently written."
@@ -251,7 +253,7 @@ If DB is not specified, then use the current database."
                (message "Save Error: %S: %s" (car (cdr foo))
                         objname)
              (error "%S" (car (cdr foo))))))))
-      (run-hook-with-args 'semanticdb-save-database-hooks
+      (run-hook-with-args 'semanticdb-save-database-functions
                           (or DB semanticdb-current-database))
       ;;(message "Saving tag summary for %s...done" objname)
       )
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 23b6784fe2a..5b39dec2628 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -72,7 +72,9 @@ updated in the current buffer.
 
 For language specific hooks, make sure you define this as a local hook.")
 
-(defvar semantic-change-hooks
+(define-obsolete-variable-alias 'semantic-change-hooks
+  'semantic-change-functions "24.3")
+(defvar semantic-change-functions
   '(semantic-edits-change-function-handle-changes)
   "Abnormal hook run when semantic detects a change in a buffer.
 Each hook function must take three arguments, identical to the
@@ -89,11 +91,15 @@ If the hook returns non-nil, then declare that a reparse is needed.
 For language specific hooks, make sure you define this as a local hook.
 Not used yet; part of the next generation reparse mechanism.")
 
-(defvar semantic-edits-new-change-hooks nil
+(define-obsolete-variable-alias 'semantic-edits-new-change-hooks
+  'semantic-edits-new-change-functions "24.3")
+(defvar semantic-edits-new-change-functions nil
   "Abnormal hook run when a new change is found.
 Functions must take one argument representing an overlay on that change.")
 
-(defvar semantic-edits-delete-change-hooks nil
+(define-obsolete-variable-alias 'semantic-edits-delete-change-hooks
+  'semantic-edits-delete-change-functions "24.3")
+(defvar semantic-edits-delete-change-functions nil
   "Abnormal hook run before a change overlay is deleted.
 Deleted changes occur when multiple changes are merged.
 Functions must take one argument representing an overlay being deleted.")
@@ -104,7 +110,9 @@ Changes move when a new change overlaps an old change.  The old change
 will be moved.
 Functions must take one argument representing an overlay being moved.")
 
-(defvar semantic-edits-reparse-change-hooks nil
+(define-obsolete-variable-alias 'semantic-edits-reparse-change-hooks
+  'semantic-edits-reparse-change-functions "24.3")
+(defvar semantic-edits-reparse-change-functions nil
   "Abnormal hook run after a change results in a reparse.
 Functions are called before the overlay is deleted, and after the
 incremental reparse.")
@@ -133,7 +141,7 @@ Argument START, END, and LENGTH specify the bounds of the change."
    (setq semantic-unmatched-syntax-cache-check t)
    (let ((inhibit-point-motion-hooks t)
          )
-     (run-hook-with-args 'semantic-change-hooks start end length)
+     (run-hook-with-args 'semantic-change-functions start end length)
      ))
 
 (defun semantic-changes-in-region (start end &optional buffer)
@@ -168,7 +176,7 @@ Argument START, END, and LENGTH specify the bounds of the change."
           ;; function will be removed from the list of active change
           ;; functions.
           (condition-case nil
-              (run-hook-with-args 'semantic-edits-new-change-hooks o)
+              (run-hook-with-args 'semantic-edits-new-change-functions o)
             (error nil)))
       (let ((tmp changes-in-change))
         ;; Find greatest bounds of all changes
@@ -188,7 +196,7 @@ Argument START, END, and LENGTH specify the bounds of the change."
         ;; Delete other changes.  They are now all bound here.
         (while changes-in-change
           (condition-case nil
-              (run-hook-with-args 'semantic-edits-delete-change-hooks
+              (run-hook-with-args 'semantic-edits-delete-change-functions
                                   (car changes-in-change))
             (error nil))
           (semantic-overlay-delete (car changes-in-change))
@@ -198,7 +206,7 @@ Argument START, END, and LENGTH specify the bounds of the change."
 (defsubst semantic-edits-flush-change (change)
   "Flush the CHANGE overlay."
   (condition-case nil
-      (run-hook-with-args 'semantic-edits-delete-change-hooks
+      (run-hook-with-args 'semantic-edits-delete-change-functions
                           change)
     (error nil))
   (semantic-overlay-delete change))
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index d7ab5911a67..274df355901 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -729,7 +729,9 @@ This is an alist of (ANCHOR . STREAM) elements where ANCHOR is the
 start position of the block, and STREAM is the list of tokens in that
 block.")
 
-(defvar semantic-lex-reset-hooks nil
+(define-obsolete-variable-alias 'semantic-lex-reset-hooks
+  'semantic-lex-reset-functions "24.3")
+(defvar semantic-lex-reset-functions nil
   "Abnormal hook used by major-modes to reset lexical analyzers.
 Hook functions are called with START and END values for the
 current lexical pass.  Should be set with `add-hook', specifying
@@ -771,7 +773,7 @@ analyzer which might mistake a number for as a symbol."
      ;; Make sure the state of block parsing starts over.
      (setq semantic-lex-block-streams nil)
      ;; Allow specialty reset items.
-     (run-hook-with-args 'semantic-lex-reset-hooks start end)
+     (run-hook-with-args 'semantic-lex-reset-functions start end)
      ;; Lexing state.
      (let* (;(starttime (current-time))
             (starting-position (point))
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 579551c9a91..2279dc2bf20 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -487,7 +487,6 @@ since it could result in memory overflow and make Emacs crash."
              (hourglass-delay cursor number)
 
              ;; xfaces.c
-             (font-list-limit display integer)
              (scalable-fonts-allowed display boolean "22.1")
              ;; xfns.c
              (x-bitmap-file-path installation
diff --git a/lisp/delsel.el b/lisp/delsel.el
index a6435672201..2ed82676189 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -44,9 +44,12 @@
 ;;      `kill-region' is used on the selection, rather than
 ;;      `delete-region'.  (Text selected with the mouse will typically
 ;;      be yankable anyhow.)
-;;  non-nil
+;;  t
 ;;      The normal case: delete the active region prior to executing
 ;;      the command which will insert replacement text.
+;;  <function>
+;;      For commands which need to dynamically determine this behaviour.
+;;      The function should return one of the above values or nil.
 
 ;;; Code:
 
@@ -71,65 +74,96 @@ any selection."
     (transient-mark-mode t)))
 
 (defun delete-active-region (&optional killp)
+  "Delete the active region.
+If KILLP in not-nil, the active region is killed instead of deleted."
   (if killp
       (kill-region (point) (mark))
     (delete-region (point) (mark)))
   t)
 
+(defun delete-selection-helper (type)
+  "Delete selection according to TYPE:
+ `yank'
+     For commands which do a yank; ensures the region about to be
+     deleted isn't yanked.
+ `supersede'
+     Delete the active region and ignore the current command,
+     i.e. the command will just delete the region.
+ `kill'
+     `kill-region' is used on the selection, rather than
+     `delete-region'.  (Text selected with the mouse will typically
+     be yankable anyhow.)
+ t
+     The normal case: delete the active region prior to executing
+     the command which will insert replacement text.
+ FUNCTION
+     For commands which need to dynamically determine this behaviour.
+     FUNCTION should take no argument and return one of the above values or nil."
+  (condition-case data
+      (cond ((eq type 'kill)
+             (delete-active-region t))
+            ((eq type 'yank)
+             ;; Before a yank command, make sure we don't yank the
+             ;; head of the kill-ring that really comes from the
+             ;; currently active region we are going to delete.
+             ;; That would make yank a no-op.
+             (when (and (string= (buffer-substring-no-properties
+                                  (point) (mark))
+                                 (car kill-ring))
+                        (fboundp 'mouse-region-match)
+                        (mouse-region-match))
+               (current-kill 1))
+             (delete-active-region))
+            ((eq type 'supersede)
+             (let ((empty-region (= (point) (mark))))
+               (delete-active-region)
+               (unless empty-region
+                 (setq this-command 'ignore))))
+            ((functionp type) (delete-selection-helper (funcall type)))
+            (type
+             (delete-active-region)
+             (if (and overwrite-mode
+                      (eq this-command 'self-insert-command))
+                 (let ((overwrite-mode nil))
+                   (self-insert-command
+                    (prefix-numeric-value current-prefix-arg))
+                   (setq this-command 'ignore)))))
+    ;; If ask-user-about-supersession-threat signals an error,
+    ;; stop safe_run_hooks from clearing out pre-command-hook.
+    (file-supersession (message "%s" (cadr data)) (ding))
+    (text-read-only
+     ;; This signal may come either from `delete-active-region' or
+     ;; `self-insert-command' (when `overwrite-mode' is non-nil).
+     ;; To avoid clearing out `pre-command-hook' we handle this case
+     ;; by issuing a simple message.  Note, however, that we do not
+     ;; handle all related problems: When read-only text ends before
+     ;; the end of the region, the latter is not deleted but any
+     ;; subsequent insertion will succeed.  We could avoid this case
+     ;; by doing a (setq this-command 'ignore) here.  This would,
+     ;; however, still not handle the case where read-only text ends
+     ;; precisely where the region starts: In that case the deletion
+     ;; would succeed but the subsequent insertion would fail with a
+     ;; text-read-only error.  To handle that case we would have to
+     ;; investigate text properties at both ends of the region and
+     ;; skip the deletion when inserting text is forbidden there.
+     (message "Text is read-only") (ding))))
+
 (defun delete-selection-pre-hook ()
-  (when (and delete-selection-mode transient-mark-mode mark-active
+  "Function run before commands that delete selections are executed.
+Commands which will delete the selection need a `delete-selection'
+property on their symbol; commands which insert text but don't
+have this property won't delete the selection.
+See `delete-selection-helper'."
+  (when (and delete-selection-mode (use-region-p)
              (not buffer-read-only))
-    (let ((type (and (symbolp this-command)
-                     (get this-command 'delete-selection))))
-      (condition-case data
-          (cond ((eq type 'kill)
-                 (delete-active-region t))
-                ((eq type 'yank)
-                 ;; Before a yank command, make sure we don't yank the
-                 ;; head of the kill-ring that really comes from the
-                 ;; currently active region we are going to delete.
-                 ;; That would make yank a no-op.
-                 (when (and (string= (buffer-substring-no-properties
-                                      (point) (mark))
-                                     (car kill-ring))
-                            (fboundp 'mouse-region-match)
-                            (mouse-region-match))
-                   (current-kill 1))
-                 (delete-active-region))
-                ((eq type 'supersede)
-                 (let ((empty-region (= (point) (mark))))
-                   (delete-active-region)
-                   (unless empty-region
-                     (setq this-command 'ignore))))
-                (type
-                 (delete-active-region)
-                 (if (and overwrite-mode
-                          (eq this-command 'self-insert-command))
-                   (let ((overwrite-mode nil))
-                     (self-insert-command
-                      (prefix-numeric-value current-prefix-arg))
-                     (setq this-command 'ignore)))))
-         ;; If ask-user-about-supersession-threat signals an error,
-         ;; stop safe_run_hooks from clearing out pre-command-hook.
-        (file-supersession (message "%s" (cadr data)) (ding))
-        (text-read-only
-         ;; This signal may come either from `delete-active-region' or
-         ;; `self-insert-command' (when `overwrite-mode' is non-nil).
-         ;; To avoid clearing out `pre-command-hook' we handle this case
-         ;; by issuing a simple message.  Note, however, that we do not
-         ;; handle all related problems: When read-only text ends before
-         ;; the end of the region, the latter is not deleted but any
-         ;; subsequent insertion will succeed.  We could avoid this case
-         ;; by doing a (setq this-command 'ignore) here.  This would,
-         ;; however, still not handle the case where read-only text ends
-         ;; precisely where the region starts: In that case the deletion
-         ;; would succeed but the subsequent insertion would fail with a
-         ;; text-read-only error.  To handle that case we would have to
-         ;; investigate text properties at both ends of the region and
-         ;; skip the deletion when inserting text is forbidden there.
-         (message "Text is read-only") (ding))))))
-
-(put 'self-insert-command 'delete-selection t)
+    (delete-selection-helper (and (symbolp this-command)
+                                  (get this-command 'delete-selection)))))
+
+(put 'self-insert-command 'delete-selection
+     (lambda ()
+       (not (run-hook-with-args-until-success
+             'self-insert-uses-region-functions))))
+
 (put 'self-insert-iso 'delete-selection t)
 
 (put 'yank 'delete-selection 'yank)
diff --git a/lisp/electric.el b/lisp/electric.el
index 3108a0ed4c0..abf5a72ecaf 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -301,14 +301,17 @@ This can be convenient for people who find it easier to hit ) than C-f."
   :version "24.1"
   :type 'boolean)
 
+(defun electric-pair-syntax (command-event)
+  (and electric-pair-mode
+       (let ((x (assq command-event electric-pair-pairs)))
+         (cond
+          (x (if (eq (car x) (cdr x)) ?\" ?\())
+          ((rassq command-event electric-pair-pairs) ?\))
+          (t (char-syntax command-event))))))
+
 (defun electric-pair-post-self-insert-function ()
   (let* ((syntax (and (eq (char-before) last-command-event) ; Sanity check.
-                      electric-pair-mode
-                      (let ((x (assq last-command-event electric-pair-pairs)))
-                        (cond
-                         (x (if (eq (car x) (cdr x)) ?\" ?\())
-                         ((rassq last-command-event electric-pair-pairs) ?\))
-                         (t (char-syntax last-command-event))))))
+                      (electric-pair-syntax last-command-event)))
          ;; FIXME: when inserting the closer, we should maybe use
          ;; self-insert-command, although it may prove tricky running
          ;; post-self-insert-hook recursively, and we wouldn't want to trigger
@@ -355,6 +358,10 @@ This can be convenient for people who find it easier to hit ) than C-f."
                (eq (char-syntax (following-char)) ?w)))
       (save-excursion (insert closer))))))
 
+(defun electric-pair-will-use-region ()
+  (and (use-region-p)
+       (memq (electric-pair-syntax last-command-event) '(?\( ?\" ?\$))))
+
 ;;;###autoload
 (define-minor-mode electric-pair-mode
   "Toggle automatic parens pairing (Electric Pair mode).
@@ -370,10 +377,15 @@ See options `electric-pair-pairs' and `electric-pair-skip-self'."
   :global t
   :group 'electricity
   (if electric-pair-mode
-      (add-hook 'post-self-insert-hook
-                #'electric-pair-post-self-insert-function)
+      (progn
+        (add-hook 'post-self-insert-hook
+                  #'electric-pair-post-self-insert-function)
+        (add-hook 'self-insert-uses-region-functions
+                  #'electric-pair-will-use-region))
     (remove-hook 'post-self-insert-hook
-                 #'electric-pair-post-self-insert-function)))
+                 #'electric-pair-post-self-insert-function)
+    (remove-hook 'self-insert-uses-region-functions
+                  #'electric-pair-will-use-region)))
 
 ;; Automatically add newlines after/before/around some chars.
 
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index ee8cbd2c3bc..6250edc8792 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -124,7 +124,7 @@
 ;; Adding your own checks:
 ;;
 ;;   You can experiment with adding your own checks by setting the
-;; hooks `checkdoc-style-hooks' and `checkdoc-comment-style-hooks'.
+;; hooks `checkdoc-style-functions' and `checkdoc-comment-style-hooks'.
 ;; Return a string which is the error you wish to report.  The cursor
 ;; position should be preserved.
 ;;
@@ -274,17 +274,21 @@ made in the style guide relating to order."
   :type 'boolean)
 ;;;###autoload(put 'checkdoc-arguments-in-order-flag 'safe-local-variable 'booleanp)
 
-(defvar checkdoc-style-hooks nil
-  "Hooks called after the standard style check is completed.
-All hooks must return nil or a string representing the error found.
+(define-obsolete-variable-alias 'checkdoc-style-hooks
+  'checkdoc-style-functions "24.3")
+(defvar checkdoc-style-functions nil
+  "Hook run after the standard style check is completed.
+All functions must return nil or a string representing the error found.
 Useful for adding new user implemented commands.
 
 Each hook is called with two parameters, (DEFUNINFO ENDPOINT).
 DEFUNINFO is the return value of `checkdoc-defun-info'.  ENDPOINT is the
 location of end of the documentation string.")
 
-(defvar checkdoc-comment-style-hooks nil
-  "Hooks called after the standard comment style check is completed.
+(define-obsolete-variable-alias 'checkdoc-comment-style-hooks
+  checkdoc-comment-style-functions "24.3")
+(defvar checkdoc-comment-style-functions nil
+  "Hook run after the standard comment style check is completed.
 Must return nil if no errors are found, or a string describing the
 problem discovered.  This is useful for adding additional checks.")
 
@@ -1843,7 +1847,7 @@ Replace with \"%s\"? " original replace)
      ;; and reliance on the Ispell program.
      (checkdoc-ispell-docstring-engine e)
      ;; User supplied checks
-     (save-excursion (checkdoc-run-hooks 'checkdoc-style-hooks fp e))
+     (save-excursion (checkdoc-run-hooks 'checkdoc-style-functions fp e))
      ;; Done!
      )))
 
@@ -2353,7 +2357,7 @@ Code:, and others referenced in the style guide."
        err
        (or
         ;; Generic Full-file checks (should be comment related)
-        (checkdoc-run-hooks 'checkdoc-comment-style-hooks)
+        (checkdoc-run-hooks 'checkdoc-comment-style-functions)
         err))
       ;; Done with full file comment checks
       err)))
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 5f8cbea7c27..608134bd54f 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -2066,7 +2066,9 @@ Keys are a number representing :before, :primary, and :after methods.")
 During executions, the list is first generated, then as each next method
 is called, the next method is popped off the stack.")
 
-(defvar eieio-pre-method-execution-hooks nil
+(define-obsolete-variable-alias 'eieio-pre-method-execution-hooks
+  'eieio-pre-method-execution-functions "24.3")
+(defvar eieio-pre-method-execution-functions nil
   "Abnormal hook run just before an EIEIO method is executed.
 The hook function must accept one argument, the list of forms
 about to be executed.")
@@ -2172,7 +2174,7 @@ This should only be called from a generic function."
               (eieiomt-method-list method method-primary nil)))
       )
 
-    (run-hook-with-args 'eieio-pre-method-execution-hooks
+    (run-hook-with-args 'eieio-pre-method-execution-functions
                         primarymethodlist)
 
     ;; Now loop through all occurrences forms which we must execute
@@ -2277,7 +2279,7 @@ for this common case to improve performance."
 
         ;; Do the regular implementation here.
 
-        (run-hook-with-args 'eieio-pre-method-execution-hooks
+        (run-hook-with-args 'eieio-pre-method-execution-functions
                             lambdas)
 
         (setq lastval (apply (car lambdas) newargs))
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 5a10721387b..e6e89d83b7c 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -484,20 +484,22 @@ implemented via rewriting, rather than as a function."
       (let ((body (car (last terms))))
         (setcdr (last terms 2) nil)
         `(let ((for-items
-                (append
-                 ,@(mapcar
-                    (lambda (elem)
-                      (if (listp elem)
-                          elem
-                        `(list ,elem)))
-                    (cdr (cddr terms)))))
-               (eshell-command-body '(nil))
+                (copy-tree
+                 (append
+                  ,@(mapcar
+                     (lambda (elem)
+                       (if (listp elem)
+                           elem
+                         `(list ,elem)))
+                     (cdr (cddr terms))))))
+               (eshell-command-body '(nil))
                (eshell-test-body '(nil)))
-           (while (consp for-items)
-             (let ((,(intern (cadr terms)) (car for-items)))
-               (eshell-protect
-                ,(eshell-invokify-arg body t)))
-             (setq for-items (cdr for-items)))
+           (while (car for-items)
+             (let ((,(intern (cadr terms)) (car for-items)))
+               (eshell-protect
+                ,(eshell-invokify-arg body t)))
+             (setcar for-items (cadr for-items))
+             (setcdr for-items (cddr for-items)))
            (eshell-close-handles
             eshell-last-command-status
             (list 'quote eshell-last-command-result))))))
diff --git a/lisp/faces.el b/lisp/faces.el
index 08aa800c067..f5ef88d08b0 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2572,6 +2572,12 @@ also the same size as FACE on FRAME, or fail."
         (car fonts))
     (cdr (assq 'font (frame-parameters (selected-frame))))))
 
+(defcustom font-list-limit 100
+  "This variable is obsolete and has no effect."
+  :type 'integer
+  :group 'display)
+(make-obsolete-variable 'font-list-limit nil "24.3")
+
 (provide 'faces)
 
 ;;; faces.el ends here
diff --git a/lisp/filesets.el b/lisp/filesets.el
index a91d8cf0fcb..7f695cf33dd 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -403,8 +403,10 @@ Don't forget to check out `filesets-menu-ensure-use-cached'."
                   (sexp :tag "Other" :value nil)))
   :group 'filesets)
 
-(defcustom filesets-cache-fill-content-hooks nil
-  "Hooks to run when writing the contents of filesets' cache file.
+(define-obsolete-variable-alias 'filesets-cache-fill-content-hooks
+  'filesets-cache-fill-content-hook "24.3")
+(defcustom filesets-cache-fill-content-hook nil
+  "Hook run when writing the contents of filesets' cache file.
 
 The hook is called with the cache file as current buffer and the cursor
 at the last position.  I.e. each hook has to make sure that the cursor is
@@ -2414,7 +2416,7 @@ fileset thinks this is necessary or not."
       (when filesets-cache-hostname-flag
         (insert (format "(setq filesets-cache-hostname %S)" (system-name)))
         (newline 2))
-      (run-hooks 'filesets-cache-fill-content-hooks)
+      (run-hooks 'filesets-cache-fill-content-hook)
       (write-file filesets-menu-cache-file))
     (setq filesets-has-changed-flag nil)
     (setq filesets-update-cache-file-flag nil)))
diff --git a/lisp/frame.el b/lisp/frame.el
index b7b61bcc576..7a54efc23e7 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -655,6 +655,8 @@ the new frame according to its own rules."
       (error "Don't know how to create a frame on window system %s" w))
 
     (unless (get w 'window-system-initialized)
+      (unless x-display-name
+        (setq x-display-name display))
       (funcall (cdr (assq w window-system-initialization-alist)))
       (put w 'window-system-initialized t))
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dade2b4bbe5..8cb53de85fa 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * nndiary.el (nndiary-request-create-group-functions)
+        (nndiary-request-update-info-functions)
+        (nndiary-request-accept-article-functions):
+        * gnus-start.el (gnus-subscribe-newsgroup-functions): Don't use
+        "-hooks" suffix.
+
 2012-10-17  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
         * starttls.el (starttls-extra-arguments): Doc fix.
@@ -110,7 +118,7 @@
 
 2012-09-05  Martin Stjernholm  <mast@lysator.liu.se>
 
-        * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and
+        * gnus-demon.el (gnus-demon-init): Fix regression when IDLE is t and
         TIME is set.
 
 2012-09-05  Juri Linkov  <juri@jurta.org>
@@ -571,7 +579,7 @@
         * gnus.el: Register gnus-registry functions.
 
         * gnus-registry.el (gnus-try-warping-via-registry):
-        Moved here and indent.
+        Move here and indent.
 
         * gnus-int.el (gnus-warp-to-article):
         Check whether the registry is enabled before warping.
@@ -703,7 +711,7 @@
         (message-multi-smtp-send-mail): Respect the X-Message-SMTP-Method
         header to implement multi-SMTP functionality.
 
-        * gnus-agent.el (gnus-agent-send-mail-function): Removed.
+        * gnus-agent.el (gnus-agent-send-mail-function): Remove.
         (gnus-agentize): Don't set it.
         (gnus-agent-send-mail): Don't use it.
 
@@ -844,8 +852,8 @@
 
 2012-06-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus-group.el (gnus-group-get-new-news): Respect
-        `gnus-group-use-permanent-levels', as documented (bug#11638).
+        * gnus-group.el (gnus-group-get-new-news):
+        Respect `gnus-group-use-permanent-levels', as documented (bug#11638).
 
 2012-06-10  Dave Abrahams  <dave@boostpro.com>
 
@@ -985,7 +993,7 @@
         (shr-insert): Allow the natural width to be computed for tables again.
         (shr-tag-table-1): Rework how the natural widths are computed by
         rendering the table a third time.
-        (shr-natural-width): Removed.
+        (shr-natural-width): Remove.
         (shr-buffer-width): New function.
         (shr-expand-newlines): Use it.
 
@@ -1396,8 +1404,8 @@
 
 2012-01-04  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
 
-        * gnus-agent.el (gnus-agent-load-local): Recompute
-        gnus-agent-article-local on changing method.
+        * gnus-agent.el (gnus-agent-load-local):
+        Recompute gnus-agent-article-local on changing method.
 
 2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -1689,8 +1697,8 @@
 
 2011-09-27  Daiki Ueno  <ueno@unixuser.org>
 
-        * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
-        documentation.
+        * plstore.el (plstore-select-keys, plstore-encrypt-to):
+        Clarify documentation.
 
 2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 40ee78bb695..eaf17d9e579 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -291,7 +291,9 @@ claim them."
                 function
                 (repeat function)))
 
-(defcustom gnus-subscribe-newsgroup-hooks nil
+(define-obsolete-variable-alias 'gnus-subscribe-newsgroup-hooks
+  'gnus-subscribe-newsgroup-functions "24.3")
+(defcustom gnus-subscribe-newsgroup-functions nil
   "*Hooks run after you subscribe to a new group.
 The hooks will be called with new group's name as argument."
   :version "22.1"
@@ -639,7 +641,7 @@ the first newsgroup."
      gnus-level-killed (gnus-group-entry (or next "dummy.group")))
     (gnus-request-update-group-status newsgroup 'subscribe)
     (gnus-message 5 "Subscribe newsgroup: %s" newsgroup)
-    (run-hook-with-args 'gnus-subscribe-newsgroup-hooks newsgroup)
+    (run-hook-with-args 'gnus-subscribe-newsgroup-functions newsgroup)
     t))
 
 (defun gnus-read-active-file-p ()
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 8752972c3c8..73dd2921b68 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -179,22 +179,28 @@ In order to make this clear, here are some examples:
   :group 'nndiary)
 
 
-(defcustom nndiary-request-create-group-hooks nil
-  "*Hooks to run after `nndiary-request-create-group' is executed.
-The hooks will be called with the full group name as argument."
+(define-obsolete-variable-alias 'nndiary-request-create-group-hooks
+  'nndiary-request-create-group-functions "24.3")
+(defcustom nndiary-request-create-group-functions nil
+  "*Hook run after `nndiary-request-create-group' is executed.
+The hook functions will be called with the full group name as argument."
   :group 'nndiary
   :type 'hook)
 
-(defcustom nndiary-request-update-info-hooks nil
-  "*Hooks to run after `nndiary-request-update-info-group' is executed.
-The hooks will be called with the full group name as argument."
+(define-obsolete-variable-alias 'nndiary-request-update-info-hooks
+  'nndiary-request-update-info-functions "24.3")
+(defcustom nndiary-request-update-info-functions nil
+  "*Hook run after `nndiary-request-update-info-group' is executed.
+The hook functions will be called with the full group name as argument."
   :group 'nndiary
   :type 'hook)
 
-(defcustom nndiary-request-accept-article-hooks nil
-  "*Hooks to run before accepting an article.
+(define-obsolete-variable-alias 'nndiary-request-accept-article-hooks
+  'nndiary-request-accept-article-functions "24.3")
+(defcustom nndiary-request-accept-article-functions nil
+  "*Hook run before accepting an article.
 Executed near the beginning of `nndiary-request-accept-article'.
-The hooks will be called with the article in the current buffer."
+The hook functions will be called with the article in the current buffer."
   :group 'nndiary
   :type 'hook)
 
@@ -541,7 +547,7 @@ all.  This may very well take some time.")
           (setcar active (apply 'min articles))
           (setcdr active (apply 'max articles))))
       (nnmail-save-active nndiary-group-alist nndiary-active-file)
-      (run-hook-with-args 'nndiary-request-create-group-hooks
+      (run-hook-with-args 'nndiary-request-create-group-functions
                           (gnus-group-prefixed-name group
                                                     (list "nndiary" server)))
       t))
@@ -633,7 +639,7 @@ all.  This may very well take some time.")
 (deffoo nndiary-request-accept-article (group &optional server last)
   (nndiary-possibly-change-directory group server)
   (nnmail-check-syntax)
-  (run-hooks 'nndiary-request-accept-article-hooks)
+  (run-hooks 'nndiary-request-accept-article-functions)
   (when (nndiary-schedule)
     (let (result)
       (when nnmail-cache-accepted-message-ids
@@ -804,7 +810,7 @@ all.  This may very well take some time.")
              (gnus-info-set-read info (gnus-update-read-articles
                                        (gnus-info-group info) unread t)))
         ))
-    (run-hook-with-args 'nndiary-request-update-info-hooks
+    (run-hook-with-args 'nndiary-request-update-info-functions
                         (gnus-info-group info))
     t))
 
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index b0bc5b6b3b3..a1853a6e04b 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -249,7 +249,8 @@ when not running under a window system."
   :tag   "init-kludge-hooks"
   :type  '(hook))
 
-(defcustom hfy-post-html-hooks nil
+(define-obsolete-variable-alias 'hfy-post-html-hooks 'hfy-post-html-hook "24.3")
+(defcustom hfy-post-html-hook nil
   "List of functions to call after creating and filling the HTML buffer.
 These functions will be called with the HTML buffer as the current buffer."
   :group   'htmlfontify
@@ -1786,7 +1787,7 @@ FILE, if set, is the file name."
       ;;(message "inserting footer")
       (insert (funcall hfy-page-footer file)))
     ;; call any post html-generation hooks:
-    (run-hooks 'hfy-post-html-hooks)
+    (run-hooks 'hfy-post-html-hook)
     ;; return the html buffer
     (set-buffer-modified-p nil)
     html-buffer))
diff --git a/lisp/image.el b/lisp/image.el
index 72dc654757a..aef44fc3701 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -308,8 +308,17 @@ be determined."
   "Determine the type of image file FILE from its name.
 Value is a symbol specifying the image type, or nil if type cannot
 be determined."
-  (assoc-default file image-type-file-name-regexps 'string-match-p))
-
+  (let (type first)
+    (or
+     (catch 'found
+       (dolist (elem image-type-file-name-regexps)
+         (when (string-match-p (car elem) file)
+           (setq type (cdr elem))
+           (or first (setq first type))
+           (if (image-type-available-p type)
+               (throw 'found type)))))
+     ;; If nothing seems to be supported, return the first type that matched.
+     first)))
 
 ;;;###autoload
 (defun image-type (source &optional type data-p)
@@ -798,7 +807,7 @@ to enable all types that ImageMagick supports.
 
 The variable `imagemagick-types-inhibit' overrides this variable.
 
-If you change this without outside of Customize, you must call
+If you change this without using customize, you must call
 `imagemagick-register-types' afterwards.
 
 If Emacs is compiled without ImageMagick support, this variable
diff --git a/lisp/loadup.el b/lisp/loadup.el
index e0f5c6265b9..e5f2cb014d3 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -38,7 +38,8 @@
 ;; doc strings in the dumped Emacs.)  Because of this:
 
 ;; ii) If the file is loaded uncompiled, it should (where possible)
-;; obey the doc-string conventions expected by make-docfile.
+;; obey the doc-string conventions expected by make-docfile.  It
+;; should also be added to the uncompiled[] list in make-docfile.c.
 
 ;;; Code:
 
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 331754fb1b5..afa13fe4e04 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -243,15 +243,14 @@ Used by `mail-yank-original' via `mail-indent-citation'."
   :type 'integer
   :group 'sendmail)
 
-;; FIXME make it really obsolete.
 (defvar mail-yank-hooks nil
   "Obsolete hook for modifying a citation just inserted in the mail buffer.
 Each hook function can find the citation between (point) and (mark t).
 And each hook function should leave point and mark around the citation
 text as modified.
-
 This is a normal hook, misnamed for historical reasons.
-It is semi-obsolete and mail agents should no longer use it.")
+It is obsolete and mail agents should no longer use it.")
+(make-obsolete-variable 'mail-yank-hooks 'mail-citation-hook "19.34")
 
 ;;;###autoload
 (defcustom mail-citation-hook nil
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 6eedef1980e..adc8707f011 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
+
 2012-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mh-utils.el (minibuffer-completing-file-name): Don't declare, unused.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 2723fb5e684..705c92b0b4c 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -3189,7 +3189,9 @@ function used to insert the signature with
   :group 'mh-letter
   :package-version '(MH-E . "8.0"))
 
-(defcustom-mh mh-kill-folder-suppress-prompt-hooks '(mh-search-p)
+(define-obsolete-variable-alias 'mh-kill-folder-suppress-prompt-hooks
+  'mh-kill-folder-suppress-prompt-functions "24.3")
+(defcustom-mh mh-kill-folder-suppress-prompt-functions '(mh-search-p)
   "Abnormal hook run at the beginning of \\<mh-folder-mode-map>\\[mh-kill-folder].
 
 The hook functions are called with no arguments and should return
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 8aed1873348..490bfc07560 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -66,8 +66,9 @@ Each hook function can find the citation between point and mark.
 And each hook function should leave point and mark around the
 citation text as modified.
 
-This is a normal hook, misnamed for historical reasons. It is
-semi-obsolete and is only used if `mail-citation-hook' is nil.")
+This is a normal hook, misnamed for historical reasons.
+It is obsolete and is only used if `mail-citation-hook' is nil.")
+(make-obsolete-variable 'mh-yank-hooks 'mail-citation-hook "19.34")
 
 
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index f464b42182d..f865a0269d4 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1134,7 +1134,23 @@ Repeated uses step through the possible completions."
       ;; through the previous possible completions.
       (let ((last (last all)))
         (setcdr last (cons (car all) (cdr last)))
-        (completion--cache-all-sorted-completions (cdr all)))))))
+        (completion--cache-all-sorted-completions (cdr all)))
+      ;; Make sure repeated uses cycle, even though completion--done might
+      ;; have added a space or something that moved us outside of the field.
+      ;; (bug#12221).
+      (let* ((table minibuffer-completion-table)
+             (pred minibuffer-completion-predicate)
+             (extra-prop completion-extra-properties)
+             (cmd
+              (lambda () "Cycle through the possible completions."
+                (interactive)
+                (let ((completion-extra-properties extra-prop))
+                  (completion-in-region start (point) table pred)))))
+        (set-temporary-overlay-map
+         (let ((map (make-sparse-keymap)))
+           (define-key map [remap completion-at-point] cmd)
+           (define-key map (vector last-command-event) cmd)
+           map)))))))
 
 (defvar minibuffer-confirm-exit-commands
   '(completion-at-point minibuffer-complete
@@ -1557,7 +1573,6 @@ variables.")
   (let* ((exit-fun (plist-get completion-extra-properties :exit-function))
          (pre-msg (and exit-fun (current-message))))
     (cl-assert (memq finished '(exact sole finished unknown)))
-    ;; FIXME: exit-fun should receive `finished' as a parameter.
     (when exit-fun
       (when (eq finished 'unknown)
         (setq finished
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 772a0a9c626..c95e901c39d 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -152,7 +152,9 @@ Otherwise, return result of last form in BODY, or all other errors."
      (dbus-error (when dbus-debug (signal (car err) (cdr err))))))
 (font-lock-add-keywords 'emacs-lisp-mode '("\\<dbus-ignore-errors\\>"))
 
-(defvar dbus-event-error-hooks nil
+(define-obsolete-variable-alias 'dbus-event-error-hooks
+  'dbus-event-error-functions "24.3")
+(defvar dbus-event-error-functions nil
   "Functions to be called when a D-Bus error happens in the event handler.
 Every function must accept two arguments, the event and the error variable
 caught in `condition-case' by `dbus-error'.")
@@ -947,7 +949,7 @@ If the HANDLER returns a `dbus-error', it is propagated as return message."
          (dbus-method-error-internal
           (nth 1 event) (nth 4 event) (nth 3 event) (cadr err))))
      ;; Propagate D-Bus error messages.
-     (run-hook-with-args 'dbus-event-error-hooks event err)
+     (run-hook-with-args 'dbus-event-error-functions event err)
      (when (or dbus-debug (= dbus-message-type-error (nth 2 event)))
        (signal (car err) (cdr err))))))
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index dd345630b9b..e9828c5f813 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -300,7 +300,9 @@ See `rcirc-dim-nick' face."
   :type '(repeat string)
   :group 'rcirc)
 
-(defcustom rcirc-print-hooks nil
+(define-obsolete-variable-alias 'rcirc-print-hooks
+  'rcirc-print-functions "24.3")
+(defcustom rcirc-print-functions nil
   "Hook run after text is printed.
 Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT."
   :type 'hook
@@ -647,7 +649,9 @@ is non-nil."
                "] "
                text)))))
 
-(defvar rcirc-sentinel-hooks nil
+(define-obsolete-variable-alias 'rcirc-sentinel-hooks
+  'rcirc-sentinel-functions "24.3")
+(defvar rcirc-sentinel-functions nil
   "Hook functions called when the process sentinel is called.
 Functions are called with PROCESS and SENTINEL arguments.")
 
@@ -664,7 +668,7 @@ Functions are called with PROCESS and SENTINEL arguments.")
                                sentinel
                                (process-status process)) (not rcirc-target))
           (rcirc-disconnect-buffer)))
-      (run-hook-with-args 'rcirc-sentinel-hooks process sentinel))))
+      (run-hook-with-args 'rcirc-sentinel-functions process sentinel))))
 
 (defun rcirc-disconnect-buffer (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
@@ -684,7 +688,9 @@ Functions are called with PROCESS and SENTINEL arguments.")
           (process-list))
     ps))
 
-(defvar rcirc-receive-message-hooks nil
+(define-obsolete-variable-alias 'rcirc-receive-message-hooks
+  'rcirc-receive-message-functions "24.3")
+(defvar rcirc-receive-message-functions nil
   "Hook functions run when a message is received from server.
 Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.")
 (defun rcirc-filter (process output)
@@ -738,7 +744,7 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.")
         (if (not (fboundp handler))
             (rcirc-handler-generic process cmd sender args text)
           (funcall handler process sender args text))
-        (run-hook-with-args 'rcirc-receive-message-hooks
+        (run-hook-with-args 'rcirc-receive-message-functions
                             process cmd sender args text)))
     (message "UNHANDLED: %s" text)))
 
@@ -1625,7 +1631,7 @@ record activity."
           (rcirc-log process sender response target text))
 
         (sit-for 0)                     ; displayed text before hook
-        (run-hook-with-args 'rcirc-print-hooks
+        (run-hook-with-args 'rcirc-print-functions
                             process sender response target text)))))
 
 (defun rcirc-generate-log-filename (process target)
@@ -1927,7 +1933,9 @@ With prefix ARG, go to the next low priority buffer with activity."
                           (key-description (this-command-keys))
                           " for low priority activity."))))))))
 
-(defvar rcirc-activity-hooks nil
+(define-obsolete-variable-alias 'rcirc-activity-hooks
+  'rcirc-activity-functions "24.3")
+(defvar rcirc-activity-functions nil
   "Hook to be run when there is channel activity.
 
 Functions are called with a single argument, the buffer with the
@@ -1950,7 +1958,7 @@ activity.  Only run if the buffer is not visible and
         (unless (and (equal rcirc-activity old-activity)
                      (member type old-types))
           (rcirc-update-activity-string)))))
-  (run-hook-with-args 'rcirc-activity-hooks buffer))
+  (run-hook-with-args 'rcirc-activity-functions buffer))
 
 (defun rcirc-clear-activity (buffer)
   "Clear the BUFFER activity."
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 567f8f2969a..f52129919cc 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1677,11 +1677,11 @@ If ARGUMENT is non-nil, use it as argument for
                           (tramp-set-connection-property
                            vec "smbserver-version" smbserver-version))))
 
-                    ;; Set chunksize.  Otherwise, `tramp-send-string' might
-                    ;; try it itself.
+                    ;; Set chunksize to 1.  smbclient reads its input
+                    ;; character by character; if we send the string
+                    ;; at once, it is read painfully slow.
                     (tramp-set-connection-property p "smb-share" share)
-                    (tramp-set-connection-property
-                     p "chunksize" tramp-chunksize))
+                    (tramp-set-connection-property p "chunksize" 1))
 
                 ;; Check for the error reason.  If it was due to wrong
                 ;; password, reestablish the connection.  We cannot
@@ -1717,7 +1717,7 @@ Returns nil if an error message has appeared."
       (while (and (not found) (not err) (memq (process-status p) '(run open)))
 
         ;; Accept pending output.
-        (tramp-accept-process-output p)
+        (tramp-accept-process-output p 0.1)
 
         ;; Search for prompt.
         (goto-char (point-min))
@@ -1731,7 +1731,7 @@ Returns nil if an error message has appeared."
       (while (and (not found) (memq (process-status p) '(run open)))
 
         ;; Accept pending output.
-        (tramp-accept-process-output p)
+        (tramp-accept-process-output p 0.1)
 
         ;; Search for prompt.
         (goto-char (point-min))
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index a754c89c4ae..2ddfb2439af 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -24,7 +24,13 @@
 
 ;;; Commentary:
 
-;; A replacement for simple.el's comment-related functions.
+;; This library contains functions and variables for commenting and
+;; uncommenting source code.
+
+;; Prior to calling any `comment-*' function, you should ensure that
+;; `comment-normalize-vars' is first called to set up the appropriate
+;; variables; except for the `comment-*' commands, which call
+;; `comment-normalize-vars' automatically as a subroutine.
 
 ;;; Bugs:
 
@@ -326,10 +332,11 @@ terminated by the end of line (i.e. `comment-end' is empty)."
 
 ;;;###autoload
 (defun comment-normalize-vars (&optional noerror)
-  "Check and setup the variables needed by other commenting functions.
-Any command calling functions from newcomment.el should call this function
-before any other, so the rest of the code can assume that the variables are
-properly set."
+  "Check and set up variables needed by other commenting functions.
+All the `comment-*' commands call this function to set up various
+variables, like `comment-start', to ensure that the commenting
+functions work correctly.  Lisp callers of any other `comment-*'
+function should first call this function explicitly."
   (unless (and (not comment-start) noerror)
     (unless comment-start
       (let ((cs (read-string "No comment syntax is defined.  Use: ")))
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 2a000957589..50eaebe4dec 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1703,7 +1703,9 @@ Key bindings:
   (message "Using CC Mode version %s" c-version)
   (c-keep-region-active))
 
-(defvar c-prepare-bug-report-hooks nil)
+(define-obsolete-variable-alias 'c-prepare-bug-report-hooks
+  'c-prepare-bug-report-hook "24.3")
+(defvar c-prepare-bug-report-hook nil)
 
 ;; Dynamic variables used by reporter.
 (defvar reporter-prompt-for-summary-p)
@@ -1770,7 +1772,7 @@ Key bindings:
                 lookup-syntax-properties))
         vars)
       (lambda ()
-        (run-hooks 'c-prepare-bug-report-hooks)
+        (run-hooks 'c-prepare-bug-report-hook)
         (insert (format "Buffer Style: %s\nc-emacs-features: %s\n"
                         style c-features)))))))
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 26d4a399c2d..2614af9ffa4 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1535,10 +1535,11 @@ if ARG is omitted or nil."
     (error "Invalid file-name"))
   (or prefix
       (setq prefix "flymake"))
-  (let* ((temp-name   (concat (file-name-sans-extension file-name)
-                              "_" prefix
-                              (and (file-name-extension file-name)
-                                   (concat "." (file-name-extension file-name))))))
+  (let* ((ext (file-name-extension file-name))
+         (temp-name (file-truename
+                     (concat (file-name-sans-extension file-name)
+                             "_" prefix
+                             (and ext (concat "." ext))))))
     (flymake-log 3 "create-temp-inplace: file=%s temp=%s" file-name temp-name)
     temp-name))
 
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 4819149bdf6..c2ce12b6ad4 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -182,7 +182,8 @@ and you want to simplify them for the mode line
 (defconst which-func-current
   '(:eval (replace-regexp-in-string
            "%" "%%"
-           (gethash (selected-window) which-func-table which-func-unknown))))
+           (or (gethash (selected-window) which-func-table)
+               which-func-unknown))))
 ;;;###autoload (put 'which-func-current 'risky-local-variable t)
 
 (defvar which-func-mode nil
diff --git a/lisp/startup.el b/lisp/startup.el
index bd75abe5b35..56281a6b164 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -971,7 +971,6 @@ Amongst another things, it parses the command-line arguments."
                  (not (eq 0 (cdr tool-bar-lines)))))))
 
   (let ((old-scalable-fonts-allowed scalable-fonts-allowed)
-        (old-font-list-limit font-list-limit)
         (old-face-ignored-fonts face-ignored-fonts))
 
     ;; Run the site-start library if it exists.  The point of this file is
@@ -1162,7 +1161,6 @@ the `--debug-init' option to view a complete error backtrace."
     ;; face realization, clear the face cache so that new faces will
     ;; be realized.
     (unless (and (eq scalable-fonts-allowed old-scalable-fonts-allowed)
-                 (eq font-list-limit old-font-list-limit)
                  (eq face-ignored-fonts old-face-ignored-fonts))
       (clear-face-cache)))
 
diff --git a/lisp/subr.el b/lisp/subr.el
index ec2d16e6529..94012fc47de 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1260,12 +1260,10 @@ is converted into a string by expressing it in decimal."
 (define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro
   "before 19.34")
 
-(defvaralias 'x-lost-selection-hooks 'x-lost-selection-functions)
-(make-obsolete-variable 'x-lost-selection-hooks
-                        'x-lost-selection-functions "22.1")
-(defvaralias 'x-sent-selection-hooks 'x-sent-selection-functions)
-(make-obsolete-variable 'x-sent-selection-hooks
-                        'x-sent-selection-functions "22.1")
+(define-obsolete-variable-alias 'x-lost-selection-hooks
+  'x-lost-selection-functions "22.1")
+(define-obsolete-variable-alias 'x-sent-selection-hooks
+  'x-sent-selection-functions "22.1")
 
 ;; This was introduced in 21.4 for pre-unicode unification.  That
 ;; usage was rendered obsolete in 23.1 which uses Unicode internally.
@@ -3151,7 +3149,7 @@ in which case `save-window-excursion' cannot help."
        (unwind-protect (progn ,@body)
          (set-window-configuration ,c)))))
 
-(defun temp-output-buffer-show (buffer)
+(defun internal-temp-output-buffer-show (buffer)
   "Internal function for `with-output-to-temp-buffer'."
   (with-current-buffer buffer
     (set-buffer-modified-p nil)
@@ -3235,7 +3233,7 @@ if it uses `temp-buffer-show-function'."
                    (run-hooks 'temp-buffer-setup-hook)))))
             (standard-output ,buf))
        (prog1 (progn ,@body)
-         (temp-output-buffer-show ,buf)))))
+         (internal-temp-output-buffer-show ,buf)))))
 
 (defmacro with-temp-file (file &rest body)
   "Create a new buffer, evaluate BODY there, and write the buffer to FILE.
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 4bd22c1d8da..dfe7a63ac1b 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -123,6 +123,7 @@
 
 (defvar sun-raw-prefix-hooks nil
   "List of forms to evaluate after setting sun-raw-prefix.")
+(make-obsolete-variable 'sun-raw-prefix-hooks 'term-setup-hook "21.1")
 
 
 
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 9e6f5769c8f..5c471664fdc 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -217,8 +217,9 @@ This can be toggled with `ediff-toggle-filename-truncation'."
   :type 'hook
   :group 'ediff-mult)
 
-(defcustom ediff-before-session-group-setup-hooks nil
-  "Hooks to run before Ediff arranges the window for group-level operations.
+(defcustom ediff-before-session-group-setup-hooks
+  nil ;FIXME: Bad name (should be -hook or -functions) and never run??
+  "Hook run before Ediff arranges the window for group-level operations.
 It is used by commands such as `ediff-directories'.
 This hook can be used to save the previous window config, which can be restored
 on `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'."
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 2da721b41d8..a909aca5bca 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1584,21 +1584,21 @@ Return t if the buffer had changes, nil otherwise."
     (let ((vc-disable-async-diff (not async)))
       (vc-call-backend (car vc-fileset) 'diff files rev1 rev2 buffer))
     (set-buffer buffer)
+    (diff-mode)
+    (set (make-local-variable 'diff-vc-backend) (car vc-fileset))
+    (set (make-local-variable 'revert-buffer-function)
+         `(lambda (ignore-auto noconfirm)
+            (vc-diff-internal ,async ',vc-fileset ,rev1 ,rev2 ,verbose)))
+    ;; Make the *vc-diff* buffer read only, the diff-mode key
+    ;; bindings are nicer for read only buffers. pcl-cvs does the
+    ;; same thing.
+    (setq buffer-read-only t)
     (if (and (zerop (buffer-size))
              (not (get-buffer-process (current-buffer))))
         ;; Treat this case specially so as not to pop the buffer.
         (progn
           (message "%s" (cdr messages))
           nil)
-      (diff-mode)
-      (set (make-local-variable 'diff-vc-backend) (car vc-fileset))
-      (set (make-local-variable 'revert-buffer-function)
-           `(lambda (ignore-auto noconfirm)
-              (vc-diff-internal ,async ',vc-fileset ,rev1 ,rev2 ,verbose)))
-      ;; Make the *vc-diff* buffer read only, the diff-mode key
-      ;; bindings are nicer for read only buffers. pcl-cvs does the
-      ;; same thing.
-      (setq buffer-read-only t)
       ;; Display the buffer, but at the end because it can change point.
       (pop-to-buffer (current-buffer))
       ;; The diff process may finish early, so call `vc-diff-finish'
diff --git a/lisp/window.el b/lisp/window.el
index a17e0adcdfe..fa7b08375ce 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5828,7 +5828,7 @@ buffer with the name BUFFER-OR-NAME and return that buffer."
   "If non-nil, `switch-to-buffer' tries to preserve `window-point'.
 If this is nil, `switch-to-buffer' displays the buffer at that
 buffer's `point'.  If this is `already-displayed', it tries to
-display the buffer at its pevious position in the selected
+display the buffer at its previous position in the selected
 window, provided the buffer is currently displayed in some other
 window on any visible or iconified frame.  If this is t, it
 unconditionally tries to display the buffer at its previous