[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Fix some erc-migrate-modules bugs.
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Fix some erc-migrate-modules bugs. |
Date: |
Sun, 14 Oct 2007 00:47:59 -0400 |
commit 59e2119b78679f6c7c514af9aa363088e18d5087
Author: Michael Olson <address@hidden>
Date: Fri Feb 10 22:06:11 2006 +0000
Fix some erc-migrate-modules bugs.
* Makefile (debbuild): Split from debrelease.
(debrevision-mwolson): New rule that causes a Debian revision to be
built.
* erc.el (erc-migrate-modules): Use a better algorithm. Thanks to Johan
Bockgård.
(erc-modules): Change use of 'pcomplete to 'completion.
git-archimport-id: address@hidden/erc--cvs--0--patch-108
diff --git a/ChangeLog b/ChangeLog
index cbddc26..ea74df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-10 Michael Olson <address@hidden>
+
+ * Makefile (debbuild): Split from debrelease.
+ (debrevision-mwolson): New rule that causes a Debian revision to
+ be built.
+
+ * erc.el (erc-migrate-modules): Use a better algorithm. Thanks to
+ Johan Bockgård.
+ (erc-modules): Change use of 'pcomplete to 'completion.
+
2006-02-09 Diane Murray <address@hidden>
* erc-capab.el: Require erc.
diff --git a/Makefile b/Makefile
index cc902ea..fef2a64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION=5.1.1
SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.0.4-2
+LASTUPLOAD = 5.1.1-1
BUILDOPTS =
SPECIAL = erc-auto.el
@@ -80,6 +80,15 @@ distclean:
-rm -f $(MANUAL).info $(MANUAL).html $(TARGET)
-rm -Rf ../$(SNAPDIR)
+debbuild:
+ (cd ../$(SNAPDIR) && \
+ dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
+ -us -uc -rfakeroot && \
+ echo "Running lintian ..." && \
+ lintian -i ../erc_$(VERSION)*.deb || : && \
+ echo "Done running lintian." && \
+ debsign)
+
debrelease: $(ALLSOURCE) $(SPECIAL) distclean
mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
@@ -98,13 +107,14 @@ debrelease: $(ALLSOURCE) $(SPECIAL) distclean
../$(SNAPDIR)/debian/.arch-ids \
../$(SNAPDIR)/debian/maint/.arch-ids \
../$(SNAPDIR)/debian/scripts/.arch-ids || :
- (cd ../$(SNAPDIR) && \
- dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
- -us -uc -rfakeroot && \
- echo "Running lintian ..." && \
- lintian -i ../erc_$(VERSION)*.deb || : && \
- echo "Done running lintian." && \
- debsign)
+ $(MAKE) debbuild
+
+debrevision-mwolson:
+ -rm -f ../../dist/erc_*
+ -rm -f ../erc_$(VERSION)-*
+ -rm -fr ../erc-$(VERSION)
+ $(MAKE) debrelease
+ cp ../erc_$(VERSION)* ../../dist
debrelease-mwolson:
-rm -f ../../dist/erc_*
diff --git a/erc.el b/erc.el
index 7d34dec..44bb402 100644
--- a/erc.el
+++ b/erc.el
@@ -1719,20 +1719,13 @@ all channel buffers on all servers."
(defun erc-migrate-modules (mods)
"Migrate old names of ERC modules to new ones."
;; modify `transforms' to specify what needs to be changed
- ;; each item is in the format '(new .old)
- (let ((transforms '((pcomplete . completion)))
- (modules (copy-alist mods)))
- (dolist (transform transforms)
- (let ((addp nil))
- (setq modules (erc-delete-if `(lambda (val)
- (and (eq val ',(car transform))
- (setq addition t)))
- modules))
- (when addp
- (add-to-list 'modules (cdr transform)))))
- (erc-delete-dups modules)))
-
-(defcustom erc-modules '(netsplit fill button match track pcomplete readonly
+ ;; each item is in the format '(old . new)
+ (let ((transforms '((pcomplete . completion))))
+ (erc-delete-dups
+ (mapcar (lambda (m) (or (cdr (assoc m transforms)) m))
+ mods))))
+
+(defcustom erc-modules '(netsplit fill button match track completion readonly
ring autojoin noncommands irccontrols
stamp)
"A list of modules which erc should enable.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Fix some erc-migrate-modules bugs.,
mwolson <=