From effc212794049d5df7ccc329da239b981c8e860d Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Thu, 14 Jul 2005 18:49:56 +0000
Subject: [PATCH] Customization error; Makefile tweaks.

* Makefile (dist): Use a tla-specific method to create the tarball.
  Create a zip file as well.
  (upload): New rule that uploads the tarball and zip file to gna.org.

* Makefile.defs (VERSION): New variable that determines the version
  string to use in the `dist' and `upload' targets.

* lisp/muse.el (muse-implicit-link-functions)
  (muse-explicit-link-functions): Use :type of hook so that the options
  get recognized.
git-archimport-id: mwolson@gnu.org--2005/muse--main--1.0--patch-136
---
 ChangeLog     | 22 ++++++++++++++++++++++
 Makefile      | 14 ++++++++++++--
 Makefile.defs |  3 +++
 lisp/muse.el  |  4 ++--
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b26f2ab..148db1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,28 @@
 # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2005/muse--main--1.0
 #
 
+2005-07-14 18:49:56 GMT	Michael Olson <mwolson@gnu.org>	patch-136
+
+    Summary:
+      Customization error; Makefile tweaks.
+    Revision:
+      muse--main--1.0--patch-136
+
+    * Makefile (dist): Use a tla-specific method to create the tarball.
+      Create a zip file as well.
+      (upload): New rule that uploads the tarball and zip file to gna.org.
+    
+    * Makefile.defs (VERSION): New variable that determines the version
+      string to use in the `dist' and `upload' targets.
+    
+    * lisp/muse.el (muse-implicit-link-functions)
+      (muse-explicit-link-functions): Use :type of hook so that the options
+      get recognized.
+
+    modified files:
+     ChangeLog Makefile Makefile.defs lisp/muse.el
+
+
 2005-07-13 23:20:12 GMT	Michael Olson <mwolson@gnu.org>	patch-135
 
     Summary:
diff --git a/Makefile b/Makefile
index 563d6c5..e0e2c64 100644
--- a/Makefile
+++ b/Makefile
@@ -39,5 +39,15 @@ install: lisp muse.info
 test: 
 	(cd lisp && $(MAKE) test)
 
-dist: distclean
-	(cd ..; tar cvzf ~/Public/Emacs/muse.tar.gz muse)
+dist: distclean ../muse-$(VERSION).zip ../muse-$(VERSION).tar.gz
+	tla inventory -sB | tar -cf - --no-recursion -T- | \
+	  (mkdir -p ../muse-$(VERSION); cd ../muse-$(VERSION) && \
+	  tar xf -)
+	(cd .. && tar czf muse-$(VERSION).tar.gz muse-$(VERSION) ; \
+	  zip -r muse-$(VERSION).zip muse-$(VERSION))
+
+upload: dist
+	(cd .. && gpg --detach muse-$(VERSION).tar.gz && \
+	  gpg --detach muse-$(VERSION).zip && \
+	  scp muse-$(VERSION).zip* muse-$(VERSION).tar.gz* \
+	    mwolson@download.gna.org:/upload/muse-el)
diff --git a/Makefile.defs b/Makefile.defs
index b4b03e9..5b541d6 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -18,3 +18,6 @@ INSTALLINFO = install-info --info-dir=$(INFODIR)
 # If you're using Debian, uncomment the following line and comment out
 #the above line.
 #INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR)
+
+# Useful only for the maintainer
+VERSION  = 3.01.90
diff --git a/lisp/muse.el b/lisp/muse.el
index 1956030..504a4a9 100644
--- a/lisp/muse.el
+++ b/lisp/muse.el
@@ -273,7 +273,7 @@ An implicit link is one that is not surrounded by brackets.
 
 By default, Muse handles URLs only.
 If you want to handle WikiWords, load muse-wiki.el."
-  :type '(repeat function)
+  :type 'hook
   :options '(muse-handle-url
              muse-wiki-handle-interwiki
              muse-wiki-handle-wikiword)
@@ -310,7 +310,7 @@ that is an accepted link."
 (defcustom muse-explicit-link-functions nil
   "A list of functions to handle an explicit link.
 An explicit link is one [[like][this]] or [[this]]."
-  :type '(repeat function)
+  :type 'hook
   :options '(muse-wiki-handle-interwiki)
   :group 'muse)
 
-- 
2.11.4.GIT