view lisp/obsolete/sc.el @ 89970:a849e5779b8c

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-35 Fix damage caused by trunk merge in emacs--unicode--0--patch-15 Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed from tagline to explicit [because they were used as template files, and their syntax didn't accommodate stripping comments, so the the generated files caused id-tag conflicts when an in-tree build was done]. Unfortunately arch doesn't handle id-tag changes well, so this resulted in the files appearing to be deleted, and then added again. When that changeset was merged into the unicode branch, it resulted in unicode-specific changes being dropped, and the trunk version being added. To fix this, I restored these files to their pre-merge versions (from emacs--unicode--0--patch-14), and then manually reapplied all changes from: (1) the unicode branch from the bogus merge point to the current version (emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34) (2) the trunk from the bogus merge point to the latest version which was merged into the unicode branch (emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522) and fixed any conflicts (mostly due to doubly-applied patch hunks that patch couldn't detect).
author Miles Bader <miles@gnu.org>
date Sun, 05 Sep 2004 01:53:47 +0000
parents 68c22ea6027c
children
line wrap: on
line source

;;; sc.el --- old name for supercite

;; Maintainer: FSF

;; This file is part of GNU Emacs.

;;; Commentary:

;;; Code:

(require 'supercite)
(provide 'sc)

(message "The name `sc' works but is obsolete; please use `supercite' instead")

;;; arch-tag: 31e8ae19-689e-4b7d-9161-6d7dd60c6ece
;;; sc.el ends here