From: Karoly Lorentey <lorentey@elte.hu>
Date: Sat, 13 Jan 2007 22:59:28 +0000 (+0000)
Subject: Merged from emacs@sv.gnu.org
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38db5c8d522cc1faa8190e77dbc932a5560e6aad;p=emacs.git

Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-592
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-593
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-594
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-595
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-596
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-597
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-598
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-186
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-187
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-188
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-189
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-190
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-191
   Update from CVS

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

38db5c8d522cc1faa8190e77dbc932a5560e6aad
diff --cc lisp/ldefs-boot.el
index 18248771da0,7c573905fc5..80e2f978f58
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@@ -7973,6 -7956,6 +7971,10 @@@ If MAP is specified, it should normall
  menu-bar keymap.  It can also be a symbol, which has earlier been used as the
  first argument in a call to `easy-menu-define', or the value of such a symbol.
  
++If MAP is specified, it should normally be a keymap; nil stands for the local
++menu-bar keymap.  It can also be a symbol, which has earlier been used as the
++first argument in a call to `easy-menu-define', or the value of such a symbol.
++
  If the menu located by PATH has no submenu named NAME, add one.
  If the optional argument BEFORE is present, add it just before
  the submenu named BEFORE, otherwise add it at the end of the menu.
@@@ -15009,6 -14939,6 +15010,15 @@@ This function is intended to be used fr
  
  \(fn)" nil nil)
  
++(autoload (quote image-type-auto-detected-p) "image" "\
++Return t iff the current buffer contains an auto-detectable image.
++Whether image types are auto-detectable or not depends on the setting
++of the variable `image-type-auto-detectable'.
++
++This function is intended to be used from `magic-mode-alist' (which see).
++
++\(fn)" nil nil)
++
  (autoload (quote create-image) "image" "\
  Create an image.
  FILE-OR-DATA is an image file name or image data.
@@@ -28017,7 -27722,7 +28026,7 @@@ Not documente
  (autoload (quote tramp-completion-handle-file-name-all-completions) "tramp" "\
  Like `file-name-all-completions' for partial tramp files.
  
--\(fn FILENAME DIRECTORY)" nil nil)
++\(fn FILENAME DIRECTORY &optional PREDICATE)" nil nil)
  
  (autoload (quote tramp-completion-handle-file-name-completion) "tramp" "\
  Like `file-name-completion' for tramp files.