[emacs-wiki-discuss] [MERGE REQUEST] urgent fix for bad merge to address@hidden/emacs-wiki--stable--1.0--patch-13

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Sacha!

I was trying to replay your stable patch-12..13 into my tree, but your 13
breaks emacs-wiki.el :-(

My server is offline at the moment, so I've attached what will become
address@hidden/emacs-wiki--gary--1.0--patch-13 to enable stable emacs-wiki
to load again :-)

Please apply, or merge from my tree when it comes back online later.

Cheers,
        Gary.
- --
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFAyHLaFRMICSmD1gYRArTEAJ0VtYKOvltTMmLp2Sqv345qO9oYQQCgnZWL
ew5s+oyTAZ0KQpPHcfOBPg8=
=ynJw
-----END PGP SIGNATURE-----

--- emacs-wiki--patch-13.el     2004-06-10 15:09:36.000000000 +0100
+++ emacs-wiki--patch-14.el     2004-06-10 15:24:55.000000000 +0100
@@ -295,6 +295,7 @@ this."
 
 (defun emacs-wiki-set-sym-and-url-regexp (sym value)
   (when (eq sym 'emacs-wiki-url-protocols)
+    (setq emacs-wiki-url-protocols value)
     (setq emacs-wiki-url-regexp
           (concat "\\<\\("
                   (mapconcat 'car emacs-wiki-url-protocols "\\|")
@@ -351,10 +352,7 @@ the final URL or nil if no URL should be
 (defvar emacs-wiki-url-regexp
   nil
   "A regexp used to match URLs within a Wiki buffer.
-Dynamically calculated from `emacs-wiki-url-protocols'."
-  :type 'regexp
-  :set 'emacs-wiki-set-sym-and-url-regexp
-  :group 'emacs-wiki)
+Dynamically calculated from `emacs-wiki-url-protocols'.")
 
 (defcustom emacs-wiki-grep-command
   "find %D -type f ! -name '*~' | xargs egrep -n -e \"\\<%W\\>\""
@@ -3964,4 +3962,3 @@ project to PROJECT."
 
 (provide 'emacs-wiki)
 ;;; emacs-wiki.el ends here
-