Merge from trunk.

[gnu-emacs] / lisp / net / quickurl.el

diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 2312f7a2375c95c6e725dee190c30ab2eb9f0085..7a1e5fc6a80d047282dce47dac427258144343c4 100644 (file)
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,7 +1,6 @@
-;;; quickurl.el --- insert an URL based on text at point in buffer
+;;; quickurl.el --- insert a URL based on text at point in buffer

 
 

-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.

 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>


@@ -25,9 +24,9 @@
 
 ;;; Commentary:
 ;;
 
 ;;; Commentary:
 ;;

-;; This package provides a simple method of inserting an URL based on the
+;; This package provides a simple method of inserting a URL based on the

 ;; text at point in the current buffer. This is part of an on-going effort
 ;; text at point in the current buffer. This is part of an on-going effort

-;; to increase the information I provide people while reducing the ammount
+;; to increase the information I provide people while reducing the amount

 ;; of typing I need to do. No-doubt there are undiscovered Emacs packages
 ;; out there that do all of this and do it better, feel free to point me to
 ;; them, in the mean time I'm having fun playing with Emacs Lisp.
 ;; of typing I need to do. No-doubt there are undiscovered Emacs packages
 ;; out there that do all of this and do it better, feel free to point me to
 ;; them, in the mean time I'm having fun playing with Emacs Lisp.


@@ -91,7 +90,7 @@
 ;; Customize options.
 
 (defgroup quickurl nil
 ;; Customize options.
 
 (defgroup quickurl nil

-  "Insert an URL based on text at point in buffer."
+  "Insert a URL based on text at point in buffer."

   :version "21.1"
   :group  'abbrev
   :prefix "quickurl-")
   :version "21.1"
   :group  'abbrev
   :prefix "quickurl-")


@@ -190,19 +189,19 @@ in your ~/.emacs (after loading/requiring quickurl).")
   "Local keymap for a `quickurl-list-mode' buffer.")
 
 (defvar quickurl-list-buffer-name "*quickurl-list*"
   "Local keymap for a `quickurl-list-mode' buffer.")
 
 (defvar quickurl-list-buffer-name "*quickurl-list*"

-  "Name for the URL listinig buffer.")
+  "Name for the URL listing buffer.")

 
 (defvar quickurl-list-last-buffer nil
   "`current-buffer' when `quickurl-list' was called.")
 
 
 (defvar quickurl-list-last-buffer nil
   "`current-buffer' when `quickurl-list' was called.")
 

-;; Functions for working with an URL entry.
+;; Functions for working with a URL entry.

 
 (defun quickurl-url-commented-p (url)
   "Does the URL have a comment?"
   (listp (cdr url)))
 
 (defun quickurl-make-url (keyword url &optional comment)
 
 (defun quickurl-url-commented-p (url)
   "Does the URL have a comment?"
   (listp (cdr url)))
 
 (defun quickurl-make-url (keyword url &optional comment)

-  "Create an URL from KEYWORD, URL and (optionaly) COMMENT."
+  "Create a URL from KEYWORD, URL and (optionaly) COMMENT."

   (if (and comment (not (zerop (length comment))))
       (list keyword url comment)
     (cons keyword url)))
   (if (and comment (not (zerop (length comment))))
       (list keyword url comment)
     (cons keyword url)))


@@ -231,7 +230,7 @@ Note that this function is a setfable place."
     (setf (cdr ,url) ,store)))
 
 (defun quickurl-url-comment (url)
     (setf (cdr ,url) ,store)))
 
 (defun quickurl-url-comment (url)

-  "Get the comment from an URL.
+  "Get the comment from a URL.

 
 If the URL has no comment an empty string is returned. Also note that this
 function is a setfable place."
 
 If the URL has no comment an empty string is returned. Also note that this
 function is a setfable place."


@@ -305,10 +304,10 @@ Also display a `message' saying what the URL was unless SILENT is non-nil."
 
 ;;;###autoload
 (defun* quickurl (&optional lookup)
 
 ;;;###autoload
 (defun* quickurl (&optional lookup)

-  "Insert an URL based on LOOKUP.
+  "Insert a URL based on LOOKUP.

 
 If not supplied LOOKUP is taken to be the word at point in the current
 
 If not supplied LOOKUP is taken to be the word at point in the current

-buffer, this default action can be modifed via
+buffer, this default action can be modified via

 `quickurl-grab-lookup-function'."
   (interactive)
   (when (or lookup
 `quickurl-grab-lookup-function'."
   (interactive)
   (when (or lookup


@@ -324,7 +323,7 @@ buffer, this default action can be modifed via
 
 ;;;###autoload
 (defun quickurl-ask (lookup)
 
 ;;;###autoload
 (defun quickurl-ask (lookup)

-  "Insert an URL, with `completing-read' prompt, based on LOOKUP."
+  "Insert a URL, with `completing-read' prompt, based on LOOKUP."

   (interactive
    (list
     (progn
   (interactive
    (list
     (progn


@@ -336,7 +335,7 @@ buffer, this default action can be modifed via
       (quickurl-insert url))))
 
 (defun quickurl-grab-url ()
       (quickurl-insert url))))
 
 (defun quickurl-grab-url ()

-  "Attempt to grab a word/url pair from point in the current buffer.
+  "Attempt to grab a word/URL pair from point in the current buffer.

 
 Point should be somewhere on the URL and the word is taken to be the thing
 that is returned from calling `quickurl-grab-lookup-function' once a
 
 Point should be somewhere on the URL and the word is taken to be the thing
 that is returned from calling `quickurl-grab-lookup-function' once a


@@ -370,7 +369,7 @@ It is assumed that the URL is either \"unguarded\" or is wrapped inside an
 (defun quickurl-add-url (word url comment)
   "Allow the user to interactively add a new URL associated with WORD.
 
 (defun quickurl-add-url (word url comment)
   "Allow the user to interactively add a new URL associated with WORD.
 

-See `quickurl-grab-url' for details on how the default word/url combination
+See `quickurl-grab-url' for details on how the default word/URL combination

 is decided."
   (interactive (let ((word-url (quickurl-grab-url)))
                  (list (read-string "Word: "    (quickurl-url-keyword word-url))
 is decided."
   (interactive (let ((word-url (quickurl-grab-url)))
                  (list (read-string "Word: "    (quickurl-url-keyword word-url))


@@ -403,7 +402,7 @@ is decided."
   "Browse the URL associated with LOOKUP.
 
 If not supplied LOOKUP is taken to be the word at point in the
   "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
+current buffer, this default action can be modified via

 `quickurl-grab-lookup-function'."
   (interactive)
   (when (or lookup
 `quickurl-grab-lookup-function'."
   (interactive)
   (when (or lookup


@@ -512,15 +511,15 @@ TYPE dictates what will be inserted, options are:
         (with-current-buffer quickurl-list-last-buffer
           (insert
            (case type
         (with-current-buffer quickurl-list-last-buffer
           (insert
            (case type

-             ('url         (funcall quickurl-format-function url))
-             ('naked-url   (quickurl-url-url url))
-             ('with-lookup (format "%s <URL:%s>"
+             (url         (funcall quickurl-format-function url))
+             (naked-url   (quickurl-url-url url))
+             (with-lookup (format "%s <URL:%s>"

                                    (quickurl-url-keyword url)
                                    (quickurl-url-url url)))
                                    (quickurl-url-keyword url)
                                    (quickurl-url-url url)))

-             ('with-desc   (format "%S <URL:%s>"
+             (with-desc   (format "%S <URL:%s>"

                                    (quickurl-url-description url)
                                    (quickurl-url-url url)))
                                    (quickurl-url-description url)
                                    (quickurl-url-url url)))

-             ('lookup      (quickurl-url-keyword url)))))
+             (lookup      (quickurl-url-keyword url)))))

       (error "No URL details on that line"))
     url))
 
       (error "No URL details on that line"))
     url))