From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 28 Dec 2014 18:17:48 +0000 (-0800)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2631^2~12^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9fb9136398821ed5f3a8b4405bbc222964f54028;p=emacs.git

Merge from origin/emacs-24

f646cd9 * build-aux/git-hooks/commit-msg: Allow tabs.
---

9fb9136398821ed5f3a8b4405bbc222964f54028
diff --cc ChangeLog
index 65a112d379f,1b161abf11b..00775edf524
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,10 +1,10 @@@
+ 2014-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* build-aux/git-hooks/commit-msg: Allow tabs.
+ 	Treat them as if they were expanded to spaces, with tab stops
+ 	every 8 columns.
+ 
 -2014-12-17  Paul Eggert  <eggert@cs.ucla.edu>
 +2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
  
  	* .gitignore: Ignore /conftest*.