aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2011-08-25 07:43:57 +0200
committerDeniz Dogan2011-08-25 07:43:57 +0200
commita2ebe600c947152c10bf657dfb9dfabdb601c766 (patch)
treea36e85c9f92b371473766bc96e234a34ed2e3aa0
parentb2948976fc35f12755c5d33e81578e5f3db0d884 (diff)
downloademacs-a2ebe600c947152c10bf657dfb9dfabdb601c766.tar.gz
emacs-a2ebe600c947152c10bf657dfb9dfabdb601c766.zip
* lisp/net/quickurl.el: Documentation typo fixes.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/quickurl.el20
2 files changed, 14 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9533d43f572..a42711dccc4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-08-25 Deniz Dogan <deniz@dogan.se>
2
3 * net/quickurl.el: Documentation typo fixes.
4
12011-08-25 Chong Yidong <cyd@stupidchicken.com> 52011-08-25 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * window.el (bury-buffer, quit-window): Use bury-buffer-internal. 7 * window.el (bury-buffer, quit-window): Use bury-buffer-internal.
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index c3da1707165..712f0b0c924 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,4 +1,4 @@
1;;; quickurl.el --- insert an URL based on text at point in buffer 1;;; quickurl.el --- insert a URL based on text at point in buffer
2 2
3;; Copyright (C) 1999-2011 Free Software Foundation, Inc. 3;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
4 4
@@ -24,7 +24,7 @@
24 24
25;;; Commentary: 25;;; Commentary:
26;; 26;;
27;; This package provides a simple method of inserting an URL based on the 27;; This package provides a simple method of inserting a URL based on the
28;; text at point in the current buffer. This is part of an on-going effort 28;; text at point in the current buffer. This is part of an on-going effort
29;; to increase the information I provide people while reducing the ammount 29;; to increase the information I provide people while reducing the ammount
30;; of typing I need to do. No-doubt there are undiscovered Emacs packages 30;; of typing I need to do. No-doubt there are undiscovered Emacs packages
@@ -90,7 +90,7 @@
90;; Customize options. 90;; Customize options.
91 91
92(defgroup quickurl nil 92(defgroup quickurl nil
93 "Insert an URL based on text at point in buffer." 93 "Insert a URL based on text at point in buffer."
94 :version "21.1" 94 :version "21.1"
95 :group 'abbrev 95 :group 'abbrev
96 :prefix "quickurl-") 96 :prefix "quickurl-")
@@ -194,14 +194,14 @@ in your ~/.emacs (after loading/requiring quickurl).")
194(defvar quickurl-list-last-buffer nil 194(defvar quickurl-list-last-buffer nil
195 "`current-buffer' when `quickurl-list' was called.") 195 "`current-buffer' when `quickurl-list' was called.")
196 196
197;; Functions for working with an URL entry. 197;; Functions for working with a URL entry.
198 198
199(defun quickurl-url-commented-p (url) 199(defun quickurl-url-commented-p (url)
200 "Does the URL have a comment?" 200 "Does the URL have a comment?"
201 (listp (cdr url))) 201 (listp (cdr url)))
202 202
203(defun quickurl-make-url (keyword url &optional comment) 203(defun quickurl-make-url (keyword url &optional comment)
204 "Create an URL from KEYWORD, URL and (optionaly) COMMENT." 204 "Create a URL from KEYWORD, URL and (optionaly) COMMENT."
205 (if (and comment (not (zerop (length comment)))) 205 (if (and comment (not (zerop (length comment))))
206 (list keyword url comment) 206 (list keyword url comment)
207 (cons keyword url))) 207 (cons keyword url)))
@@ -230,7 +230,7 @@ Note that this function is a setfable place."
230 (setf (cdr ,url) ,store))) 230 (setf (cdr ,url) ,store)))
231 231
232(defun quickurl-url-comment (url) 232(defun quickurl-url-comment (url)
233 "Get the comment from an URL. 233 "Get the comment from a URL.
234 234
235If the URL has no comment an empty string is returned. Also note that this 235If the URL has no comment an empty string is returned. Also note that this
236function is a setfable place." 236function is a setfable place."
@@ -304,7 +304,7 @@ Also display a `message' saying what the URL was unless SILENT is non-nil."
304 304
305;;;###autoload 305;;;###autoload
306(defun* quickurl (&optional lookup) 306(defun* quickurl (&optional lookup)
307 "Insert an URL based on LOOKUP. 307 "Insert a URL based on LOOKUP.
308 308
309If not supplied LOOKUP is taken to be the word at point in the current 309If not supplied LOOKUP is taken to be the word at point in the current
310buffer, this default action can be modifed via 310buffer, this default action can be modifed via
@@ -323,7 +323,7 @@ buffer, this default action can be modifed via
323 323
324;;;###autoload 324;;;###autoload
325(defun quickurl-ask (lookup) 325(defun quickurl-ask (lookup)
326 "Insert an URL, with `completing-read' prompt, based on LOOKUP." 326 "Insert a URL, with `completing-read' prompt, based on LOOKUP."
327 (interactive 327 (interactive
328 (list 328 (list
329 (progn 329 (progn
@@ -335,7 +335,7 @@ buffer, this default action can be modifed via
335 (quickurl-insert url)))) 335 (quickurl-insert url))))
336 336
337(defun quickurl-grab-url () 337(defun quickurl-grab-url ()
338 "Attempt to grab a word/url pair from point in the current buffer. 338 "Attempt to grab a word/URL pair from point in the current buffer.
339 339
340Point should be somewhere on the URL and the word is taken to be the thing 340Point should be somewhere on the URL and the word is taken to be the thing
341that is returned from calling `quickurl-grab-lookup-function' once a 341that is returned from calling `quickurl-grab-lookup-function' once a
@@ -369,7 +369,7 @@ It is assumed that the URL is either \"unguarded\" or is wrapped inside an
369(defun quickurl-add-url (word url comment) 369(defun quickurl-add-url (word url comment)
370 "Allow the user to interactively add a new URL associated with WORD. 370 "Allow the user to interactively add a new URL associated with WORD.
371 371
372See `quickurl-grab-url' for details on how the default word/url combination 372See `quickurl-grab-url' for details on how the default word/URL combination
373is decided." 373is decided."
374 (interactive (let ((word-url (quickurl-grab-url))) 374 (interactive (let ((word-url (quickurl-grab-url)))
375 (list (read-string "Word: " (quickurl-url-keyword word-url)) 375 (list (read-string "Word: " (quickurl-url-keyword word-url))