15 files changed, 138 insertions, 37 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 471b1219c19..e058f387a93 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,38 @@
-2011-10-17  Ryan Barrett <emacs@ryanb.org>  (tiny change)
+2011-10-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * facemenu.el (list-colors-duplicates): On Windows, detect more
+        duplicates by assuming that only colors matching "^System" are
+        special "system colors".  (Bug#9722)
+
+2011-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/log-edit.el (log-edit): Add "Author:" header to encourage people
+        to distinguish the author from the committer.
+
+2011-10-18  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-file-name-handler): Load Tramp packages silently.
+
+2011-10-18  Jirka Kosek  <jirka@kosek.cz>  (tiny change)
+
+        * international/mule.el (sgml-html-meta-auto-coding-function):
+        Add support for detecting encoding in HTML5 specified only as
+        <meta charset="UTF-8">.  Implementation just makes http-equiv and
+        content-type parts from HTML4 encoding string optional.  (Bug#9716)
+
+2011-10-18  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc.el (vc-initial-comment): Mark as obsolete.  (Bug#9745)
+
+2011-10-18  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (cursor): Doc fix.
+
+2011-10-17  Chong Yidong  <cyd@gnu.org>
+
+        * font-lock.el (font-lock-maximum-size): Mark as obsolete.
+
+2011-10-17  Ryan Barrett  <emacs@ryanb.org>  (tiny change)
 
         * dirtrack.el (dirtrack): Support shell buffers with path
         prefixes, e.g. tramp-based remote shells.  (Bug#9647)
@@ -437,8 +471,8 @@
 
         * net/newst-reader.el (newsticker-html-renderer)
         (newsticker-show-news): Automatically
-        load html rendering package if newsticker-html-renderer is
-        set. Fixes "Warning: defvar ignored because w3m-fill-column is
+        load html rendering package if newsticker-html-renderer is set.
+        Fixes "Warning: defvar ignored because w3m-fill-column is
         let-bound" and the error "Symbol's value as variable is void:
         w3m-fill-column".
 
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 2acf847cddc..9cb24baeb1f 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -22676,7 +22676,7 @@
         (vc-next-action, vc-transfer-file, vc-rename-file): Also pass the
         backend when calling vc-mode-line.
         (vc-register): Do not create a closure for calling the vc register
-        function, call it directly.
+        function, call it directly.  No longer obey vc-initial-comment.
 
 2009-06-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index a18b892efe8..54b17d58f33 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -639,8 +639,15 @@ a list of colors that the current display can handle."
          (l list))
     (while (cdr l)
       (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l))))
-               (not (if (fboundp 'w32-default-color-map)
-                        (not (assoc (car (car l)) (w32-default-color-map))))))
+               ;; On MS-Windows, there are logical colors that might have
+               ;; the same value but different names and meanings.  For
+               ;; example, `SystemMenuText' (the color w32 uses for the
+               ;; text in menu entries) and `SystemWindowText' (the default
+               ;; color w32 uses for the text in windows and dialogs) may
+               ;; be the same display color and be adjacent in the list.
+               ;; This makes them different to any other color.  Bug#9722
+               (not (and (eq system-type 'windows-nt)
+                         (string-match-p "^System" (car (car l))))))
           (progn
             (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l))))
             (setcdr l (cdr (cdr l))))
diff --git a/lisp/faces.el b/lisp/faces.el
index d5f0ef90ee0..45173eb35da 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2366,6 +2366,10 @@ used to display the prompt text."
   '((((background light)) :background "black")
     (((background dark))  :background "white"))
   "Basic face for the cursor color under X.
+Currently, only the `:background' attribute is meaningful; all
+other attributes are ignored.  The cursor foreground color is
+taken from the background color of the underlying text.
+
 Note: Other faces cannot inherit from the cursor face."
   :version "21.1"
   :group 'cursor
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c37a9ae916e..2f4b7413dcc 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -228,8 +228,11 @@
 ;; User variables.
 
 (defcustom font-lock-maximum-size 256000
-  "Maximum size of a buffer for buffer fontification.
-Only buffers less than this can be fontified when Font Lock mode is turned on.
+  "Maximum buffer size for unsupported buffer fontification.
+When `font-lock-support-mode' is nil, only buffers smaller than
+this are fontified.  This variable has no effect if a Font Lock
+support mode (usually `jit-lock-mode') is enabled.
+
 If nil, means size is irrelevant.
 If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE),
 where MAJOR-MODE is a symbol or t (meaning the default).  For example:
@@ -248,6 +251,7 @@ for buffers in Rmail mode, and size is irrelevant otherwise."
                                       (const :tag "none" nil)
                                       (integer :tag "size")))))
   :group 'font-lock)
+(make-obsolete-variable 'font-lock-maximum-size nil "24.1")
 
 (defcustom font-lock-maximum-decoration t
   "Maximum decoration level for fontification.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cc2568a3647..b7f41e22e50 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,9 +1,42 @@
+2011-10-18  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-util.el (gnus-bound-and-true-p): Macro for XEmacs compatibility.
+        * nnir.el (nnir-mode): Use it.
+        * nnmairix.el (nnmairix-determine-original-group-from-registry):
+        Use it.
+
+        * nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy.
+        * nnmairix.el (gnus-registry-enabled): Ditto.
+
+2011-10-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-registry.el (gnus-registry-enabled): Add new variable.
+        (gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask
+        only while we need to find out if it should be t or nil.
+        (gnus-registry-initialize): Don't set `gnus-registry-install' to t.
+        (gnus-registry-install-hooks): Set `gnus-registry-enabled' to t when
+        the registry is installed.  Set it to nil when it's unloaded.
+        (gnus-registry-install-p): Provide user guidance for the initial value
+        of `gnus-registry-install' when it's 'ask, otherwise return its value.
+        * nnregistry.el (nnregistry-open-server, nnregistry-server-opened):
+        Use `gnus-registry-enabled' instead of `gnus-registry-install'.
+        * nnmairix.el (nnmairix-determine-original-group-from-registry):
+        Use `gnus-registry-enabled' instead of `gnus-registry-install'.
+        * nnir.el (nnir-mode): Use `gnus-registry-enabled' instead of
+        `gnus-registry-install'.
+        From Dave Abrahams <dave@boostpro.com>.
+
 2011-10-17  Daiki Ueno  <ueno@unixuser.org>
 
+        * mml2015.el (mml2015-epg-find-usable-key): Add comment about the
+        previous change.
+        * mml1991.el (mml1991-epg-find-usable-key): Skip the whole key if the
+        primary key is marked as disabled.
+
+2011-10-17  Christian von Roques  <roques@mti.ag>  (tiny change)
+
         * mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the
         primary key is marked as disabled.
-        * mml1991.el (mml1991-epg-find-usable-key): Ditto.
-        Thanks to Christian von Roques <roques@mti.ag>.
 
 2011-10-11  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index f8ff52f128f..652e816e56a 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -164,6 +164,8 @@ nnmairix groups are specifically excluded because they are ephemeral."
                  (const :tag "Always Install" t)
                  (const :tag "Ask Me" ask)))
 
+(defvar gnus-registry-enabled)
+
 (defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning.
 
 (defvar gnus-registry-misc-menus nil)   ; ugly way to keep the menus
@@ -873,8 +875,9 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
 
                  ;; if this is called and the user doesn't want the
                  ;; registry enabled, we'll ask anyhow
-                 (when (eq gnus-registry-install nil)
-                   (setq gnus-registry-install 'ask))
+                 (unless gnus-registry-install
+                   (let ((gnus-registry-install 'ask))
+                     (gnus-registry-install-p)))
 
                  ;; now the user is asked if gnus-registry-install is 'ask
                  (when (gnus-registry-install-p)
@@ -1151,7 +1154,6 @@ only the last one's marks are returned."
 "Initialize the Gnus registry."
   (interactive)
   (gnus-message 5 "Initializing the registry")
-  (setq gnus-registry-install t)        ; in case it was 'ask or nil
   (gnus-registry-install-hooks)
   (gnus-registry-install-shortcuts)
   (gnus-registry-read))
@@ -1160,6 +1162,7 @@ only the last one's marks are returned."
 (defun gnus-registry-install-hooks ()
   "Install the registry hooks."
   (interactive)
+  (setq gnus-registry-enabled t)
   (add-hook 'gnus-summary-article-move-hook 'gnus-registry-action)
   (add-hook 'gnus-summary-article-delete-hook 'gnus-registry-action)
   (add-hook 'gnus-summary-article-expire-hook 'gnus-registry-action)
@@ -1181,23 +1184,25 @@ only the last one's marks are returned."
   (remove-hook 'gnus-save-newsrc-hook 'gnus-registry-save)
   (remove-hook 'gnus-read-newsrc-el-hook 'gnus-registry-read)
 
-  (remove-hook 'gnus-summary-prepare-hook 'gnus-registry-register-message-ids))
+  (remove-hook 'gnus-summary-prepare-hook 'gnus-registry-register-message-ids)
+  (setq gnus-registry-enabled nil))
 
 (add-hook 'gnus-registry-unload-hook 'gnus-registry-unload-hook)
 
 (defun gnus-registry-install-p ()
+  "If the registry is not already enabled, and `gnus-registry-install' is t,
+the registry is enabled.  If `gnus-registry-install' is `ask',
+the user is asked first.  Returns non-nil iff the registry is enabled."
   (interactive)
-  (when (eq gnus-registry-install 'ask)
-    (setq gnus-registry-install
-          (gnus-y-or-n-p
-           (concat "Enable the Gnus registry?  "
-                   "See the variable `gnus-registry-install' "
-                   "to get rid of this query permanently. ")))
-    (when gnus-registry-install
-      ;; we just set gnus-registry-install to t, so initialize the registry!
+  (unless gnus-registry-enabled
+    (when (if (eq gnus-registry-install 'ask)
+              (gnus-y-or-n-p
+               (concat "Enable the Gnus registry?  "
+                       "See the variable `gnus-registry-install' "
+                       "to get rid of this query permanently. "))
+            gnus-registry-install)
       (gnus-registry-initialize)))
-;;; we could call it here: (customize-variable 'gnus-registry-install)
-  gnus-registry-install)
+  gnus-registry-enabled)
 
 ;; TODO: a few things
 
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index e9d6ba423fd..9c5e6e8312b 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1986,6 +1986,14 @@ definitions to shadow the loaded ones for use in file byte-compilation."
               (gnus-macroexpand-all expanded environment)))
         form))))
 
+(eval-when-compile
+  ;; This is unnecessary in the compiled version as it is a macro.
+  (if (fboundp 'bound-and-true-p)
+      (defalias 'gnus-bound-and-true-p 'bound-and-true-p)
+    (defmacro gnus-bound-and-true-p (var)
+      "Return the value of symbol VAR if it is bound, else nil."
+      `(and (boundp (quote ,var)) ,var))))
+
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 0be6a17d50e..2d3c05864e8 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -290,9 +290,10 @@ is `(valuefunc member)'."
   (autoload 'nnimap-command "nnimap")
   (autoload 'nnimap-possibly-change-group "nnimap")
   (autoload 'nnimap-make-thread-query "nnimap")
-  (autoload 'gnus-registry-action "gnus-registry")
-  (defvar gnus-registry-install))
+  (autoload 'gnus-registry-action "gnus-registry"))
 
+;; Suppress byte-compiler warning `reference to free variable'
+(defvar gnus-registry-enabled)
 
 (nnoo-declare nnir)
 (nnoo-define-basics nnir)
@@ -1741,8 +1742,7 @@ environment unless `not-global' is non-nil."
   (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir)
     (setq gnus-summary-line-format
           (or nnir-summary-line-format gnus-summary-line-format))
-    (when (and (boundp 'gnus-registry-install)
-                       (eq gnus-registry-install t))
+    (when (gnus-bound-and-true-p gnus-registry-enabled)
       (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t)
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 3d1ac02b6aa..1bf28c5d32f 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -603,9 +603,11 @@ Other back ends might or might not work.")
     nil))
 
 ;; Silence byte-compiler.
-(defvar gnus-registry-install)
 (autoload 'gnus-registry-get-id-key "gnus-registry")
 
+;; Suppress byte-compiler warning `reference to free variable'
+(defvar gnus-registry-enabled)
+
 (deffoo nnmairix-request-set-mark (group actions &optional server)
   (when server
     (nnmairix-open-server server))
@@ -1636,8 +1638,7 @@ search in raw mode."
 
 (defun nnmairix-determine-original-group-from-registry (mid)
   "Try to determinale original group for message-id MID from the registry."
-  (when (and (boundp 'gnus-registry-install)
-             gnus-registry-install)
+  (when (gnus-bound-and-true-p gnus-registry-enabled)
     (unless (string-match "^<" mid)
       (set mid (concat "<" mid)))
     (unless (string-match ">$" mid)
diff --git a/lisp/gnus/nnregistry.el b/lisp/gnus/nnregistry.el
index 359050c356c..75a640a428a 100644
--- a/lisp/gnus/nnregistry.el
+++ b/lisp/gnus/nnregistry.el
@@ -36,8 +36,11 @@
 
 (nnoo-declare nnregistry)
 
+;; Suppress byte-compiler warning `reference to free variable'
+(defvar gnus-registry-enabled)
+
 (deffoo nnregistry-server-opened (server)
-  (eq gnus-registry-install t))
+  gnus-registry-enabled)
 
 (deffoo nnregistry-close-server (server)
   t)
@@ -46,7 +49,7 @@
   nil)
 
 (deffoo nnregistry-open-server (server &optional defs)
-  (eq gnus-registry-install t))
+  gnus-registry-enabled)
 
 (defvar nnregistry-within-nnregistry nil)
 
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 4a387a233a0..cac37b3b8c5 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2403,8 +2403,8 @@ This function is intended to be added to `auto-coding-functions'."
     ;; (allowing for whitespace at bob).  Note: 'DOCTYPE NETSCAPE' is
     ;; useful for Mozilla bookmark files.
     (when (and (re-search-forward "\\`[[:space:]\n]*\\(<!doctype[[:space:]\n]+\\(html\\|netscape\\)\\|<html\\)" size t)
-               (re-search-forward "<meta\\s-+http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*charset=\\(.+?\\)[\"']" size t))
-      (let* ((match (match-string 1))
+               (re-search-forward "<meta\\s-+\\(http-equiv=[\"']?content-type[\"']?\\s-+content=[\"']text/\\sw+;\\s-*\\)?charset=[\"']?\\(.+?\\)[\"'\\s-/>]" size t))
+      (let* ((match (match-string 2))
              (sym (intern (downcase match))))
         (if (coding-system-p sym)
             sym
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index adc66f6766c..cc4fda32dff 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1886,7 +1886,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
                       (when (and (listp sf) (eq (car sf) 'autoload))
                         (let ((default-directory
                                 (tramp-compat-temporary-file-directory)))
-                          (load (cadr sf) 'noerror)))
+                          (load (cadr sf) 'noerror 'nomessage)))
                       (apply foreign operation args))
 
                   ;; Trace that somebody has interrupted the operation.
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index b3f5cfb78f7..ebbe318fc15 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -386,7 +386,7 @@ uses the current buffer."
       (setq setup (not setup)))
     (when setup
       (erase-buffer)
-      (insert "Summary: ")
+      (insert "Summary: \nAuthor: ")
       (save-excursion (insert "\n\n")))
     (if mode
         (funcall mode)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 62536fd94be..cdc4f155083 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -675,6 +675,8 @@
   :type 'boolean
   :group 'vc)
 
+(make-obsolete-variable 'vc-initial-comment "it has no effect." "23.2")
+
 (defcustom vc-default-init-revision "1.1"
   "A string used as the default revision number when a new file is registered.
 This can be overridden by giving a prefix argument to \\[vc-register].  This