Mercurial > emacs
view lisp/net/quickurl.el @ 47576:b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
2002-09-22 Kai Gro?ohann <grossjoh@ls6.informatik.uni-dortmund.de>
Version 2.0.20 released.
2002-09-20 Kai Gro?ohann <grossjoh@ls6.informatik.uni-dortmund.de>
* net/tramp.el (tramp-completion-function-alist): Escape open
paren in docstring.
(tramp-user-regexp, tramp-host-regexp): Allow empty strings.
(tramp-handle-insert-file-contents): Call tramp-message-for-buffer
instead of tramp-message.
(tramp-open-connection-rsh): Handle empty string as user name.
(tramp-open-connection-su): Handle empty string as host name.
Handle nil user name.
(tramp-handle-file-local-copy, tramp-handle-write-region)
(tramp-completion-handle-file-name-all-completions)
(tramp-open-connection-telnet, tramp-open-connection-rsh)
(tramp-open-connection-su, tramp-post-connection)
(tramp-maybe-open-connection, tramp-method-out-of-band-p)
(tramp-get-connection-function, tramp-get-remote-sh)
(tramp-get-rsh-program, tramp-get-rsh-args)
(tramp-get-rcp-program, tramp-get-rcp-args)
(tramp-get-rcp-keep-date-arg, tramp-get-su-program)
(tramp-get-su-args, tramp-get-telnet-program)
(tramp-get-telnet-args): Use `tramp-find-method', perhaps require
additional args USER, HOST.
(tramp-action-password, tramp-open-connection-telnet)
(tramp-open-connection-su, tramp-open-connection-multi)
(tramp-method-out-of-band-p): `tramp-method-out-of-band-p' now
takes USER and HOST arguments, to be able to use
`tramp-find-method'. Update callers.
(tramp-find-method): New function.
2002-09-20 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-insert-directory): Handle "--dired"
in SWITCHES (by removing it).
2002-09-18 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-file-name-handler): Add `file-remote-p'
property.
2002-09-17 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (top-level): Maybe autoload uudecode-decode-region.
2002-09-16 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-bug): Add tramp-methods.
2002-09-16 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-methods): Update docstring:
tramp-encoding-command, tramp-decoding-command,
tramp-encoding-function and tramp-decoding-function are not
parameters anymore.
(tramp-uuencode-region): Autoload it.
2002-09-13 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
Version 2.0.19 released.
* net/tramp-uu.el: New file, implements uuencode in Lisp.
* net/tramp.el (tramp-coding-commands): Use
`tramp-uuencode-region' as local encoder for the uuencode based
entries.
2002-09-13 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-write-region): Wrong parens.
2002-09-13 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
Version 2.0.18 released.
* net/tramp.el (tramp-perl-decode): Perl changes to accomodate
older versions of Perl. Now tested with 5.004. Suggestion from
Michael Albinus.
2002-09-12 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-find-inline-encoding): Call
tramp-call-local-coding-command with nil for INPUT and OUTPUT.
(tramp-call-local-coding-command): OUTPUT equals nil means to
discard the output. INPUT equals nil means /dev/null.
2002-09-12 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-encoding-shell): Default to environment
variable COMSPEC on Windows.
(tramp-handle-write-region): More debugging output.
(tramp-find-inline-encoding): Ditto.
2002-09-11 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-handle-file-name-all-completions):
Define `result1'.
(tramp-parse-hosts-group): Discard IPv6 entries.
2002-09-11 Kai Gro?ohann <grossjoh@ls6.informatik.uni-dortmund.de>
* net/tramp.el (tramp-post-connection): Only send Perl
mime-encode/decode implementations when using inline method.
(tramp-handle-file-local-copy)
(tramp-handle-write-region, tramp-post-connection)
(tramp-coding-commands, tramp-find-inline-encoding): For the
inline encodings, distinguish between local and remote commands,
instead of between commands and functions. (The local commands
can be functions, too.) If the local host is a Windows machine,
we can't expect the same commands to work there as on the remote
host.
(tramp-call-local-coding-command): New function for calling local
encoding and decoding commands.
(tramp-set-remote-encoding, tramp-get-remote-encoding)
(tramp-set-remote-decoding, tramp-get-remote-decoding)
(tramp-set-local-encoding, tramp-get-local-encoding)
(tramp-set-local-decoding, tramp-get-local-decoding): New
functions.
(tramp-get-encoding-command, tramp-set-encoding-command)
(tramp-get-decoding-command, tramp-set-decoding-command)
(tramp-get-encoding-function, tramp-set-encoding-function)
(tramp-get-decoding-function, tramp-set-decoding-function): Old
functions, removed.
2002-09-10 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-open-connection-setup-interactive-shell):
Change command to invoke /bin/sh slightly to make it compatible
with the `rc' shell. Suggested by Daniel Pittman.
2002-09-10 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-handle-write-region): Added missing
`)'. Hope it's the right place.
2002-09-09 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-open-connection-setup-interactive-shell): Do
"exec env PS1='$ ' /bin/sh" instead of just "exec /bin/sh" in
order to get a sane shell prompt. If people have ${CWD}, say, in
their shell prompt, then the default login shell might display
something harmless, but the /bin/sh will display a dollar sign
which confused the subsequent prompt recognition.
(tramp-multi-action-password): More debugging output.
(tramp-encoding-shell): Renamed from tramp-sh-program. More
documentation. Default to cmd.exe on Windows NT.
(tramp-encoding-command-switch): New variable. Use instead of
hard-wired "-c" which is only good for /bin/sh.
(tramp-encoding-reads-stdin): New variable. If t, commands are
called like "/bin/sh -c COMMAND <INPUT", if nil, they are called
like "/bin/sh -c COMMAND INPUT", ie the input file is the last
argument.
(tramp-multi-sh-program): Always default to tramp-encoding-shell.
(tramp-handle-file-local-copy, tramp-handle-write-region): Respect
tramp-encoding-shell and friends.
(tramp-find-inline-encoding): Use new-style calls for checking if
the local commands work.
2002-09-07 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-methods): Remove `tramp-completion-function'
entries. They are handled now by
`tramp-completion-function-alist'.
(tramp-completion-function): Defvar removed. I've never used
it. Hmm.
(tramp-get-completion-function)
(tramp-get-completion-rsh, tramp-get-completion-ssh)
(tramp-get-completion-telnet, tramp-get-completion-su): Functions
removed as well. Not necessary any longer due to extended
customization means.
(tramp-completion-function-alist): New defcustom. Holds all
FUNCTION FILE pairs used for user and host name completion
relevant for METHOD.
(tramp-completion-function-alist-rsh)
(tramp-completion-function-alist-ssh)
(tramp-completion-function-alist-telnet)
(tramp-completion-function-alist-su): Defconst for initializing
`tramp-completion-function-alist'. Unfortunately, mainly UNIX-like
values are known for me until now. Needs to be completed for at
least VMS++ like operating systems.
(tramp-set-completion-function)
(tramp-get-completion-function): New functions for configuration
of `tramp-completion-function-alist'. The old definition of
`tramp-get-completion-function' has been discarded.
(tramp-completion-handle-file-name-all-completions): Change
function call for user/host completion according to definition in
`tramp-completion-function-alist'.
(tramp-parse-passwd): Added exception handling for "root", because
`tramp-get-completion-su' (the previous place for this stuff)
doesn't exist any longer.
2002-09-07 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-enter-password): Use
`tramp-password-end-of-line' to terminate the line.
(tramp-bug): Include new variable `tramp-password-end-of-line'.
(tramp-password-end-of-line): New variable. People who use plink
under Windows might have to issue "\r\n" after the password, but
they need to send just "\n" after the other commands. So this
variable was introduced to complement `tramp-rsh-end-of-line'.
(tramp-wait-for-output, tramp-post-connection): Allow "\r" at end
of line of the output delimiter.
2002-09-06 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-file-local-copy, tramp-find-shell)
(tramp-open-connection-setup-interactive-shell): Add some comments
about Douglas Grey Stephen's suggestions to make Tramp work better
with plink under Windows. I'm not sure what to think of them, but
now I have a guinea pig to try it out on. Said guinea pig is
having other problems, though... Also remove some commented-out
code.
2002-09-06 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-methods): Algorithm slightly
tuned.
(tramp-get-completion-user-host): Accept user names as they are if
typed until "@".
(tramp-completion-mode): Replace `last-input-char' by modern
`last-input-event'. Check for `event-modifiers'.
2002-09-06 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (file-expand-wildcards): Corrected check to see if
advising is necessary.
2002-09-05 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-postfix-single-method-format)
(tramp-postfix-multi-method-format)
(tramp-postfix-multi-hop-format)
(tramp-postfix-user-format): New format strings.
(tramp-postfix-single-method-regexp)
(tramp-postfix-multi-method-regexp)
(tramp-postfix-multi-hop-regexp)
(tramp-postfix-user-regexp)
(tramp-make-multi-tramp-file-format)
(tramp-make-tramp-file-name): Apply them.
(tramp-completion-handle-file-name-all-completions): Fix for
invoking ange-ftp in case of "/ftp:xxx" file names.
2002-09-04 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-prefix-format)
(tramp-postfix-host-format): New format strings.
(tramp-prefix-regexp, tramp-method-regexp)
(tramp-postfix-single-method-regexp)
(tramp-postfix-multi-method-regexp)
(tramp-postfix-multi-hop-regexp)
(tramp-user-regexp, tramp-postfix-user-regexp)
(tramp-host-regexp, tramp-postfix-host-regexp)
(tramp-path-regexp): New atomar regular expressions. If
corresponding format strings exist, derived from them.
(tramp-file-name-structure)
(tramp-multi-file-name-structure)
(tramp-multi-file-name-hop-structure)
(tramp-make-multi-tramp-file-format)
(tramp-completion-mode)
(tramp-completion-dissect-file-name)
(tramp-parse-rhosts-group)
(tramp-parse-shosts-group)
(tramp-parse-hosts-group)
(tramp-parse-passwd-group): Apply these expressions.
(tramp-file-name-structure-unified)
(tramp-file-name-structure-separate)
(tramp-make-tramp-file-format-unified)
(tramp-make-tramp-file-format-separate)
(tramp-make-tramp-file-format)
(tramp-make-tramp-file-user-nil-format-unified)
(tramp-make-tramp-file-user-nil-format-separate)
(tramp-make-tramp-file-user-nil-format)
(tramp-multi-file-name-structure-unified)
(tramp-multi-file-name-structure-separate)
(tramp-multi-file-name-hop-structure-unified)
(tramp-multi-file-name-hop-structure-separate)
(tramp-make-multi-tramp-file-format-unified)
(tramp-make-multi-tramp-file-format-separate): Removed.
(tramp-make-tramp-file-name): Allow partial tramp file
names. Generate tramp file format on-the-fly depending on
parameters. Apply atomar format strings resp expressions.
(tramp-get-completion-methods)
(tramp-get-completion-user-host): Apply
`tramp-make-tramp-file-name'.
(tramp-parse-hosts-group): Take all host names and IP addresses
into account.
(tramp-bug): Remove `tramp-make-tramp-file-format'.
2002-09-01 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-methods): Add `tramp-completion-function'
for "su" and "sudo".
(tramp-get-completion-telnet): Implement it.
(tramp-parse-hosts)
(tramp-parse-hosts-group)
(tramp-get-completion-su)
(tramp-parse-passwd)
(tramp-parse-passwd-group): New functions.
2002-08-31 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-mode): Check for
`last-input-char'.
(tramp-completion-file-name-handler-alist): Add handler for
`file-exists-p.
(tramp-completion-handle-file-exists-p): New function.
(tramp-completion-handle-file-name-completion): Simplified.
(tramp-completion-dissect-file-name): Regexp's reorganised.
(tramp-completion-handle-file-name-all-completions): Call
completion-function only if `user' or `host' is given.
(tramp-get-completion-user-host): New function.
(tramp-get-completion-rsh)
(tramp-get-completion-ssh): Apply it.
2002-08-29 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-file-name-handler-alist): Add
handler for `expand-file-name'.
(tramp-completion-handle-expand-file-name): New function.
2002-08-26 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-mode): New function.
(tramp-completion-handle-file-name-directory)
(tramp-completion-handle-file-name-all-completions): Apply it.
(tramp-methods): Remove double definition of `ssh1-old' and
`ssh2-old'.
(tramp-point-at-eol): New defalias.
(tramp-parse-rhosts-group)
(tramp-parse-shosts-group):: Apply it.
2002-08-25 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-methods)
(tramp-get-completion-rsh)
(tramp-get-completion-ssh): Add "[" for Xemacs.
(tramp-completion-file-name-regexp-separate): Expression adapted.
(tramp-completion-file-name-handler-alist): Add handler for
`file-name-directory' and `file-name-nondirectory'.
(tramp-completion-handle-file-name-directory)
(tramp-completion-handle-file-name-nondirectory)
(tramp-completion-run-real-handler): New functions.
(tramp-completion-file-name-handler)
(tramp-completion-handle-file-name-all-completions): Apply
`tramp-completion-run-real-handler'.
(tramp-parse-rhosts)
(tramp-parse-shosts): Use `with-temp-buffer'. `result? renamed to
`res' (otherwise side effects in XEmacs).
2002-08-24 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-file-name-regexp)
(tramp-completion-file-name-handler-alist)
(tramp-flatten-list)
(tramp-completion-dissect-file-name)
(tramp-get-completion-rsh)
(tramp-parse-rhosts)
(tramp-parse-rhosts-group)
(tramp-get-completion-ssh): Doc string tuned.
(tramp-methods): Doc string and custom type extended for
`tramp-completion-function'.
(tramp-completion-function): Variable added. Is it really used?
Other variables like `tramp-completion-function' aren't used.
(tramp-completion-file-name-handler-alist): Add handler for
`file-name-completion'.
(tramp-completion-handle-file-name-completion): New function.
2002-08-18 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-parse-rhosts)
(tramp-parse-rhosts-group)
(tramp-parse-shosts)
(tramp-parse-shosts-group): New functions.
2002-08-17 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1): New functions.
2002-08-16 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-function)
(tramp-get-completion-rsh)
(tramp-get-completion-ssh)
(tramp-get-completion-telnet): New functions.
(tramp-methods): Add `tramp-completion-function' for all methods.
2002-08-15 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-methods): New function.
(tramp-find-default-method): Allow host to be nil (like user).
2002-08-14 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-file-name-regexp-unified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp)
(tramp-completion-file-name-handler-alist): New defcustoms.
(tramp-completion-file-name-handler): New function. Add
`tramp-completion-file-name-handler' to `file-name-handler-alist'.
(tramp-run-real-handler): Add `tramp-completion-file-name-handler'
to `inhibit-file-name-handlers'.
(tramp-completion-handle-file-name-all-completions)
(tramp-completion-handle-file-name-completion): New functions.
2002-08-12 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-invoke-ange-ftp): `tramp-disable-ange-ftp'
must be called again after activating `ange-ftp'.
(tramp-ange-ftp-file-name-p): Check for Xemacs.
2002-08-08 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-do-copy-or-rename-file): Don't pass
KEEP-DATE to tramp-invoke-ange-ftp 'rename.
(tramp-handle-write-region): Don't pass LOCKNAME and CONFIRM to
tramp-invoke-ange-ftp 'write-region.
(tramp-handle-set-file-modes): Change order of FILENAME and MODE
passing to tramp-invoke-ange-ftp 'set-file-modes.
(tramp-flatten-list): New function. Maybe this functionality does
exist already elsewhere in the libraries.
(tramp-invoke-ange-ftp): Apply `tramp-flatten-list' to parameter
list in order to avoid nested lists, f.e. when invoked from
`tramp-handle-dired-call-process'.
2002-09-05 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-chunksize): New kluge variable.
(tramp-send-region): If tramp-chunksize is non-nil, send region in
parts and sleep 0.1 seconds between chunks.
2002-09-03 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-insert-directory): Use
`insert-buffer-substring' instead of `insert-buffer', which is not
supposed to be used from Lisp. Remember old point in a variable
instead of using `mark'. Suggestion from Stefan Monnier.
(tramp-unified-filenames): New variable. Use it in default value
of other filename variables.
(file-expand-wildcards): Don't advise unless "[" and "]" are used
in the filename format.
2002-09-01 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-methods): Remove duplicate definition of
ssh1-old and ssh2-old.
author | Kai Großjohann <kgrossjo@eu.uu.net> |
---|---|
date | Sun, 22 Sep 2002 13:23:36 +0000 |
parents | b174db545cfd |
children | 0d8b17d428b5 |
line wrap: on
line source
;;; quickurl.el --- insert an URL based on text at point in buffer ;; Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. ;; Author: Dave Pearson <davep@davep.org> ;; Maintainer: Dave Pearson <davep@davep.org> ;; Created: 1999-05-28 ;; Keywords: hypermedia ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; This package provides a simple method of inserting an URL based on the ;; 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 ;; 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. ;; ;; The URLs are stored in an external file as a list of either cons cells, ;; or lists. A cons cell entry looks like this: ;; ;; (<Lookup> . <URL>) ;; ;; where <Lookup> is a string that acts as the keyword lookup and <URL> is ;; the URL associated with it. An example might be: ;; ;; ("GNU" . "http://www.gnu.org/") ;; ;; A list entry looks like: ;; ;; (<Lookup> <URL> <Comment>) ;; ;; where <Lookup> and <URL> are the same as with the cons cell and <Comment> ;; is any text you like that describes the URL. This description will be ;; used when presenting a list of URLS using `quickurl-list'. An example ;; might be: ;; ;; ("FSF" "http://www.fsf.org/" "The Free Software Foundation") ;; ;; Given the above, your quickurl file might look like: ;; ;; (("GNU" . "http://www.gnu.org/") ;; ("FSF" "http://www.fsf.org/" "The Free Software Foundation") ;; ("emacs" . "http://www.emacs.org/") ;; ("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. ;; URL comments are a later addition and so there is a mixture to keep ;; backward compatibility with existing URL lists. ;; ;; The name and location of the file is up to you, the default name used by ;; `quickurl' is stored in `quickurl-url-file'. ;; ;; quickurl is always available from: ;; ;; <URL:http://www.davep.org/emacs/quickurl.el> ;;; TODO: ;; ;; o The quickurl-browse-url* functions pretty much duplicate their non ;; browsing friends. It would feel better if a more generic solution could ;; be found. ;;; Code: ;; Things we need: (eval-when-compile (require 'cl)) (require 'thingatpt) (require 'pp) (require 'browse-url) ;; Attempt to handle older/other emacs. (eval-and-compile ;; If customize isn't available just use defvar instead. (unless (fboundp 'defgroup) (defmacro defgroup (&rest rest) nil) (defmacro defcustom (symbol init docstring &rest rest) `(defvar ,symbol ,init ,docstring)))) ;; Customize options. (defgroup quickurl nil "Insert an URL based on text at point in buffer." :version "21.1" :group 'abbrev :prefix "quickurl-") (defcustom quickurl-url-file (convert-standard-filename "~/.quickurls") "*File that contains the URL list." :type 'file :group 'quickurl) (defcustom quickurl-format-function (lambda (url) (format "<URL:%s>" (quickurl-url-url url))) "*Function to format the URL before insertion into the current buffer." :type 'function :group 'quickurl) (defcustom quickurl-sort-function (lambda (list) (sort list (lambda (x y) (string< (downcase (quickurl-url-description x)) (downcase (quickurl-url-description y)))))) "*Function to sort the URL list." :type 'function :group 'quickurl) (defcustom quickurl-grab-lookup-function #'current-word "*Function to grab the thing to lookup." :type 'function :group 'quickurl) (defcustom quickurl-assoc-function #'assoc-ignore-case "*Function to use for alist lookup into `quickurl-urls'." :type 'function :group 'quickurl) (defcustom quickurl-completion-ignore-case t "*Should `quickurl-ask' ignore case when doing the input lookup?" :type 'boolean :group 'quickurl) (defcustom quickurl-prefix ";; -*- lisp -*-\n\n" "*Text to write to `quickurl-url-file' before writing the URL list." :type 'string :group 'quickurl) (defcustom quickurl-postfix "" "*Text to write to `quickurl-url-file' after writing the URL list. See the constant `quickurl-reread-hook-postfix' for some example text that could be used here." :type 'string :group 'quickurl) (defcustom quickurl-list-mode-hook nil "*Hooks for `quickurl-list-mode'." :type 'hook :group 'quickurl) ;; Constants. ;;;###autoload (defconst quickurl-reread-hook-postfix " ;; Local Variables: ;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil))) ;; End: " "Example `quickurl-postfix' text that adds a local variable to the `quickurl-url-file' so that if you edit it by hand it will ensure that `quickurl-urls' is updated with the new URL list. To make use of this do something like: (setq quickurl-postfix quickurl-reread-hook-postfix) in your ~/.emacs (after loading/requiring quickurl).") ;; Non-customize variables. (defvar quickurl-urls nil "URL alist for use with `quickurl' and `quickurl-ask'.") (defvar quickurl-list-mode-map nil "Local keymap for a `quickurl-list-mode' buffer.") (defvar quickurl-list-buffer-name "*quickurl-list*" "Name for the URL listinig buffer.") (defvar quickurl-list-last-buffer nil "`current-buffer' when `quickurl-list' was called.") ;; Functions for working with an 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) "Create an URL from KEYWORD, URL and (optionaly) COMMENT." (if (and comment (not (zerop (length comment)))) (list keyword url comment) (cons keyword url))) (defun quickurl-url-keyword (url) "Return the keyword for the URL. Note that this function is a setfable place." (car url)) (defsetf quickurl-url-keyword (url) (store) `(setf (car ,url) ,store)) (defun quickurl-url-url (url) "Return the actual URL of the URL. Note that this function is a setfable place." (if (quickurl-url-commented-p url) (cadr url) (cdr url))) (defsetf quickurl-url-url (url) (store) ` (if (quickurl-url-commented-p ,url) (setf (cadr ,url) ,store) (setf (cdr ,url) ,store))) (defun quickurl-url-comment (url) "Get the comment from an URL. If the URL has no comment an empty string is returned. Also note that this function is a setfable place." (if (quickurl-url-commented-p url) (nth 2 url) "")) (defsetf quickurl-url-comment (url) (store) ` (if (quickurl-url-commented-p ,url) (if (zerop (length ,store)) (setf (cdr ,url) (cadr ,url)) (setf (nth 2 ,url) ,store)) (unless (zerop (length ,store)) (setf (cdr ,url) (list (cdr ,url) ,store))))) (defun quickurl-url-description (url) "Return a description for the URL. If the URL has a comment then this is returned, otherwise the keyword is returned." (let ((desc (quickurl-url-comment url))) (if (zerop (length desc)) (quickurl-url-keyword url) desc))) ;; 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'." (when (file-exists-p quickurl-url-file) (with-temp-buffer (insert-file-contents quickurl-url-file) (quickurl-read)))) (defun quickurl-save-urls () "Save the contents of `quickurl-urls' to `quickurl-url-file'." (with-temp-buffer (let ((standard-output (current-buffer))) (princ quickurl-prefix) (pp quickurl-urls) (princ quickurl-postfix) (write-region (point-min) (point-max) quickurl-url-file nil 0)))) (defun quickurl-find-url (lookup) "Return URL associated with key LOOKUP. The lookup is done by looking in the alist `quickurl-urls' and the `cons' for the URL is returned. The actual method used to look into the alist depends on the setting of the variable `quickurl-assoc-function'." (funcall quickurl-assoc-function lookup quickurl-urls)) (defun quickurl-insert (url &optional silent) "Insert URL, formatted using `quickurl-format-function'. Also display a `message' saying what the URL was unless SILENT is non-nil." (insert (funcall quickurl-format-function url)) (unless silent (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) (error "No URL associated with \"%s\"" lookup) (when (looking-at "\\w") (skip-syntax-forward "\\w")) (insert " ") (quickurl-insert url))))) ;;;###autoload (defun quickurl-ask (lookup) "Insert an URL, with `completing-read' prompt, based on LOOKUP." (interactive (list (progn (quickurl-load-urls) (let ((completion-ignore-case quickurl-completion-ignore-case)) (completing-read "Lookup: " quickurl-urls nil t))))) (let ((url (quickurl-find-url lookup))) (when url (quickurl-insert url)))) (defun quickurl-grab-url () "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 `backward-word' has been issued at the start of the URL. It is assumed that the URL is either \"unguarded\" or is wrapped inside an <URL:...> wrapper." (let ((url (thing-at-point 'url))) (when url (save-excursion (beginning-of-thing 'url) ;; `beginning-of-thing' doesn't take you to the start of a marked-up ;; URL, only to the start of the URL within the "markup". So, we ;; need to do a little more work to get to where we want to be. (when (thing-at-point-looking-at thing-at-point-markedup-url-regexp) (search-backward "<URL:")) (backward-word 1) (let ((word (funcall quickurl-grab-lookup-function))) (when word (quickurl-make-url ;; The grab function may return the word with properties. I don't ;; want the properties. I couldn't find a method of stripping ;; them from a "string" so this will have to do. If you know of ;; a better method of doing this I'd love to know. (with-temp-buffer (insert word) (buffer-substring-no-properties (point-min) (point-max))) url))))))) ;;;###autoload (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 is decided." (interactive (let ((word-url (quickurl-grab-url))) (list (read-string "Word: " (quickurl-url-keyword word-url)) (read-string "URL: " (quickurl-url-url word-url)) (read-string "Comment: " (quickurl-url-comment word-url))))) (if (zerop (length word)) (error "You must specify a WORD for lookup") (quickurl-load-urls) (let* ((current-url (quickurl-find-url word)) (add-it (if current-url (if (interactive-p) (y-or-n-p (format "\"%s\" exists, replace URL? " word)) t) t))) (when add-it (if current-url (progn (setf (quickurl-url-url current-url) url) (setf (quickurl-url-comment current-url) comment)) (push (quickurl-make-url word url comment) quickurl-urls)) (setq quickurl-urls (funcall quickurl-sort-function quickurl-urls)) (quickurl-save-urls) (when (get-buffer quickurl-list-buffer-name) (quickurl-list-populate-buffer)) (when (interactive-p) (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 (browse-url (quickurl-url-url url)) (error "No URL associated with \"%s\"" lookup))))) ;;;###autoload (defun quickurl-browse-url-ask (lookup) "Browse the URL, with `completing-read' prompt, associated with LOOKUP." (interactive (list (progn (quickurl-load-urls) (completing-read "Browse: " quickurl-urls nil t)))) (let ((url (quickurl-find-url lookup))) (when url (browse-url (quickurl-url-url url))))) ;;;###autoload (defun quickurl-edit-urls () "Pull `quickurl-url-file' into a buffer for hand editing." (interactive) (find-file quickurl-url-file)) ;; quickurl-list mode. (unless quickurl-list-mode-map (let ((map (make-sparse-keymap))) (suppress-keymap map t) (define-key map "a" #'quickurl-list-add-url) (define-key map [(control m)] #'quickurl-list-insert-url) (define-key map "u" #'quickurl-list-insert-naked-url) (define-key map " " #'quickurl-list-insert-with-lookup) (define-key map "l" #'quickurl-list-insert-lookup) (define-key map "d" #'quickurl-list-insert-with-desc) (define-key map [(control g)] #'quickurl-list-quit) (define-key map "q" #'quickurl-list-quit) (define-key map [mouse-2] #'quickurl-list-mouse-select) (define-key map "?" #'describe-mode) (setq quickurl-list-mode-map map))) (put 'quickurl-list-mode 'mode-class 'special) ;;;###autoload (defun quickurl-list-mode () "A mode for browsing the quickurl URL list. The key bindings for `quickurl-list-mode' are: \\{quickurl-list-mode-map}" (interactive) (kill-all-local-variables) (use-local-map quickurl-list-mode-map) (setq major-mode 'quickurl-list-mode mode-name "quickurl list") (run-hooks 'quickurl-list-mode-hook) (setq buffer-read-only t truncate-lines t)) ;;;###autoload (defun quickurl-list () "Display `quickurl-list' as a formatted list using `quickurl-list-mode'." (interactive) (quickurl-load-urls) (unless (string= (buffer-name) quickurl-list-buffer-name) (setq quickurl-list-last-buffer (current-buffer))) (pop-to-buffer quickurl-list-buffer-name) (quickurl-list-populate-buffer) (quickurl-list-mode)) (defun quickurl-list-populate-buffer () "Populate the `quickurl-list' buffer." (with-current-buffer (get-buffer quickurl-list-buffer-name) (let ((buffer-read-only nil) (fmt (format "%%-%ds %%s\n" (apply #'max (or (loop for url in quickurl-urls collect (length (quickurl-url-description url))) (list 20)))))) (setf (buffer-string) "") (loop for url in quickurl-urls do (let ((start (point))) (insert (format fmt (quickurl-url-description url) (quickurl-url-url url))) (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) "Wrapper for `quickurl-add-url' that doesn't guess the parameters." (interactive "sWord: \nsURL: \nsComment: ") (quickurl-add-url word url comment)) (defun quickurl-list-quit () "Kill the buffer named `quickurl-list-buffer-name'." (interactive) (kill-buffer quickurl-list-buffer-name) (switch-to-buffer quickurl-list-last-buffer) (delete-other-windows)) (defun quickurl-list-mouse-select (event) "Select the URL under the mouse click." (interactive "e") (setf (point) (posn-point (event-end event))) (quickurl-list-insert-url)) (defun quickurl-list-insert (type) "Insert the URL under cursor into `quickurl-list-last-buffer'. TYPE dictates what will be inserted, options are: `url' - Insert the URL as <URL:url> `naked-url' - Insert the URL with no formatting `with-lookup' - Insert \"lookup <URL:url>\" `with-desc' - Insert \"description <URL:url>\" `lookup' - Insert the lookup for that URL" (let ((url (nth (save-excursion (beginning-of-line) (count-lines (point-min) (point))) quickurl-urls))) (if url (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>" (quickurl-url-keyword url) (quickurl-url-url url))) ('with-desc (format "%S <URL:%s>" (quickurl-url-description url) (quickurl-url-url url))) ('lookup (quickurl-url-keyword url))))) (error "No URL details on that line")) url)) (defmacro quickurl-list-make-inserter (type) "Macro to make a key-response function for use in `quickurl-list-mode-map'." `(defun ,(intern (format "quickurl-list-insert-%S" type)) () ,(format "Insert the result of calling `quickurl-list-insert' with `%s'." type) (interactive) (when (quickurl-list-insert ',type) (quickurl-list-quit)))) (quickurl-list-make-inserter url) (quickurl-list-make-inserter naked-url) (quickurl-list-make-inserter with-lookup) (quickurl-list-make-inserter with-desc) (quickurl-list-make-inserter lookup) (provide 'quickurl) ;;; quickurl.el ends here