[Emacs-diffs] Changes to emacs/lisp/net/webjump.el

[Juanma Barranquero]

Index: emacs/lisp/net/webjump.el
diff -c emacs/lisp/net/webjump.el:1.3 emacs/lisp/net/webjump.el:1.4
*** emacs/lisp/net/webjump.el:1.3       Tue Dec 11 02:01:35 2001
--- emacs/lisp/net/webjump.el   Tue Feb  4 08:17:16 2003
***************
*** 1,5 ****
  ;;; webjump.el --- programmable Web hotlist
!      
  ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
  
  ;; Author:    Neil W. Van Dyke <address@hidden>
--- 1,5 ----
  ;;; webjump.el --- programmable Web hotlist
! 
  ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
  
  ;; Author:    Neil W. Van Dyke <address@hidden>
***************
*** 109,115 ****
                "ftp://ftp.luth.se/pub/unix/gnu";
                "ftp://ftp.sunet.se/pub/gnu";
                "ftp://archive.eu.net";
!               ;; SOUTH AMERICA: 
                "ftp://ftp.inf.utfsm.cl/pub/gnu";
                "ftp://ftp.unicamp.br/pub/gnu";
                ;; WESTERN CANADA:
--- 109,115 ----
                "ftp://ftp.luth.se/pub/unix/gnu";
                "ftp://ftp.sunet.se/pub/gnu";
                "ftp://archive.eu.net";
!               ;; SOUTH AMERICA:
                "ftp://ftp.inf.utfsm.cl/pub/gnu";
                "ftp://ftp.unicamp.br/pub/gnu";
                ;; WESTERN CANADA:
***************
*** 133,139 ****
       "ftp://ftp.emacs.org/pub/";)
  
      ;; Internet search engines.
!     ("AltaVista" . 
       [simple-query
        "www.altavista.digital.com"
        "www.altavista.digital.com/cgi-bin/query?pg=aq&what=web&fmt=.&q="
--- 133,139 ----
       "ftp://ftp.emacs.org/pub/";)
  
      ;; Internet search engines.
!     ("AltaVista" .
       [simple-query
        "www.altavista.digital.com"
        "www.altavista.digital.com/cgi-bin/query?pg=aq&what=web&fmt=.&q="
***************
*** 144,155 ****
      ("Lycos" .
       [simple-query "www.lycos.com"
                     "www.lycos.com/cgi-bin/pursuit?cat=lycos&query=" ""])
!     ("Yahoo" . 
       [simple-query "www.yahoo.com" "search.yahoo.com/bin/search?p=" ""])
  
      ;; Misc. general interest.
      ("Interactive Weather Information Network" . webjump-to-iwin)
!     ("Usenet FAQs" . 
       [simple-query "www.cis.ohio-state.edu/hypertext/faq/usenet/FAQ-List.html"
                   "www.cis.ohio-state.edu/htbin/search-usenet-faqs/form?find="
                   ""])
--- 144,155 ----
      ("Lycos" .
       [simple-query "www.lycos.com"
                     "www.lycos.com/cgi-bin/pursuit?cat=lycos&query=" ""])
!     ("Yahoo" .
       [simple-query "www.yahoo.com" "search.yahoo.com/bin/search?p=" ""])
  
      ;; Misc. general interest.
      ("Interactive Weather Information Network" . webjump-to-iwin)
!     ("Usenet FAQs" .
       [simple-query "www.cis.ohio-state.edu/hypertext/faq/usenet/FAQ-List.html"
                   "www.cis.ohio-state.edu/htbin/search-usenet-faqs/form?find="
                   ""])
***************
*** 287,293 ****
                       ((symbolp expr)
                        (if (fboundp expr)
                            (funcall expr name)
!                         (error "WebJump URL function \"%s\" undefined" 
                                 expr)))
                       (t (error "WebJump URL expression for \"%s\" invalid"
                                 name)))))))
--- 287,293 ----
                       ((symbolp expr)
                        (if (fboundp expr)
                            (funcall expr name)
!                         (error "WebJump URL function \"%s\" undefined"
                                 expr)))
                       (t (error "WebJump URL expression for \"%s\" invalid"
                                 name)))))))
***************
*** 343,353 ****
    ;; Note: I should make this more robust someday.
    (let ((input (webjump-read-string prompt)))
      (if input (string-to-number input))))
!   
  (defun webjump-read-string (prompt)
    (let ((input (read-string (concat prompt ": "))))
      (if (webjump-null-or-blank-string-p input) nil input)))
!   
  (defun webjump-read-url-choice (what urls &optional default)
    ;; Note: Convert this to use `webjump-read-choice' someday.
    (let* ((completions (mapcar (function (lambda (n) (cons n n)))
--- 343,353 ----
    ;; Note: I should make this more robust someday.
    (let ((input (webjump-read-string prompt)))
      (if input (string-to-number input))))
! 
  (defun webjump-read-string (prompt)
    (let ((input (read-string (concat prompt ": "))))
      (if (webjump-null-or-blank-string-p input) nil input)))
! 
  (defun webjump-read-url-choice (what urls &optional default)
    ;; Note: Convert this to use `webjump-read-choice' someday.
    (let* ((completions (mapcar (function (lambda (n) (cons n n)))