Merge from origin/emacs-24

f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32  (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat

Conflicts:
	admin/notes/repo
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog

4 files changed, 46 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7a30c6e897a..b1d9822f2f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,28 @@
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
+        * search.c (find_newline): Avoid assertion violations in
+        CHAR_TO_BYTE when a portion of the buffer was deleted and we look
+        for newlines near the end of the buffer.  This happens in Rmail
+        hen JIT font-lock fontifies a newly displayed portion of the
+        buffer.
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fw32__menu_bar_in_use): New internal function.
+        (Bug#19925)
+
+2015-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * fileio.c (Fmake_temp_name): Doc tweaks.  (Bug#19858)
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call
+        mouse_position_for_popup only for X frames.  (Bug#19862)
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
         * buffer.c (syms_of_buffer): Doc fix.  (Bug#19841)
 
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/fileio.c b/src/fileio.c
index 43ab456d813..d4e12cbe277 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -724,20 +724,16 @@ make_temp_name (Lisp_Object prefix, bool base64_p)
 
 DEFUN ("make-temp-name", Fmake_temp_name, Smake_temp_name, 1, 1, 0,
        doc: /* Generate temporary file name (string) starting with PREFIX (a string).
-The Emacs process number forms part of the result,
-so there is no danger of generating a name being used by another process.
+The Emacs process number forms part of the result, so there is no
+danger of generating a name being used by another Emacs process
+\(so long as only a single host can access the containing directory...).
 
-In addition, this function makes an attempt to choose a name
-which has no existing file.  To make this work,
-PREFIX should be an absolute file name.
+This function tries to choose a name that has no existing file.
+For this to work, PREFIX should be an absolute file name.
 
 There is a race condition between calling `make-temp-name' and creating the
-file which opens all kinds of security holes.  For that reason, you should
-probably use `make-temp-file' instead, except in three circumstances:
-
-* If you are creating the file in the user's home directory.
-* If you are creating a directory rather than an ordinary file.
-* If you are taking special precautions as `make-temp-file' does.  */)
+file, which opens all kinds of security holes.  For that reason, you should
+normally use `make-temp-file' instead.  */)
   (Lisp_Object prefix)
 {
   return make_temp_name (prefix, 0);
diff --git a/src/search.c b/src/search.c
index e9617985c18..5da99c408a5 100644
--- a/src/search.c
+++ b/src/search.c
@@ -706,6 +706,12 @@ find_newline (ptrdiff_t start, ptrdiff_t start_byte, ptrdiff_t end,
                                                start, &next_change);
                 if (result)
                   {
+                    /* When the cache revalidation is deferred,
+                       next-change might point beyond ZV, which will
+                       cause assertion violation in CHAR_TO_BYTE below.
+                       Limit next_change to ZV to avoid that.  */
+                    if (next_change > ZV)
+                      next_change = ZV;
                     start = next_change;
                     lim1 = next_change = end;
                   }
diff --git a/src/w32fns.c b/src/w32fns.c
index 6f404e98a62..64532ae6629 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8238,6 +8238,15 @@ w32_sys_ring_bell (struct frame *f)
     MessageBeep (sound_type);
 }
 
+DEFUN ("w32--menu-bar-in-use", Fw32__menu_bar_in_use, Sw32__menu_bar_in_use,
+       0, 0, 0,
+       doc: /* Return non-nil when a menu-bar menu is being used.
+Internal use only.  */)
+  (void)
+{
+  return menubar_in_use ? Qt : Qnil;
+}
+
 
 /***********************************************************************
                             Initialization
@@ -8615,6 +8624,7 @@ only be necessary if the default setting causes problems.  */);
   defsubr (&Sw32_frame_rect);
   defsubr (&Sw32_frame_menu_bar_size);
   defsubr (&Sw32_battery_status);
+  defsubr (&Sw32__menu_bar_in_use);
 
 #ifdef WINDOWSNT
   defsubr (&Sfile_system_info);