From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ams@gnu.org (Alfred M. Szmidt) Newsgroups: gmane.emacs.devel Subject: default file for diff-backup Date: Fri, 20 Jun 2014 08:32:31 -0400 Message-ID: Reply-To: ams@gnu.org NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1403267572 27131 80.91.229.3 (20 Jun 2014 12:32:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Jun 2014 12:32:52 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 20 14:32:43 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wxxzm-0001db-77 for ged-emacs-devel@m.gmane.org; Fri, 20 Jun 2014 14:32:42 +0200 Original-Received: from localhost ([::1]:40615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxxzl-0000Ew-Gd for ged-emacs-devel@m.gmane.org; Fri, 20 Jun 2014 08:32:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxxzh-0000Cq-Sz for emacs-devel@gnu.org; Fri, 20 Jun 2014 08:32:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wxxzc-0000mK-99 for emacs-devel@gnu.org; Fri, 20 Jun 2014 08:32:37 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxxzc-0000mG-6A for emacs-devel@gnu.org; Fri, 20 Jun 2014 08:32:32 -0400 Original-Received: from ams by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Wxxzb-0002n2-Vp for emacs-devel@gnu.org; Fri, 20 Jun 2014 08:32:32 -0400 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:172561 Archived-At: This makes diff-backup supply a default file name, making the default behaviour a bit more useful. *** lisp/vc/diff.el.~1~ --- lisp/vc/diff.el *************** *** 187,194 **** If this file is a backup, diff it with its original. The backup file is the first file given to `diff'. With prefix arg, prompt for diff switches." ! (interactive (list (read-file-name "Diff (file with backup): ") ! (diff-switches))) (let (bak ori) (if (backup-file-name-p file) (setq bak file --- 187,201 ---- If this file is a backup, diff it with its original. The backup file is the first file given to `diff'. With prefix arg, prompt for diff switches." ! (interactive ! (list ! (if (and buffer-file-name (file-exists-p buffer-file-name)) ! (read-file-name ! (concat "Diff file with backup (default " ! (file-name-nondirectory buffer-file-name) "): ") ! nil buffer-file-name t) ! (read-file-name "Diff file with backup: " nil nil t)) ! (diff-switches))) (let (bak ori) (if (backup-file-name-p file) (setq bak file Diff finished. Fri Jun 20 14:06:26 2014