Merge from origin/emacs-24

4b0b27d Fix invocation of commands whose file name includes extension
87fc99f Better support for the case of typing RET on the prompt in comint.
a7b1c2f Don't lose frame's background color when setting foreground
20c817d Fix handling of frame color parameters in TTY sessions
eca7da1 Complete the remaining documentation updates for 24.5

Conflicts:
	doc/lispref/ChangeLog
	etc/NEWS
	lisp/ChangeLog
	nt/ChangeLog
	src/ChangeLog

1 files changed, 25 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd042da8e92..69ccbfaa507 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,30 @@
 2015-03-03  Juri Linkov  <juri@linkov.net>
 
+        Better support for the case of typing RET on the prompt in comint.
+
+        * comint.el (comint-get-old-input-default): Go to the field end
+        when comint-use-prompt-regexp is nil.
+        (comint-line-beginning-position): Check if point is already
+        on the prompt before searching for the prompt when
+        comint-use-prompt-regexp is non-nil.  (Bug#19710)
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.el (frame-notice-user-settings): Refresh the value of
+        frame parameters after calling tty-handle-reverse-video.  Call
+        face-set-after-frame-default with the actual parameters, to avoid
+        resetting colors back to unspecified.
+        (set-background-color, set-foreground-color): Pass the foreground
+        and background colors to face-set-after-frame-default.  (Bug#19802)
+
+2015-03-03  Wolfgang Jenkner  <wjenkner@inode.at>
+
+        * net/network-stream.el (network-stream-open-tls): Respect the
+        :end-of-capability setting.
+
+2015-03-03  Juri Linkov  <juri@linkov.net>
+2015-03-03  Juri Linkov  <juri@linkov.net>
+
         Revert the previous change of comint-line-beginning-position callers,
         and modify comint-line-beginning-position instead.