From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: What's your favourite *under_publicized* editing feature ofEmacs? Date: Mon, 28 Feb 2011 18:31:18 -0500 Organization: A noiseless patient Spider Message-ID: References: <1578157c-17a0-41ea-9420-9330f68b10fe@glegroupsg2000goo.googlegroups.com> <87ei6zpbor.fsf@rapttech.com.au> <2p8vx4550z.fsf@shell.xmission.com> <87lj11dhm9.fsf@lola.goethe.zz> <1fa184d7-7e4e-44b3-bba8-f2c94929f657@o7g2000prn.googlegroups.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1298936451 22471 80.91.229.12 (28 Feb 2011 23:40:51 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 28 Feb 2011 23:40:51 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Tue Mar 01 00:40:47 2011 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PuChq-0002BA-Ld for geh-help-gnu-emacs@m.gmane.org; Tue, 01 Mar 2011 00:40:46 +0100 Original-Received: from localhost ([127.0.0.1]:36368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PuChq-00086M-5L for geh-help-gnu-emacs@m.gmane.org; Mon, 28 Feb 2011 18:40:46 -0500 Original-Path: usenet.stanford.edu!news-transit.tcx.org.uk!eternal-september.org!feeder.eternal-september.org!.POSTED!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 27 Injection-Info: mx02.eternal-september.org; posting-host="vq8iubvLjF+5Hn2vWUSSjw"; logging-data="27576"; mail-complaints-to="abuse@eternal-september.org"; posting-account="U2FsdGVkX1/h+trjmrsZJqQvGz3ViLN4" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:G0LkxD+VbOoOPOTXVA3QB2aa5Ss= sha1:BP+CEzkJAvDZd1CoSXOIjSOKOVc= Original-Xref: usenet.stanford.edu gnu.emacs.help:185437 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:79589 Archived-At: > For Emacs (and such) this may be the way to go and is welcome. > For git (and such) however it may be preferable to have generic diff/ > merge plugin capability; specifically for 'xml-container' formats like > odt and docx but also more generically. Versioning documents in formats like odt is indeed a different issue: for diffs and merges you don't want to do it at the line-level of course, but neither do you necessarily want to do it at the XML level itself: maybe automatic merging can be done at the XML level, but when conflicts or diffs need to be shown to users, they have to be shown in terms that the user can understand and most users have no idea about odt's underlying XML representation other than that it exists. So you need something like OpenOffice to do the diff for you. > Personal note: I use nted > http://vsr.informatik.tu-chemnitz.de/~jan/nted/nted.xhtml > to enter music and I have a hell of a time versioning and diffing. Right: since this uses WYSIWYG you basically get the same problem: only nted can do the diff and merge-conflict display in a way that can make sense to the user. If you care about revision control, you're generally better off without WYSIWYG (I tend to think you're better off without it in any circumstance, but that's a different discussion ;-). Stefan