Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
658052a2
Commit
658052a2
authored
Dec 30, 2006
by
Michael Albinus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sync with Tramp 2.0.55.
parent
11e95b02
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
10 deletions
+45
-10
lisp/ChangeLog
lisp/ChangeLog
+16
-0
lisp/net/tramp.el
lisp/net/tramp.el
+20
-7
lisp/net/trampver.el
lisp/net/trampver.el
+1
-1
man/ChangeLog
man/ChangeLog
+6
-0
man/trampver.texi
man/trampver.texi
+2
-2
No files found.
lisp/ChangeLog
View file @
658052a2
2006-12-30 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.0.55.
* net/tramp.el (tramp-completion-mode): Use `wholenump' instead of
`integerp'. `char-equal' could fail else in case of negative
numbers. Reported by Toby Speight <T.M.Speight.90@cantab.net>.
(top): Check for `font-lock-add-keywords' before calling; it
doesn't exist under XEmacs.
(tramp-yn-prompt-regexp): Fix regexp. Add question from plink.
(tramp-completion-mode): Remove clause (not
tramp-unified-filenames), because the function is called in other
context too, where this check results in wrong results in the
XEmacs case on Windows.
(tramp-touch): UTC handling is not possible for XEmacs.
2006-12-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* scroll-bar.el (previous-scroll-bar-mode): New variable
lisp/net/tramp.el
View file @
658052a2
...
...
@@ -956,8 +956,10 @@ See also `tramp-yn-prompt-regexp'."
:type
'regexp
)
(
defcustom
tramp-yn-prompt-regexp
(
concat
(
regexp-opt
'
(
"Store key in cache? (y/n)"
)
t
)
"\\s-*"
)
(
concat
(
regexp-opt
'
(
"Store key in cache? (y/n)"
"Update cached key? (y/n, Return cancels connection)"
)
t
)
"\\s-*"
)
"Regular expression matching all y/n queries which need to be confirmed.
The confirmation should be done with y or n.
The regexp should match at end of buffer.
...
...
@@ -2075,7 +2077,9 @@ If VAR is nil, then we bind `v' to the structure and `multi-method',
;; Enable debugging.
(
def-edebug-spec
with-parsed-tramp-file-name
(
form
symbolp
body
))
;; Highlight as keyword.
(
font-lock-add-keywords
'emacs-lisp-mode
'
(
"\\<with-parsed-tramp-file-name\\>"
))
(
when
(
functionp
'font-lock-add-keywords
)
(
funcall
'font-lock-add-keywords
'emacs-lisp-mode
'
(
"\\<with-parsed-tramp-file-name\\>"
)))
(
defmacro
tramp-let-maybe
(
variable
value
&rest
body
)
"Let-bind VARIABLE to VALUE in BODY, but only if VARIABLE is not obsolete.
...
...
@@ -4526,7 +4530,6 @@ Falls back to normal file name handler if no tramp file name handler exists."
"Checks whether method / user name / host name completion is active."
(
cond
(
tramp-completion-mode
t
)
((
not
tramp-unified-filenames
)
t
)
((
string-match
"^/.*:.*:$"
file
)
nil
)
((
string-match
(
concat
tramp-prefix-regexp
...
...
@@ -4535,7 +4538,7 @@ Falls back to normal file name handler if no tramp file name handler exists."
(
member
(
match-string
1
file
)
(
mapcar
'car
tramp-methods
)))
((
or
(
equal
last-input-event
'tab
)
;; Emacs
(
and
(
integer
p
last-input-event
)
(
and
(
wholenum
p
last-input-event
)
(
or
;; ?\t has event-modifier 'control
(
char-equal
last-input-event
?\t
)
...
...
@@ -5104,13 +5107,23 @@ hosts, or files, disagree."
(
defun
tramp-touch
(
file
time
)
"Set the last-modified timestamp of the given file.
TIME is an Emacs internal time value as returned by `current-time'."
(
let
((
touch-time
(
format-time-string
"%Y%m%d%H%M.%S"
time
t
)))
(
let*
((
utc
;; With GNU Emacs, `format-time-string' has an optional
;; parameter UNIVERSAL. This is preferred.
(
and
(
functionp
'subr-arity
)
(
=
3
(
cdr
(
funcall
(
symbol-function
'subr-arity
)
(
symbol-function
'format-time-string
))))))
(
touch-time
(
if
utc
(
format-time-string
"%Y%m%d%H%M.%S"
time
t
)
(
format-time-string
"%Y%m%d%H%M.%S"
time
))))
(
if
(
tramp-tramp-file-p
file
)
(
with-parsed-tramp-file-name
file
nil
(
let
((
buf
(
tramp-get-buffer
multi-method
method
user
host
)))
(
unless
(
zerop
(
tramp-send-command-and-check
multi-method
method
user
host
(
format
"TZ=UTC; export TZ; touch -t %s %s"
(
format
"%s touch -t %s %s"
(
if
utc
"TZ=UTC; export TZ;"
""
)
touch-time
(
tramp-shell-quote-argument
localname
))
t
))
...
...
lisp/net/trampver.el
View file @
658052a2
...
...
@@ -30,7 +30,7 @@
;; are auto-frobbed from configure.ac, so you should edit that file and run
;; "autoconf && ./configure" to change them.
(
defconst
tramp-version
"2.0.5
4
"
(
defconst
tramp-version
"2.0.5
5
"
"This version of Tramp."
)
(
defconst
tramp-bug-report-address
"tramp-devel@gnu.org"
...
...
man/ChangeLog
View file @
658052a2
2006-12-30 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.0.55.
* trampver.texi: Update release number.
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Customizing Articles): Add index entries for all
...
...
man/trampver.texi
View file @
658052a2
...
...
@@ -4,12 +4,12 @@
@c In the Tramp CVS, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
@set trampver 2.0.5
4
@set trampver 2.0.5
5
@c Other flags from configuration
@set prefix /usr/local
@set lispdir /usr/local/share/emacs/site-lisp
@set infodir /usr/local/info
@set infodir /usr/local/
share/
info
@c Formatting of the tramp program name consistent.
@set tramp @sc{tramp}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment