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

8 files changed, 73 insertions, 60 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47ddedae883..ad4a05f9129 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,33 @@
 2015-03-03  Glenn Morris  <rgm@gnu.org>
 
+        * net/browse-url.el (browse-url-firefox-startup-arguments):
+        Make obsolete.
+        (browse-url-firefox): Doc fix.  Remove -remote, which no longer
+        exists in Firefox 36.  (Bug#19921)
+        (browse-url-firefox-sentinel): Remove function.
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.el (blink-cursor-timer-function): Don't increment
+        blink-cursor-blinks-done counter when a menu is active on a w32
+        frame.  (Bug#19925)
+
+2015-03-03  Juri Linkov  <juri@linkov.net>
+
+        * comint.el (comint-line-beginning-position): Revert searching for
+        the prompt when comint-use-prompt-regexp is non-nil because it
+        doesn't distinguish input from output.  Check the field property
+        `output' for the case when comint-use-prompt-regexp is nil.
+        (Bug#19710)
+
+2015-03-03  Jérémy Compostella  <jeremy.compostella@gmail.com>
+
+        * net/tramp-sh.el (tramp-remote-process-environment): Disable paging
+        with PAGER=cat.  (Bug#19870)
+
+2015-03-03  Glenn Morris  <rgm@gnu.org>
+2015-03-03  Glenn Morris  <rgm@gnu.org>
+
         * textmodes/flyspell.el (flyspell-duplicate-distance):
         Bump :version.
 
diff --git a/lisp/comint.el b/lisp/comint.el
index 722a42d6af2..b6944da355c 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2274,8 +2274,6 @@ a buffer local variable."
       ;; Use comint-prompt-regexp
       (save-excursion
         (beginning-of-line)
-        (unless (looking-at comint-prompt-regexp)
-          (re-search-backward comint-prompt-regexp nil t))
         (comint-skip-prompt)
         (point))
     ;; Use input fields.  Note that, unlike the behavior of
@@ -2285,7 +2283,10 @@ a buffer local variable."
     ;; if there are two fields on a line, then the first one is the
     ;; prompt, and the second one is an input field, and is front-sticky
     ;; (as input fields should be).
-    (constrain-to-field (field-beginning) (line-end-position))))
+    (constrain-to-field (if (eq (field-at-pos (point)) 'output)
+                            (line-beginning-position)
+                          (field-beginning))
+                        (line-end-position))))
 
 (defun comint-bol (&optional arg)
   "Go to the beginning of line, then skip past the prompt, if any.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index f89d5a2d043..22ebae4576c 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-03  Kelvin White  <kwhite@gnu.org>
+
+        * erc.el: Add old version string back to file header for
+        package.el compatibility
+
+2015-03-03  Glenn Morris  <rgm@gnu.org>
 2015-03-03  Glenn Morris  <rgm@gnu.org>
 
         * erc.el (erc-rename-buffers): Doc fix.  Add :version.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e2366a1b58f..a84f9f07523 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -12,7 +12,7 @@
 ;;               Kelvin White (kwhite@gnu.org)
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: IRC, chat, client, Internet
-
+;; Version: 5.3
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/frame.el b/lisp/frame.el
index 94e581b1e24..e8a89828b8d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1816,8 +1816,12 @@ command starts, by installing a pre-command hook."
 (defun blink-cursor-timer-function ()
   "Timer function of timer `blink-cursor-timer'."
   (internal-show-cursor nil (not (internal-show-cursor-p)))
+  ;; Suspend counting blinks when the w32 menu-bar menu is displayed,
+  ;; since otherwise menu tooltips will behave erratically.
+  (or (and (fboundp 'w32--menu-bar-in-use)
+           (w32--menu-bar-in-use))
+      (setq blink-cursor-blinks-done (1+ blink-cursor-blinks-done)))
   ;; Each blink is two calls to this function.
-  (setq blink-cursor-blinks-done (1+ blink-cursor-blinks-done))
   (when (and (> blink-cursor-blinks 0)
              (<= (* 2 blink-cursor-blinks) blink-cursor-blinks-done))
     (blink-cursor-suspend)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 42fb9549255..4c8ebf01588 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -337,6 +337,9 @@ Defaults to the value of `browse-url-firefox-arguments' at the time
   :type '(repeat (string :tag "Argument"))
   :group 'browse-url)
 
+(make-obsolete-variable 'browse-url-firefox-startup-arguments
+                        "it no longer has any effect." "24.5")
+
 (defcustom browse-url-chromium-program
   (let ((candidates '("chromium" "chromium-browser")))
     (while (and candidates (not (executable-find (car candidates))))
@@ -1102,68 +1105,39 @@ used instead of `browse-url-new-window-flag'."
 ;;;###autoload
 (defun browse-url-firefox (url &optional new-window)
   "Ask the Firefox WWW browser to load URL.
-Default to the URL around or before point.  The strings in
-variable `browse-url-firefox-arguments' are also passed to
-Firefox.
+Defaults to the URL around or before point.  Passes the strings
+in the variable `browse-url-firefox-arguments' to Firefox.
 
-When called interactively, if variable
-`browse-url-new-window-flag' is non-nil, load the document in a
-new Firefox window, otherwise use a random existing one.  A
-non-nil interactive prefix argument reverses the effect of
-`browse-url-new-window-flag'.
+Interactively, if the variable `browse-url-new-window-flag' is non-nil,
+loads the document in a new Firefox window.  A non-nil prefix argument
+reverses the effect of `browse-url-new-window-flag'.
 
 If `browse-url-firefox-new-window-is-tab' is non-nil, then
 whenever a document would otherwise be loaded in a new window, it
 is loaded in a new tab in an existing window instead.
 
-When called non-interactively, optional second argument
-NEW-WINDOW is used instead of `browse-url-new-window-flag'.
+Non-interactively, this uses the optional second argument NEW-WINDOW
+instead of `browse-url-new-window-flag'.
 
-On MS-Windows systems the optional `new-window' parameter is
-ignored.  Firefox for Windows does not support the \"-remote\"
-command line parameter.  Therefore, the
-`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab'
-are ignored as well.  Firefox on Windows will always open the requested
-URL in a new window."
+On MS Windows, this ignores `browse-url-new-window-flag' and
+`browse-url-firefox-new-window-is-tab', as well as the NEW-WINDOW argument.
+It always uses a new window."
   (interactive (browse-url-interactive-arg "URL: "))
   (setq url (browse-url-encode-url url))
-  (let* ((process-environment (browse-url-process-environment))
-         (use-remote
-          (not (memq system-type '(windows-nt ms-dos))))
-         (process
-          (apply 'start-process
-                 (concat "firefox " url) nil
-                 browse-url-firefox-program
-                 (append
-                  browse-url-firefox-arguments
-                  (if use-remote
-                      (list "-remote"
-                            (concat
-                             "openURL("
-                             url
-                             (if (browse-url-maybe-new-window new-window)
-                                 (if browse-url-firefox-new-window-is-tab
-                                     ",new-tab"
-                                   ",new-window"))
-                             ")"))
-                    (list url))))))
-    ;; If we use -remote, the process exits with status code 2 if
-    ;; Firefox is not already running.  The sentinel runs firefox
-    ;; directly if that happens.
-    (when use-remote
-      (set-process-sentinel process
-                            `(lambda (process change)
-                               (browse-url-firefox-sentinel process ,url))))))
-
-(defun browse-url-firefox-sentinel (process url)
-  "Handle a change to the process communicating with Firefox."
-  (or (eq (process-exit-status process) 0)
-      (let* ((process-environment (browse-url-process-environment)))
-        ;; Firefox is not running - start it
-        (message "Starting Firefox...")
-        (apply 'start-process (concat "firefox " url) nil
-               browse-url-firefox-program
-               (append browse-url-firefox-startup-arguments (list url))))))
+  (let* ((process-environment (browse-url-process-environment)))
+    (apply 'start-process
+           (concat "firefox " url) nil
+           browse-url-firefox-program
+           (append
+            browse-url-firefox-arguments
+            ;; FIXME someone should check if this limitation
+            ;; still applies.
+            (unless (memq system-type '(windows-nt ms-dos))
+              (if (browse-url-maybe-new-window new-window)
+                  (if browse-url-firefox-new-window-is-tab
+                      '("-new-tab")
+                    '("-new-window"))))
+            (list url)))))
 
 ;;;###autoload
 (defun browse-url-chromium (url &optional _new-window)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index ce39bb7d568..35e6ef1eccd 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -13109,7 +13109,7 @@
 2012-01-03  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-fontify-meta-lines-and-blocks-1):
-        Recognize "name" as a valid keyword that can preceed a block.
+        Recognize "name" as a valid keyword that can precede a block.
 
 2012-01-03  Eric Schulte  <schulte.eric@gmail.com>
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 1c3f7466c8c..42272a9d558 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4,7 +4,7 @@
 
 ;; Author: Fabián E. Gallina <fabian@anue.biz>
 ;; URL: https://github.com/fgallina/python.el
-;; Version: 0.24.4
+;; Version: 0.24.5
 ;; Maintainer: emacs-devel@gnu.org
 ;; Created: Jul 2010
 ;; Keywords: languages