Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-485
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-486
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-487
   Tweak permissions

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-488
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-229

14 files changed, 184 insertions, 93 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5c86c060880..c26a8a7d786 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-10  Steven Tamm  <steventamm@mac.com>
+
+        * PROBLEMS: Remove description of Mac OS version upgrade
+        problems as it is no longer applicable.
+
 2004-07-27  Werner Lemberg  <wl@gnu.org>
 
         * NEWS: Document all new tutorials.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index abc04f3dd11..a72d6f14e31 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -59,17 +59,6 @@ There appears to be a problem with the implementation of pty's on the
 Mac OS X that causes process output to be truncated.  To avoid this,
 leave process-connection-type set to its default value of nil.
 
-* Emacs crashes on Mac OS X (Carbon) after system software upgrade.
-
-This problem seems to be now solved by Steven Tamm's patch to
-unexmacosx.c on Nov 24, 2002.
-
-Between Mac OS X release 10.2.1 and 10.2.2 there was an incompatible
-change in the memory allocator that causes a EXC_BAD_ACCESS error near
-xrealloc().  Relinking the application (by deleting src/temacs and
-running make) will solve the problem.  It appears to be caused by some
-problems with the unexec code and its interaction with libSystem.B.
-
 * Emacs crashes with SIGSEGV in XtInitializeWidgetClass
 
 It crashes on X, but runs fine when called with option "-nw".
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31e414c2a4b..8321253666a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2004-08-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.44.
+
+        * net/tramp.el (tramp-post-connection): Quote $1 and $2 of shell
+        function "tramp_file_attributes".  Otherwise, file names
+        containing spaces are misinterpreted.  Reported by Magnus Henoch
+        <mange@freemail.hu>.
+        (tramp-handle-file-truename): FILENAME must be expanded first.
+        Otherwise, parameters like "/ssh:deego@gnufans.net:~" will return
+        obscure results.  Reported by D. Goel <deego@gnufans.org>.
+        (tramp-handle-verify-visited-file-modtime): If file does not
+        exist, say it is not modified if and only if that agrees with the
+        buffer's record.  Check whether a file is visiting the buffer, or
+        the buffer has no recorded last modification time.  Return t in
+        case the visiting file doesn't exist.  Suggested by Luc Teirlinck
+        <teirllm@auburn.edu>.
+        (tramp-handle-write-region): Pass modtime explicitely to
+        `set-visited-file-modtime', because filename can be different
+        from (buffer-file-name) if `file-precious-flag' is set.
+        `set-visited-file-modtime' must be called always when `visit' is t
+        or a string.  Suggested by Luc Teirlinck <teirllm@auburn.edu>.
+        (tramp-handle-set-visited-file-modtime): If `time-list' is not
+        nil, don't apply the whole body.  If the file doesn't exists, set
+        modtime to '(-1 65535).  Suggested by Luc Teirlinck
+        <teirllm@auburn.edu>.
+
+2004-08-09  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * help.el (describe-bindings): Doc fix.
+
+        * subr.el (kbd): Doc fix.
+
 2004-08-08  John Paul Wallington  <jpw@gnu.org>
 
         * ibuffer.el (define-ibuffer-column size): Use `string-to-number'
@@ -32,6 +65,11 @@
         (reb-lisp-syntax-p, reb-change-syntax): `rx' is a Lisp syntax.
         (reb-cook-regexp): Call `rx-to-string' when `re-reb-syntax' is `rx'.
 
+2004-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>  (tiny change)
+
+        * mail/mail-extr.el (mail-extr-disable-voodoo): New variable.
+        (mail-extr-voodoo): Check mail-extr-disable-voodoo.
+
 2004-08-04  Kenichi Handa  <handa@m17n.org>
 
         * international/encoded-kb.el (encoded-kbd-setup-keymap): Fix
diff --git a/lisp/help.el b/lisp/help.el
index fc43d8db03d..52a772779a5 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -428,7 +428,8 @@ We put that list in a buffer, and display the buffer.
 The optional argument PREFIX, if non-nil, should be a key sequence;
 then we display only bindings that start with that prefix.
 The optional argument BUFFER specifies which buffer's bindings
-to display (default, the current buffer)."
+to display (default, the current buffer).  BUFFER can be a buffer
+or a buffer name."
   (interactive)
   (or buffer (setq buffer (current-buffer)))
   (help-setup-xref (list #'describe-bindings prefix buffer) (interactive-p))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 02b076483c1..cda0d41fd8d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2055,7 +2055,7 @@ target of the symlink differ."
 
 (defun tramp-handle-file-truename (filename &optional counter prev-dirs)
   "Like `file-truename' for tramp files."
-  (with-parsed-tramp-file-name filename nil
+  (with-parsed-tramp-file-name (expand-file-name filename) nil
     (let* ((steps        (tramp-split-string localname "/"))
            (localnamedir (tramp-let-maybe directory-sep-char ?/ ;for XEmacs
                            (file-name-as-directory localname)))
@@ -2299,32 +2299,33 @@ If it doesn't exist, generate a new one."
   (unless (buffer-file-name)
     (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file"
            (buffer-name)))
-  (when time-list
-    (tramp-run-real-handler 'set-visited-file-modtime (list time-list)))
-  (let ((f (buffer-file-name))
-        (coding-system-used nil))
-    (with-parsed-tramp-file-name f nil
-      (let* ((attr (file-attributes f))
-             (modtime (nth 5 attr)))
-        ;; We use '(0 0) as a don't-know value.  See also
-        ;; `tramp-handle-file-attributes-with-ls'.
-        (when (boundp 'last-coding-system-used)
-          (setq coding-system-used last-coding-system-used))
-        (if (not (equal modtime '(0 0)))
-            (tramp-run-real-handler 'set-visited-file-modtime (list modtime))
-          (save-excursion
-            (tramp-send-command
-             multi-method method user host
-             (format "%s -ild %s"
-                     (tramp-get-ls-command multi-method method user host)
-                     (tramp-shell-quote-argument localname)))
-            (tramp-wait-for-output)
-            (setq attr (buffer-substring (point)
-                                         (progn (end-of-line) (point)))))
-          (setq tramp-buffer-file-attributes attr))
-        (when (boundp 'last-coding-system-used)
-          (setq last-coding-system-used coding-system-used))
-        nil))))
+  (if time-list
+      (tramp-run-real-handler 'set-visited-file-modtime (list time-list))
+    (let ((f (buffer-file-name))
+          (coding-system-used nil))
+      (with-parsed-tramp-file-name f nil
+        (let* ((attr (file-attributes f))
+               ;; '(-1 65535) means file doesn't exists yet.
+               (modtime (or (nth 5 attr) '(-1 65535))))
+          ;; We use '(0 0) as a don't-know value.  See also
+          ;; `tramp-handle-file-attributes-with-ls'.
+          (when (boundp 'last-coding-system-used)
+            (setq coding-system-used last-coding-system-used))
+          (if (not (equal modtime '(0 0)))
+              (tramp-run-real-handler 'set-visited-file-modtime (list modtime))
+            (save-excursion
+              (tramp-send-command
+               multi-method method user host
+               (format "%s -ild %s"
+                       (tramp-get-ls-command multi-method method user host)
+                       (tramp-shell-quote-argument localname)))
+              (tramp-wait-for-output)
+              (setq attr (buffer-substring (point)
+                                           (progn (end-of-line) (point)))))
+            (setq tramp-buffer-file-attributes attr))
+          (when (boundp 'last-coding-system-used)
+            (setq last-coding-system-used coding-system-used))
+        nil)))))
 
 ;; CCC continue here
 
@@ -3811,8 +3812,11 @@ This will break if COMMAND prints a newline, followed by the value of
       (unless (equal curbuf (current-buffer))
         (error "Buffer has changed from `%s' to `%s'"
                curbuf (current-buffer)))
-      (when (eq visit t)
-        (set-visited-file-modtime))
+      (when (or (eq visit t) (stringp visit))
+        (set-visited-file-modtime
+         ;; We must pass modtime explicitely, because filename can be different
+         ;; from (buffer-file-name), f.e. if `file-precious-flag' is set.
+         (nth 5 (file-attributes filename))))
       ;; Make `last-coding-system-used' have the right value.
       (when (boundp 'last-coding-system-used)
         (setq last-coding-system-used coding-system-used))
@@ -5847,7 +5851,8 @@ locale to C and sets up the remote shell search path."
          multi-method method user host
          (concat "tramp_file_attributes () {\n"
                  tramp-remote-perl
-                 " -e '" tramp-perl-file-attributes "' $1 $2 2>/dev/null\n"
+                 " -e '" tramp-perl-file-attributes "'"
+                 " \"$1\" \"$2\" 2>/dev/null\n"
                  "}"))
         (tramp-wait-for-output)
         (unless (tramp-method-out-of-band-p multi-method method user host)
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index b3223d7a46e..46b33b2d50f 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -30,7 +30,7 @@
 ;; are auto-frobbed from configure.ac, so you should edit that file and run
 ;; "autoconf && ./configure" to change them.
 
-(defconst tramp-version "2.0.39"
+(defconst tramp-version "2.0.44"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "tramp-devel@mail.freesoftware.fsf.org"
diff --git a/lisp/subr.el b/lisp/subr.el
index 2833dd10611..af599940d52 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -566,7 +566,7 @@ The order of bindings in a keymap matters when it is used as a menu."
 (defmacro kbd (keys)
   "Convert KEYS to the internal Emacs key representation.
 KEYS should be a string constant in the format used for
-saving keyboard macros (see `insert-kbd-macro')."
+saving keyboard macros (see `edmacro-mode')."
   (read-kbd-macro keys))
 
 (put 'keyboard-translate-table 'char-table-extra-slots 0)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 5f4f8901637..ed0c2e9d421 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,22 @@
+2004-08-10  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * keymaps.texi: Various changes in addition to:
+        (Keymap Terminology): `kbd' uses same syntax as Edit Macro mode.
+        Give more varied examples for `kbd'.
+        (Creating Keymaps): Char tables have slots for all characters
+        without modifiers.
+        (Active Keymaps): `overriding-local-map' and
+        `overriding-terminal-local-map' also override text property and
+        overlay keymaps.
+        (Functions for Key Lookup): Mention OLP arg to `current-active-maps'.
+        (Scanning Keymaps): `accessible-keymaps' uses `[]' instead of `""'
+        to denote a prefix of no events.
+        `map-keymap' includes parent's bindings _recursively_.
+        Clarify and correct description of `where-is-internal'.
+        Mention BUFFER-OR-NAME arg to `describe-bindings'.
+        (Menu Example): For menus intended for use with the keyboard, the
+        menu items should be bound to characters or real function keys.
+
 2004-08-08  Luc Teirlinck  <teirllm@auburn.edu>
 
         * objects.texi (Character Type): Reposition `@anchor' to prevent
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 6d7b956af64..c2c488873a4 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -563,9 +563,9 @@ menu bar.  @xref{Menu Bar}.  (The X toolkit and GTK allow at most one
 menu bar line; they treat larger values as 1.)
 
 @item tool-bar-lines
-The number of lines to use for the toolbar.  A value of @code{nil} means
-don't display a tool bar.  (GTK allows at most one tool bar line; it
-treats larger values as 1.)
+The number of lines to use for the tool bar.  A value of @code{nil}
+means don't display a tool bar.  (GTK allows at most one tool bar line;
+it treats larger values as 1.)
 
 @item screen-gamma
 @cindex gamma correction
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 12246f0b236..089d29fc4ee 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2004
 @c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/keymaps
@@ -103,16 +103,19 @@ representation; it is also convenient to use @code{kbd}:
 This macro converts the text @var{keyseq-text} (a string constant)
 into a key sequence (a string or vector constant).  The contents
 of @var{keyseq-text} should describe the key sequence using the syntax
-used in this manual:
+used in this manual.  More precisely, it uses the same syntax that
+Edit Macro mode uses for editing keyboard macros (@pxref{Edit Keyboard
+Macro,,, emacs, The GNU Emacs Manual}).
 
 @example
 (kbd "C-x") @result{} "\C-x"
 (kbd "C-x C-f") @result{} "\C-x\C-f"
-(kbd "C-c C-c") @result{} "\C-c\C-c"
 (kbd "C-x 4 C-f") @result{} "\C-x4\C-f"
 (kbd "X") @result{} "X"
 (kbd "RET") @result{} "\^M"
-(kbd "C-c 3") @result{} "\C-c3"
+(kbd "C-c SPC") @result{} "\C-c@ "
+(kbd "<f1> SPC") @result{} [f1 32]
+(kbd "C-M-<down>") @result{} [C-M-down]
 @end example
 @end defmac
 
@@ -144,7 +147,8 @@ This specifies a @dfn{default key binding}; any event not bound by other
 elements of the keymap is given @var{binding} as its binding.  Default
 bindings allow a keymap to bind all possible event types without having
 to enumerate all of them.  A keymap that has a default binding
-completely masks any lower-precedence keymap.
+completely masks any lower-precedence keymap, except for events
+explicitly bound to @code{nil} (see below).
 
 @item @var{char-table}
 If an element of a keymap is a char-table, it counts as holding
@@ -251,17 +255,15 @@ satisfies @code{keymapp}.
 @c ??? This should come after make-sparse-keymap
 @defun make-keymap &optional prompt
 This function creates and returns a new full keymap.  That keymap
-contains a char-table (@pxref{Char-Tables}) with 384 slots: the first
-128 slots are for defining all the @acronym{ASCII} characters, the next 128
-slots are for 8-bit European characters, and each one of the final 128
-slots is for one character set of non-@acronym{ASCII} characters supported by
-Emacs.  The new keymap initially binds all these characters to
-@code{nil}, and does not bind any other kind of event.
+contains a char-table (@pxref{Char-Tables}) with slots for all
+characters without modifiers.  The new keymap initially binds all
+these characters to @code{nil}, and does not bind any other kind of
+event.
 
 @example
 @group
 (make-keymap)
-    @result{} (keymap [nil nil nil @dots{} nil nil])
+    @result{} (keymap #^[t nil nil nil @dots{} nil nil keymap])
 @end group
 @end example
 
@@ -509,6 +511,7 @@ active keymap.
 
 @defun define-prefix-command symbol &optional mapvar prompt
 @cindex prefix command
+@anchor{Definition of define-prefix-command}
 This function prepares @var{symbol} for use as a prefix key's binding:
 it creates a sparse keymap and stores it as @var{symbol}'s function
 definition.  Subsequently binding a key sequence to @var{symbol} will
@@ -698,15 +701,16 @@ all buffers.
 
 @defvar overriding-local-map
 If non-@code{nil}, this variable holds a keymap to use instead of the
-buffer's local keymap and instead of all the minor mode keymaps.  This
-keymap, if any, overrides all other maps that would have been active,
-except for the current global map.
+buffer's local keymap, text property or overlay keymaps, and instead
+of all the minor mode keymaps.  This keymap, if any, overrides all
+other maps that would have been active, except for the current global
+map.
 @end defvar
 
 @defvar overriding-terminal-local-map
 If non-@code{nil}, this variable holds a keymap to use instead of
-@code{overriding-local-map}, the buffer's local keymap and all the minor
-mode keymaps.
+@code{overriding-local-map}, the buffer's local keymap, text property
+or overlay keymaps, and all the minor mode keymaps.
 
 This variable is always local to the current terminal and cannot be
 buffer-local.  @xref{Multiple Displays}.  It is used to implement
@@ -977,9 +981,12 @@ An error is signaled if @var{key} is not a string or a vector.
 @end example
 @end defun
 
-@defun current-active-maps
+@defun current-active-maps &optional olp
 This returns the list of keymaps that would be used by the command
-loop in the current circumstances to look up a key sequence.
+loop in the current circumstances to look up a key sequence.  Normally
+it ignores @code{overriding-local-map} and
+@code{overriding-terminal-local-map}, but if @var{olp} is
+non-@code{nil} then it pays attention to them.
 @end defun
 
 @defun local-key-binding key &optional accept-defaults
@@ -1191,7 +1198,7 @@ changing the bindings of both @kbd{C-p C-f} and @kbd{C-x C-f} in the
 default global map.
 
   The function @code{substitute-key-definition} scans a keymap for
-keys that have a certain binding and rebind them with a different
+keys that have a certain binding and rebinds them with a different
 binding.  Another feature you can use for similar effects, but which
 is often cleaner, is to add a binding that remaps a command
 (@pxref{Remapping Commands}).
@@ -1324,7 +1331,7 @@ this by making these two command-remapping bindings in its keymap:
 Whenever @code{my-mode-map} is an active keymap, if the user types
 @kbd{C-k}, Emacs will find the standard global binding of
 @code{kill-line} (assuming nobody has changed it).  But
-@code{my-mode-map} remaps @code{kill-line} to @code{my-mode-map},
+@code{my-mode-map} remaps @code{kill-line} to @code{my-kill-line},
 so instead of running @code{kill-line}, Emacs runs
 @code{my-kill-line}.
 
@@ -1337,15 +1344,16 @@ Remapping only works through a single level.  In other words,
 
 @noindent
 does not have the effect of remapping @code{kill-line} into
-@code{my-other-kill-line}.  If an ordinary key binding specifies 
+@code{my-other-kill-line}.  If an ordinary key binding specifies
 @code{kill-line}, this keymap will remap it to @code{my-kill-line};
 if an ordinary binding specifies @code{my-kill-line}, this keymap will
 remap it to @code{my-other-kill-line}.
 
 @defun command-remapping command
-This function returns the remapping for @var{command}, given the
-current active keymaps.  If @var{command} is not remapped (which is
-the usual situation), the function returns @code{nil}.
+This function returns the remapping for @var{command} (a symbol),
+given the current active keymaps.  If @var{command} is not remapped
+(which is the usual situation), or not a symbol, the function returns
+@code{nil}.
 @end defun
 
 @node Key Binding Commands
@@ -1409,7 +1417,7 @@ actually bind the multibyte character with code 2294, not the unibyte
 Latin-1 character with code 246 (@kbd{M-v}).  In order to use this
 binding, you need to enter the multibyte Latin-1 character as keyboard
 input.  One way to do this is by using an appropriate input method
-(@pxref{Input Methods, , Input Methods, emacs,The GNU Emacs Manual}).
+(@pxref{Input Methods, , Input Methods, emacs, The GNU Emacs Manual}).
 
   If you want to use a unibyte character in the key binding, you can
 construct the key sequence string using @code{multibyte-char-to-unibyte}
@@ -1499,7 +1507,7 @@ association list with elements of the form @code{(@var{key} .@:
 @var{keymap} is @var{map}.
 
 The elements of the alist are ordered so that the @var{key} increases
-in length.  The first element is always @code{("" .@: @var{keymap})},
+in length.  The first element is always @code{([] .@: @var{keymap})},
 because the specified keymap is accessible from itself with a prefix of
 no events.
 
@@ -1517,7 +1525,7 @@ definition is the sparse keymap @code{(keymap (83 .@: center-paragraph)
 @smallexample
 @group
 (accessible-keymaps (current-local-map))
-@result{}(("" keymap
+@result{}(([] keymap
       (27 keymap   ; @r{Note this keymap for @key{ESC} is repeated below.}
           (83 . center-paragraph)
           (115 . center-line))
@@ -1541,7 +1549,7 @@ of a window.
 @smallexample
 @group
 (accessible-keymaps (current-global-map))
-@result{} (("" keymap [set-mark-command beginning-of-line @dots{}
+@result{} (([] keymap [set-mark-command beginning-of-line @dots{}
                    delete-backward-char])
 @end group
 @group
@@ -1572,6 +1580,8 @@ The function @code{map-keymap} calls @var{function} once
 for each binding in @var{keymap}.  It passes two arguments,
 the event type and the value of the binding.  If @var{keymap}
 has a parent, the parent's bindings are included as well.
+This works recursively: if the parent has itself a parent, then the
+grandparent's bindings are also included and so on.
 
 This function is the cleanest way to examine all the bindings
 in a keymap.
@@ -1580,7 +1590,7 @@ in a keymap.
 @defun where-is-internal command &optional keymap firstonly noindirect no-remap
 This function is a subroutine used by the @code{where-is} command
 (@pxref{Help, , Help, emacs,The GNU Emacs Manual}).  It returns a list
-of key sequences (of any length) that are bound to @var{command} in a
+of all key sequences (of any length) that are bound to @var{command} in a
 set of keymaps.
 
 The argument @var{command} can be any object; it is compared with all
@@ -1588,7 +1598,7 @@ keymap entries using @code{eq}.
 
 If @var{keymap} is @code{nil}, then the maps used are the current active
 keymaps, disregarding @code{overriding-local-map} (that is, pretending
-its value is @code{nil}).  If @var{keymap} is non-@code{nil}, then the
+its value is @code{nil}).  If @var{keymap} is a keymap, then the
 maps searched are @var{keymap} and the global keymap.  If @var{keymap}
 is a list of keymaps, only those keymaps are searched.
 
@@ -1598,11 +1608,12 @@ keymaps that are active.  To search only the global map, pass
 @code{(keymap)} (an empty keymap) as @var{keymap}.
 
 If @var{firstonly} is @code{non-ascii}, then the value is a single
-string representing the first key sequence found, rather than a list of
+vector representing the first key sequence found, rather than a list of
 all possible key sequences.  If @var{firstonly} is @code{t}, then the
 value is the first key sequence, except that key sequences consisting
 entirely of @acronym{ASCII} characters (or meta variants of @acronym{ASCII}
-characters) are preferred to all other key sequences.
+characters) are preferred to all other key sequences and that the
+return value can never be a menu binding.
 
 If @var{noindirect} is non-@code{nil}, @code{where-is-internal} doesn't
 follow indirect keymap bindings.  This makes it possible to search for
@@ -1623,7 +1634,7 @@ other command.  However, if @var{no-remap} is non-@code{nil}.
 @end smallexample
 @end defun
 
-@deffn Command describe-bindings &optional prefix
+@deffn Command describe-bindings &optional prefix buffer-or-name
 This function creates a listing of all current key bindings, and
 displays it in a buffer named @samp{*Help*}.  The text is grouped by
 modes---minor modes first, then the major mode, then global bindings.
@@ -1643,6 +1654,10 @@ For example, in the default global map, the characters @samp{@key{SPC}
 @kbd{~} is @acronym{ASCII} 126, and the characters between them include all
 the normal printing characters, (e.g., letters, digits, punctuation,
 etc.@:); all these characters are bound to @code{self-insert-command}.
+
+If @var{buffer-or-name} is non-@code{nil}, it should be a buffer or a
+buffer name.  Then @code{describe-bindings} lists that buffer's bindings,
+instead of the current buffer's.
 @end deffn
 
 @node Menu Keymaps
@@ -1681,8 +1696,9 @@ prompt string.
 
 The easiest way to construct a keymap with a prompt string is to specify
 the string as an argument when you call @code{make-keymap},
-@code{make-sparse-keymap} or @code{define-prefix-command}
-(@pxref{Creating Keymaps}).
+@code{make-sparse-keymap} (@pxref{Creating Keymaps}), or
+@code{define-prefix-command} (@pxref{Definition of define-prefix-command}).
+
 
 @defun keymap-prompt keymap
 This function returns the overall prompt string of @var{keymap},
@@ -2107,6 +2123,12 @@ functioning of the menu itself, but they are ``echoed'' in the echo area
 when the user selects from the menu, and they appear in the output of
 @code{where-is} and @code{apropos}.
 
+  The menu in this example is intended for use with the mouse.  If a
+menu is intended for use with the keyboard, that is, if it is bound to
+a key sequence ending with a keyboard event, then the menu items
+should be bound to characters or ``real'' function keys, that can be
+typed with the keyboard.
+
   The binding whose definition is @code{("--")} is a separator line.
 Like a real menu item, the separator has a key symbol, in this case
 @code{separator-ps-print}.  If one menu has two separators, they must
@@ -2389,7 +2411,7 @@ property list elements to add to the menu item specification.
 This function is used for making non-global tool bar items.  Use it
 like @code{tool-bar-add-item-from-menu} except that @var{in-map}
 specifies the local map to make the definition in.  The argument
-@var{from-map} si like the @var{map} argument of
+@var{from-map} is like the @var{map} argument of
 @code{tool-bar-add-item-from-menu}.
 @end defun
 
diff --git a/man/ChangeLog b/man/ChangeLog
index 4f2ce160de6..d6e105977fc 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.0.44.
+
 2004-08-05  Lars Hansen  <larsh@math.ku.dk>
 
         * widget.texi (User Interface): Update how to separate the
diff --git a/man/trampver.texi b/man/trampver.texi
index 32ab2349241..a5cc874b3fb 100644
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -4,7 +4,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.0.43
+@set trampver 2.0.44
 
 @c Other flags from configuration
 @set prefix /usr/local
diff --git a/src/ChangeLog b/src/ChangeLog
index 248d5daa92e..3f9b6d85e51 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-09  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * keymap.c (Fmake_keymap, Fmap_keymap, Fwhere_is_internal): Doc fixes.
+
 2004-08-08  Luc Teirlinck  <teirllm@auburn.edu>
 
         * keyboard.c: Declare Qdisabled_command_function instead of
diff --git a/src/keymap.c b/src/keymap.c
index e93a3f89fe4..484f08b9077 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -131,10 +131,11 @@ static void silly_event_symbol_error P_ ((Lisp_Object));
 
 DEFUN ("make-keymap", Fmake_keymap, Smake_keymap, 0, 1, 0,
        doc: /* Construct and return a new keymap, of the form (keymap CHARTABLE . ALIST).
-CHARTABLE is a char-table that holds the bindings for the ASCII
-characters.  ALIST is an assoc-list which holds bindings for function keys,
-mouse events, and any other things that appear in the input stream.
-All entries in it are initially nil, meaning "command undefined".
+CHARTABLE is a char-table that holds the bindings for all characters
+without modifiers.  All entries in it are initially nil, meaning
+"command undefined".  ALIST is an assoc-list which holds bindings for
+function keys, mouse events, and any other things that appear in the
+input stream.  Initially, ALIST is nil.
 
 The optional arg STRING supplies a menu name for the keymap
 in case you use it as a menu with `x-popup-menu'.  */)
@@ -729,7 +730,10 @@ map_keymap_call (key, val, fun, dummy)
 
 DEFUN ("map-keymap", Fmap_keymap, Smap_keymap, 2, 2, 0,
        doc: /* Call FUNCTION for every binding in KEYMAP.
-FUNCTION is called with two arguments: the event and its binding.  */)
+FUNCTION is called with two arguments: the event and its binding.
+If KEYMAP has a parent, the parent's bindings are included as well.
+This works recursively: if the parent has itself a parent, then the
+grandparent's bindings are also included and so on.  */)
      (function, keymap)
      Lisp_Object function, keymap;
 {
@@ -2573,7 +2577,7 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap)
 
 DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0,
        doc: /* Return list of keys that invoke DEFINITION.
-If KEYMAP is non-nil, search only KEYMAP and the global keymap.
+If KEYMAP is a keymap, search only KEYMAP and the global keymap.
 If KEYMAP is nil, search all the currently active keymaps.
 If KEYMAP is a list of keymaps, search only those keymaps.
 
@@ -2581,8 +2585,8 @@ If optional 3rd arg FIRSTONLY is non-nil, return the first key sequence found,
 rather than a list of all possible key sequences.
 If FIRSTONLY is the symbol `non-ascii', return the first binding found,
 no matter what it is.
-If FIRSTONLY has another non-nil value, prefer sequences of ASCII characters,
-and entirely reject menu bindings.
+If FIRSTONLY has another non-nil value, prefer sequences of ASCII characters
+\(or their meta variants) and entirely reject menu bindings.
 
 If optional 4th arg NOINDIRECT is non-nil, don't follow indirections
 to other keymaps or slots.  This makes it possible to search for an