Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
85806390
Commit
85806390
authored
Apr 17, 2006
by
Michael Albinus
Browse files
Sync with Tramp 2.0.53.
parent
587043f8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
20 deletions
+48
-20
lisp/ChangeLog
lisp/ChangeLog
+20
-1
lisp/net/tramp-smb.el
lisp/net/tramp-smb.el
+1
-1
lisp/net/tramp.el
lisp/net/tramp.el
+21
-16
lisp/net/trampver.el
lisp/net/trampver.el
+1
-1
man/ChangeLog
man/ChangeLog
+4
-0
man/trampver.texi
man/trampver.texi
+1
-1
No files found.
lisp/ChangeLog
View file @
85806390
2006-04-17 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.0.53.
* net/tramp.el (tramp-completion-mode): ?\t has event-modifier
'control. Reported by Matthias Frste
<slashdevslashnull@gmx.net>.
(tramp-completion-file-name-handler): Add autoload cookie for
adding to `file-name-handler-alist'.
* net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for
the prompt. If it returns earlier (when detecting an error
message), the rest of the output will merge accidently with the
output of the next command. Reported by M Jared Finder
<jared@hpalace.com>.
* net/tramp-vc.el (vc-user-login-name): Wrap defadvice with a test
for `process-file', in order to let it work for older Emacsen too.
2006-04-17 Ralf Angeli <angeli@iwi.uni-sb.de>
* textmodes/tex-mode.el (tex-font-lock-match-suscript): New function.
...
...
@@ -2933,7 +2952,7 @@
(vc-default-update-changelog): Don't use vc-user-login-name, we
don't need it here.
* tramp-vc.el (vc-user-login-name): Comment out defadvice, it is
*
net/
tramp-vc.el (vc-user-login-name): Comment out defadvice, it is
no longer necessary.
2006-01-25 Kenichi Handa <handa@m17n.org>
...
...
lisp/net/tramp-smb.el
View file @
85806390
...
...
@@ -979,7 +979,7 @@ Returns nil if an error message has appeared."
;; Algorithm: get waiting output. See if last line contains
;; tramp-smb-prompt sentinel or tramp-smb-errors strings.
;; If not, wait a bit and again get waiting output.
(
while
(
and
(
not
found
)
(
not
err
))
(
while
(
not
found
)
;; Accept pending output.
(
tramp-accept-process-output
proc
)
...
...
lisp/net/tramp.el
View file @
85806390
...
...
@@ -4344,6 +4344,7 @@ Falls back to normal file name handler if no tramp file name handler exists."
;;;###autoload
(
add-to-list
'file-name-handler-alist
(
cons
tramp-file-name-regexp
'tramp-file-name-handler
))
;;;###autoload
(
add-to-list
'file-name-handler-alist
(
cons
tramp-completion-file-name-regexp
'tramp-completion-file-name-handler
))
...
...
@@ -4458,24 +4459,28 @@ necessary anymore."
file
)
(
member
(
match-string
1
file
)
(
mapcar
'car
tramp-methods
)))
((
or
(
equal
last-input-event
'tab
)
;; Emacs
(and (integerp last-input-event)
(not (event-modifiers last-input-event))
(or (char-equal last-input-event ?\?)
(char-equal last-input-event ?\t) ; handled by 'tab already?
(char-equal last-input-event ?\ )))
;; Emacs
(
and
(
integerp
last-input-event
)
(
or
;; ?\t has event-modifier 'control
(
char-equal
last-input-event
?\t
)
(
and
(
not
(
event-modifiers
last-input-event
))
(
or
(
char-equal
last-input-event
?\?
)
(
char-equal
last-input-event
?\
)))))
;; XEmacs
(
and
(
featurep
'xemacs
)
(not (event-modifiers last-input-event))
(or (char-equal
(funcall (symbol-function 'event-to-character)
last-input-event) ?\?)
(char-equal
(funcall (symbol-function 'event-to-character)
last-input-event) ?\t)
(char-equal
(funcall (symbol-function 'event-to-character)
last-input-event) ?\ ))))
(
or
;; ?\t has event-modifier 'control
(
char-equal
(
funcall
(
symbol-function
'event-to-character
)
last-input-event
)
?\t
)
(
and
(
not
(
event-modifiers
last-input-event
))
(
or
(
char-equal
(
funcall
(
symbol-function
'event-to-character
)
last-input-event
)
?\?
)
(
char-equal
(
funcall
(
symbol-function
'event-to-character
)
last-input-event
)
?\
))))))
t
)))
(
defun
tramp-completion-handle-file-exists-p
(
filename
)
...
...
lisp/net/trampver.el
View file @
85806390
...
...
@@ -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
2
"
(
defconst
tramp-version
"2.0.5
3
"
"This version of Tramp."
)
(
defconst
tramp-bug-report-address
"tramp-devel@gnu.org"
...
...
man/ChangeLog
View file @
85806390
2006-04-17 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.0.53.
2006-04-13 Carsten Dominik <dominik@science.uva.nl>
* org.texi: (Updating settings): New section.
...
...
man/trampver.texi
View file @
85806390
...
...
@@ -4,7 +4,7 @@
@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
2
@set trampver 2.0.5
3
@c Other flags from configuration
@set prefix /usr/local
...
...
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