comparison lisp/url/url-parse.el @ 83353:532e0a9335a9

Merged in changes from CVS trunk. Plus added lisp/term tweaks. Patches applied: * lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0 tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1 Add CVS metadata files. * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2 Update from CVS. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 04 Sep 2005 03:48:17 +0000
parents 6c13700d1c13 875dcc490074
children d04d8ccb3c41
comparison
equal deleted inserted replaced
83352:b258b3492423 83353:532e0a9335a9
1 ;;; url-parse.el --- Uniform Resource Locator parser 1 ;;; url-parse.el --- Uniform Resource Locator parser
2 2
3 ;; Copyright (c) 1996,1997,1998,1999,2004 Free Software Foundation, Inc. 3 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
4 ;; 2005 Free Software Foundation, Inc.
4 5
5 ;; Keywords: comm, data, processes 6 ;; Keywords: comm, data, processes
6 7
7 ;; This file is part of GNU Emacs. 8 ;; This file is part of GNU Emacs.
8 ;; 9 ;;
82 (defmacro url-set-attributes (urlobj targ) 83 (defmacro url-set-attributes (urlobj targ)
83 `(aset ,urlobj 7 ,targ)) 84 `(aset ,urlobj 7 ,targ))
84 85
85 (defmacro url-set-full (urlobj val) 86 (defmacro url-set-full (urlobj val)
86 `(aset ,urlobj 8 ,val)) 87 `(aset ,urlobj 8 ,val))
87 88
88 ;;;###autoload 89 ;;;###autoload
89 (defun url-recreate-url (urlobj) 90 (defun url-recreate-url (urlobj)
90 "Recreate a URL string from the parsed URLOBJ." 91 "Recreate a URL string from the parsed URLOBJ."
91 (concat (url-type urlobj) ":" (if (url-host urlobj) "//" "") 92 (concat (url-type urlobj) ":" (if (url-host urlobj) "//" "")
92 (if (url-user urlobj) 93 (if (url-user urlobj)