From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: diff-mode documentation Date: Tue, 14 Mar 2006 11:15:16 -0500 Message-ID: <87hd6180un.fsf-monnier+emacs@gnu.org> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1142353198 17114 80.91.229.2 (14 Mar 2006 16:19:58 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 14 Mar 2006 16:19:58 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 14 17:19:56 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FJCBN-0004JG-9d for ged-emacs-devel@m.gmane.org; Tue, 14 Mar 2006 17:15:38 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FJCBM-0004Kj-Nd for ged-emacs-devel@m.gmane.org; Tue, 14 Mar 2006 11:15:36 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FJCB5-0004K1-71 for emacs-devel@gnu.org; Tue, 14 Mar 2006 11:15:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FJCB3-0004JL-CY for emacs-devel@gnu.org; Tue, 14 Mar 2006 11:15:18 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FJCB3-0004JG-8z for emacs-devel@gnu.org; Tue, 14 Mar 2006 11:15:17 -0500 Original-Received: from [209.226.175.34] (helo=tomts13-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FJCFH-0004a2-G8 for emacs-devel@gnu.org; Tue, 14 Mar 2006 11:19:39 -0500 Original-Received: from alfajor ([67.71.115.9]) by tomts13-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20060314161516.QTJV29052.tomts13-srv.bellnexxia.net@alfajor>; Tue, 14 Mar 2006 11:15:16 -0500 Original-Received: by alfajor (Postfix, from userid 1000) id 2B06FD73A1; Tue, 14 Mar 2006 11:15:16 -0500 (EST) Original-To: "Aaron S. Hawley" In-Reply-To: (Aaron S. Hawley's message of "Tue, 14 Mar 2006 09:50:37 -0500 (EST)") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:51605 Archived-At: > On Thu, 9 Mar 2006, Richard Stallman wrote: >> @item M-R >> @findex diff-reverse-direction >> Convert the patch to a patch that reverts. >> @xref{Reversed Patches, Applying Reversed Patches, Patch, diff, >> Comparing and Merging Files}. >> >> @item M-U >> @findex diff-context->unified >> Convert the patch to the unified diff format. >> @xref{Unified Format, Unified Format, Diff, diff, >> Comparing and Merging Files}. >> >> @item M-C >> @findex diff-unified->context >> Convert the patch back to context diff format. >> @xref{Context Format, Context Format, Diff, diff, >> Comparing and Merging Files}. >> >> I would rather these be C-c commands. They are not the sort of commands >> one would repeat over and over in a short period, so there's no harm >> in using C-c, and that would make it possible for the M- commands >> to be case-independent. Good point. These bindings date back to the beginning of diff-mode when I wasn't following coding conventions as much and when all the other bindings were under M- so it seemed like a natural choice at that point. > I haven't heard anything from Stefan on this, but to get the "ball > rolling" I suppose we're talking about a patch like the one below. I'm Sorry, I missed a couple days of this mailing list cause fsf's mailohost got put on some random blacklist again. At least this time I finally managed to convince my sysadmin that add a whitelist that overrules the blacklist, so hopefully the problem won't re-appear in the near future. > --- diff-mode.el 19 Feb 2006 14:01:04 -0500 1.84 > +++ diff-mode.el 10 Mar 2006 12:33:38 -0500 > @@ -142,8 +142,13 @@ > `(("\e" . ,diff-mode-shared-map) > ;; From compilation-minor-mode. > ("\C-c\C-c" . diff-goto-source) > + ("\C-ca" . diff-ediff-patch) > + ("\C-cr" . diff-reverse-direction) > + ("\C-cu" . diff-context->unified) > + ("\C-cc" . diff-unified->context) > + ("\C-c\C-k" . diff-file-kill) Bindings of the form C-c are reserved for the user, so they're out. Better use C-c C-. Stefan