Masatake YAMATO <[EMAIL PROTECTED]> writes:
> Phase 1. Stefan set tab-width less than 8.
> Phase 2. He did untabify.
> Phase 3. He committed the changes the tree.
> Phase 4. The other developers did star-merge.
>
> Is this right?
Not exactly. You forget
Phase 0: Developers write code, some with tabs, others with spaces,
some with tab-width=8, others with tab-width=4.
The typical example is: (`.' is space, `<--->' is tab)
(function arg1
arg2)
With spaces, this will be
(function arg1
..........arg2)
Which is editor independant. With tabs and tab-width=8, this will be
(function arg1
<------>..arg2)
That will be displayed like this with a tab-width=4
(function arg1
<-->..arg2)
And in particular, a M-x untabbify RET in an editor configured with
tab-width=4 will most probably result in
(function arg1
......arg2)
--
Matthieu