Merge changes from emacs-23 branch

1 files changed, 25 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0529bc00f1..a3fa53b1b7a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2011-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/cl-seq.el (union, nunion, intersection)
+        (nintersection, set-difference, nset-difference)
+        (set-exclusive-or, nset-exclusive-or): Doc fix.
+
+        * ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
+
+2011-02-08  Glenn Morris  <rgm@gnu.org>
+
+        * faces.el (face-attr-match-p): Handle the obsolete :bold and
+        :italic props, so that frame-set-background-mode works.  (Bug#7966)
+
+2011-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (next-error): Doc fix.
+
 2011-02-12  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
         * dired-aux.el (dired-create-files): Adapt destination name to
@@ -1651,7 +1668,7 @@
         (rmail-mime-insert-text): Call rmail-mime-insert-decoded-text.
         (rmail-mime-insert-image): Argument changed.  Caller changed.
         (rmail-mime-image): Call rmail-mime-toggle-hidden.
-        (rmail-mime-set-bulk-data): New funciton.
+        (rmail-mime-set-bulk-data): New function.
         (rmail-mime-insert-bulk): Argument changed.
         (rmail-mime-multipart-handler): Return t.
         (rmail-mime-process-multipart): Argument changed.
@@ -4145,7 +4162,7 @@
         is indented differently if it is after a begin..end clock.
         (verilog-in-attribute-p, verilog-skip-backward-comments)
         (verilog-skip-forward-comment-p): Support proper treatment of
-        attributes by indent code. Reported by Jeff Steele.
+        attributes by indent code.  Reported by Jeff Steele.
         (verilog-in-directive-p): Fix comment to correctly describe function.
         (verilog-backward-up-list, verilog-in-struct-region-p)
         (verilog-backward-token, verilog-in-struct-p)
@@ -4156,9 +4173,9 @@
         (verilog-property-re, verilog-endcomment-reason-re)
         (verilog-beg-of-statement, verilog-set-auto-endcomments)
         (verilog-calc-1 ): Fix for assert a; else b; indentation (new form
-        of if). Reported by Max Bjurling and
+        of if).  Reported by Max Bjurling and
         (verilog-calc-1): Fix for clocking block in modport
-        declaration. Reported by Brian Hunter.
+        declaration.  Reported by Brian Hunter.
 
 2010-10-24  Wilson Snyder  <wsnyder@wsnyder.org>
 
@@ -4174,7 +4191,7 @@
         (verilog-read-always-signals-recurse, verilog-read-decls): Fix not
         treating `elsif similar to `endif inside AUTOSENSE.
         (verilog-do-indent): Implement correct automatic or static task or
-        function end comment highlight. Reported by Steve Pearlmutter.
+        function end comment highlight.  Reported by Steve Pearlmutter.
         (verilog-font-lock-keywords-2): Fix highlighting of single
         character pins, bug264.  Reported by Michael Laajanen.
         (verilog-auto-inst, verilog-read-decls, verilog-read-sub-decls)
@@ -4185,7 +4202,7 @@
         Reported by Mark Johnson.
         (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp):
         Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF,
-        bug269. Suggested by Gary Delp.
+        bug269.  Suggested by Gary Delp.
         (verilog-mode-map, verilog-preprocess, verilog-preprocess-history)
         (verilog-preprocessor, verilog-set-compile-command):
         Create verilog-preprocess and verilog-preprocessor to show
@@ -4193,7 +4210,7 @@
         (verilog-get-beg-of-line, verilog-get-end-of-line)
         (verilog-modi-file-or-buffer, verilog-modi-name)
         (verilog-modi-point, verilog-within-string): Move defmacro's
-        before first use to avoid warning. Reported by Steve Pearlmutter.
+        before first use to avoid warning.  Reported by Steve Pearlmutter.
         (verilog-colorize-buffer, verilog-colorize-include-files-buffer)
         (verilog-colorize-region, verilog-highlight-buffer)
         (verilog-highlight-includes, verilog-highlight-modules)
@@ -4225,7 +4242,7 @@
         (verilog-alw-get-temps, verilog-auto-reset)
         (verilog-auto-sense-sigs, verilog-read-always-signals)
         (verilog-read-always-signals-recurse): Fix loop indexes being
-        AUTORESET. AUTORESET now assumes any variables in the
+        AUTORESET.  AUTORESET now assumes any variables in the
         initialization section of a for() should be ignored.
         Reported by Dan Dever.
         (verilog-error-font-lock-keywords)