From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Robert Thorpe" Newsgroups: gmane.emacs.help Subject: Re: ediff between buffer and corresponding (changed) file Date: 8 Dec 2006 07:04:37 -0800 Organization: http://groups.google.com Message-ID: <1165590277.739247.260950@f1g2000cwa.googlegroups.com> References: <4ttbmjF1546mpU1@mid.individual.net> NNTP-Posting-Host: dough.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Trace: sea.gmane.org 1165592459 10638 80.91.229.10 (8 Dec 2006 15:40:59 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 8 Dec 2006 15:40:59 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Dec 08 16:40:57 2006 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by dough.gmane.org with esmtp (Exim 4.50) id 1GshqL-0007dc-Ec for geh-help-gnu-emacs@m.gmane.org; Fri, 08 Dec 2006 16:40:57 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GshqK-0003dm-Vd for geh-help-gnu-emacs@m.gmane.org; Fri, 08 Dec 2006 10:40:57 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!postnews.google.com!f1g2000cwa.googlegroups.com!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 21 Original-NNTP-Posting-Host: 163.244.62.65 Original-X-Trace: posting.google.com 1165590283 6484 127.0.0.1 (8 Dec 2006 15:04:43 GMT) Original-X-Complaints-To: groups-abuse@google.com Original-NNTP-Posting-Date: Fri, 8 Dec 2006 15:04:43 +0000 (UTC) In-Reply-To: <4ttbmjF1546mpU1@mid.individual.net> User-Agent: G2/1.0 X-HTTP-UserAgent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6,gzip(gfe),gzip(gfe) X-HTTP-Via: 1.0 EMF1ASPROXY03 Complaints-To: groups-abuse@google.com Injection-Info: f1g2000cwa.googlegroups.com; posting-host=163.244.62.65; posting-account=hWoAPxMAAAAnBKSBz1ZivwUPPjEuve7bvVCHZQ8rhrluPfwcBJd92w Original-Xref: shelby.stanford.edu gnu.emacs.help:143751 Original-To: help-gnu-emacs@gnu.org 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:39353 Archived-At: Sascha Wilde wrote: > Hi *, > > the (not too uncommon) situation is this: > > - I'm editing a file > - the file is changed by someone (or something) else on disk > - I want to safe my changes and emacs asks if I want to overwrite the > changes on disk > > now I would like to make a diff and merge between my version and the > version on disk, but I can't find a straight forward way top do this, > without writing a temporary file. > > Am I missing something? It is a recent addition, which can be added by inserting some elisp. See this thread:- http://groups.google.co.uk/group/gnu.emacs.help/browse_frm/thread/ee86853ef6243e5f/3b7bdaedebb77c2e?lnk=st&q=ediff+buffer+underlying+file+emacs&rnum=1#3b7bdaedebb77c2e Message-ID: