[Emacs-diffs] Changes to emacs/lisp/net/quickurl.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/net/quickurl.el
diff -c emacs/lisp/net/quickurl.el:1.6.6.1 emacs/lisp/net/quickurl.el:1.6.6.2
*** emacs/lisp/net/quickurl.el:1.6.6.1  Fri Apr 16 12:50:33 2004
--- emacs/lisp/net/quickurl.el  Mon Jun 28 07:29:49 2004
***************
*** 256,269 ****
  
  ;; Main code:
  
! (defun* quickurl-read (&optional (buffer (current-buffer)))
    "`read' the URL list from BUFFER into `quickurl-urls'.
  
  Note that this function moves point to `point-min' before doing the `read'
  It also restores point after the `read'."
    (save-excursion
      (setf (point) (point-min))
!     (setq quickurl-urls (funcall quickurl-sort-function (read buffer)))))
  
  (defun quickurl-load-urls ()
    "Load the contents of `quickurl-url-file' into `quickurl-urls'."
--- 256,271 ----
  
  ;; Main code:
  
! (defun* quickurl-read (&optional buffer)
    "`read' the URL list from BUFFER into `quickurl-urls'.
  
+ BUFFER, if nil, defaults to current buffer.
  Note that this function moves point to `point-min' before doing the `read'
  It also restores point after the `read'."
    (save-excursion
      (setf (point) (point-min))
!     (setq quickurl-urls (funcall quickurl-sort-function
!                                  (read (or buffer (current-buffer)))))))
  
  (defun quickurl-load-urls ()
    "Load the contents of `quickurl-url-file' into `quickurl-urls'."
***************
*** 298,311 ****
      (message "Found %s" (quickurl-url-url url))))
  
  ;;;###autoload
! (defun* quickurl (&optional (lookup (funcall quickurl-grab-lookup-function)))
    "Insert an URL based on LOOKUP.
  
  If not supplied LOOKUP is taken to be the word at point in the current
  buffer, this default action can be modifed via
  `quickurl-grab-lookup-function'."
    (interactive)
!   (when lookup
      (quickurl-load-urls)
      (let ((url (quickurl-find-url lookup)))
        (if (null url)
--- 300,314 ----
      (message "Found %s" (quickurl-url-url url))))
  
  ;;;###autoload
! (defun* quickurl (&optional lookup)
    "Insert an URL based on LOOKUP.
  
  If not supplied LOOKUP is taken to be the word at point in the current
  buffer, this default action can be modifed via
  `quickurl-grab-lookup-function'."
    (interactive)
!   (when (or lookup
!             (setq lookup (funcall quickurl-grab-lookup-function)))
      (quickurl-load-urls)
      (let ((url (quickurl-find-url lookup)))
        (if (null url)
***************
*** 392,405 ****
            (message "Added %s" url))))))
  
  ;;;###autoload
! (defun* quickurl-browse-url (&optional (lookup (funcall 
quickurl-grab-lookup-function)))
    "Browse the URL associated with LOOKUP.
  
  If not supplied LOOKUP is taken to be the word at point in the
  current buffer, this default action can be modifed via
  `quickurl-grab-lookup-function'."
    (interactive)
!   (when lookup
      (quickurl-load-urls)
      (let ((url (quickurl-find-url lookup)))
        (if url
--- 395,409 ----
            (message "Added %s" url))))))
  
  ;;;###autoload
! (defun quickurl-browse-url (&optional lookup)
    "Browse the URL associated with LOOKUP.
  
  If not supplied LOOKUP is taken to be the word at point in the
  current buffer, this default action can be modifed via
  `quickurl-grab-lookup-function'."
    (interactive)
!   (when (or lookup
!             (setq lookup (funcall quickurl-grab-lookup-function)))
      (quickurl-load-urls)
      (let ((url (quickurl-find-url lookup)))
        (if url