Merge from emacs-23.

Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.

5 files changed, 53 insertions, 14 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e196b3015bd..7dcf00ba81e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-25  Chong Yidong  <cyd@stupidchicken.com>
+            Richard Kim  <emacs18@gmail.com>
+
+        * loading.texi (Library Search): Document list-load-path-shadows
+        (Bug#7757).
+
+2011-01-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * searching.texi (Regexp Special): Remove outdated discussion of
+        character sets (Bug#7780).
+
+        * frames.texi (Pop-Up Menus): Document where menu title comes
+        from (Bug#7684).
+
+2011-01-25  Glenn Morris  <rgm@gnu.org>
+
+        * display.texi (Making Buttons): Mention limitation of text buttons.
+
 2011-01-23  Werner Lemberg  <wl@gnu.org>
 
         * Makefile.in (MAKEINFO): Now controlled by `configure'.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 34d81068916..7ba4d967615 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5012,8 +5012,9 @@ and returns it.
 button actually part of the text instead of being a property of the
 buffer.  Buttons using text properties do not create markers into the
 buffer, which is important for speed when you use extremely large
-numbers of buttons.  Both functions return the position of the start
-of the new button:
+numbers of buttons.  (However, if there is an existing face text
+property at the site of the button, the button face may not be visible.)
+Both functions return the position of the start of the new button:
 
 @defun make-text-button beg end &rest properties
 This makes a button from @var{beg} to @var{end} in the current buffer, using
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 0d83aadbcd2..c4e74798415 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -1791,9 +1791,13 @@ without actually displaying or popping up the menu.
 The argument @var{menu} says what to display in the menu.  It can be a
 keymap or a list of keymaps (@pxref{Menu Keymaps}).  In this case, the
 return value is the list of events corresponding to the user's choice.
-(This list has more than one element if the choice occurred in a
-submenu.)  Note that @code{x-popup-menu} does not actually execute the
-command bound to that sequence of events.
+This list has more than one element if the choice occurred in a
+submenu.  (Note that @code{x-popup-menu} does not actually execute the
+command bound to that sequence of events.)  On toolkits that support
+menu titles, the title is taken from the prompt string of @var{menu}
+if @var{menu} is a keymap, or from the prompt string of the first
+keymap in @var{menu} if it is a list of keymaps (@pxref{Defining
+Menus}).
 
 Alternatively, @var{menu} can have the following form:
 
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 5733df87d17..4a74005b2ee 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -363,6 +363,31 @@ interactively, the argument @var{interactive-call} is @code{t}, and this
 tells @code{locate-library} to display the file name in the echo area.
 @end deffn
 
+@cindex shadowed Lisp files
+@deffn Command list-load-path-shadows &optional stringp
+This command shows a list of @dfn{shadowed} Emacs Lisp files.  A
+shadowed file is one that will not normally be loaded, despite being
+in a directory on @code{load-path}, due to the existence of another
+similarly-named file in a directory earlier on @code{load-path}.
+
+For instance, suppose @code{load-path} is set to
+
+@smallexample
+  ("/opt/emacs/site-lisp" "/usr/share/emacs/23.3/lisp")
+@end smallexample
+
+@noindent
+and that both these directories contain a file named @file{foo.el}.
+Then @code{(require 'foo)} never loads the file in the second
+directory.  Such a situation might indicate a problem in the way Emacs
+was installed.
+
+When called from Lisp, this function prints a message listing the
+shadowed files, instead of displaying them in a buffer.  If the
+optional argument @code{stringp} is non-@code{nil}, it instead returns
+the shadowed files as a string.
+@end deffn
+
 @node Loading Non-ASCII
 @section Loading Non-@acronym{ASCII} Characters
 
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 908b776a858..ac3620c510a 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -386,15 +386,6 @@ matches both @samp{]} and @samp{-}.
 To include @samp{^} in a character alternative, put it anywhere but at
 the beginning.
 
-The beginning and end of a range of multibyte characters must be in
-the same character set (@pxref{Character Sets}).  Thus,
-@code{"[\x8e0-\x97c]"} is invalid because character 0x8e0 (@samp{a}
-with grave accent) is in the Emacs character set for Latin-1 but the
-character 0x97c (@samp{u} with diaeresis) is in the Emacs character
-set for Latin-2.  (We use Lisp string syntax to write that example,
-and a few others in the next few paragraphs, in order to include hex
-escape sequences in them.)
-
 If a range starts with a unibyte character @var{c} and ends with a
 multibyte character @var{c2}, the range is divided into two parts: one
 is @samp{@var{c}..?\377}, the other is @samp{@var{c1}..@var{c2}}, where