upstream

72 files changed, 755 insertions, 308 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0769badf4f5..5c7e8f2e8f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,184 @@
+2012-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * minibuffer.el (read-file-name): Doc fix.  (Bug#10798)
+
+2012-02-13  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * net/gnutls.el (gnutls-trustfiles): New variable.
+        (gnutls-negotiate): Use it.
+
+2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * simple.el (mail-user-agent): Mention that `gnus-user-agent' only
+        does its stuff if Gnus is running.
+
+2012-02-13  Alan Mackenzie  <acm@muc.de>
+
+        Fix a loop in c-set-fl-decl-start.
+
+        * progmodes/cc-engine (c-set-fl-decl-start): Add a check that
+        c-backward-syntactic-ws actually moves backwards.
+
+2012-02-13  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-markup-attributes): Move point to the
+        beginning so that all \C-o chars are removed.
+
+2012-02-12  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * net/gnutls.el (gnutls-algorithm-priority): Add missing :group
+        tag.
+
+2012-02-12  Alan Mackenzie  <acm@muc.de>
+
+        Fix infinite loop with long macros.
+        * cc-engine.el (c-state-safe-place): Handle macros properly.
+
+2012-02-12  Chong Yidong  <cyd@gnu.org>
+
+        * window.el (display-buffer): Doc fix (Bug#10785).
+
+2012-02-12  Glenn Morris  <rgm@gnu.org>
+
+        * term/pc-win.el (x-selection-owner-p, x-own-selection-internal)
+        (x-disown-selection-internal, x-get-selection-internal):
+        Sync docs with the xselect.c versions.
+
+        * allout-widgets.el: Add missing license notice.
+
+2012-02-11  Glenn Morris  <rgm@gnu.org>
+
+        * select.el (x-get-selection-internal, x-own-selection-internal)
+        (x-disown-selection-internal):
+        * x-dnd.el (x-get-selection-internal): Update declarations.
+
+        * vc/log-view.el (vc-diff-internal): Remove unneeded declaration.
+
+        * window.el (window-sides-slots):
+        * tool-bar.el (tool-bar-position):
+        * term/xterm.el (xterm-extra-capabilities):
+        * ses.el (ses-self-reference-early-detection):
+        * progmodes/verilog-mode.el (verilog-auto-declare-nettype)
+        (verilog-auto-wire-type)
+        (verilog-auto-delete-trailing-whitespace)
+        (verilog-auto-reset-blocking-in-non, verilog-auto-inst-sort)
+        (verilog-auto-tieoff-declaration):
+        * progmodes/sql.el (sql-login-hook, sql-ansi-statement-starters)
+        (sql-oracle-statement-starters, sql-oracle-scan-on):
+        * progmodes/prolog.el (prolog-align-comments-flag)
+        (prolog-indent-mline-comments-flag, prolog-object-end-to-0-flag)
+        (prolog-left-indent-regexp, prolog-paren-indent-p)
+        (prolog-paren-indent, prolog-parse-mode, prolog-keywords)
+        (prolog-types, prolog-mode-specificators)
+        (prolog-determinism-specificators, prolog-directives)
+        (prolog-electric-newline-flag, prolog-hungry-delete-key-flag)
+        (prolog-electric-dot-flag)
+        (prolog-electric-dot-full-predicate-template)
+        (prolog-electric-underscore-flag, prolog-electric-tab-flag)
+        (prolog-electric-if-then-else-flag, prolog-electric-colon-flag)
+        (prolog-electric-dash-flag, prolog-old-sicstus-keys-flag)
+        (prolog-program-switches, prolog-prompt-regexp)
+        (prolog-debug-on-string, prolog-debug-off-string)
+        (prolog-trace-on-string, prolog-trace-off-string)
+        (prolog-zip-on-string, prolog-zip-off-string)
+        (prolog-use-standard-consult-compile-method-flag)
+        (prolog-use-prolog-tokenizer-flag, prolog-imenu-flag)
+        (prolog-imenu-max-lines, prolog-info-predicate-index)
+        (prolog-underscore-wordchar-flag, prolog-use-sicstus-sd)
+        (prolog-char-quote-workaround):
+        * progmodes/cc-vars.el (c-defun-tactic):
+        * net/tramp.el (tramp-encoding-command-interactive)
+        (tramp-local-end-of-line):
+        * net/soap-client.el (soap-client):
+        * net/netrc.el (netrc-file):
+        * net/gnutls.el (gnutls):
+        * minibuffer.el (completion-category-overrides)
+        (completion-cycle-threshold)
+        (completion-pcm-complete-word-inserts-delimiters):
+        * man.el (Man-name-local-regexp):
+        * mail/feedmail.el (feedmail-display-full-frame):
+        * international/characters.el (glyphless-char-display-control):
+        * eshell/em-ls.el (eshell-ls-date-format):
+        * emacs-lisp/cl-indent.el (lisp-lambda-list-keyword-alignment)
+        (lisp-lambda-list-keyword-parameter-indentation)
+        (lisp-lambda-list-keyword-parameter-alignment):
+        * doc-view.el (doc-view-image-width, doc-view-unoconv-program):
+        * dired-x.el (dired-omit-verbose):
+        * cus-theme.el (custom-theme-allow-multiple-selections):
+        * calc/calc.el (calc-highlight-selections-with-faces)
+        (calc-lu-field-reference, calc-lu-power-reference)
+        (calc-note-threshold):
+        * battery.el (battery-mode-line-limit):
+        * arc-mode.el (archive-7z-extract, archive-7z-expunge)
+        (archive-7z-update):
+        * allout.el (allout-prefixed-keybindings)
+        (allout-unprefixed-keybindings)
+        (allout-inhibit-auto-fill-on-headline)
+        (allout-flattened-numbering-abbreviation):
+        * allout-widgets.el (allout-widgets-auto-activation)
+        (allout-widgets-icons-dark-subdir)
+        (allout-widgets-icons-light-subdir, allout-widgets-icon-types)
+        (allout-widgets-theme-dark-background)
+        (allout-widgets-theme-light-background)
+        (allout-widgets-item-image-properties-emacs)
+        (allout-widgets-item-image-properties-xemacs)
+        (allout-widgets-run-unit-tests-on-load)
+        (allout-widgets-time-decoration-activity)
+        (allout-widgets-hook-error-post-time)
+        (allout-widgets-track-decoration):
+        Add missing :version tags to new defcustoms and defgroups.
+
+        * progmodes/sql.el (sql-ansi-statement-starters)
+        (sql-oracle-statement-starters): Add custom type.
+
+        * progmodes/prolog.el: Remove leading '*' from defcustom docs.
+        (prolog-system-version): Give it a type.
+
+2012-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * term/pc-win.el (x-select-text, x-selection-owner-p)
+        (x-own-selection-internal, x-disown-selection-internal)
+        (x-get-selection-internal): Sync doc strings and argument lists
+        with xselect.c, common-win.el and x-win.el.  (Bug#10783)
+
+2012-02-11  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/python.el (python-end-of-statement): Fix infinite
+        loop.  (Bug#10788)
+
+2012-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * international/mule-cmds.el (unify-8859-on-encoding-mode)
+        (unify-8859-on-decoding-mode): Properly mark as obsolete.
+
+2012-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * 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
+        into own function for reuse by emacsbug.el.
+
+2012-02-10  Leo Liu  <sdl.web@gmail.com>
+
+        * subr.el (condition-case-unless-debug): Rename from
+        condition-case-no-debug.  All callers changed.
+        (with-demoted-errors): Fix caller.
+
+        * vc/diff-mode.el (diff-auto-refine-mode, diff-hunk):
+        * nxml/rng-valid.el (rng-do-some-validation):
+        * 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.
+
+2012-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * textmodes/bibtex.el:
+        Add missing :version tags for new/changed defcustoms.
+
+        * files.el (remote-file-name-inhibit-cache): Doc fixes.
+
 2012-02-09  Lars Ingebrigtsen  <larsi@rusty>
 
         * mail/smtpmail.el (smtpmail-user-mail-address): New function.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 0e4a4c6e5a7..86d567bcdde 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -9,6 +9,21 @@
 ;; Keywords: outlines
 ;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout
 
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 ;;; Commentary:
 
 ;; This is an allout outline-mode add-on that highlights outline structure
@@ -131,6 +146,7 @@ explicitly invoke `allout-widgets-mode' in allout buffers where
 you want allout widgets operation.
 
 See `allout-widgets-mode' for allout widgets mode features."
+  :version "24.1"
   :type 'boolean
   :group 'allout-widgets
   :set 'allout-widgets-setup
@@ -155,16 +171,19 @@ See `allout-widgets-mode' for allout widgets mode features."
 ;;;_  = allout-widgets-icons-dark-subdir
 (defcustom allout-widgets-icons-dark-subdir "icons/allout-widgets/dark-bg/"
   "Directory on `image-load-path' holding allout icons for dark backgrounds."
+  :version "24.1"
   :type 'string
   :group 'allout-widgets)
 ;;;_  = allout-widgets-icons-light-subdir
 (defcustom allout-widgets-icons-light-subdir "icons/allout-widgets/light-bg/"
   "Directory on `image-load-path' holding allout icons for light backgrounds."
+  :version "24.1"
   :type 'string
   :group 'allout-widgets)
 ;;;_  = allout-widgets-icon-types
 (defcustom allout-widgets-icon-types '(xpm png)
   "File extensions for the icon graphic format types, in order of preference."
+  :version "24.1"
   :type '(repeat symbol)
   :group 'allout-widgets)
 
@@ -172,23 +191,27 @@ See `allout-widgets-mode' for allout widgets mode features."
 ;;;_   = allout-widgets-theme-dark-background
 (defcustom allout-widgets-theme-dark-background "allout-dark-bg"
   "Identify the outline's icon theme to use with a dark background."
+  :version "24.1"
   :type '(string)
   :group 'allout-widgets)
 ;;;_   = allout-widgets-theme-light-background
 (defcustom allout-widgets-theme-light-background "allout-light-bg"
   "Identify the outline's icon theme to use with a light background."
+  :version "24.1"
   :type '(string)
   :group 'allout-widgets)
 ;;;_   = allout-widgets-item-image-properties-emacs
 (defcustom allout-widgets-item-image-properties-emacs
   '(:ascent center :mask (heuristic t))
   "*Default properties item widget images in mainline Emacs."
+  :version "24.1"
   :type 'plist
   :group 'allout-widgets)
 ;;;_   = allout-widgets-item-image-properties-xemacs
 (defcustom allout-widgets-item-image-properties-xemacs
   nil
   "*Default properties item widget images in XEmacs."
+  :version "24.1"
   :type 'plist
   :group 'allout-widgets)
 ;;;_  . Developer
@@ -204,6 +227,7 @@ doing byte-compilation with a repeat count, so the file is loaded after
 compilation.)
 
 See `allout-widgets-run-unit-tests' to see what's run."
+  :version "24.1"
   :type 'boolean
   :group 'allout-widgets-developer)
 ;;;_   = allout-widgets-time-decoration-activity
@@ -215,6 +239,7 @@ The details are retained as the value of
 
 Generally, allout widgets code developers are the only ones who'll want to
 set this."
+  :version "24.1"
   :type 'boolean
   :group 'allout-widgets-developer)
 ;;;_   = allout-widgets-hook-error-post-time 0
@@ -224,6 +249,7 @@ set this."
 0 is minimal, or nil to not post to the message area.
 
 This is for debugging purposes."
+  :version "24.1"
   :type 'integer
   :group 'allout-widgets-developer)
 ;;;_   = allout-widgets-maintain-tally nil
@@ -235,6 +261,7 @@ This is for debugging purposes.
 The tally shows the total number of item widgets in the current
 buffer, and tracking increases as new widgets are added and
 decreases as obsolete widgets are garbage collected."
+  :version "24.1"
   :type 'boolean
   :group 'allout-widgets-developer)
 (defvar allout-widgets-tally nil
@@ -268,6 +295,7 @@ The number varies according to the evanescence of objects on a
 This is for debugging purposes, and generally set at need in a
 buffer rather than as a prevailing configuration \(but it's handy
 to publicize it by making it a customization variable\)."
+  :version "24.1"
   :type 'boolean
   :group 'allout-widgets-developer)
 (make-variable-buffer-local 'allout-widgets-track-decoration)
diff --git a/lisp/allout.el b/lisp/allout.el
index d673c7dba0b..3eed3c7d23e 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -240,6 +240,7 @@ See the existing keys for examples.
 Functions can be bound to multiple keys, but binding keys to
 multiple functions will not work - the last binding for a key
 prevails."
+  :version "24.1"
   :type 'allout-keybindings-binding
   :group 'allout-keybindings
   :set 'allout-compose-and-institute-keymap
@@ -263,6 +264,7 @@ Use vector format for the keys:
     parentheses, with the literal key, as above, preceded by the name(s)
     of the modifiers, eg: [(control ?a)]
 See the existing keys for examples."
+  :version "24.1"
   :type 'allout-keybindings-binding
   :group 'allout-keybindings
   :set 'allout-compose-and-institute-keymap
@@ -402,6 +404,7 @@ else allout's special hanging-indent maintaining auto-fill function,
 ;;;_  = allout-inhibit-auto-fill-on-headline
 (defcustom allout-inhibit-auto-fill-on-headline nil
   "If non-nil, auto-fill will be inhibited while on topic's header line."
+  :version "24.1"
   :type 'boolean
   :group 'allout)
 (make-variable-buffer-local 'allout-inhibit-auto-fill-on-headline)
@@ -764,6 +767,7 @@ Set this var to the bullet you want to use for file cross-references."
   "If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic
 numbers to minimal amount with some context.  Otherwise, entire
 numbers are always used."
+  :version "24.1"
   :type 'boolean
   :group 'allout)
 
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 83862555c80..8b17208983f 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -322,6 +322,7 @@ Archive and member name will be added."
   "Program and its options to run in order to extract a 7z file member.
 Extraction should happen to standard output.  Archive and member name will
 be added."
+  :version "24.1"
   :type '(list (string :tag "Program")
                (repeat :tag "Options"
                        :inline t
@@ -332,6 +333,7 @@ be added."
   '("7z" "d")
   "Program and its options to run in order to delete 7z file members.
 Archive and member names will be added."
+  :version "24.1"
   :type '(list (string :tag "Program")
                (repeat :tag "Options"
                        :inline t
@@ -343,6 +345,7 @@ Archive and member names will be added."
   "Program and its options to run in order to update a 7z file member.
 Options should ensure that specified directory will be put into the 7z
 file.  Archive and member name will be added."
+  :version "24.1"
   :type '(list (string :tag "Program")
                (repeat :tag "Options"
                        :inline t
diff --git a/lisp/battery.el b/lisp/battery.el
index a3be2fe4b88..586be9e8938 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -110,6 +110,7 @@ string are substituted as defined by the current value of the variable
 
 (defcustom battery-mode-line-limit 100
   "Percentage of full battery load below which display battery status"
+  :version "24.1"
   :type 'integer
   :group 'battery)
 
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 5789e23ac74..41cdb491cfa 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -431,24 +431,28 @@ If `calc-show-selections' is non-nil, then selected sub-formulas are shown
 by displaying the rest of the formula in `calc-nonselected-face'.
 If `calc-show-selections' is nil, then selected sub-formulas are shown
 by displaying the sub-formula in `calc-selected-face'."
+  :version "24.1"
   :group 'calc
   :type 'boolean)
 
 (defcustom calc-lu-field-reference
   "20 uPa"
   "The default reference level for logarithmic units (field)."
+  :version "24.1"
   :group 'calc
   :type '(string))
 
 (defcustom calc-lu-power-reference
   "mW"
   "The default reference level for logarithmic units (power)."
+  :version "24.1"
   :group 'calc
   :type '(string))
 
 (defcustom calc-note-threshold "1"
   "The number of cents that a frequency should be near a note
 to be identified as that note."
+  :version "24.1"
   :type 'string
   :group 'calc)
 
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 6bddb02add6..79799049378 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -521,6 +521,7 @@ It includes all faces in list FACES."
 
 (defcustom custom-theme-allow-multiple-selections nil
   "Whether to allow multi-selections in the *Custom Themes* buffer."
+  :version "24.1"
   :type 'boolean
   :group 'custom-buffer)
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 2f79cc05e79..674ce72dba3 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1158,7 +1158,7 @@ directory DIRNAME."
       (desktop-load-file desktop-buffer-major-mode)
       (let ((buffer-list (buffer-list))
             (result
-             (condition-case-no-debug err
+             (condition-case-unless-debug err
                  (funcall (or (cdr (assq desktop-buffer-major-mode
                                          desktop-buffer-mode-handlers))
                               'desktop-restore-file-buffer)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 9b54954695b..067d15764f8 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -172,6 +172,7 @@ files and lock files."
 (defcustom dired-omit-verbose t
   "When non-nil, show messages when omitting files.
 When nil, don't show messages."
+  :version "24.1"
   :type 'boolean
   :group 'dired-x)
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 3962ef14aa4..b683cb15b88 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4196,7 +4196,7 @@ instead.
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "dired-x" "dired-x.el" "8d995933a8d82be3a8662d7eff7543cc")
+;;;;;;  "dired-x" "dired-x.el" "bc516591d881911d72b58eeed8816576")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index f31487e62bd..53e7811bad1 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -172,6 +172,7 @@ Higher values result in larger images."
 (defcustom doc-view-image-width 850
   "Default image width.
 Has only an effect if imagemagick support is compiled into emacs."
+  :version "24.1"
   :type 'number
   :group 'doc-view)
 
@@ -201,6 +202,7 @@ If this and `doc-view-dvipdfm-program' are set,
   "Program to convert any file type readable by OpenOffice.org to PDF.
 
 Needed for viewing OpenOffice.org (and MS Office) files."
+  :version "24.1"
   :type 'file
   :group 'doc-view)
 
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index e0d8ffaba90..09dde2c1c17 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -348,10 +348,7 @@
 ;; first argument list defined in the list of before/around/after advices.
 ;; The values of <arglist> variables can be accessed/changed in the body of
 ;; an advice by simply referring to them by their original name, however,
-;; more portable argument access macros are also provided (see below).  For
-;; subrs/special-forms for which neither explicit argument list definitions
-;; are available, nor their documentation strings contain such definitions
-;; (as they do v19s), `(&rest ad-subr-args)' will be used.
+;; more portable argument access macros are also provided (see below).
 
 ;; <advised-docstring> is an optional, special documentation string which will
 ;; be expanded into a proper documentation string upon call of `documentation'.
@@ -491,17 +488,15 @@
 
 ;; @@@ Argument list mapping:
 ;; ==========================
-;; Because `defadvice' allows the specification of the argument list of the
-;; advised function we need a mapping mechanism that maps this argument list
-;; onto that of the original function. For example, somebody might specify
-;; `(sym newdef)' as the argument list of `fset', while advice might use
-;; `(&rest ad-subr-args)' as the argument list of the original function
-;; (depending on what Emacs version is used). Hence SYM and NEWDEF have to
-;; be properly mapped onto the &rest variable when the original definition is
-;; called. Advice automatically takes care of that mapping, hence, the advice
-;; programmer can specify an argument list without having to know about the
-;; exact structure of the original argument list as long as the new argument
-;; list takes a compatible number/magnitude of actual arguments.
+;; Because `defadvice' allows the specification of the argument list
+;; of the advised function we need a mapping mechanism that maps this
+;; argument list onto that of the original function. Hence SYM and
+;; NEWDEF have to be properly mapped onto the &rest variable when the
+;; original definition is called. Advice automatically takes care of
+;; that mapping, hence, the advice programmer can specify an argument
+;; list without having to know about the exact structure of the
+;; original argument list as long as the new argument list takes a
+;; compatible number/magnitude of actual arguments.
 
 ;; @@ Activation and deactivation:
 ;; ===============================
@@ -884,9 +879,6 @@
 ;; @@ Summary of forms with special meanings when used within an advice:
 ;; =====================================================================
 ;;   ad-return-value   name of the return value variable (get/settable)
-;;   ad-subr-args      name of &rest argument variable used for advised
-;;                     subrs whose actual argument list cannot be
-;;                     determined (get/settable)
 ;;   (ad-get-arg <pos>), (ad-get-args <pos>),
 ;;   (ad-set-arg <pos> <value>), (ad-set-args <pos> <value-list>)
 ;;                     argument access text macros to get/set the values of
@@ -2594,36 +2586,6 @@ For that it has to be fbound with a non-autoload definition."
          (byte-compile symbol)
          (fset function (symbol-function symbol))))))
 
-
-;; @@ Constructing advised definitions:
-;; ====================================
-;;
-;; Main design decisions about the form of advised definitions:
-;;
-;; A) How will original definitions be called?
-;; B) What will argument lists of advised functions look like?
-;;
-;; Ad A)
-;;    I chose to use function indirection for all four types of original
-;;    definitions (functions, macros, subrs and special forms), i.e., create
-;;    a unique symbol `ad-Orig-<name>' which is fbound to the original
-;;    definition and call it according to type and arguments.  Functions and
-;;    subrs that don't have any &rest arguments can be called directly in a
-;;    `(ad-Orig-<name> ....)' form.  If they have a &rest argument we have to
-;;    use `apply'.  Macros will be called with
-;;    `(macroexpand '(ad-Orig-<name> ....))', and special forms also need a
-;;    form like that with `eval' instead of `macroexpand'.
-;;
-;; Ad B)
-;;    Use original arguments where possible and `(&rest ad-subr-args)'
-;;    otherwise, even though this seems to be more complicated and less
-;;    uniform than a general `(&rest args)' approach.  My reason to still
-;;    do it that way is that in most cases my approach leads to the more
-;;    efficient form for the advised function, and portability (e.g., to
-;;    make the same advice work regardless of whether something is a
-;;    function or a subr) can still be achieved with argument access macros.
-
-
 (defun ad-prognify (forms)
   (cond ((<= (length forms) 1)
          (car forms))
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 0a690af572c..01bdfbf4bf2 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -104,6 +104,7 @@ If non-nil, alignment is done with the first keyword
 \(defun foo (arg1 arg2 &rest rest
                       &key key1 key2)
   #|...|#)"
+  :version "24.1"
   :type 'boolean
   :group 'lisp-indent)
 
@@ -111,6 +112,7 @@ If non-nil, alignment is done with the first keyword
   "Indentation of lambda list keyword parameters.
 See `lisp-lambda-list-keyword-parameter-alignment'
 for more information."
+  :version "24.1"
   :type 'integer
   :group 'lisp-indent)
 
@@ -130,6 +132,7 @@ If non-nil, alignment is done with the first parameter
 \(defun foo (arg1 arg2 &key key1 key2
                             key3 key4)
   #|...|#)"
+  :version "24.1"
   :type 'boolean
   :group 'lisp-indent)
 
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index c729ca22610..dd9ee259b6d 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -286,7 +286,7 @@ This also does some trivial optimizations to make the form prettier.
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "d823fe159b79b4f85f49a3fbe463d848")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "045f9588e561616741b5f9aef96ce7df")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 317fa1fd23d..d80454ba269 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1103,7 +1103,7 @@ makes them available for download."
   (unless (file-exists-p package-user-dir)
     (make-directory package-user-dir t))
   (dolist (archive package-archives)
-    (condition-case-no-debug nil
+    (condition-case-unless-debug nil
         (package--download-one-archive archive "archive-contents")
       (error (message "Failed to download `%s' archive."
                       (car archive)))))
@@ -1608,7 +1608,7 @@ packages marked for deletion are removed."
                                 delete-list
                                 ", "))))
           (dolist (elt delete-list)
-            (condition-case-no-debug err
+            (condition-case-unless-debug err
                 (package-delete (car elt) (cdr elt))
               (error (message (cadr err)))))
         (error "Aborted")))
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index af60cdc1260..144b4dda8e2 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -61,6 +61,7 @@ properties to colorize its output based on the setting of
   "How to display time information in `eshell-ls-file'.
 This is passed to `format-time-string' as a format string.
 To display the date using the current locale, use \"%b \%e\"."
+  :version "24.1"
   :type 'string
   :group 'eshell-ls)
 
diff --git a/lisp/files.el b/lisp/files.el
index 7bb44098223..87218c9a6e8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -981,20 +981,18 @@ Tip: You can use this expansion of remote identifier components
 
 (defcustom remote-file-name-inhibit-cache 10
   "Whether to use the remote file-name cache for read access.
-
-When `nil', always use the cached values.
-When `t', never use them.
-A number means use them for that amount of seconds since they were
-cached.
-
-File attributes of remote files are cached for better performance.
-If they are changed out of Emacs' control, the cached values
-become invalid, and must be invalidated.
-
-In case a remote file is checked regularly, it might be
-reasonable to let-bind this variable to a value less then the
-time period between two checks.
-Example:
+When `nil', never expire cached values (caution)
+When `t', never use the cache (safe, but may be slow)
+A number means use cached values for that amount of seconds since caching.
+
+The attributes of remote files are cached for better performance.
+If they are changed outside of Emacs's control, the cached values
+become invalid, and must be reread.  If you are sure that nothing
+other than Emacs changes the files, you can set this variable to `nil'.
+
+If a remote file is checked regularly, it might be a good idea to
+let-bind this variable to a value less than the interval between
+consecutive checks.  For example:
 
   (defun display-time-file-nonempty-p (file)
     (let ((remote-file-name-inhibit-cache (- display-time-interval 5)))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index befed33abba..9f9445bdea9 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2272,7 +2272,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                  "save-selected-window" "save-window-excursion"
                  "save-match-data" "save-current-buffer"
                  "combine-after-change-calls" "unwind-protect"
-                 "condition-case" "condition-case-no-debug"
+                 "condition-case" "condition-case-unless-debug"
                  "track-mouse" "eval-after-load" "eval-and-compile"
                  "eval-when-compile" "eval-when" "eval-next-after-load"
                  "with-case-table" "with-category-table"
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9305114b634..99554cd9ffe 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,51 @@
+2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-record-commands): New variable.
+        (nnimap-log-command): Use it.
+        (nnimap-make-process-buffer): Add a space to the process buffer.
+        (nnimap-transform-headers): Don't bug out on header lines containing
+        stuff that look like IMAP length encodings.
+
+        * shr.el (shr-rescale-image): Allow viewing large images.
+
+2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnml.el (nnml-request-compact-group): Delete the marks file after
+        compaction (bug#10800).
+
+        * gnus-art.el (gnus-stop-downloads): Stop `url-queue' downloads on
+        group exit.
+
+        * nnimap.el (nnimap-parse-flags): Parse correctly when we have mixed
+        QRESYNC/FETCH output.
+
+2012-02-11  Glenn Morris  <rgm@gnu.org>
+
+        * sieve-manage.el (sieve-manage-default-stream):
+        * shr.el (shr):
+        * nnir.el (nnir-ignored-newsgroups, nnir-summary-line-format)
+        (nnir-retrieve-headers-override-function)
+        (nnir-imap-default-search-key, nnir-notmuch-program)
+        (nnir-notmuch-additional-switches, nnir-notmuch-remove-prefix)
+        (nnir-method-default-engines):
+        * message.el (message-cite-reply-position):
+        * gssapi.el (gssapi-program):
+        * gravatar.el (gravatar):
+        * gnus-sum.el (gnus-refer-thread-use-nnir):
+        * gnus-registry.el (gnus-registry-unfollowed-addresses)
+        (gnus-registry-max-pruned-entries):
+        * gnus-picon.el (gnus-picon-inhibit-top-level-domains):
+        * gnus-int.el (gnus-after-set-mark-hook)
+        (gnus-before-update-mark-hook):
+        * gnus-async.el (gnus-async-post-fetch-function):
+        * auth-source.el (auth-source-cache-expiry):
+        Add missing :version tags to new defcustoms and defgroups.
+
+2012-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-default-send-mail-function): Made into own
+        function for reuse by emacsbug.el.
+
 2012-02-09  Juanma Barranquero  <lekktu@gmail.com>
 
         * gnus.el (gnus-method-ephemeral-p): Move after declaration of defsubst
@@ -39,7 +87,7 @@
         have newlines within the strings, and where the UID comes after the
         BODYSTRUCTURE element (bug#10537).
 
-        * shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix
+        * shr-color.el (shr-color-set-minimum-interval): Rename to add prefix
         (bug#10732).
 
         * shr.el (shr-insert-document): Add doc string.
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 5e946372d04..80a3b91b60a 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -84,6 +84,7 @@
   "How many seconds passwords are cached, or nil to disable
 expiring.  Overrides `password-cache-expiry' through a
 let-binding."
+  :version "24.1"
   :group 'auth-source
   :type '(choice (const :tag "Never" nil)
                  (const :tag "All Day" 86400)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index b282afd961c..048f8956567 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4582,6 +4582,10 @@ commands:
     (when (eq (elt timer 5) 'image-animate-timeout)
       (cancel-timer timer))))
 
+(defun gnus-stop-downloads ()
+  (when (boundp 'url-queue)
+    (set (intern "url-queue" obarray) nil)))
+
 ;; Set article window start at LINE, where LINE is the number of lines
 ;; from the head of the article.
 (defun gnus-article-set-window-start (&optional line)
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 378b0e063cb..603952dd17b 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -74,6 +74,7 @@ It should return non-nil if the article is to be prefetched."
   "Function called after an article has been prefetched.
 The function will be called narrowed to the region of the article
 that was fetched."
+  :version "24.1"
   :group 'gnus-asynchronous
   :type 'function)
 
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 20add470abe..8dc691ffe42 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -43,11 +43,13 @@
 
 (defcustom gnus-after-set-mark-hook nil
   "Hook called just after marks are set in a group."
+  :version "24.1"
   :group 'gnus-start
   :type 'hook)
 
 (defcustom gnus-before-update-mark-hook nil
   "Hook called just before marks are updated in a group."
+  :version "24.1"
   :group 'gnus-start
   :type 'hook)
 
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 69b65dfcb03..2f347efe579 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -87,6 +87,7 @@ added right to the textual representation."
 (defcustom gnus-picon-inhibit-top-level-domains t
   "If non-nil, don't piconify top-level domains.
 These are often not very interesting."
+  :version "24.1"
   :type 'boolean
   :group 'gnus-picon)
 
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 9df6dc4ab6f..f1618b376ef 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -142,6 +142,7 @@ display.")
 The addresses are matched, they don't have to be fully qualified.
 In the messages, these addresses can be the sender or the
 recipients."
+  :version "24.1"
   :group 'gnus-registry
   :type '(repeat regexp))
 
@@ -243,6 +244,7 @@ the Bit Bucket."
 
 (defcustom gnus-registry-max-pruned-entries nil
   "Maximum number of pruned entries in the registry, nil for unlimited."
+  :version "24.1"
   :group 'gnus-registry
   :type '(radio (const :format "Unlimited " nil)
                 (integer :format "Maximum number: %v")))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 63482eea1c4..8ae8d0b8ae2 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -122,6 +122,7 @@ If t, fetch all the available old headers."
   "*Use nnir to search an entire server when referring threads. A
 nil value will only search for thread-related articles in the
 current group."
+  :version "24.1"
   :group 'gnus-thread
   :type 'boolean)
 
@@ -7318,6 +7319,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
       (when (gnus-buffer-live-p gnus-article-buffer)
         (with-current-buffer gnus-article-buffer
           (gnus-article-stop-animations)
+          (gnus-stop-downloads)
           (mm-destroy-parts gnus-article-mime-handles)
           ;; Set it to nil for safety reason.
           (setq gnus-article-mime-handle-alist nil)
@@ -9655,6 +9657,7 @@ C-u g', show the raw article."
       (when (gnus-buffer-live-p gnus-article-buffer)
         (with-current-buffer gnus-article-buffer
           (gnus-article-stop-animations)
+          (gnus-stop-downloads)
           (mm-destroy-parts gnus-article-mime-handles)
           ;; Set it to nil for safety reason.
           (setq gnus-article-mime-handle-alist nil)
diff --git a/lisp/gnus/gravatar.el b/lisp/gnus/gravatar.el
index 75e74803743..a10ea21b96b 100644
--- a/lisp/gnus/gravatar.el
+++ b/lisp/gnus/gravatar.el
@@ -29,6 +29,7 @@
 
 (defgroup gravatar nil
   "Gravatar."
+  :version "24.1"
   :group 'comm)
 
 (defcustom gravatar-automatic-caching t
diff --git a/lisp/gnus/gssapi.el b/lisp/gnus/gssapi.el
index 4bc93924723..ab8831dc49e 100644
--- a/lisp/gnus/gssapi.el
+++ b/lisp/gnus/gssapi.el
@@ -37,6 +37,7 @@
 and %l with the user name.  The program should accept commands on
 stdin and return responses to stdout.  Each entry in the list is
 tried until a successful connection is made."
+  :version "24.1"
   :group 'network
   :type '(repeat string))
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5678acc5a2f..4ce9279114b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -655,14 +655,16 @@ Done before generating the new subject of a forward."
         (t
          (error "Don't know how to send mail.  Please customize `message-send-mail-function'"))))
 
-;; Useful to set in site-init.el
-(defcustom message-send-mail-function
+(defun message-default-send-mail-function ()
   (cond ((eq send-mail-function 'smtpmail-send-it) 'message-smtpmail-send-it)
         ((eq send-mail-function 'feedmail-send-it) 'feedmail-send-it)
         ((eq send-mail-function 'sendmail-query-once) 'sendmail-query-once)
         ((eq send-mail-function 'mailclient-send-it)
          'message-send-mail-with-mailclient)
-        (t (message-send-mail-function)))
+        (t (message-send-mail-function))))
+
+;; Useful to set in site-init.el
+(defcustom message-send-mail-function (message-default-send-mail-function)
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line whose contents match the
 variable `mail-header-separator'.
@@ -1093,6 +1095,7 @@ probably want to set this variable only for specific groups,
 e.g. using `gnus-posting-styles':
 
   (eval (set (make-local-variable 'message-cite-reply-position) 'above))"
+  :version "24.1"
   :type '(choice (const :tag "Reply inline" 'traditional)
                  (const :tag "Reply above" 'above)
                  (const :tag "Reply below" 'below))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index de4d248c624..c6f0f7a97e8 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -201,7 +201,10 @@ textual parts.")
         (while (re-search-forward
                 "[^]][ (]{\\([0-9]+\\)}\r?\n"
                 (save-excursion
-                  (or (re-search-forward "\\* [0-9]+ FETCH" nil t)
+                  ;; Start of the header section.
+                  (or (re-search-forward "] {[0-9]+}\r?\n" nil t)
+                      ;; Start of the next FETCH.
+                      (re-search-forward "\\* [0-9]+ FETCH" nil t)
                       (point-max)))
                 t)
           (setq size (string-to-number (match-string 1)))
@@ -289,7 +292,7 @@ textual parts.")
 
 (defun nnimap-make-process-buffer (buffer)
   (with-current-buffer
-      (generate-new-buffer (format "*nnimap %s %s %s*"
+      (generate-new-buffer (format " *nnimap %s %s %s*"
                                    nnimap-address nnimap-server-port
                                    (gnus-buffer-exists-p buffer)))
     (mm-disable-multibyte)
@@ -1539,7 +1542,8 @@ textual parts.")
 
 (defun nnimap-parse-flags (sequences)
   (goto-char (point-min))
-  ;; Change \Delete etc to %Delete, so that the reader can read it.
+  ;; Change \Delete etc to %Delete, so that the Emacs Lisp reader can
+  ;; read it.
   (subst-char-in-region (point-min) (point-max)
                         ?\\ ?% t)
   ;; Remove any MODSEQ entries in the buffer, because they may contain
@@ -1610,7 +1614,9 @@ textual parts.")
                              vanished highestmodseq)
                        articles)
                 groups)
-          (goto-char end)
+          (if (eq flag-sequence 'qresync)
+              (goto-char end)
+            (setq end (point)))
           (setq articles nil))))
     groups))
 
@@ -1693,13 +1699,17 @@ textual parts.")
     (nnimap-wait-for-response nnimap-sequence))
   nnimap-sequence)
 
+(defvar nnimap-record-commands nil
+  "If non-nil, log commands to the \"*imap log*\" buffer.")
+
 (defun nnimap-log-command (command)
-  (with-current-buffer (get-buffer-create "*imap log*")
-    (goto-char (point-max))
-    (insert (format-time-string "%H:%M:%S") " "
-            (if nnimap-inhibit-logging
-                "(inhibited)\n"
-              command)))
+  (when nnimap-record-commands
+    (with-current-buffer (get-buffer-create "*imap log*")
+      (goto-char (point-max))
+      (insert (format-time-string "%H:%M:%S") " "
+              (if nnimap-inhibit-logging
+                  "(inhibited)\n"
+                command))))
   command)
 
 (defun nnimap-command (&rest args)
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 1d4f1c25a09..d1ca0213ed9 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -310,6 +310,7 @@ is `(valuefunc member)'."
 (defcustom nnir-ignored-newsgroups ""
   "*A regexp to match newsgroups in the active file that should
   be skipped when searching."
+  :version "24.1"
   :type '(regexp)
   :group 'nnir)
 
@@ -324,6 +325,7 @@ with three items unique to nnir summary buffers:
 %g    Article original short group name (string)
 
 If nil this will use `gnus-summary-line-format'."
+  :version "24.1"
   :type '(string)
   :group 'nnir)
 
@@ -335,6 +337,7 @@ retrieved header format.
 
 If this variable is nil, or if the provided function returns nil for a search
 result, `gnus-retrieve-headers' will be called instead."
+  :version "24.1"
   :type '(function)
   :group 'nnir)
 
@@ -342,6 +345,7 @@ result, `gnus-retrieve-headers' will be called instead."
   "*The default IMAP search key for an nnir search. Must be one of
   the keys in `nnir-imap-search-arguments'. To use raw imap queries
   by default set this to \"Imap\"."
+  :version "24.1"
   :type `(choice ,@(mapcar (lambda (elem) (list 'const (car elem)))
                            nnir-imap-search-arguments))
   :group 'nnir)
@@ -503,6 +507,7 @@ arrive at the correct group name, \"mail.misc\"."
 
 (defcustom nnir-notmuch-program "notmuch"
   "*Name of notmuch search executable."
+  :version "24.1"
   :type '(string)
   :group 'nnir)
 
@@ -513,6 +518,7 @@ Note that this should be a list.  Ie, do NOT use the following:
     (setq nnir-notmuch-additional-switches \"-i -w\") ; wrong
 Instead, use this:
     (setq nnir-notmuch-additional-switches '(\"-i\" \"-w\"))"
+  :version "24.1"
   :type '(repeat (string))
   :group 'nnir)
 
@@ -523,6 +529,7 @@ regular expression.
 
 This variable is very similar to `nnir-namazu-remove-prefix', except
 that it is for notmuch, not Namazu."
+  :version "24.1"
   :type '(regexp)
   :group 'nnir)
 
@@ -573,6 +580,7 @@ Add an entry here when adding a new search engine.")
   '((nnimap . imap)
     (nntp . gmane))
   "*Alist of default search engines keyed by server method."
+  :version "24.1"
   :type `(repeat (cons (choice (const nnimap) (const nttp) (const nnspool)
                                (const nneething) (const nndir) (const nnmbox)
                                (const nnml) (const nnmh) (const nndraft)
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index acb23ed1693..b8652600ae7 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1298,6 +1298,9 @@ Use the nov database for the current group if available."
           (nnml-save-nov)
           ;; b/ Save the active file:
           (nnmail-save-active nnml-group-alist nnml-active-file)
+          (let ((marks (nnml-group-pathname group nnml-marks-file-name server)))
+            (when (file-exists-p marks)
+              (delete-file marks)))
           t)))))
 
 (defun nnml-request-compact (&optional server)
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 386c9c62b67..47622f5183d 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -35,6 +35,7 @@
 
 (defgroup shr nil
   "Simple HTML Renderer"
+  :version "24.1"
   :group 'mail)
 
 (defcustom shr-max-image-proportion 0.9
@@ -556,7 +557,8 @@ the URL of the image to the kill buffer instead."
     (insert alt)))
 
 (defun shr-rescale-image (data)
-  (let ((image (create-image data nil t :ascent 100)))
+  (let* ((max-image-size nil)
+         (image (create-image data nil t :ascent 100)))
     (if (or (not (fboundp 'imagemagick-types))
             (not (get-buffer-window (current-buffer))))
         image
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 4712cab6bff..74bcbcc7899 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -157,6 +157,7 @@ for doing the actual authentication."
 (defcustom sieve-manage-default-stream 'network
   "Default stream type to use for `sieve-manage'.
 Must be a name of a stream in `sieve-manage-stream-alist'."
+  :version "24.1"
   :type 'symbol
   :group 'sieve-manage)
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 183253878f5..0175ffa4d9a 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -707,12 +707,19 @@ it is displayed along with the global value."
               (with-current-buffer standard-output
                 (setq val-start-pos (point))
                 (princ "value is ")
-                (let ((from (point)))
-                  (terpri)
-                  (pp val)
-                  (if (< (point) (+ 68 (line-beginning-position 0)))
-                      (delete-region from (1+ from))
-                    (delete-region (1- from) from))
+                (let ((from (point))
+                      (line-beg (line-beginning-position))
+                      ;;
+                      (print-rep
+                       (let ((print-quoted t))
+                         (prin1-to-string val))))
+                  (if (< (+ (length print-rep) (point) (- line-beg)) 68)
+                      (insert print-rep)
+                    (terpri)
+                    (pp val)
+                    (if (< (point) (+ 68 (line-beginning-position 0)))
+                        (delete-region from (1+ from))
+                      (delete-region (1- from) from)))
                   (let* ((sv (get variable 'standard-value))
                          (origval (and (consp sv)
                                        (condition-case nil
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index d7b55d56093..4b8ed3e21e2 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1372,7 +1372,7 @@ METHOD must be one of these symbols:
   `acronym':    display an acronym of the character in a box.  The
                 acronym is taken from `char-acronym-table', which see.
   `hex-code':   display the hexadecimal character code in a box."
-
+  :version "24.1"
   :type '(alist :key-type (symbol :tag "Character Group")
                 :value-type (symbol :tag "Display Method"))
   :options '((c0-control
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 378cbc9badd..a7fac427e41 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1,6 +1,6 @@
 ;;; mule-cmds.el --- commands for multilingual environment -*-coding: iso-2022-7bit -*-
 
-;; 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)
@@ -2863,13 +2863,18 @@ on encoding."
 ;; Backwards compatibility.  These might be better with :init-value t,
 ;; but that breaks loadup.
 (define-minor-mode unify-8859-on-encoding-mode
-  "Obsolete."
+  "Exists only for backwards compatibility."
   :group 'mule
   :global t)
+;; Doc said "obsolete" in 23.1, this statement only added in 24.1.
+(make-obsolete 'unify-8859-on-encoding-mode "don't use it." "23.1")
+
 (define-minor-mode unify-8859-on-decoding-mode
-  "Obsolete."
+  "Exists only for backwards compatibility."
   :group 'mule
   :global t)
+;; Doc said "obsolete" in 23.1, this statement only added in 24.1.
+(make-obsolete 'unify-8859-on-decoding-mode "don't use it." "23.1")
 
 (defvar nonascii-insert-offset 0)
 (make-obsolete-variable 'nonascii-insert-offset "do not use it." "23.1")
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 20b436172ba..50fcfceee35 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -32,6 +32,9 @@
 
 ;;; Code:
 
+(require 'sendmail)
+(require 'message)
+
 (defgroup emacsbug nil
   "Sending Emacs bug reports."
   :group 'maint
@@ -365,26 +368,7 @@ usually do not have translators for other languages.\n\n")))
          (string-equal (buffer-substring-no-properties (point-min) (point))
                        report-emacs-bug-orig-text)
          (error "No text entered in bug report"))
-    (or report-emacs-bug-no-confirmation
-        ;; mailclient.el does not handle From (at present).
-        (if (derived-mode-p 'message-mode)
-            (eq message-send-mail-function 'message-send-mail-with-mailclient)
-          (eq send-mail-function 'mailclient-send-it))
-        ;; Not narrowing to the headers, but that's OK.
-        (let ((from (mail-fetch-field "From")))
-          (and (or (not from)
-                   (message-bogus-recipient-p from)
-                   ;; This is the default user-mail-address.  On today's
-                   ;; systems, it seems more likely to be wrong than right,
-                   ;; since most people don't run their own mail server.
-                   (string-match (format "\\<%s@%s\\>"
-                                         (regexp-quote (user-login-name))
-                                         (regexp-quote (system-name)))
-                                 from))
-               (not (yes-or-no-p
-                     (format "Is `%s' really your email address? " from)))
-               (error "Please edit the From address and try again"))))
-    ;; The last warning for novice users.
+    ;; Warning for novice users.
     (unless (or report-emacs-bug-no-confirmation
                 (yes-or-no-p
                  "Send this bug report to the Emacs maintainers? "))
@@ -407,7 +391,32 @@ and send the mail again%s."
                                     report-emacs-bug-send-command)
                           "")))))
       (error "M-x report-emacs-bug was cancelled, please read *Bug Help* buffer"))
-
+    ;; 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)
+      (sendmail-query-user-about-smtp)
+      (when (derived-mode-p 'message-mode)
+        (setq message-send-mail-function (message-default-send-mail-function))))
+    (or report-emacs-bug-no-confirmation
+        ;; mailclient.el does not need a valid From
+        (if (derived-mode-p 'message-mode)
+            (eq message-send-mail-function 'message-send-mail-with-mailclient)
+          (eq send-mail-function 'mailclient-send-it))
+        ;; Not narrowing to the headers, but that's OK.
+        (let ((from (mail-fetch-field "From")))
+          (and (or (not from)
+                   (message-bogus-recipient-p from)
+                   ;; This is the default user-mail-address.  On today's
+                   ;; systems, it seems more likely to be wrong than right,
+                   ;; since most people don't run their own mail server.
+                   (string-match (format "\\<%s@%s\\>"
+                                         (regexp-quote (user-login-name))
+                                         (regexp-quote (system-name)))
+                                 from))
+               (not (yes-or-no-p
+                     (format "Is `%s' really your email address? " from)))
+               (error "Please edit the From address and try again"))))
     ;; Delete the uninteresting text that was just to help fill out the report.
     (rfc822-goto-eoh)
     (forward-line 1)
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 7e3d983a76c..e45bbfe2ca0 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -428,6 +428,7 @@ any other non-nil value, take the action in both cases.  Even if
 you're not confirming the sending of immediate or queued messages,
 it can still be interesting to see a lot about them as they are
 shuttled robotically onward."
+  :version "24.1"
   :group 'feedmail-misc
   :type 'boolean
   )
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 18d928e4b90..91e0b183a68 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -513,48 +513,51 @@ This also saves the value of `send-mail-function' via Customize."
   ;; a second time, probably because someone's using an old value
   ;; of send-mail-function.
   (when (eq send-mail-function 'sendmail-query-once)
-    (let* ((options `(("mail client" . mailclient-send-it)
-                      ,@(when (and sendmail-program
-                                   (executable-find sendmail-program))
-                          '(("transport" . sendmail-send-it)))
-                      ("smtp" . smtpmail-send-it)))
-           (choice
-            ;; Query the user.
-            (with-temp-buffer
-              (rename-buffer "*Emacs Mail Setup Help*" t)
-              (insert "\
+    (sendmail-query-user-about-smtp))
+  (funcall send-mail-function))
+
+(defun sendmail-query-user-about-smtp ()
+  (let* ((options `(("mail client" . mailclient-send-it)
+                    ,@(when (and sendmail-program
+                                 (executable-find sendmail-program))
+                        '(("transport" . sendmail-send-it)))
+                    ("smtp" . smtpmail-send-it)))
+         (choice
+          ;; Query the user.
+          (with-temp-buffer
+            (rename-buffer "*Emacs Mail Setup Help*" t)
+            (insert "\
  Emacs is about to send an email message, but it has not been
  configured for sending email.  To tell Emacs how to send email:
 
  - Type `"
-                      (propertize "mail client" 'face 'bold)
-                      "' to start your default email client and
+                    (propertize "mail client" 'face 'bold)
+                    "' to start your default email client and
    pass it the message text.\n\n")
-              (and sendmail-program
-                   (executable-find sendmail-program)
-                   (insert "\
+            (and sendmail-program
+                 (executable-find sendmail-program)
+                 (insert "\
  - Type `"
-                           (propertize "transport" 'face 'bold)
-                           "' to invoke the system's mail transport agent
+                         (propertize "transport" 'face 'bold)
+                         "' to invoke the system's mail transport agent
    (the `"
-                           sendmail-program
-                           "' program).\n\n"))
-              (insert "\
+                         sendmail-program
+                         "' program).\n\n"))
+            (insert "\
  - Type `"
-                      (propertize "smtp" 'face 'bold)
-                      "' to send mail directly to an \"outgoing mail\" server.
+                    (propertize "smtp" 'face 'bold)
+                    "' to send mail directly to an \"outgoing mail\" server.
    (Emacs may prompt you for SMTP settings).
 
  Emacs will record your selection and will use it thereafter.
  To change it later, customize the option `send-mail-function'.\n")
-              (goto-char (point-min))
-              (display-buffer (current-buffer))
-              (let ((completion-ignore-case t))
-                (completing-read "Send mail via: "
-                                 options nil 'require-match)))))
-      (customize-save-variable 'send-mail-function
-                               (cdr (assoc-string choice options t)))))
-  (funcall send-mail-function))
+            (goto-char (point-min))
+            (display-buffer (current-buffer))
+            (let ((completion-ignore-case t))
+              (completing-read "Send mail via: "
+                               options nil 'require-match)))))
+    (customize-save-variable 'send-mail-function
+                             (cdr (assoc-string choice options t)))))
 
 (defun sendmail-sync-aliases ()
   (when mail-personal-alias-file
diff --git a/lisp/man.el b/lisp/man.el
index fb315352749..7698cc255b7 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -224,6 +224,7 @@ the associated section number."
 (defcustom Man-name-local-regexp (concat "^" (regexp-opt '("NOM" "NAME")) "$")
   "Regexp that matches the text that precedes the command's name.
 Used in `bookmark-set' to get the default bookmark name."
+  :version "24.1"
   :type 'string :group 'bookmark)
 
 (defvar manual-program "man"
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index cb2f2d76384..611df1eb6d9 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -510,6 +510,7 @@ Each override has the shape (CATEGORY . ALIST) where ALIST is
 an association list that can specify properties such as:
 - `styles': the list of `completion-styles' to use for that category.
 - `cycle': the `completion-cycle-threshold' to use for that category."
+  :version "24.1"
   :type `(alist :key-type (choice :tag "Category"
                                   (const buffer)
                                   (const file)
@@ -612,6 +613,7 @@ If nil, cycling is never used.
 If t, cycling is always used.
 If an integer, cycling is used as soon as there are fewer completion
 candidates than this number."
+  :version "24.1"
   :type completion--cycling-threshold-type)
 
 (defun completion--cycle-threshold (metadata)
@@ -2009,12 +2011,19 @@ DIR should be an absolute directory name.  It defaults to the value of
 If this command was invoked with the mouse, use a graphical file
 dialog if `use-dialog-box' is non-nil, and the window system or X
 toolkit in use provides a file dialog box, and DIR is not a
-remote file.  For graphical file dialogs, any the special values
-of MUSTMATCH; `confirm' and `confirm-after-completion' are
-treated as equivalent to nil.
+remote file.  For graphical file dialogs, any of the special values
+of MUSTMATCH `confirm' and `confirm-after-completion' are
+treated as equivalent to nil.  Some graphical file dialogs respect
+a MUSTMATCH value of t, and some do not (or it only has a cosmetic
+effect, and does not actually prevent the user from entering a
+non-existent file).
 
 See also `read-file-name-completion-ignore-case'
 and `read-file-name-function'."
+  ;; If x-gtk-use-old-file-dialog = t (xg_get_file_with_selection),
+  ;; then MUSTMATCH is enforced.  But with newer Gtk
+  ;; (xg_get_file_with_chooser), it only has a cosmetic effect.
+  ;; The user can still type a non-existent file name.
   (funcall (or read-file-name-function #'read-file-name-default)
            prompt dir default-filename mustmatch initial predicate))
 
@@ -2310,6 +2319,7 @@ Those chars are treated as delimiters iff this variable is non-nil.
 I.e. if non-nil, M-x SPC will just insert a \"-\" in the minibuffer, whereas
 if nil, it will list all possible commands in *Completions* because none of
 the commands start with a \"-\" or a SPC."
+  :version "24.1"
   :type 'boolean)
 
 (defun completion-pcm--pattern-trivial-p (pattern)
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 17fef277736..9b734637103 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -39,6 +39,7 @@
 
 (defgroup gnutls nil
   "Emacs interface to the GnuTLS library."
+  :version "24.1"
   :prefix "gnutls-"
   :group 'net-utils)
 
@@ -46,8 +47,22 @@
   "If non-nil, this should be a TLS priority string.
 For instance, if you want to skip the \"dhe-rsa\" algorithm,
 set this variable to \"normal:-dhe-rsa\"."
+  :group 'gnutls
   :type '(choice (const nil)
-                 string))
+                 string))
+
+(defcustom gnutls-trustfiles
+  '(
+    "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux
+    "/etc/pki/tls/certs/ca-bundle.crt"   ; Fedora and RHEL
+    "/etc/ssl/ca-bundle.pem"             ; Suse
+    )
+  "List of CA bundle location filenames or a function returning said list.
+The files may be in PEM or DER format, as per the GnuTLS documentation.
+The files may not exist, in which case they will be ignored."
+  :group 'gnutls
+  :type '(choice (function :tag "Function to produce list of bundle filenames")
+                 (repeat (file :tag "Bundle filename"))))
 
 ;;;###autoload
 (defcustom gnutls-min-prime-bits nil
@@ -116,7 +131,7 @@ TYPE is `gnutls-x509pki' (default) or `gnutls-anon'.  Use nil for the default.
 PROCESS is a process returned by `open-network-stream'.
 HOSTNAME is the remote hostname.  It must be a valid string.
 PRIORITY-STRING is as per the GnuTLS docs, default is \"NORMAL\".
-TRUSTFILES is a list of CA bundles.
+TRUSTFILES is a list of CA bundles.  It defaults to `gnutls-trustfiles'.
 CRLFILES is a list of CRL files.
 KEYLIST is an alist of (client key file, client cert file) pairs.
 MIN-PRIME-BITS is the minimum acceptable size of Diffie-Hellman keys
@@ -154,18 +169,20 @@ here's a recent version of the list.
 It must be omitted, a number, or nil; if omitted or nil it
 defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
   (let* ((type (or type 'gnutls-x509pki))
-         (default-trustfile "/etc/ssl/certs/ca-certificates.crt")
          (trustfiles (or trustfiles
-                         (when (file-exists-p default-trustfile)
-                           (list default-trustfile))))
+                         (delq nil
+                               (mapcar (lambda (f) (and f (file-exists-p f) f))
+                                       (if (functionp gnutls-trustfiles)
+                                           (funcall gnutls-trustfiles)
+                                         gnutls-trustfiles)))))
          (priority-string (or priority-string
                               (cond
                                ((eq type 'gnutls-anon)
                                 "NORMAL:+ANON-DH:!ARCFOUR-128")
                                ((eq type 'gnutls-x509pki)
-                                (if gnutls-algorithm-priority
-                                    (upcase gnutls-algorithm-priority)
-                                  "NORMAL")))))
+                                (if gnutls-algorithm-priority
+                                    (upcase gnutls-algorithm-priority)
+                                  "NORMAL")))))
          (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))
          (params `(:priority ,priority-string
                              :hostname ,hostname
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index 070b32a63d0..16d9203ba04 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -39,6 +39,7 @@
 
 (defcustom netrc-file "~/.authinfo"
   "File where user credentials are stored."
+  :version "24.1"
   :type 'file
   :group 'netrc)
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index b8bf270d87c..1c74e6190dc 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2384,6 +2384,7 @@ keywords when no KEYWORD is given."
     (delete-region (match-beginning 1) (match-end 1))
     (goto-char (match-beginning 1)))
   ;; remove the ^O characters now
+  (goto-char (point-min))
   (while (re-search-forward "\C-o+" nil t)
     (delete-region (match-beginning 0) (match-end 0))))
 
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index dfa2b76899a..e17b283c55f 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -55,6 +55,7 @@
 
 (defgroup soap-client nil
   "Access SOAP web services from Emacs."
+  :version "24.1"
   :group 'tools)
 
 ;;;; Support for parsing XML documents with namespaces
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f13315bc662..851b11629f4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -181,6 +181,7 @@ See the variable `tramp-encoding-shell' for more information."
   (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i")
   "*Use this switch together with `tramp-encoding-shell' for interactive shells.
 See the variable `tramp-encoding-shell' for more information."
+  :version "24.1"
   :group 'tramp
   :type '(choice (const nil) string))
 
@@ -463,6 +464,7 @@ the remote shell.")
 (defcustom tramp-local-end-of-line
   (if (memq system-type '(windows-nt)) "\r\n" "\n")
   "*String used for end of line in local processes."
+  :version "24.1"
   :group 'tramp
   :type 'string)
 
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 6fc696361e8..61b583b56c2 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -475,7 +475,7 @@ The schema is set like `rng-auto-set-schema'."
     (save-restriction
       (widen)
       (nxml-with-invisible-motion
-        (condition-case-no-debug err
+        (condition-case-unless-debug err
             (and (rng-validate-prepare)
                  (let ((rng-dt-namespace-context-getter '(nxml-ns-get-context)))
                    (nxml-with-unmodifying-text-property-changes
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index be0f86ddd7e..95b43e763d5 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2129,7 +2129,7 @@ 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)
+            pos npos 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)))
@@ -2143,28 +2143,29 @@ comment at the start of cc-engine.el for more info."
             ;; 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))))
-               (cond
-                ((null lit)
-                 (setq pos npos)
-                 t)
-                ((<= (cdr lit) here)
-                 (setq pos (cdr lit))
-                 t)
-                (t
-                 (setq pos (car lit))
-                 nil))))
+               (or (null lit)
+                   (prog1 (<= (cdr lit) here)
+                     (setq npos (cdr lit)))))
 
-          (goto-char pos)
-          (when (and (c-beginning-of-macro) (/= (point) pos))
-              (setq macro-beg (point))
-              (c-syntactic-end-of-macro)
-              (or (eobp) (forward-char))
-              (setq pos (if (<= (point) here)
-                            (point)
-                          macro-beg)))
-            (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache)))
+             ;; 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)))
 
         (if (> pos c-state-nonlit-pos-cache-limit)
             (setq c-state-nonlit-pos-cache-limit pos))
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 374c9b434d1..2eb00e72a76 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1114,7 +1114,7 @@ Note that the style variables are always made local to the buffer."
     (goto-char (c-point 'bol new-pos))
     (when lit-limits                    ; Comment or string.
       (goto-char (car lit-limits)))
-    (setq bod-lim (max (- (point) 500) (point-min)))
+    (setq bod-lim (c-determine-limit 500))
 
     (while
         ;; Go to a less nested declaration each time round this loop.
@@ -1132,11 +1132,12 @@ Note that the style variables are always made local to the buffer."
          ;; Try and go out a level to search again.
          (progn
            (c-backward-syntactic-ws bod-lim)
-           (or (memq (char-before) '(?\( ?\[))
-               (and (eq (char-before) ?\<)
-                    (eq (c-get-char-property
-                         (1- (point)) 'syntax-table)
-                        c-<-as-paren-syntax))))
+           (and (> (point) bod-lim)
+                (or (memq (char-before) '(?\( ?\[))
+                    (and (eq (char-before) ?\<)
+                         (eq (c-get-char-property
+                              (1- (point)) 'syntax-table)
+                             c-<-as-paren-syntax)))))
          (not (bobp)))
       (backward-char))
     new-pos))                           ; back over (, [, <.
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 8efe3f27002..5201e4a26ed 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -349,6 +349,7 @@ Its value is one of:
  go-outward  -- Nested functions are also recognized.  Should a function
                 command hit the beginning/end of a nested scope, it will
                 carry on at the less nested level."
+  :version "24.1"
   :type '(radio
           (const :tag "Functions are at the top-level" t)
           (const :tag "Functions are also recognized inside declaration scopes" go-outward))
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index b531fc0dc9c..bb72984a00b 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -329,7 +329,7 @@
 ;; General configuration
 
 (defcustom prolog-system nil
-  "*Prolog interpreter/compiler used.
+  "Prolog interpreter/compiler used.
 The value of this variable is nil or a symbol.
 If it is a symbol, it determines default values of other configuration
 variables with respect to properties of the specified Prolog
@@ -341,6 +341,7 @@ mercury - Mercury
 sicstus - SICStus Prolog
 swi     - SWI Prolog
 gnu     - GNU Prolog"
+  :version "24.1"
   :group 'prolog
   :type '(choice (const :tag "SICStus" :value sicstus)
                  (const :tag "SWI Prolog" :value swi)
@@ -361,63 +362,74 @@ gnu     - GNU Prolog"
     (eclipse  (3 . 7))
     (gnu      (0 . 0)))
   ;; FIXME: This should be auto-detected instead of user-provided.
-  "*Alist of Prolog system versions.
+  "Alist of Prolog system versions.
 The version numbers are of the format (Major . Minor)."
+  :version "24.1"
+  :type '(repeat (list (symbol :tag "System")
+                       (cons :tag "Version numbers" (integer :tag "Major")
+                             (integer :tag "Minor"))))
   :group 'prolog)
 
 ;; Indentation
 
 (defcustom prolog-indent-width 4
-  "*The indentation width used by the editing buffer."
+  "The indentation width used by the editing buffer."
   :group 'prolog-indentation
   :type 'integer)
 
 (defcustom prolog-align-comments-flag t
-  "*Non-nil means automatically align comments when indenting."
+  "Non-nil means automatically align comments when indenting."
+  :version "24.1"
   :group 'prolog-indentation
   :type 'boolean)
 
 (defcustom prolog-indent-mline-comments-flag t
-  "*Non-nil means indent contents of /* */ comments.
+  "Non-nil means indent contents of /* */ comments.
 Otherwise leave such lines as they are."
+  :version "24.1"
   :group 'prolog-indentation
   :type 'boolean)
 
 (defcustom prolog-object-end-to-0-flag t
-  "*Non-nil means indent closing '}' in SICStus object definitions to level 0.
+  "Non-nil means indent closing '}' in SICStus object definitions to level 0.
 Otherwise indent to `prolog-indent-width'."
+  :version "24.1"
   :group 'prolog-indentation
   :type 'boolean)
 
 (defcustom prolog-left-indent-regexp "\\(;\\|\\*?->\\)"
-  "*Regexp for character sequences after which next line is indented.
+  "Regexp for character sequences after which next line is indented.
 Next line after such a regexp is indented to the opening parenthesis level."
+  :version "24.1"
   :group 'prolog-indentation
   :type 'regexp)
 
 (defcustom prolog-paren-indent-p nil
-  "*If non-nil, increase indentation for parenthesis expressions.
+  "If non-nil, increase indentation for parenthesis expressions.
 The second and subsequent line in a parenthesis expression other than
 a compound term can either be indented `prolog-paren-indent' to the
 right (if this variable is non-nil) or in the same way as for compound
 terms (if this variable is nil, default)."
+  :version "24.1"
   :group 'prolog-indentation
   :type 'boolean)
 
 (defcustom prolog-paren-indent 4
-  "*The indentation increase for parenthesis expressions.
+  "The indentation increase for parenthesis expressions.
 Only used in ( If -> Then ; Else) and ( Disj1 ; Disj2 ) style expressions."
+  :version "24.1"
   :group 'prolog-indentation
   :type 'integer)
 
 (defcustom prolog-parse-mode 'beg-of-clause
-  "*The parse mode used (decides from which point parsing is done).
+  "The parse mode used (decides from which point parsing is done).
 Legal values:
 'beg-of-line   - starts parsing at the beginning of a line, unless the
                  previous line ends with a backslash.  Fast, but has
                  problems detecting multiline /* */ comments.
 'beg-of-clause - starts parsing at the beginning of the current clause.
                  Slow, but copes better with /* */ comments."
+  :version "24.1"
   :group 'prolog-indentation
   :type '(choice (const :value beg-of-line)
                  (const :value beg-of-clause)))
@@ -447,7 +459,8 @@ Legal values:
     (t
      ;; FIXME: Shouldn't we just use the union of all the above here?
      ("dynamic" "module")))
-  "*Alist of Prolog keywords which is used for font locking of directives."
+  "Alist of Prolog keywords which is used for font locking of directives."
+  :version "24.1"
   :group 'prolog-font-lock
   :type 'sexp)
 
@@ -455,7 +468,8 @@ Legal values:
   '((mercury
      ("char" "float" "int" "io__state" "string" "univ"))
     (t nil))
-  "*Alist of Prolog types used by font locking."
+  "Alist of Prolog types used by font locking."
+  :version "24.1"
   :group 'prolog-font-lock
   :type 'sexp)
 
@@ -463,7 +477,8 @@ Legal values:
   '((mercury
      ("bound" "di" "free" "ground" "in" "mdi" "mui" "muo" "out" "ui" "uo"))
     (t nil))
-  "*Alist of Prolog mode specificators used by font locking."
+  "Alist of Prolog mode specificators used by font locking."
+  :version "24.1"
   :group 'prolog-font-lock
   :type 'sexp)
 
@@ -472,7 +487,8 @@ Legal values:
      ("cc_multi" "cc_nondet" "det" "erroneous" "failure" "multi" "nondet"
       "semidet"))
     (t nil))
-  "*Alist of Prolog determinism specificators used by font locking."
+  "Alist of Prolog determinism specificators used by font locking."
+  :version "24.1"
   :group 'prolog-font-lock
   :type 'sexp)
 
@@ -480,7 +496,8 @@ Legal values:
   '((mercury
      ("^#[0-9]+"))
     (t nil))
-  "*Alist of Prolog source code directives used by font locking."
+  "Alist of Prolog source code directives used by font locking."
+  :version "24.1"
   :group 'prolog-font-lock
   :type 'sexp)
 
@@ -488,17 +505,19 @@ Legal values:
 ;; Keyboard
 
 (defcustom prolog-electric-newline-flag (not (fboundp 'electric-indent-mode))
-  "*Non-nil means automatically indent the next line when the user types RET."
+  "Non-nil means automatically indent the next line when the user types RET."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-hungry-delete-key-flag nil
-  "*Non-nil means delete key consumes all preceding spaces."
+  "Non-nil means delete key consumes all preceding spaces."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-electric-dot-flag nil
-  "*Non-nil means make dot key electric.
+  "Non-nil means make dot key electric.
 Electric dot appends newline or inserts head of a new clause.
 If dot is pressed at the end of a line where at least one white space
 precedes the point, it inserts a recursive call to the current predicate.
@@ -506,53 +525,61 @@ If dot is pressed at the beginning of an empty line, it inserts the head
 of a new clause for the current predicate.  It does not apply in strings
 and comments.
 It does not apply in strings and comments."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-electric-dot-full-predicate-template nil
-  "*If nil, electric dot inserts only the current predicate's name and `('
+  "If nil, electric dot inserts only the current predicate's name and `('
 for recursive calls or new clause heads.  Non-nil means to also
 insert enough commas to cover the predicate's arity and `)',
 and dot and newline for recursive calls."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-electric-underscore-flag nil
-  "*Non-nil means make underscore key electric.
+  "Non-nil means make underscore key electric.
 Electric underscore replaces the current variable with underscore.
 If underscore is pressed not on a variable then it behaves as usual."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-electric-tab-flag nil
-  "*Non-nil means make TAB key electric.
+  "Non-nil means make TAB key electric.
 Electric TAB inserts spaces after parentheses, ->, and ;
 in ( If -> Then ; Else) and ( Disj1 ; Disj2 ) style expressions."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-electric-if-then-else-flag nil
-  "*Non-nil makes `(', `>' and `;' electric
+  "Non-nil makes `(', `>' and `;' electric
 to automatically indent if-then-else constructs."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-electric-colon-flag nil
-  "*Makes `:' electric (inserts `:-' on a new line).
+  "Makes `:' electric (inserts `:-' on a new line).
 If non-nil, pressing `:' at the end of a line that starts in
 the first column (i.e., clause heads) inserts ` :-' and newline."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-electric-dash-flag nil
-  "*Makes `-' electric (inserts a `-->' on a new line).
+  "Makes `-' electric (inserts a `-->' on a new line).
 If non-nil, pressing `-' at the end of a line that starts in
 the first column (i.e., DCG heads) inserts ` -->' and newline."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
 (defcustom prolog-old-sicstus-keys-flag nil
-  "*Non-nil means old SICStus Prolog mode keybindings are used."
+  "Non-nil means old SICStus Prolog mode keybindings are used."
+  :version "24.1"
   :group 'prolog-keyboard
   :type 'boolean)
 
@@ -570,7 +597,7 @@ the first column (i.e., DCG heads) inserts ` -->' and newline."
                       (not (executable-find (car names))))
             (setq names (cdr names)))
           (or (car names) "prolog"))))
-  "*Alist of program names for invoking an inferior Prolog with `run-prolog'."
+  "Alist of program names for invoking an inferior Prolog with `run-prolog'."
   :group 'prolog-inferior
   :type 'sexp)
 (defun prolog-program-name ()
@@ -579,7 +606,8 @@ the first column (i.e., DCG heads) inserts ` -->' and newline."
 (defcustom prolog-program-switches
   '((sicstus ("-i"))
     (t nil))
-  "*Alist of switches given to inferior Prolog run with `run-prolog'."
+  "Alist of switches given to inferior Prolog run with `run-prolog'."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'sexp)
 (defun prolog-program-switches ()
@@ -594,7 +622,7 @@ the first column (i.e., DCG heads) inserts ` -->' and newline."
     (swi "[%f].")
     (gnu     "[%f].")
     (t "reconsult(%f)."))
-  "*Alist of strings defining predicate for reconsulting.
+  "Alist of strings defining predicate for reconsulting.
 
 Some parts of the string are replaced:
 `%f' by the name of the consulted file (can be a temporary file)
@@ -616,7 +644,7 @@ Some parts of the string are replaced:
                      "prolog:zap_file(%m,%b,compile).")))
     (swi "[%f].")
     (t "compile(%f)."))
-  "*Alist of strings and lists defining predicate for recompilation.
+  "Alist of strings and lists defining predicate for recompilation.
 
 Some parts of the string are replaced:
 `%f' by the name of the compiled file (can be a temporary file)
@@ -634,7 +662,7 @@ If `prolog-program-name' is nil, it is an argument to the `compile' function."
   (prolog-find-value-by-system prolog-compile-string))
 
 (defcustom prolog-eof-string "end_of_file.\n"
-  "*Alist of strings that represent end of file for prolog.
+  "Alist of strings that represent end of file for prolog.
 nil means send actual operating system end of file."
   :group 'prolog-inferior
   :type 'sexp)
@@ -645,7 +673,8 @@ nil means send actual operating system end of file."
     (swi "^\\(\\[[a-zA-Z]*\\] \\)?[1-9]?[0-9]*[ ]?\\?- \\|^| +")
     (gnu "^| \\?-")
     (t "^|? *\\?-"))
-  "*Alist of prompts of the prolog system command line."
+  "Alist of prompts of the prolog system command line."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'sexp)
 (defun prolog-prompt-regexp ()
@@ -654,42 +683,48 @@ nil means send actual operating system end of file."
 ;; (defcustom prolog-continued-prompt-regexp
 ;;   '((sicstus "^\\(| +\\|     +\\)")
 ;;     (t "^|: +"))
-;;   "*Alist of regexps matching the prompt when consulting `user'."
+;;   "Alist of regexps matching the prompt when consulting `user'."
 ;;   :group 'prolog-inferior
 ;;   :type 'sexp)
 
 (defcustom prolog-debug-on-string "debug.\n"
-  "*Predicate for enabling debug mode."
+  "Predicate for enabling debug mode."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'string)
 
 (defcustom prolog-debug-off-string "nodebug.\n"
-  "*Predicate for disabling debug mode."
+  "Predicate for disabling debug mode."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'string)
 
 (defcustom prolog-trace-on-string "trace.\n"
-  "*Predicate for enabling tracing."
+  "Predicate for enabling tracing."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'string)
 
 (defcustom prolog-trace-off-string "notrace.\n"
-  "*Predicate for disabling tracing."
+  "Predicate for disabling tracing."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'string)
 
 (defcustom prolog-zip-on-string "zip.\n"
-  "*Predicate for enabling zip mode for SICStus."
+  "Predicate for enabling zip mode for SICStus."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'string)
 
 (defcustom prolog-zip-off-string "nozip.\n"
-  "*Predicate for disabling zip mode for SICStus."
+  "Predicate for disabling zip mode for SICStus."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'string)
 
 (defcustom prolog-use-standard-consult-compile-method-flag t
-  "*Non-nil means use the standard compilation method.
+  "Non-nil means use the standard compilation method.
 Otherwise the new compilation method will be used.  This
 utilizes a special compilation buffer with the associated
 features such as parsing of error messages and automatically
@@ -698,6 +733,7 @@ jumping to the source code responsible for the error.
 Warning: the new method is so far only experimental and
 does contain bugs.  The recommended setting for the novice user
 is non-nil for this variable."
+  :version "24.1"
   :group 'prolog-inferior
   :type 'boolean)
 
@@ -706,41 +742,48 @@ is non-nil for this variable."
 
 (defcustom prolog-use-prolog-tokenizer-flag
   (not (fboundp 'syntax-propertize-rules))
-  "*Non-nil means use the internal prolog tokenizer for indentation etc.
+  "Non-nil means use the internal prolog tokenizer for indentation etc.
 Otherwise use `parse-partial-sexp' which is faster but sometimes incorrect."
+  :version "24.1"
   :group 'prolog-other
   :type 'boolean)
 
 (defcustom prolog-imenu-flag t
-  "*Non-nil means add a clause index menu for all prolog files."
+  "Non-nil means add a clause index menu for all prolog files."
+  :version "24.1"
   :group 'prolog-other
   :type 'boolean)
 
 (defcustom prolog-imenu-max-lines 3000
-  "*The maximum number of lines of the file for imenu to be enabled.
+  "The maximum number of lines of the file for imenu to be enabled.
 Relevant only when `prolog-imenu-flag' is non-nil."
+  :version "24.1"
   :group 'prolog-other
   :type 'integer)
 
 (defcustom prolog-info-predicate-index
   "(sicstus)Predicate Index"
-  "*The info node for the SICStus predicate index."
+  "The info node for the SICStus predicate index."
+  :version "24.1"
   :group 'prolog-other
   :type 'string)
 
 (defcustom prolog-underscore-wordchar-flag nil
-  "*Non-nil means underscore (_) is a word-constituent character."
+  "Non-nil means underscore (_) is a word-constituent character."
+  :version "24.1"
   :group 'prolog-other
   :type 'boolean)
 
 (defcustom prolog-use-sicstus-sd nil
-  "*If non-nil, use the source level debugger of SICStus 3#7 and later."
+  "If non-nil, use the source level debugger of SICStus 3#7 and later."
+  :version "24.1"
   :group 'prolog-other
   :type 'boolean)
 
 (defcustom prolog-char-quote-workaround nil
-  "*If non-nil, declare 0 as a quote character to handle 0'<char>.
+  "If non-nil, declare 0 as a quote character to handle 0'<char>.
 This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
+  :version "24.1"
   :group 'prolog-other
   :type 'boolean)
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 15d98ce48af..3ef872d26eb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1004,9 +1004,10 @@ On a comment line, go to end of line."
                                (error (goto-char pos) (end-of-line)))))
                           ((python-skip-out t s))))
              (end-of-line))
-           (unless comment
-             (eq ?\\ (char-before))))   ; Line continued?
-    (end-of-line 2))                    ; Try next line.
+           (and (not comment)
+                (not (eobp))
+                (eq ?\\ (char-before)))) ; Line continued?
+    (end-of-line 2))                     ; Try next line.
   (point))
 
 (defun python-previous-statement (&optional count)
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index f8f62d113e6..f5bfe526aae 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -810,6 +810,7 @@ is changed."
 
 This hook is invoked in a buffer once it is ready to accept input
 for the first time."
+  :version "24.1"
   :type 'hook
   :group 'SQL)
 
@@ -824,7 +825,10 @@ for the first time."
 
 All products share this list; products should define a regexp to
 identify additional keywords in a variable defined by
-the :statement feature.")
+the :statement feature."
+  :version "24.1"
+  :type 'string
+  :group 'SQL)
 
 ;; Customization for Oracle
 
@@ -851,8 +855,12 @@ You will find the file in your Orant\\bin directory."
   :version "24.1"
   :group 'SQL)
 
-(defcustom sql-oracle-statement-starters (regexp-opt '("declare" "begin" "with"))
-  "Additional statement starting keywords in Oracle.")
+(defcustom sql-oracle-statement-starters
+  (regexp-opt '("declare" "begin" "with"))
+  "Additional statement starting keywords in Oracle."
+  :version "24.1"
+  :type 'string
+  :group 'SQL)
 
 (defcustom sql-oracle-scan-on t
   "Non-nil if placeholders should be replaced in Oracle SQLi.
@@ -867,6 +875,7 @@ You need to issue the following command in SQL*Plus to be safe:
     SET DEFINE OFF
 
 In older versions of SQL*Plus, this was the SET SCAN OFF command."
+  :version "24.1"
   :type 'boolean
   :group 'SQL)
 
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index f3bac41fb32..73e3cd9980f 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -689,6 +689,7 @@ file referenced.  If false, this is not supported."
 Set this to \"wire\" if the Verilog code uses \"`default_nettype
 none\".  Note using `default_nettype none isn't recommended practice; this
 mode is experimental."
+  :version "24.1"
   :group 'verilog-mode-actions
   :type 'boolean)
 (put 'verilog-auto-declare-nettype 'safe-local-variable `stringp)
@@ -696,6 +697,7 @@ mode is experimental."
 (defcustom verilog-auto-wire-type nil
   "*Non-nil specifies the data type to use with `verilog-auto-wire' etc.
 Set this to \"logic\" for SystemVerilog code, or use `verilog-auto-logic'."
+  :version "24.1"
   :group 'verilog-mode-actions
   :type 'boolean)
 (put 'verilog-auto-wire-type 'safe-local-variable `stringp)
@@ -709,6 +711,7 @@ The name of the function or case will be set between the braces."
 
 (defcustom verilog-auto-delete-trailing-whitespace nil
   "*True means to `delete-trailing-whitespace' in `verilog-auto'."
+  :version "24.1"
   :group 'verilog-mode-actions
   :type 'boolean)
 (put 'verilog-auto-delete-trailing-whitespace 'safe-local-variable 'verilog-booleanp)
@@ -986,6 +989,7 @@ If nil, all blocking assigned signals are ignored when any
 non-blocking assignment is in the AUTORESET block.  This allows
 blocking assignments to be used for temporary values and not have
 those temporaries reset.  See example in `verilog-auto-reset'."
+  :version "24.1"
   :type 'boolean
   :group 'verilog-mode-auto)
 (put 'verilog-auto-reset-blocking-in-non 'safe-local-variable 'verilog-booleanp)
@@ -1073,6 +1077,7 @@ declared together to remain together.  Sorted order reduces
 changes when declarations are moved around in a file.
 
 See also `verilog-auto-arg-sort'."
+  :version "24.1"
   :group 'verilog-mode-auto
   :type 'boolean)
 (put 'verilog-auto-inst-sort 'safe-local-variable 'verilog-booleanp)
@@ -1135,6 +1140,7 @@ See the \\[verilog-faq] for examples on using this."
   "*Data type used for the declaration for AUTOTIEOFF.  If \"wire\" then
 create a wire, if \"assign\" create an assignment, else the data type for
 variable creation."
+  :version "24.1"
   :group 'verilog-mode-auto
   :type 'string)
 (put 'verilog-auto-tieoff-declaration 'safe-local-variable 'stringp)
diff --git a/lisp/select.el b/lisp/select.el
index 8d9d7cc386b..0260eba4682 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -72,7 +72,7 @@ variable is set, it is used for the next communication only.
 After the communication, this variable is set to nil.")
 
 (declare-function x-get-selection-internal "xselect.c"
-                  (selection-symbol target-type &optional time-stamp))
+                  (selection-symbol target-type &optional time-stamp terminal))
 
 ;; Only declared obsolete in 23.3.
 (define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34")
@@ -118,9 +118,9 @@ in `selection-converter-alist', which see."
   (x-get-selection-internal 'CLIPBOARD 'STRING))
 
 (declare-function x-own-selection-internal "xselect.c"
-                  (selection-name selection-value))
+                  (selection-name selection-value &optional frame))
 (declare-function x-disown-selection-internal "xselect.c"
-                  (selection &optional time))
+                  (selection &optional time terminal))
 
 (defun x-set-selection (type data)
   "Make an X selection of type TYPE and value DATA.
diff --git a/lisp/ses.el b/lisp/ses.el
index 43ce9da033e..0638fc344c7 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -923,6 +923,7 @@ the old and FORCE is nil."
 
 (defcustom ses-self-reference-early-detection nil
   "True if cycle detection is early for cells that refer to themselves."
+  :version "24.1"
   :type 'boolean
   :group 'ses)
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 881b0b22079..c968ac01b0d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5810,8 +5810,8 @@ Valid values include:
   `mh-e-user-agent'     -- use the Emacs interface to the MH mail system.
                            See Info node `(mh-e)'.
   `gnus-user-agent'     -- like `message-user-agent', but with Gnus
-                           paraphernalia, particularly the Gcc: header for
-                           archiving.
+                           paraphernalia if Gnus is running, particularly
+                           the Gcc: header for archiving.
 
 Additional valid symbols may be available; check with the author of
 your package for details.  The function should return non-nil if it
diff --git a/lisp/subr.el b/lisp/subr.el
index 6c79b3f88e2..00a030c744c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3219,7 +3219,7 @@ If BODY finishes, `while-no-input' returns whatever value BODY produced."
            (or (input-pending-p)
                (progn ,@body)))))))
 
-(defmacro condition-case-no-debug (var bodyform &rest handlers)
+(defmacro condition-case-unless-debug (var bodyform &rest handlers)
   "Like `condition-case' except that it does not catch anything when debugging.
 More specifically if `debug-on-error' is set, then it does not catch any signal."
   (declare (debug condition-case) (indent 2))
@@ -3231,6 +3231,9 @@ More specifically if `debug-on-error' is set, then it does not catch any signal.
              (funcall ,bodysym)
            ,@handlers)))))
 
+(define-obsolete-function-alias 'condition-case-no-debug
+  'condition-case-unless-debug "24.1")
+
 (defmacro with-demoted-errors (&rest body)
   "Run BODY and demote any errors to simple messages.
 If `debug-on-error' is non-nil, run BODY without catching its errors.
@@ -3238,7 +3241,7 @@ This is to be used around code which is not expected to signal an error
 but which should be robust in the unexpected case that an error is signaled."
   (declare (debug t) (indent 0))
   (let ((err (make-symbol "err")))
-    `(condition-case-no-debug ,err
+    `(condition-case-unless-debug ,err
          (progn ,@body)
        (error (message "Error: %S" ,err) nil))))
 
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index bfa642699af..fc86d4179b6 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -218,11 +218,12 @@ On X, if `x-select-enable-clipboard' is non-nil, copy TEXT to the
 clipboard.  If `x-select-enable-primary' is non-nil, put TEXT in
 the primary selection.
 
-On Windows, make TEXT the current selection.  If
+On MS-Windows, make TEXT the current selection.  If
 `x-select-enable-clipboard' is non-nil, copy the text to the
 clipboard as well.
 
-On Nextstep, put TEXT in the pasteboard."
+On Nextstep, put TEXT in the pasteboard (`x-select-enable-clipboard'
+is not used)."
   (if x-select-enable-clipboard
       (w16-set-clipboard-data text))
   (setq x-last-selected-text text))
@@ -248,13 +249,19 @@ On Nextstep, put TEXT in the pasteboard."
           (setq x-last-selected-text text))))))
 
 ;; x-selection-owner-p is used in simple.el.
-(defun x-selection-owner-p (&optional type)
+(defun x-selection-owner-p (&optional selection terminal)
   "Whether the current Emacs process owns the given X Selection.
 The arg should be the name of the selection in question, typically one of
 the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
 For convenience, the symbol nil is the same as `PRIMARY',
-and t is the same as `SECONDARY'."
+and t is the same as `SECONDARY'.
+
+TERMINAL should be a terminal object or a frame specifying the X
+server to query.  If omitted or nil, that stands for the selected
+frame's display, or the first available X display.
+
+On Nextstep, TERMINAL is unused."
     (if x-select-enable-clipboard
       (let (text)
         ;; Don't die if w16-get-clipboard-data signals an error.
@@ -272,30 +279,52 @@ and t is the same as `SECONDARY'."
 
 ;; x-own-selection-internal and x-disown-selection-internal are used
 ;; in select.el:x-set-selection.
-(defun x-own-selection-internal (type value)
-  "Assert an X selection of the given TYPE with the given VALUE.
-TYPE is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
+(defun x-own-selection-internal (selection value &optional frame)
+  "Assert an X selection of the type SELECTION with and value VALUE.
+SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
 VALUE is typically a string, or a cons of two markers, but may be
-anything that the functions on `selection-converter-alist' know about."
+anything that the functions on `selection-converter-alist' know about.
+
+FRAME should be a frame that should own the selection.  If omitted or
+nil, it defaults to the selected frame.
+
+On Nextstep, FRAME is unused."
   (ignore-errors
     (x-select-text value))
   value)
 
-(defun x-disown-selection-internal (selection &optional time)
+(defun x-disown-selection-internal (selection &optional time-object terminal)
   "If we own the selection SELECTION, disown it.
-Disowning it means there is no such selection."
+Disowning it means there is no such selection.
+
+Sets the last-change time for the selection to TIME-OBJECT (by default
+the time of the last event).
+
+TERMINAL should be a terminal object or a frame specifying the X
+server to query.  If omitted or nil, that stands for the selected
+frame's display, or the first available X display.
+
+On Nextstep, the TIME-OBJECT and TERMINAL arguments are unused.
+On MS-DOS, all this does is return non-nil if we own the selection."
   (if (x-selection-owner-p selection)
       t))
 
 ;; x-get-selection-internal is used in select.el
-(defun x-get-selection-internal (selection type &optional time_stamp)
+(defun x-get-selection-internal (selection-symbol target-type &optional time-stamp terminal)
   "Return text selected from some X window.
-SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
+SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
-TYPE is the type of data desired, typically `STRING'.
-TIME_STAMP is the time to use in the XConvertSelection call for foreign
-selections.  If omitted, defaults to the time for the last event."
+TARGET-TYPE is the type of data desired, typically `STRING'.
+
+TIME-STAMP is the time to use in the XConvertSelection call for foreign
+selections.  If omitted, defaults to the time for the last event.
+
+TERMINAL should be a terminal object or a frame specifying the X
+server to query.  If omitted or nil, that stands for the selected
+frame's display, or the first available X display.
+
+On Nextstep, TIME-STAMP and TERMINAL are unused."
   (x-get-selection-value))
 
 ;; From src/fontset.c:
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 89825771233..eea6d767512 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -33,6 +33,7 @@
   "Set to a list if the XTerm supports modifyOtherKeys or
 reporting the background color.  Set to 'check to check for those
 features.  Set to nil to skip the checks."
+  :version "24.1"
   :group 'xterm
   :type '(choice (const :tag "No" nil)
                  (const :tag "Check" check)
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index e9dea3dd4ec..a873680a8c8 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -443,6 +443,7 @@ which is called to determine the initial content of the field.
 ALTERNATIVE if non-nil is an integer that numbers sets of
 alternatives, starting from zero."
   :group 'BibTeX
+  :version "24.1"
   :type 'bibtex-entry-alist)
 (put 'bibtex-BibTeX-entry-alist 'risky-local-variable t)
 
@@ -696,6 +697,7 @@ alternatives, starting from zero."
   "Alist of biblatex entry types and their associated fields.
 It has the same format as `bibtex-BibTeX-entry-alist'."
   :group 'bibtex
+  :version "24.1"
   :type 'bibtex-entry-alist)
 (put 'bibtex-biblatex-entry-alist 'risky-local-variable t)
 
@@ -717,6 +719,7 @@ It has the same format as `bibtex-BibTeX-entry-alist'."
 Each element is a list (FIELD COMMENT).  COMMENT is used as a default
 if `bibtex-BibTeX-entry-alist' does not define a comment for FIELD."
   :group 'bibtex
+  :version "24.1"
   :type 'bibtex-field-alist)
 
 (defcustom bibtex-biblatex-field-alist
@@ -814,6 +817,7 @@ if `bibtex-BibTeX-entry-alist' does not define a comment for FIELD."
     "Alist of biblatex fields.
 It has the same format as `bibtex-BibTeX-entry-alist'."
   :group 'bibtex
+  :version "24.1"
   :type 'bibtex-field-alist)
 
 (defcustom bibtex-dialect-list '(BibTeX biblatex)
@@ -822,12 +826,14 @@ For each DIALECT (a symbol) a variable bibtex-DIALECT-entry-alist defines
 the allowed entries and bibtex-DIALECT-field-alist defines known field types.
 Predefined dialects include BibTeX and biblatex."
   :group 'bibtex
+  :version "24.1"
   :type '(repeat (symbol :tag "Dialect")))
 
 (defcustom bibtex-dialect 'BibTeX
   "Current BibTeX dialect.  For allowed values see `bibtex-dialect-list'.
 To interactively change the dialect use the command `bibtex-set-dialect'."
   :group 'bibtex
+  :version "24.1"
   :set '(lambda (symbol value)
           (set-default symbol value)
           ;; `bibtex-set-dialect' is undefined during loading (no problem)
@@ -842,6 +848,7 @@ To interactively change the dialect use the command `bibtex-set-dialect'."
   "If a field name matches this regexp, the prefix OPT is not removed.
 If nil prefix OPT is always removed"
   :group 'bibtex
+  :version "24.1"
   :type '(choice (regexp) (const nil)))
 
 (defcustom bibtex-comment-start "@Comment"
@@ -930,6 +937,7 @@ See also `bibtex-search-entry-globally'."
   "If non-nil, interactive calls of `bibtex-search-entry' search globally.
 A global search includes all files in `bibtex-files'."
   :group 'bibtex
+  :version "24.1"
   :type 'boolean)
 
 (defcustom bibtex-help-message t
@@ -1291,6 +1299,7 @@ Set this variable before loading BibTeX mode."
 (defcustom bibtex-search-buffer "*BibTeX Search*"
   "Buffer for BibTeX search results."
   :group 'bibtex
+  :version "24.1"
   :type 'string)
 
 ;; `bibtex-font-lock-keywords' is a user option, too.  But since the
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 0e47338bf9f..f04cad4463a 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -287,6 +287,7 @@ holds a keymap."
 Possible values are `top' (tool bar on top), `bottom' (tool bar at bottom),
 `left' (tool bar on left) and `right' (tool bar on right).
 Customize `tool-bar-mode' if you want to show or hide the tool bar."
+      :version "24.1"
       :type '(choice (const top)
                      (const bottom)
                      (const left)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index d7a22b72123..c53f7294aef 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,27 @@
+2012-02-14  Leo Liu  <sdl.web@gmail.com>
+
+        * url-future.el: Fix last change.
+
+2012-02-13  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * url-future.el (url-future-test): Move to test/automated.
+
+2012-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-parse-headers): When redirecting, pass on
+        the `inhibit-cookie' parameter.
+
+2012-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * url-queue.el (url-queue-retrieve): Fic previous doc fix.
+
+2012-02-10  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * url-http.el (url-http-clean-headers): Return the number of
+        removed characters.
+        (url-http-wait-for-headers-change-function): Adjust end position
+        after cleaning the headers.  (Bug#10768)
+
 2012-02-10  Glenn Morris  <rgm@gnu.org>
 
         * url-queue.el (url-queue-retrieve): Doc fix.
diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el
index 2798f936f21..38ac09c06bb 100644
--- a/lisp/url/url-future.el
+++ b/lisp/url/url-future.el
@@ -41,7 +41,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'ert))
 
 (defstruct url-future callback errorback status value)
 
@@ -95,32 +94,5 @@
       (signal 'error 'url-future-already-done)
     (url-future-finish url-future 'cancel)))
 
-(ert-deftest url-future-test ()
-  (let* (saver
-         (text "running future")
-         (good (make-url-future :value (lambda () (format text))
-                                :callback (lambda (f) (set 'saver f))))
-         (bad (make-url-future :value (lambda () (/ 1 0))
-                               :errorback (lambda (&rest d) (set 'saver d))))
-         (tocancel (make-url-future :value (lambda () (/ 1 0))
-                                    :callback (lambda (f) (set 'saver f))
-                                    :errorback (lambda (&rest d)
-                                                 (set 'saver d)))))
-    (should (equal good (url-future-call good)))
-    (should (equal good saver))
-    (should (equal text (url-future-value good)))
-    (should (url-future-completed-p good))
-    (should-error (url-future-call good))
-    (setq saver nil)
-    (should (equal bad (url-future-call bad)))
-    (should-error (url-future-call bad))
-    (should (equal saver (list bad '(arith-error))))
-    (should (url-future-errored-p bad))
-    (setq saver nil)
-    (should (equal (url-future-cancel tocancel) tocancel))
-    (should-error (url-future-call tocancel))
-    (should (null saver))
-    (should (url-future-cancelled-p tocancel))))
-
 (provide 'url-future)
 ;;; url-future.el ends here
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index b2f93f093e6..0c911260ca5 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -354,11 +354,14 @@ request.")
 ;; Parsing routines
 (defun url-http-clean-headers ()
   "Remove trailing \r from header lines.
-This allows us to use `mail-fetch-field', etc."
+This allows us to use `mail-fetch-field', etc.
+Return the number of characters removed."
   (declare (special url-http-end-of-headers))
-  (goto-char (point-min))
-  (while (re-search-forward "\r$" url-http-end-of-headers t)
-    (replace-match "")))
+  (let ((end (marker-position url-http-end-of-headers)))
+    (goto-char (point-min))
+    (while (re-search-forward "\r$" url-http-end-of-headers t)
+      (replace-match ""))
+    (- end url-http-end-of-headers)))
 
 (defun url-http-handle-authentication (proxy)
   (declare (special status success url-http-method url-http-data
@@ -644,7 +647,8 @@ should be shown to the user."
                         (url-retrieve-internal
                          redirect-uri url-callback-function
                          url-callback-arguments
-                         (url-silent url-current-object)))
+                         (url-silent url-current-object)
+                         (not (url-use-cookies url-current-object))))
                    (url-mark-buffer-as-dead buffer))
                ;; We hit url-max-redirections, so issue an error and
                ;; stop redirecting.
@@ -1054,7 +1058,7 @@ the end of the document."
           (setq url-http-end-of-headers (set-marker (make-marker)
                                                     (point))
                 end-of-headers t)
-          (url-http-clean-headers)))
+          (setq nd (- nd (url-http-clean-headers)))))
 
       (if (not end-of-headers)
           ;; Haven't seen the end of the headers yet, need to wait
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index 62e5e2f84d4..9dfee485918 100644
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -57,9 +57,9 @@
 (defun url-queue-retrieve (url callback &optional cbargs silent inhibit-cookies)
   "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished.
 This is like `url-retrieve' (which see for details of the arguments),
-but downloads in parallel.  The variable `url-queue-parallel-processes'
-sets the number of concurrent processes.  The variable `url-queue-timeout'
-sets a timeout."
+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."
   (setq url-queue
         (append url-queue
                 (list (make-url-queue :url url
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 7de9d17e3f7..ba4a2766526 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -237,7 +237,7 @@ from disabled to enabled, it tries to refine the current hunk, as
 well."
   :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine"
   (when diff-auto-refine-mode
-    (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
+    (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 ;;;;
 ;;;; font-lock support
@@ -542,7 +542,7 @@ but in the file header instead, in which case move forward to the first hunk."
 (easy-mmode-define-navigation
  diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view
  (if diff-auto-refine-mode
-     (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
+     (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 (easy-mmode-define-navigation
  diff-file diff-file-header-re "file" diff-end-of-hunk)
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 7512c9283eb..d345a20a0f5 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -561,9 +561,6 @@ changeset that affected the currently considered file(s)."
                log-view-vc-fileset))
      to fr)))
 
-(declare-function vc-diff-internal "vc"
-                  (async vc-fileset rev1 rev2 &optional verbose))
-
 (defun log-view-diff-changeset (beg end)
   "Get the diff between two revisions.
 If the mark is not active or the mark is on the revision at point,
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 9d55e9c7b43..6cd2b1ddf76 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -7,6 +7,8 @@
 ;; Keywords: url, vc
 ;; Package: vc
 
+;; This file is part of GNU Emacs.
+
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -20,7 +22,6 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-
 ;;; Commentary:
 
 ;;; Todo:
diff --git a/lisp/window.el b/lisp/window.el
index c9bddba942c..edd8a113876 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -385,6 +385,7 @@ bottom side of each frame.  If an element is a number, this means
 to display at most that many side windows on the corresponding
 side.  If an element is nil, this means there's no bound on the
 number of slots on that side."
+  :version "24.1"
   :risky t
   :type
   '(list
@@ -4624,16 +4625,20 @@ buffer.  Return the window chosen for displaying BUFFER-OR-NAME,
 or nil if no such window is found.
 
 Optional argument ACTION should have the form (FUNCTION . ALIST).
-FUNCTION is either a function or a list of functions.  Each such
-function is called with two arguments: the buffer to display and
-an alist.  It should either display the buffer and return the
-window, or return nil if unable to display the buffer.
+FUNCTION is either a function or a list of functions.
+ALIST is an arbitrary association list (alist).
+
+Each such FUNCTION should accept two arguments: the buffer to
+display and an alist.  Based on those arguments, it should either
+display the buffer and return the window, or return nil if unable
+to display the buffer.
 
 The `display-buffer' function builds a function list and an alist
-from `display-buffer-overriding-action', `display-buffer-alist',
-the ACTION argument, `display-buffer-base-action', and
-`display-buffer-fallback-action' (in that order).  Then it calls
-each function in the combined function list in turn, passing the
+by combining the functions and alists specified in
+`display-buffer-overriding-action', `display-buffer-alist', the
+ACTION argument, `display-buffer-base-action', and
+`display-buffer-fallback-action' (in order).  Then it calls each
+function in the combined function list in turn, passing the
 buffer as the first argument and the combined alist as the second
 argument, until one of the functions returns non-nil.
 
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 65dcf845064..539b95a18fd 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -431,7 +431,7 @@ otherwise return the frame coordinates."
 (declare-function x-send-client-message "xselect.c"
                   (display dest from message-type format values))
 (declare-function x-get-selection-internal "xselect.c"
-                  (selection-symbol target-type &optional time-stamp))
+                  (selection-symbol target-type &optional time-stamp terminal))
 
 (defun x-dnd-version-from-flags (flags)
   "Return the version byte from the 32 bit FLAGS in an XDndEnter message"