2 files changed, 12 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e1401575946..2939f0e743f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2001-06-17  Eli Zaretskii  <eliz@is.elta.co.il>
 
+        * net/quickurl.el (quickurl-url-file): Run through
+        convert-standard-filename.
+        (quickurl-list-populate-buffer): Add help-echo to
+        mouse-highlighted text.
+        (top-level): Update Dave's URL.
+
         * textmodes/tex-mode.el (tex-validate-buffer): Add help-echo to
         mouse-highlighted text.
 
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 6d47bcb65b9..4076c5ae7f2 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,6 +1,6 @@
 ;;; quickurl.el --- Insert an URL based on text at point in buffer.
 
-;; Copyright (C) 1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
@@ -59,7 +59,7 @@
 ;; (("GNU"    . "http://www.gnu.org/")
 ;;  ("FSF"      "http://www.fsf.org/" "The Free Software Foundation")
 ;;  ("emacs"  . "http://www.emacs.org/")
-;;  ("hagbard"  "http://www.hagbard.demon.co.uk" "Hagbard's World"))
+;;  ("davep"    "http://www.davep.org/" "Dave's homepage"))
 ;;
 ;; In case you're wondering about the mixture of cons cells and lists,
 ;; quickurl started life using just the cons cells, there were no comments.
@@ -105,7 +105,7 @@
   :group  'abbrev
   :prefix "quickurl-")
 
-(defcustom quickurl-url-file "~/.quickurls"
+(defcustom quickurl-url-file (convert-standard-filename "~/.quickurls")
   "*File that contains the URL list."
   :type  'file
   :group 'quickurl)
@@ -482,8 +482,9 @@ The key bindings for `quickurl-list-mode' are:
             do (let ((start (point)))
                  (insert (format fmt (quickurl-url-description url)
                                  (quickurl-url-url url)))
-                 (put-text-property start (1- (point))
-                                    'mouse-face 'highlight)))
+                 (add-text-properties start (1- (point))
+                                    '(mouse-face highlight
+                                      help-echo "mouse-2: insert this URL"))))
       (setf (point) (point-min)))))
 
 (defun quickurl-list-add-url (word url comment)