]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:37:43 +0000 (14:37 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:37:43 +0000 (14:37 -0800)
commite2ae1c5a40e2802fcd9f5ee26b4906be97c8b878
treeb2d56b00e2ae8ba90167ede434561d4a3b1f273d
parentd8462361f2d087d6f7c745305c61a266843ee19c
parent4b0b27d0018f040bda6a2ec885fa54c666d9c083
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
doc/lispref/ChangeLog
doc/lispref/processes.texi
etc/NEWS
lisp/ChangeLog
lisp/comint.el
lisp/frame.el
nt/ChangeLog
nt/cmdproxy.c
src/ChangeLog
src/xfaces.c