Mercurial > emacs
annotate lisp/url/url-proxy.el @ 67575:d0f7b15488df
(bibtex-expand-strings)
(bibtex-autokey-expand-string, bibtex-name-part)
(bibtex-entry-type-whitespace, bibtex-entry-type-str)
(bibtex-any-entry-maybe-empty-head, bibtex-string-type)
(bibtex-preamble-prefix, bibtex-string-empty-key): New variables.
(bibtex-entry-type, bibtex-entry-head): Match only valid entries.
(bibtex-entry-postfix, bibtex-known-entry-type-re)
(bibtex-valid-entry-re, bibtex-any-valid-entry-re)
(bibtex-valid-entry-whitespace-re, bibtex-empty-field-re)
(bibtex-field-name-for-parsing, bibtex-remove-delimiters-string)
(bibtex-beginning-of-last-entry): Remove.
(bibtex-parse-field-name): Use bibtex-field-name. Issue error
message if comma is missing but buffer is read-only.
(bibtex-parse-field-text): Handle whitespaces at the end of field
text. Return 3-element list with beginning and end of field text
and end of field.
(bibtex-end-of-text-in-field, bibtex-end-of-field): Change accordingly.
(bibtex-parse-field): Remove arg name. Use bibtex-field-name.
(bibtex-search-forward-field, bibtex-search-backward-field):
Search always delimited by limits of entry. Use more efficient
search algorithms.
(bibtex-name-in-field): Use bibtex-start-of-name-in-field and
bibtex-end-of-name-in-field.
(bibtex-text-in-field-bounds): Handle BibTeX strings when
extracting the content of a field.
(bibtex-text-in-field): Use search limits.
(bibtex-parse-string-prefix): Handle empty string keys based on
bibtex-string-empty-key.
(bibtex-parse-string): Fix docstring.
(bibtex-text-in-string): Use bibtex-text-in-field-bounds.
(bibtex-preamble-prefix, bibtex-strings): New functions.
(bibtex-skip-to-valid-entry): Include preceding whitespace in
BibTeX entries (consistent with other BibTeX functions).
(bibtex-map-entries): Use bibtex-skip-to-valid-entry.
(bibtex-search-entry): Fix docstring. Simplify.
(bibtex-flash-head, bibtex-complete-string-cleanup)
(bibtex-count-entries, bibtex-sort-buffer): Simplify.
(bibtex-beginning-of-first-entry): Use bibtex-skip-to-valid-entry.
(bibtex-parse-entry): New optional arg content.
(bibtex-format-entry, bibtex-autofill-entry, bibtex-url): Use it.
Use bibtex-text-in-field-bounds.
(bibtex-print-help-message): Handle BibTeX strings and preambles.
(bibtex-end-of-entry): Use bibtex-preamble-prefix and
bibtex-parse-string-postfix.
(bibtex-find-text-internal): New function.
(bibtex-remove-delimiters): Use it.
(bibtex-find-text): Use it. New optional arg help.
(bibtex-complete): Handle BibTeX string and preamble entries.
(bibtex-Preamble): Fix order of closing delimiters.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 14 Dec 2005 17:15:20 +0000 |
parents | 875dcc490074 |
children | e8a3fb527b77 532e0a9335a9 |
rev | line source |
---|---|
54695 | 1 ;;; url-proxy.el --- Proxy server support |
57612 | 2 |
64748
875dcc490074
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
3 ;; Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. |
57612 | 4 |
54695 | 5 ;; Keywords: comm, data, processes, hypermedia |
6 | |
57612 | 7 ;; This file is part of GNU Emacs. |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 ;; it under the terms of the GNU General Public License as published by | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
12 ;; any later version. | |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64084 | 21 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
22 ;; Boston, MA 02110-1301, USA. | |
57612 | 23 |
24 ;;; Code: | |
54695 | 25 |
26 (require 'url-parse) | |
27 (autoload 'url-warn "url") | |
28 | |
29 (defun url-default-find-proxy-for-url (urlobj host) | |
30 (cond | |
31 ((or (and (assoc "no_proxy" url-proxy-services) | |
32 (string-match | |
33 (cdr | |
34 (assoc "no_proxy" url-proxy-services)) | |
35 host)) | |
36 (equal "www" (url-type urlobj))) | |
37 "DIRECT") | |
38 ((cdr (assoc (url-type urlobj) url-proxy-services)) | |
39 (concat "PROXY " (cdr (assoc (url-type urlobj) url-proxy-services)))) | |
40 ;; | |
41 ;; Should check for socks | |
42 ;; | |
43 (t | |
44 "DIRECT"))) | |
45 | |
46 (defvar url-proxy-locator 'url-default-find-proxy-for-url) | |
47 | |
48 (defun url-find-proxy-for-url (url host) | |
49 (let ((proxies (split-string (funcall url-proxy-locator url host) " *; *")) | |
50 (proxy nil) | |
51 (case-fold-search t)) | |
52 ;; Not sure how I should handle gracefully degrading from one proxy to | |
53 ;; another, so for now just deal with the first one | |
54 ;; (while proxies | |
55 (if (listp proxies) | |
56 (setq proxy (car proxies)) | |
57 (setq proxy proxies)) | |
58 (cond | |
59 ((string-match "^direct" proxy) nil) | |
60 ((string-match "^proxy +" proxy) | |
61 (concat "http://" (substring proxy (match-end 0)) "/")) | |
62 ((string-match "^socks +" proxy) | |
63 (concat "socks://" (substring proxy (match-end 0)))) | |
64 (t | |
65 (url-warn 'url (format "Unknown proxy directive: %s" proxy) 'critical) | |
66 nil)))) | |
67 | |
68 (defun url-proxy (url callback &optional cbargs) | |
69 ;; Retrieve URL from a proxy. | |
70 ;; Expects `url-using-proxy' to be bound to the specific proxy to use." | |
71 (setq url-using-proxy (url-generic-parse-url url-using-proxy)) | |
72 (let ((proxy-object (copy-sequence url))) | |
73 (url-set-target proxy-object nil) | |
74 (url-http url-using-proxy callback cbargs))) | |
75 | |
76 (provide 'url-proxy) | |
54699 | 77 |
78 ;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62 | |
57612 | 79 ;;; url-proxy.el ends here |