diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12208786795..1f9e909b1aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-10-14 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-process-one-action): Embed regexp in | ||
| 4 | parentheses, before adding end-of-buffer construct. Suggested by | ||
| 5 | Markus Triska <markus.triska@gmx.at>. | ||
| 6 | |||
| 1 | 2008-10-13 Ulf Jasper <ulf.jasper@web.de> | 7 | 2008-10-13 Ulf Jasper <ulf.jasper@web.de> |
| 2 | 8 | ||
| 3 | * net/newst-plainview.el (w3m-toggle-inline-image): | 9 | * net/newst-plainview.el (w3m-toggle-inline-image): |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 68f75eb7771..84917dc8dfd 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -5641,7 +5641,7 @@ The terminal type can be configured with `tramp-terminal-type'." | |||
| 5641 | (setq todo actions) | 5641 | (setq todo actions) |
| 5642 | (while todo | 5642 | (while todo |
| 5643 | (setq item (pop todo)) | 5643 | (setq item (pop todo)) |
| 5644 | (setq pattern (concat (symbol-value (nth 0 item)) "\\'")) | 5644 | (setq pattern (format "\\(%s\\)\\'" (symbol-value (nth 0 item)))) |
| 5645 | (setq action (nth 1 item)) | 5645 | (setq action (nth 1 item)) |
| 5646 | (tramp-message | 5646 | (tramp-message |
| 5647 | vec 5 "Looking for regexp \"%s\" from remote shell" pattern) | 5647 | vec 5 "Looking for regexp \"%s\" from remote shell" pattern) |