3 files changed, 55 insertions, 38 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8dab0b4989..49bbe7b1816 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-08  Richard Stallman  <rms@gnu.org>
+
+        * emacs-lisp/edebug.el (edebug-install-custom-print-funcs)
+        (edebug-install-custom-print, edebug-reset-print-funcs)
+        (edebug-uninstall-custom-print, edebug-uninstall-custom-print-funcs):
+        Functions deleted.
+        (edebug-prin1, edebug-print, edebug-prin1-to-string)
+        (edebug-format, edebug-message): Define directly as aliases.
+
 2007-10-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * follow.el (follow-mode): Don't run hooks twice.  Use `when'.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 6cdf672d7ab..c13a4f3b7a7 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-09  Richard Stallman  <rms@gnu.org>
+
+        * url-parse.el (url-type, url-user, url-password, url-host)
+        (url-port, url-filename, url-target, url-attributes)
+        (url-fullness, url-set-type, url-set-user, url-set-password)
+        (url-set-host, url-set-port, url-set-filename, url-set-target)
+        (url-set-attributes, url-set-full): Change macros to defuns.
+
 2007-09-22  Diane Murray  <disumu@x3y2z1.net>
 
         * url-misc.el (url-generic-emulator-loader): Send the port as a
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index 3dfc7ac86a2..57bebe56034 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -30,61 +30,61 @@
 
 (autoload 'url-scheme-get-property "url-methods")
 
-(defmacro url-type (urlobj)
-  `(aref ,urlobj 0))
+(defun url-type (urlobj)
+  (aref urlobj 0))
 
-(defmacro url-user (urlobj)
-  `(aref ,urlobj 1))
+(defun url-user (urlobj)
+  (aref urlobj 1))
 
-(defmacro url-password (urlobj)
-  `(aref ,urlobj 2))
+(defun url-password (urlobj)
+  (aref urlobj 2))
 
-(defmacro url-host (urlobj)
-  `(aref ,urlobj 3))
+(defun url-host (urlobj)
+  (aref urlobj 3))
 
-(defmacro url-port (urlobj)
-  `(or (aref ,urlobj 4)
-      (if (url-fullness ,urlobj)
-          (url-scheme-get-property (url-type ,urlobj) 'default-port))))
+(defun url-port (urlobj)
+  (or (aref urlobj 4)
+      (if (url-fullness urlobj)
+          (url-scheme-get-property (url-type urlobj) 'default-port))))
 
-(defmacro url-filename (urlobj)
-  `(aref ,urlobj 5))
+(defun url-filename (urlobj)
+  (aref urlobj 5))
 
-(defmacro url-target (urlobj)
-  `(aref ,urlobj 6))
+(defun url-target (urlobj)
+  (aref urlobj 6))
 
-(defmacro url-attributes (urlobj)
-  `(aref ,urlobj 7))
+(defun url-attributes (urlobj)
+  (aref urlobj 7))
 
-(defmacro url-fullness (urlobj)
-  `(aref ,urlobj 8))
+(defun url-fullness (urlobj)
+  (aref urlobj 8))
 
-(defmacro url-set-type (urlobj type)
-  `(aset ,urlobj 0 ,type))
+(defun url-set-type (urlobj type)
+  (aset urlobj 0 type))
 
-(defmacro url-set-user (urlobj user)
-  `(aset ,urlobj 1 ,user))
+(defun url-set-user (urlobj user)
+  (aset urlobj 1 user))
 
-(defmacro url-set-password (urlobj pass)
-  `(aset ,urlobj 2 ,pass))
+(defun url-set-password (urlobj pass)
+  (aset urlobj 2 pass))
 
-(defmacro url-set-host (urlobj host)
-  `(aset ,urlobj 3 ,host))
+(defun url-set-host (urlobj host)
+  (aset urlobj 3 host))
 
-(defmacro url-set-port (urlobj port)
-  `(aset ,urlobj 4 ,port))
+(defun url-set-port (urlobj port)
+  (aset urlobj 4 port))
 
-(defmacro url-set-filename (urlobj file)
-  `(aset ,urlobj 5 ,file))
+(defun url-set-filename (urlobj file)
+  (aset urlobj 5 file))
 
-(defmacro url-set-target (urlobj targ)
-  `(aset ,urlobj 6 ,targ))
+(defun url-set-target (urlobj targ)
+  (aset urlobj 6 targ))
 
-(defmacro url-set-attributes (urlobj targ)
-  `(aset ,urlobj 7 ,targ))
+(defun url-set-attributes (urlobj targ)
+  (aset urlobj 7 targ))
 
-(defmacro url-set-full (urlobj val)
-  `(aset ,urlobj 8 ,val))
+(defun url-set-full (urlobj val)
+  (aset urlobj 8 val))
 
 ;;;###autoload
 (defun url-recreate-url (urlobj)