From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 16 Nov 2014 05:23:39 +0000 (-0500)
Subject: Resolve pull conflict
X-Git-Tag: emacs-25.0.90~2635^2~458^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a713024a012f574d16084cf42703e6ef49473cf;p=emacs.git

Resolve pull conflict
---

1a713024a012f574d16084cf42703e6ef49473cf
diff --cc lisp/ChangeLog
index 42de048e429,cfb7900aa36..2fabb8eade1
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,26 -1,18 +1,38 @@@
 +2014-11-16  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +	* version.el (emacs-repository-get-version): Use git rev-parse
 +	instead of git log.
 +
 +2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +
 +	* progmodes/python.el (python-indent-calculate-levels):
 +	Fix indentation behavior multiline dedenter statement.  (Bug#18432)
 +
 +2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +
 +	* progmodes/python.el (python-indent-region):
 +	Use python-indent-line and skip special cases.  (Bug#18843)
 +
 +2014-11-16  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
 +
 +	* mail/emacsbug.el (report-emacs-bug): Make a better guess at
 +	  envelope-from when reporting through sendmail (bug#19054).
 +
+ 2014-11-16  Oscar Fuentes <ofv@wanadoo.es>
+ 
+ 	Add faces for the VC modeline state indicator.
+ 	* lisp/vc/vc-hooks.el:
+ 	(vc-state-faces, vc-state-base-face)
+ 	(vc-up-to-date-state, vc-needs-update-state)
+ 	(vc-locked-state, vc-locally-added-state)
+ 	(vc-conflict-state, vc-removed-state)
+ 	(vc-missing-state, vc-edited-state):
+ 	New faces.
+ 	(vc-default-mode-line-string): Use them
+ 
  2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 -	* emacs-lisp/backquote.el (backquote-process): Optimize away the ,' case.
 +	* emacs-lisp/backquote.el (backquote-process): Optimize away ",'".
  
  2014-11-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>