custom-print requires "%s", not "%S", in ediff

[Michael Ernst]

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)
      ))