From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: Michael Ernst <mernst@alum.mit.edu>
Newsgroups: gmane.emacs.bugs
Subject: custom-print requires "%s", not "%S", in ediff
Date: Mon, 25 Mar 2002 17:22:20 -0500
Sender: bug-gnu-emacs-admin@gnu.org
Message-ID: <200203252222.RAA16964@meoptiplex.lcs.mit.edu>
NNTP-Posting-Host: localhost.gmane.org
X-Trace: main.gmane.org 1017095054 19423 127.0.0.1 (25 Mar 2002 22:24:14 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Mon, 25 Mar 2002 22:24:14 +0000 (UTC)
Original-Received: from fencepost.gnu.org ([199.232.76.164])
	by main.gmane.org with esmtp (Exim 3.33 #1 (Debian))
	id 16pcsw-00053A-00
	for <gnu-bug-gnu-emacs@m.gmane.org>; Mon, 25 Mar 2002 23:24:14 +0100
Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
	by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian))
	id 16pcsu-0006iN-00; Mon, 25 Mar 2002 17:24:12 -0500
Original-Received: from geyer.lcs.mit.edu ([18.26.3.21])
	by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian))
	id 16pcr6-0006bC-00
	for <bug-gnu-emacs@gnu.org>; Mon, 25 Mar 2002 17:22:20 -0500
Original-Received: from meoptiplex.lcs.mit.edu (meoptiplex.lcs.mit.edu [18.26.3.32])
	by geyer.lcs.mit.edu (8.9.3/8.9.3) with ESMTP id RAA07233;
	Mon, 25 Mar 2002 17:22:20 -0500
Original-Received: (from mernst@localhost)
	by meoptiplex.lcs.mit.edu (8.9.3/8.9.1) id RAA16964;
	Mon, 25 Mar 2002 17:22:20 -0500
Original-To: bug-gnu-emacs@gnu.org
Errors-To: bug-gnu-emacs-admin@gnu.org
X-BeenThere: bug-gnu-emacs@gnu.org
X-Mailman-Version: 2.0.5
Precedence: bulk
List-Help: <mailto:bug-gnu-emacs-request@gnu.org?subject=help>
List-Post: <mailto:bug-gnu-emacs@gnu.org>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/bug-gnu-emacs>,
	<mailto:bug-gnu-emacs-request@gnu.org?subject=subscribe>
List-Id: Bug reports for GNU Emacs,
	the Swiss army knife of text editors <bug-gnu-emacs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/bug-gnu-emacs>,
	<mailto:bug-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/bug-gnu-emacs/>
Xref: main.gmane.org gmane.emacs.bugs:170
X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:170

This patch to Emacs 21.2 is required to make custom-print interact properly
with ediff, which inserts quotation marks for "%S" but not for "%s".  This
change shouldn't affect non-users of custom-print.

ChangeLog entry:

2002-03-24  Michael Ernst  <mernst@alum.mit.edu>

	* ediff.el (ediff-merge-revisions-with-ancestor, ediff-revision):
	Use "%s", not "%S", in format command.

*** /usr/local/share/emacs/21.2/lisp/ediff.el	Sat Jul 21 01:28:24 2001
--- -	Sun Mar 24 18:44:05 2002
***************
*** 1219,1223 ****
      (ediff-load-version-control)
      (funcall
!      (intern (format "ediff-%S-merge-internal" ediff-version-control-package))
       rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
  
--- 1219,1223 ----
      (ediff-load-version-control)
      (funcall
!      (intern (format "ediff-%s-merge-internal" ediff-version-control-package))
       rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
  
***************
*** 1324,1328 ****
      (ediff-load-version-control)
      (funcall
!      (intern (format "ediff-%S-internal" ediff-version-control-package))
       rev1 rev2 startup-hooks)
      ))
--- 1324,1328 ----
      (ediff-load-version-control)
      (funcall
!      (intern (format "ediff-%s-internal" ediff-version-control-package))
       rev1 rev2 startup-hooks)
      ))