HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright notices for 2013.
[bpt/emacs.git]
/
lisp
/
net
/
tramp-gw.el
diff --git
a/lisp/net/tramp-gw.el
b/lisp/net/tramp-gw.el
index
1496858
..
13f2964
100644
(file)
--- a/
lisp/net/tramp-gw.el
+++ b/
lisp/net/tramp-gw.el
@@
-1,6
+1,6
@@
;;; tramp-gw.el --- Tramp utility functions for HTTP tunnels and SOCKS gateways
;;; tramp-gw.el --- Tramp utility functions for HTTP tunnels and SOCKS gateways
-;; Copyright (C) 2007
, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
+;; Copyright (C) 2007
-2013
Free Software Foundation, Inc.
;; Author: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
;; Author: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
@@
-50,20
+50,20
@@
;; Define HTTP tunnel method ...
;;;###tramp-autoload
(defconst tramp-gw-tunnel-method "tunnel"
;; Define HTTP tunnel method ...
;;;###tramp-autoload
(defconst tramp-gw-tunnel-method "tunnel"
- "
*
Method to connect HTTP gateways.")
+ "Method to connect HTTP gateways.")
;; ... and port.
(defconst tramp-gw-default-tunnel-port 8080
;; ... and port.
(defconst tramp-gw-default-tunnel-port 8080
- "
*
Default port for HTTP gateways.")
+ "Default port for HTTP gateways.")
;; Define SOCKS method ...
;;;###tramp-autoload
(defconst tramp-gw-socks-method "socks"
;; Define SOCKS method ...
;;;###tramp-autoload
(defconst tramp-gw-socks-method "socks"
- "
*
Method to connect SOCKS servers.")
+ "Method to connect SOCKS servers.")
;; ... and port.
(defconst tramp-gw-default-socks-port 1080
;; ... and port.
(defconst tramp-gw-default-socks-port 1080
- "
*
Default port for SOCKS servers.")
+ "Default port for SOCKS servers.")
;; Autoload the socks library. It is used only when we access a SOCKS server.
(autoload 'socks-open-network-stream "socks")
;; Autoload the socks library. It is used only when we access a SOCKS server.
(autoload 'socks-open-network-stream "socks")
@@
-154,7
+154,7
@@
instead of the host name declared in TARGET-VEC."
(memq (process-status tramp-gw-aux-proc) '(listen)))
(let ((aux-vec
(vector "aux" (tramp-file-name-user gw-vec)
(memq (process-status tramp-gw-aux-proc) '(listen)))
(let ((aux-vec
(vector "aux" (tramp-file-name-user gw-vec)
- (tramp-file-name-host gw-vec) nil)))
+ (tramp-file-name-host gw-vec) nil
nil
)))
(setq tramp-gw-aux-proc
(make-network-process
:name (tramp-buffer-name aux-vec) :buffer nil :host 'local
(setq tramp-gw-aux-proc
(make-network-process
:name (tramp-buffer-name aux-vec) :buffer nil :host 'local
@@
-178,7
+178,7
@@
instead of the host name declared in TARGET-VEC."
(tramp-file-name-host gw-vec)))
;; Declare the SOCKS server to be used.
(socks-server
(tramp-file-name-host gw-vec)))
;; Declare the SOCKS server to be used.
(socks-server
- (list "Tramp tempory socks server list"
+ (list "Tramp tempor
ar
y socks server list"
;; Host name.
(tramp-file-name-real-host gw-vec)
;; Port number.
;; Host name.
(tramp-file-name-real-host gw-vec)
;; Port number.