Merge from mainline.

26 files changed, 287 insertions, 128 deletions

diff --git a/ChangeLog b/ChangeLog
index db1d28dd620..6792ba4f3e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-23  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+        * configure.in: Check for utmp.h availability (FreeBSD 9.x lacks
+        this header file).
+
 2010-01-12  Juanma Barranquero  <lekktu@gmail.com>
 
         * .bzrignore: Ignore all .exe, instead of individual files.
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index e253cb6d1b4..1a9f6f2bd4c 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -35,15 +35,16 @@ So you need to explicitly CC him/her (and anyone else you like).
 (Many people think the submitter SHOULD be automatically subscribed
 to subsequent discussion, but this does not seem to be implemented.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=37078)
+See also http://debbugs.gnu.org/5439
 
-Do NOT send a separate copy to the bug list, since this may generate a
-new report. The only time to send mail to the bug list is to create a
-new report.
+Do NOT send a separate copy to the bug list address, since this may
+generate a new report.  The only time to send mail to the bug list
+address is to create a new report.
 
 Gnus users can add the following to message-dont-reply-to-names;
 similarly with Rmail and rmail-dont-reply-to-names:
 
-"\\(emacs-pretest-bug\\|bug-gnu-emacs\\)@gnu\\.org\\|\
+"\\(emacs-pretest-bug\\|bug-gnu-emacs\\|bug-\\(e\\|gnu\\)macs\\)@gnu\\.org\\|\
 \\(submit\\|control\\|owner\\)@debbugs\\.gnu\\.org"
 
 The "owner@debbugs.gnu.org" entry is there because it appears in the
@@ -58,27 +59,23 @@ reporting.)
 (e.g. bug-cc-mode@gnu.org), do NOT just use a Cc: header.
 Instead, use "X-Debbugs-CC:".  This ensures the Cc address will get a
 mail with the bug report number in.  If you do not do this, each reply
-in the subsequent discussion will end up creating a new bug.  This is
-annoying.
-
-Note that the way this feature works is perhaps not ideal (Bug#1720).
-If X-Debbugs-CC: was specifed by a real header, that header is removed
-in the mail sent out to the bug list, and the addresses merged into
-the Resent-CC header (see below).  They don't appear as an explicit CC:
-header, nor do they appear in the Reply-To: header.  So people you
-X-Debbugs-CC are not included in any following discussion unless they are
-manually cc'd.  So this feature really only serves to notify them that
-a bug has been filed.  It's then up to them to follow any subsequent
-discussion.
-
-If X-Debbugs-CC were merged into the Reply-To header, this might work
-more the way people expect.
+in the subsequent discussion will end up creating a new bug.
+This is annoying.
+
+If a new report contains X-Debbugs-CC in the input, this is
+converted to a real Cc header in the output.  (See Bug#1720).
+It is also merged into the Resent-CC header (see below).
 
 ** How does Debbugs send out mails?
 
-The mails are sent out to the bug list with From: and To: unchanged.
-Eg if you file a bug with "submit@debbugs.gnu.org", that
-remains in the To: address.  They reach the bug list by being resent.
+The mails are sent out to the bug list by being resent.  The From:
+header is unchanged.  In new reports only (at present), the To:
+address is altered as follows.  Any "bug-gnu-emacs",
+"emacs-pretest-bug", or "submit@debbugs" address is replaced by
+123@debbugs in the mail that gets sent out.  (This also applies to any
+Cc: header, though you should be using X-Debbugs-CC instead in new
+reports).  The original header is stored as X-Debbugs-Original-To, if
+it was changed.  Any X-Debbugs-CC is merged into the Cc.
 
 Mails arriving at the bug list have the following Resent-* headers:
 
@@ -88,10 +85,6 @@ Resent-CC:   maintainer email address, plus any X-Debbugs-CC: entries
 
 The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases.
 
-A new report also has:
-
-Mail-Followup-To: bug submitter, 123@debbugs.gnu.org
-
 ** To not get acknowledgement mail from the tracker,
 add an "X-Debbugs-No-Ack:" header (with any value).  If you use Gnus,
 you can add an element to gnus-posting-styles to do this automatically, eg:
@@ -124,10 +117,10 @@ When you close a bug, you get a message matching:
 ^X-Emacs-PR-Message: closed
 
 ** How to avoid multiple copies of mails.
-When you reply to a bug, respect the Reply-To address, ie send mail
-only to the submitter address and the numbered bug address.  Do not
-send mail direct to bug-gnu-emacs or emacs-pretest-bug unless you are
-reporting a new bug.
+If you reply to reports in the normal way, this should work fine.
+Basically, reply only to the numbered bug address (and any individual
+people's addresses). Do not send mail direct to bug-gnu-emacs or
+emacs-pretest-bug unless you are reporting a new bug.
 
 ** To close bug #123 (for example), send mail
 
@@ -195,8 +188,7 @@ tag:tag                # all bugs with given tag
 See <http://wiki.debian.org/bugs.debian.org/usertags>
 
 "Usertags" are very similar to tags: a set of labels that can be added
-to a bug.  There are two differences between normal tags and user
-tags:
+to a bug.  There are two differences between normal tags and user tags:
 
 1) Anyone can define any valid usertag they like.  In contrast, only a
 limited, predefined set of normal tags are available (see above).
@@ -362,7 +354,7 @@ bug number.
 
 Similarly, when you close a bug, it can be helpful to include the
 relevant ChangeLog entry in the message to the bug tracker, so people
-can see eaxctly what the fix was.
+can see exactly what the fix was.
 
 *** bug-reference-mode
 
@@ -373,6 +365,17 @@ the bug web-pages.
 
 http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 
+** Bazaar stuff
+
+*** You can use `bzr commit --fixes emacs:123' to mark that a commit fixes
+Emacs bug 123.  You will first need to add a line to your bazaar.conf
+(untested):
+
+bugtracker_emacs_url = http://debbugs.gnu.org/{id}
+
+Note that all this does is add some metadata to the commit, it doesn't
+actually mark the bug as closed in the tracker.
+
 ** Gnus-specific voodoo
 
 *** Put point on a bug-number and try: M-x gnus-read-ephemeral-emacs-bug-group
@@ -448,7 +451,10 @@ needlessly held for moderation:
 *** debbugs-submit
 (quiet|control|submit)@(debbugs\.gnu\.org|emacsbugs\.donarmstrong\.com)
 [0-9]+(-done|-quiet|-subscribe)?@(debbugs\.gnu\.org|emacsbugs\.donarmstrong\.com)
-(bug-gnu-emacs|emacs-pretest-bug)@gnu\.org
+(bug-gnu-emacs|emacs-pretest-bug|bug-(e|gnu)macs)@gnu\.org
+
+bug-emacs and bug-gnumacs are lesser-used aliases from fencepost's
+/etc/aliases file.
 
 *** emacs-bug-tracker
 sender: bug-gnu-emacs AT gnu.org
@@ -456,3 +462,18 @@ recipient: emacs-bug-tracker AT debbugs\.gnu\.org
 
 The latter is because that is the address that debbugs actually sends to.
 An /etc/aliases entry redirects it to the real emacs-bug-tracker address.
+
+** Administrivia
+
+The debbugs-submit list should have the administrivia option off,
+else it can by mistake filter out requests to subscribe to bugs.
+But, this feature doesn't work anyway (see bug#5439).
+
+** How to test changes
+
+Add an entry to /etc/debbugs/Maintainers like:
+
+mytest       my.email.address
+
+Then if you do all your testing with 'Package: mytest', the resulting
+mails should only go to your email address.
diff --git a/configure b/configure
index 947b8ae9c3e..1ba9d361e6a 100755
--- a/configure
+++ b/configure
@@ -6665,11 +6665,12 @@ fi
 
 
 
+
 for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
   termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
   sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
-  sys/utsname.h pwd.h
+  sys/utsname.h pwd.h utmp.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
diff --git a/configure.in b/configure.in
index 33671e530ee..82d3dfe4ede 100644
--- a/configure.in
+++ b/configure.in
@@ -1106,7 +1106,7 @@ AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
   termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
   sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
-  sys/utsname.h pwd.h)
+  sys/utsname.h pwd.h utmp.h)
 
 AC_MSG_CHECKING(if personality LINUX32 can be set)
 AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7d7002a6469..39ffa2c2acc 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index ac955956b91..8ebbcf58ed4 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1609,13 +1609,13 @@ hungry-delete feature is enabled.
 
 @table @kbd
 @item C-c C-w
-@itemx M-x c-subword-mode
-@findex c-subword-mode
+@itemx M-x subword-mode
+@findex subword-mode
 Enable (or disable) @dfn{subword mode}.  In subword mode, Emacs's word
 commands recognize upper case letters in
 @samp{StudlyCapsIdentifiers} as word boundaries.  This is indicated by
 the flag @samp{/w} on the mode line after the mode name
-(e.g. @samp{C/law}).  You can even use @kbd{M-x c-subword-mode} in
+(e.g. @samp{C/law}).  You can even use @kbd{M-x subword-mode} in
 non-CC Mode buffers.
 
 In the GNU project, we recommend using underscores to separate words
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3d39b108049..fe34433c391 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,7 +1,11 @@
-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 --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 6b72c69e05b..bfe09b64244 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -1012,7 +1012,7 @@ capitalized word.  With prefix argument @var{n}, move @var{n} times.
 If @var{n} is negative, move in the opposite direction.
 
 Note that these two commands have been superseded by
-@code{c-subword-mode}, which you should use instead.  @xref{Subword
+@code{subword-mode}, which you should use instead.  @xref{Subword
 Movement}.  They might be removed from a future release of @ccmode{}.
 @end table
 
@@ -1194,10 +1194,9 @@ Toggle hungry-delete minor mode.
 @findex toggle-auto-hungry-state (c-)
 Toggle both auto-newline and hungry delete minor modes.
 
-@item @kbd{C-c C-w} (@code{M-x c-subword-mode})
+@item @kbd{C-c C-w} (@code{M-x subword-mode})
 @kindex C-c C-w
-@findex c-subword-mode
-@findex subword-mode (c-)
+@findex subword-mode
 Toggle subword mode.
 
 @item @kbd{M-x c-toggle-syntactic-indentation}
@@ -1694,11 +1693,11 @@ mode turn on automatically, put the following code in your
 
 @example
 (add-hook 'c-mode-common-hook
-          (lambda () (c-subword-mode 1)))
+          (lambda () (subword-mode 1)))
 @end example
 
-As a bonus, you can also use @code{c-subword-mode} in non-@ccmode{}
-buffers by typing @kbd{M-x c-subword-mode}.
+As a bonus, you can also use @code{subword-mode} in non-@ccmode{}
+buffers by typing @kbd{M-x subword-mode}.
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 @node    Other Commands,  , Subword Movement, Commands
diff --git a/etc/NEWS b/etc/NEWS
index 5d1ffac8904..7d864d15fd5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -322,15 +322,14 @@ backends do not support this.
 **** The short log format for git makes use of the graph display, so
 it's not supported on git versions earlier than 1.5.
 
-**** The new variable vc-git-add-signoff can be used to add a
-Signed-off-by line when committing.
-
 **** Support for operating with stashes has been added to vc-dir: the stash list is
 displayed in the *vc-dir* header, stashes can be created, removed, applied and
 their content displayed.
 
 **** vc-dir displays the stash status
 
+**** vc-dir requires at least git-1.5.5.
+
 *** vc-bzr supports operating with shelves: the shelve list is
 displayed in the *vc-dir* header, shelves can be created, removed and applied.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65e171c1381..6af0ffdf5a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,61 @@
+2010-01-25  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-annotate.el (vc-annotate-revision-at-line): Compare file
+        names too.
+
+        * vc-bzr.el (vc-bzr-print-log): Use the more compact --line option
+        for the short log.
+        (vc-bzr-log-view-mode): Adjust regexp for the above change.
+
+2010-01-25  Mark A. Hershberger  <mah@everybody.org>
+
+        * progmodes/python.el: Replace reference to obsolete
+        c-subward-mode.
+
+        * vc-bzr.el: (vc-bzr-revision-table) New function.
+
+2010-01-25  Eric Hanchrow  <eric.hanchrow@gmail.com>  (tiny change)
+
+        * vc-git.el (vc-git-dir-status-goto-stage): Pass --relative to the
+        diff-index command.  This requires at least git-1.5.5.  (Bug#1589).
+
+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.
+        * net/tramp-imap.el (top): Autoload needed packages.  (Bug#5448)
 
 2010-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index bac24b63021..003f70ea4a5 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2191,7 +2191,7 @@ Redefining advices affect the construction of an advised definition."
 
 (defmacro ad-set-orig-definition (function definition)
   `(ad-safe-fset
-    (ad-get-advice-info-field function 'origname) ,definition))
+    (ad-get-advice-info-field ,function 'origname) ,definition))
 
 (defmacro ad-clear-orig-definition (function)
   `(fmakunbound (ad-get-advice-info-field ,function 'origname)))
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index 8082069a34b..ccab5d90c09 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -1,7 +1,7 @@
 ;;; assoc.el --- insert/delete/sort functions on association lists
 
-;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Keywords: extensions
@@ -27,6 +27,7 @@
 ;; fetching off key-value pairs in association lists.
 
 ;;; Code:
+(eval-when-compile (require 'cl))
 
 (defun asort (alist-symbol key)
   "Move a specified key-value pair to the head of an alist.
@@ -41,7 +42,8 @@ sorted list."
 
 (defun aelement (key value)
   "Make a list of a cons cell containing car of KEY and cdr of VALUE.
-The returned list is suitable as an element of an alist."
+The returned list is suitable for concatenating with an existing
+alist, via `nconc'."
   (list (cons key value)))
 
 
@@ -71,8 +73,8 @@ If VALUE is not supplied, or is nil, the key-value pair will not be
 modified, but will be moved to the head of the alist.  If the key-value
 pair cannot be found in the alist, it will be inserted into the head
 of the alist (with value nil if VALUE is nil or not supplied)."
-  (let ((elem (aelement key value))
-        alist)
+  (lexical-let ((elem (aelement key value))
+                alist)
     (asort alist-symbol key)
     (setq alist (eval alist-symbol))
     (cond ((null alist) (set alist-symbol elem))
@@ -86,7 +88,7 @@ of the alist (with value nil if VALUE is nil or not supplied)."
 Alist is referenced by ALIST-SYMBOL and the key-value pair to remove
 is pair matching KEY.  Returns the altered alist."
   (asort alist-symbol key)
-  (let ((alist (eval alist-symbol)))
+  (lexical-let ((alist (eval alist-symbol)))
     (cond ((null alist) nil)
           ((anot-head-p alist key) alist)
           (t (set alist-symbol (cdr alist))))))
@@ -123,10 +125,10 @@ KEYLIST and VALUELIST should have the same number of elements, but
 this isn't enforced.  If VALUELIST is smaller than KEYLIST, remaining
 keys are associated with nil.  If VALUELIST is larger than KEYLIST,
 extra values are ignored.  Returns the created alist."
-  (let ((keycar (car keylist))
-        (keycdr (cdr keylist))
-        (valcar (car valuelist))
-        (valcdr (cdr valuelist)))
+  (lexical-let ((keycar (car keylist))
+                (keycdr (cdr keylist))
+                (valcar (car valuelist))
+                (valcdr (cdr valuelist)))
     (cond ((null keycdr)
            (aput alist-symbol keycar valcar))
           (t
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 9d176a1fd3c..e9051f0a435 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -61,6 +61,13 @@
   :group 'tramp
   :type 'string)
 
+(defcustom tramp-smb-conf "/dev/null"
+  "*Path of the smb.conf file.
+If it is nil, no smb.conf will be added to the `tramp-smb-program'
+call, letting the SMB client use the default one."
+  :group 'tramp
+  :type '(choice (const nil) (file :must-match t)))
+
 (defvar tramp-smb-version nil
   "*Version string of the SMB client.")
 
@@ -1281,7 +1288,8 @@ connection if a previous connection has died for some reason."
 
           (when domain (setq args (append args (list "-W" domain))))
           (when port   (setq args (append args (list "-p" port))))
-          (setq args (append args (list "-s" "/dev/null")))
+          (when tramp-smb-conf
+            (setq args (append args (list "-s" tramp-smb-conf))))
 
           ;; OK, let's go.
           (tramp-message
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 3694de23f88..a08e31e2016 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -257,7 +257,7 @@ Note that indentation is calculated only if `ada-indent-comment-as-code' is t.
 
 For instance:
     A := 1;   --  A multi-line comment
-              --  aligned if ada-indent-align-comments is t"
+              --  aligned if `ada-indent-align-comments' is t"
   :type 'boolean :group 'ada)
 
 (defcustom ada-indent-comment-as-code t
@@ -4163,7 +4163,7 @@ Return nil if the private is part of the package name, as in
 
 
 (defun ada-in-paramlist-p ()
-  "Return t if point is inside a parameter-list."
+  "Return t if point is inside the parameter-list of a declaration, but not a subprogram call or aggregate."
   (save-excursion
     (and
      (ada-search-ignore-string-comment "(\\|)" t nil t)
@@ -4194,13 +4194,13 @@ Return nil if the private is part of the package name, as in
 
      ;; right keyword two words before parenthesis ?
      ;; Type is in this list because of discriminants
+     ;; pragma is not, because the syntax is that of a subprogram call.
      (looking-at (eval-when-compile
                    (concat "\\<\\("
                            "procedure\\|function\\|body\\|"
                            "task\\|entry\\|accept\\|"
                            "access[ \t]+procedure\\|"
                            "access[ \t]+function\\|"
-                           "pragma\\|"
                            "type\\)\\>"))))))
 
 (defun ada-search-ignore-complex-boolean (regexp backwardp)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 94124ad54f0..a6354eff998 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -45,7 +45,7 @@
 ;; `forward-into-nomenclature' should be done separately, since it's
 ;; not specific to Python, and I've installed a minor mode to do the
 ;; job properly in Emacs 23.  [CC mode 5.31 contains an incompatible
-;; feature, `c-subword-mode' which is intended to have a similar
+;; feature, `subword-mode' which is intended to have a similar
 ;; effect, but actually only affects word-oriented keybindings.]
 
 ;; Other things seem more natural or canonical here, e.g. the
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 203c538609f..d881e6fcc7d 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -462,6 +462,7 @@
       (set-keymap-parent input-decode-map map)))
 
     (xterm-register-default-colors)
+    (tty-set-up-initial-frame-faces)
 
     ;; Try to turn on the modifyOtherKeys feature on modern xterms.
     ;; When it is turned on many more key bindings work: things like
@@ -471,6 +472,7 @@
     (let ((coding-system-for-read 'binary)
           (chr nil)
           (str nil)
+          (recompute-faces nil)
           version)
       ;; Pending input can be mistakenly returned by the calls to
       ;; read-event below.  Discard it.
@@ -502,10 +504,11 @@
                   (while (not (equal (setq chr (read-event nil nil 2)) ?\\))
                     (setq str (concat str (string chr))))
                   (when (string-match "11;rgb:\\([a-f0-9]+\\)/\\([a-f0-9]+\\)/\\([a-f0-9]+\\)" str)
-                    (xterm-set-background-mode
-                     (string-to-number (match-string 1 str) 16)
-                     (string-to-number (match-string 2 str) 16)
-                     (string-to-number (match-string 3 str) 16))))))
+                    (setq recompute-faces
+                          (xterm-maybe-set-dark-background-mode
+                           (string-to-number (match-string 1 str) 16)
+                           (string-to-number (match-string 2 str) 16)
+                           (string-to-number (match-string 3 str) 16)))))))
             ;; NUMBER2 is the xterm version number, look for something
             ;; greater than 216, the version when modifyOtherKeys was
             ;; introduced.
@@ -520,10 +523,16 @@
               ;; need to deal with modify-other-keys.
               (push (frame-terminal (selected-frame))
                     xterm-modify-other-keys-terminal-list)
-              (xterm-turn-on-modify-other-keys))))))
+              (xterm-turn-on-modify-other-keys))
 
-    ;; This recomputes all the default faces given the colors we've just set up.
-    (tty-set-up-initial-frame-faces)
+            ;; Recompute faces here in case the background mode was
+            ;; set to dark.  We used to call
+            ;; `tty-set-up-initial-frame-faces' only once, but that
+            ;; caused the light background faces to be computed
+            ;; incorrectly.  See:
+            ;; http://permalink.gmane.org/gmane.emacs.devel/119627
+            (when recompute-faces
+              (tty-set-up-initial-frame-faces))))))
 
     (run-hooks 'terminal-init-xterm-hook))
 
@@ -666,11 +675,13 @@ versions of xterm."
           (delq terminal xterm-modify-other-keys-terminal-list))
     (send-string-to-terminal "\e[>4m" terminal)))
 
-(defun xterm-set-background-mode (redc greenc bluec)
+(defun xterm-maybe-set-dark-background-mode (redc greenc bluec)
   ;; Use the heuristic in `frame-set-background-mode' to decide if a
   ;; frame is dark.
   (when (< (+ redc greenc bluec) (* .6 (+ 65535 65535 65535)))
-    (set-terminal-parameter nil 'background-mode 'dark)))
+    (setq xterm-background-mode-changed t)
+    (set-terminal-parameter nil 'background-mode 'dark)
+    t))
 
 ;; arch-tag: 12e7ebdd-1e6c-4b25-b0f9-35ace25e855a
 ;;; xterm.el ends here
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8d32f7242b7..2a8c6ebe25b 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * url-util.el: Require url-vars (Bug#5459).
+
 2009-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-parse.el (url-generic-parse-url): Bind deactivate-mark.
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 8a9cc01e1f3..c0b2595a6e0 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -26,6 +26,7 @@
 ;;; Code:
 
 (require 'url-parse)
+(require 'url-vars)
 (eval-when-compile (require 'cl))
 (autoload 'timezone-parse-date "timezone")
 (autoload 'timezone-make-date-arpa-standard "timezone")
diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el
index 9f8daad0fde..71839443553 100644
--- a/lisp/vc-annotate.el
+++ b/lisp/vc-annotate.el
@@ -447,7 +447,8 @@ Return a cons (REV . FILENAME)."
     (let ((rev-at-line (vc-annotate-extract-revision-at-line)))
       (if (not rev-at-line)
           (message "Cannot extract revision number from the current line")
-        (if (equal (car rev-at-line) vc-annotate-parent-rev)
+        (if (and (equal (car rev-at-line) vc-annotate-parent-rev)
+                 (string= (cdr rev-at-line) vc-annotate-parent-file))
             (message "Already at revision %s" rev-at-line)
           (vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line)))))))
 
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index d04c783ca32..8861fef0388 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -487,7 +487,7 @@ REV non-nil gets an error."
   (set (make-local-variable 'log-view-file-re) "\\`a\\`")
   (set (make-local-variable 'log-view-message-re)
        (if vc-short-log
-           "^ *\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
+           "^ *\\([0-9.]+\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
          "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
   (set (make-local-variable 'log-view-font-lock-keywords)
        ;; log-view-font-lock-keywords is careful to use the buffer-local
@@ -519,7 +519,7 @@ REV non-nil gets an error."
   (with-current-buffer buffer
     (apply 'vc-bzr-command "log" buffer 'async files
            (append
-            (when shortlog '("--short"))
+            (when shortlog '("--line"))
             (when start-revision (list (format "-r..%s" start-revision)))
             (when limit (list "-l" (format "%s" limit)))
             (if (stringp vc-bzr-log-switches)
@@ -898,6 +898,19 @@ stream.  Standard error output is discarded."
   (interactive "e")
   (vc-dir-at-event e (popup-menu vc-bzr-shelve-menu-map e)))
 
+(defun vc-bzr-revision-table (files)
+  (let ((vc-bzr-revisions '())
+        (default-directory (file-name-directory (car files))))
+    (with-temp-buffer
+      (vc-bzr-command "log" t 0 files "--line")
+      (let ((start (point-min))
+            (loglines (buffer-substring-no-properties (point-min) (point-max))))
+        (while (string-match "^\\([0-9]+\\):" loglines)
+          (push (match-string 1 loglines) vc-bzr-revisions)
+          (setq start (+ start (match-end 0)))
+          (setq loglines (buffer-substring-no-properties start (point-max))))))
+    vc-bzr-revisions))
+
 ;;; Revision completion
 
 (eval-and-compile
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 52482d9ff4b..0d8e6307d6e 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -118,13 +118,6 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :version "23.1"
   :group 'vc)
 
-(defcustom vc-git-add-signoff nil
-  "Add a Signed-off-by line when committing."
-  :type 'boolean
-  :version "23.2"
-  :group 'vc)
-
-
 (defvar git-commits-coding-system 'utf-8
   "Default coding system for git commits.")
 
@@ -388,7 +381,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
      (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i"
                      "--directory" "--no-empty-directory" "--exclude-standard" "--"))
     ('diff-index
-     (vc-git-command (current-buffer) 'async files "diff-index" "-z" "-M" "HEAD" "--")))
+     (vc-git-command (current-buffer) 'async files "diff-index" "--relative" "-z" "-M" "HEAD" "--")))
   (vc-exec-after
    `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function))))
 
@@ -515,7 +508,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 (defun vc-git-checkin (files rev comment)
   (let ((coding-system-for-write git-commits-coding-system))
     (vc-git-command nil 0 files "commit"
-                    (if vc-git-add-signoff "-s") "-m" comment "--only" "--")))
+                    "-m" comment "--only" "--")))
 
 (defun vc-git-find-revision (file rev buffer)
   (let* (process-file-side-effects
@@ -766,10 +759,6 @@ or BRANCH^ (where \"^\" can be repeated)."
     (define-key map [git-ss]
       '(menu-item "Show Stash..." vc-git-stash-show
                   :help "Show stash contents"))
-    (define-key map [git-sig]
-      '(menu-item "Add Signed-off-by on commit" vc-git-toggle-signoff
-              :help "Add Add Signed-off-by when commiting (i.e. add the -s flag)"
-              :button (:toggle . vc-git-add-signoff)))
     map))
 
 (defun vc-git-extra-menu () vc-git-extra-menu-map)
@@ -779,10 +768,6 @@ or BRANCH^ (where \"^\" can be repeated)."
 (defun vc-git-root (file)
   (vc-find-root file ".git"))
 
-(defun vc-git-toggle-signoff ()
-  (interactive)
-  (setq vc-git-add-signoff (not vc-git-add-signoff)))
-
 ;; Derived from `lgrep'.
 (defun vc-git-grep (regexp &optional files dir)
   "Run git grep, searching for REGEXP in FILES in directory DIR.
diff --git a/src/ChangeLog b/src/ChangeLog
index 62337d8db63..96dc0066fd9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2010-01-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (Fx_create_frame): If frame height is too big, try
+        sizes 24 and 10. Bug #3643.
+
+2010-01-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Try and fix bug#788, hopefully for real this time.
+        * keymap.c (shadow_lookup): Add `remap' arg.
+        (describe_map, describe_vector): Update calls to shadow_lookup.
+        (Fwhere_is_internal): Fix up handling of `remapped_sequences' and
+        `remapped' so this flag is applicable to `sequence'.  Be careful to
+        perform remapping during shadow_lookup check of remapped_sequences.
+
+2010-01-24  Eric Bélanger  <snowmaniscool@gmail.com>  (tiny change)
+
+        * image.c (png_load): Use png_sig_cmp instead of the obsolete
+        png_check_sig, which has been removed in libpng 1.4.
+
+2010-01-23  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+        * filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x
+        lacks this header file).
+
 2010-01-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * xdisp.c (draw_glyphs): Update `start' for left_overwritten case
diff --git a/src/filelock.c b/src/filelock.c
index 3c92d495060..7c69ea954fc 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -63,7 +63,9 @@ Lisp_Object Vtemporary_file_directory;
 
 #ifdef CLASH_DETECTION
 
+#ifdef HAVE_UTMP_H
 #include <utmp.h>
+#endif
 
 #if !defined (S_ISLNK) && defined (S_IFLNK)
 #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
diff --git a/src/image.c b/src/image.c
index 9c11f466807..1265b900c6c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -33,7 +33,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #else
 # include <png.h>
 #endif
-#endif 
+#endif
 
 #include <setjmp.h>
 
@@ -3051,7 +3051,7 @@ xbm_load (f, img)
             int nbytes, i;
             /* Windows mono bitmaps are reversed compared with X.  */
             invertedBits = bits;
-            nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR 
+            nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR
               * img->height;
             bits = (char *) alloca(nbytes);
             for (i = 0; i < nbytes; i++)
@@ -5559,7 +5559,7 @@ png_image_p (object)
 /* PNG library details.  */
 
 DEF_IMGLIB_FN (png_get_io_ptr);
-DEF_IMGLIB_FN (png_check_sig);
+DEF_IMGLIB_FN (png_sig_cmp);
 DEF_IMGLIB_FN (png_create_read_struct);
 DEF_IMGLIB_FN (png_create_info_struct);
 DEF_IMGLIB_FN (png_destroy_read_struct);
@@ -5590,7 +5590,7 @@ init_png_functions (Lisp_Object libraries)
     return 0;
 
   LOAD_IMGLIB_FN (library, png_get_io_ptr);
-  LOAD_IMGLIB_FN (library, png_check_sig);
+  LOAD_IMGLIB_FN (library, png_sig_cmp);
   LOAD_IMGLIB_FN (library, png_create_read_struct);
   LOAD_IMGLIB_FN (library, png_create_info_struct);
   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
@@ -5615,7 +5615,7 @@ init_png_functions (Lisp_Object libraries)
 #else
 
 #define fn_png_get_io_ptr               png_get_io_ptr
-#define fn_png_check_sig                png_check_sig
+#define fn_png_sig_cmp                  png_sig_cmp
 #define fn_png_create_read_struct       png_create_read_struct
 #define fn_png_create_info_struct       png_create_info_struct
 #define fn_png_destroy_read_struct      png_destroy_read_struct
@@ -5762,7 +5762,7 @@ png_load (f, img)
 
       /* Check PNG signature.  */
       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
-          || !fn_png_check_sig (sig, sizeof sig))
+          || fn_png_sig_cmp (sig, 0, sizeof sig))
         {
           image_error ("Not a PNG file: `%s'", file, Qnil);
           UNGCPRO;
@@ -5779,7 +5779,7 @@ png_load (f, img)
 
       /* Check PNG signature.  */
       if (tbr.len < sizeof sig
-          || !fn_png_check_sig (tbr.bytes, sizeof sig))
+          || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
         {
           image_error ("Not a PNG image: `%s'", img->spec, Qnil);
           UNGCPRO;
diff --git a/src/keymap.c b/src/keymap.c
index 17666c7efcc..98774d5d685 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2650,11 +2650,13 @@ static void where_is_internal_1 P_ ((Lisp_Object key, Lisp_Object binding,
                                      Lisp_Object args, void *data));
 
 /* Like Flookup_key, but uses a list of keymaps SHADOW instead of a single map.
-   Returns the first non-nil binding found in any of those maps.  */
+   Returns the first non-nil binding found in any of those maps.
+   If REMAP is true, pass the result of the lookup through command
+   remapping before returning it.  */
 
 static Lisp_Object
-shadow_lookup (shadow, key, flag)
-     Lisp_Object shadow, key, flag;
+shadow_lookup (Lisp_Object shadow, Lisp_Object key, Lisp_Object flag,
+               int remap)
 {
   Lisp_Object tail, value;
 
@@ -2669,7 +2671,15 @@ shadow_lookup (shadow, key, flag)
             return Qnil;
         }
       else if (!NILP (value))
-        return value;
+        {
+          Lisp_Object remapping;
+          if (remap && SYMBOLP (value)
+              && (remapping = Fcommand_remapping (value, Qnil, shadow),
+                  !NILP (remapping)))
+            return remapping;
+          else
+            return value;
+        }
     }
   return Qnil;
 }
@@ -2860,30 +2870,30 @@ remapped command in the returned list.  */)
     {
       /* We have a list of advertized bindings.  */
       while (CONSP (tem))
-        if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil), definition))
+        if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition))
           return XCAR (tem);
         else
           tem = XCDR (tem);
-      if (EQ (shadow_lookup (keymaps, tem, Qnil), definition))
+      if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition))
         return tem;
     }
 
   sequences = Freverse (where_is_internal (definition, keymaps,
                                            !NILP (noindirect), nomenus));
 
-  while (CONSP (sequences))
+  while (CONSP (sequences)
+         /* If we're at the end of the `sequences' list and we haven't
+            considered remapped sequences yet, copy them over and
+            process them.  */
+         || (!remapped && (sequences = remapped_sequences,
+                           remapped = 1),
+             CONSP (sequences)))
     {
       Lisp_Object sequence, function;
           
       sequence = XCAR (sequences);
       sequences = XCDR (sequences);
 
-      if (NILP (sequences) && !remapped)
-        {
-          sequences = remapped_sequences;
-          remapped = 1;
-        }
-
       /* Verify that this key binding is not shadowed by another
          binding for the same key, before we say it exists.
 
@@ -2893,7 +2903,8 @@ remapped command in the returned list.  */)
 
          Either nil or number as value from Flookup_key
          means undefined.  */
-      if (!EQ (shadow_lookup (keymaps, sequence, Qnil), definition))
+      if (!EQ (shadow_lookup (keymaps, sequence, Qnil, remapped),
+               definition))
         continue;
 
       /* If the current sequence is a command remapping with
@@ -3506,7 +3517,7 @@ describe_map (map, prefix, elt_describer, partial, shadow,
           ASET (kludge, 0, event);
           if (!NILP (shadow))
             {
-              tem = shadow_lookup (shadow, kludge, Qt);
+              tem = shadow_lookup (shadow, kludge, Qt, 0);
               if (!NILP (tem))
                 {
                   /* If both bindings are keymaps, this key is a prefix key,
@@ -3776,7 +3787,7 @@ describe_vector (vector, prefix, args, elt_describer,
         {
           Lisp_Object tem;
 
-          tem = shadow_lookup (shadow, kludge, Qt);
+          tem = shadow_lookup (shadow, kludge, Qt, 0);
 
           if (!NILP (tem))
             {
diff --git a/src/xfns.c b/src/xfns.c
index 6f18e4e813a..905ed9c576a 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3518,27 +3518,35 @@ This function is an internal primitive--use `make-frame' instead.  */)
   window_prompting = x_figure_window_size (f, parms, 1);
 
   /* Don't make height higher than display height unless the user asked
-     for it.  */
+     for it.  Try sizes 24 and 10 if current is too large.  */
   height = FRAME_LINES (f);
   tem = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER);
   if (EQ (tem, Qunbound))
     {
-      int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f));
+      int h = FRAME_LINES (f) + FRAME_TOOL_BAR_LINES (f)
+        + FRAME_MENU_BAR_LINES (f) + 2;
+      int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h);
       int dph = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f));
+      static int tryheight[] = { 24, 10, 0 } ;
+      int i;
+
+      ph += (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0) /* Gtk toolbar size */
+        + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0); /* Arbitrary */
+
       /* Some desktops have fixed menus above and/or panels below.  Try to
          figure out the usable size we have for emacs.  */
       current_desktop = x_get_current_desktop (f);
       x_get_desktop_workarea (f, current_desktop, &deskw, &deskh);
       if (deskh > 0 && deskh < dph) dph = deskh;
       
-      if (ph > dph)
+      /* Allow 40 pixels for manager decorations.  */
+      for (i = 0; ph+40 > dph && tryheight[i] != 0; ++i)
         {
-          height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, dph) -
-            FRAME_TOOL_BAR_LINES (f) - FRAME_MENU_BAR_LINES (f);
-          if (FRAME_EXTERNAL_TOOL_BAR (f))
-            height -= 2; /* We can't know how big it will be.  */
-          if (FRAME_EXTERNAL_MENU_BAR (f))
-            height -= 2; /* We can't know how big it will be.  */
+          height = tryheight[i];
+          h = height + FRAME_TOOL_BAR_LINES (f) + FRAME_MENU_BAR_LINES (f) + 2;
+          ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h)
+            + (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0)
+            + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0);
         }
     }