merge conflict

diff --cc doc/emacs/ChangeLog
index e9ab5edd57e79c71c7593ca089165f5b72f8b1f9,7d7002a646989700c44da1645d6fe4cbe7ef0e5d..39ffa2c2acc05a33e0609476890d13c3a79c0e5a
--- 1/doc/emacs/ChangeLog
--- 2/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
- 2010-01-19  Mark A. Hershberger  <mah@everybody.org>
++2010-01-24  Mark A. Hershberger  <mah@everybody.org>
 +
 +      * programs.texi (Other C Commands): Replace reference to obsolete
 +      c-subword-mode.
 +
+ 2010-01-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * trouble.texi (Bugs): Fix PROBLEMS keybinding.
+ 
  2010-01-12  Glenn Morris  <rgm@gnu.org>
  
        * trouble.texi (Checklist): Use bug-gnu-emacs rather than

diff --cc doc/misc/ChangeLog
index 50673dc7147e984f45a90d3e4ca889e8894015a1,3d39b108049cbbafff789ec02a1cdea17769e331..fe34433c391216704655e3acb72700044e5e3bff
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
- 2010-01-19  Mark A. Hershberger  <mah@everybody.org>
 -2010-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
++2010-01-24  Mark A. Hershberger  <mah@everybody.org>
+ 
+       * gnus.texi (Score File Format): Fix typo.
+ 
++2010-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 +
 +      * cc-mode.texi: Replace references to obsolete c-subword-mode.
 +
  2010-01-18  Juanma Barranquero  <lekktu@gmail.com>
  
        * ada-mode.texi (Project File Overview): Fix typo.

diff --cc lisp/ChangeLog
index 2ec6621c20b720d8b936c717d8aaa2cbea1ce858,fa3761738bffae97632e1fa016e565c51f6e65ae..1b5d8f241ecb37ce0e7a4988663fd00c382b5c02
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,84 +1,88 @@@
- 2010-01-19  Mark A. Hershberger  <mah@everybody.org>
++2010-01-24  Mark A. Hershberger  <mah@everybody.org>
 +
 +      * progmodes/python.el: Replace reference to obsolete c-subward-mode.
 +
+ 2010-01-24  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       Remove support for adding --signoff on commit.
+       Future support will use an incompatible generic mechanism.
+       * vc-git.el (vc-git-add-signoff): Remove variable.
+       (vc-git-toggle-signoff): Remove function.
+       (vc-git-extra-menu-map): Do not bind vc-git-toggle-signoff.
+ 
+       * term/xterm.el (xterm-maybe-set-dark-background-mode): Rename
+       from xterm-set-background-mode.  Return t if the background mode
+       was set.
+       (terminal-init-xterm): Move tty-set-up-initial-frame-faces
+       earlier, call it again in case the background mode has changed.
+ 
+ 2010-01-23  Dmitri Paduchikh  <dpaduch@k66.ru>  (tiny change)
+ 
+       * emacs-lisp/advice.el (ad-set-orig-definition): Fix typo
+       (Bug#3541).
+ 
+ 2010-01-23  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * emacs-lisp/assoc.el (aelement): Doc fix.
+       (aput, adelete, amake): Use lexical-let (Bug#5450).
+ 
+ 2010-01-23  Stephen Leake  <stephen_leake@member.fsf.org>
+ 
+         * progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax
+       is the same as subprogram call, not declaration.  (Bug#5435).
+ 
+ 2010-01-23  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp-smb.el (tramp-smb-conf): New defcustom.
+       (tramp-smb-maybe-open-connection): Use it.
+ 
+ 2010-01-22  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp-imap.el (top): Autoload needed packages.  (Bug#5448)
+ 
+ 2010-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte
+       just because we see "encoding: 8bit".
+       * mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes.
+ 
+ 2010-01-22  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).
+ 
+ 2010-01-22  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * jka-compr.el (jka-compr-load): If load-file is not in
+       load-history, try its file-truename version.  (bug#5447)
+ 
+ 2010-01-21  Alan Mackenzie  <acm@muc.de>
+ 
+       Fix a situation where deletion of a cpp construct throws an error.
+       * progmodes/cc-engine.el (c-invalidate-state-cache): Before
+       invoking c-with-all-but-one-cpps-commented-out, check that the
+       special cpp construct is still in the buffer.
+       (c-parse-state): Record the special cpp with markers, not numbers.
+ 
+ 2010-01-21  Kenichi Handa  <handa@m17n.org>
+ 
+       * textmodes/sgml-mode.el (sgml-maybe-name-self): No need to
+       process last-command-event, as it is now decoded first (Bug#5380).
+ 
+ 2010-01-20  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).
+ 
+ 2010-01-20  Glenn Morris  <rgm@gnu.org>
+ 
+       * indent.el (tab-always-indent): Fix custom-type.
+ 
+ 2010-01-19  Alan Mackenzie  <acm@muc.de>
+ 
+       * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty
+       buffer throws "args out of range".
+       (c-set-cpp-delimiters, c-clear-cpp-delimiters): Check for EOB
+       playing the role of delimiter.
+ 
  2010-01-18  Stephen Leake  <stephen_leake@member.fsf.org>
  
        * lisp/progmodes/ada-mode.el: Fix bug#5400.