diff options
| author | Richard M. Stallman | 2005-10-28 16:23:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-10-28 16:23:55 +0000 |
| commit | 8cee983d52161ecda8b2af093f3280f75f87a6c4 (patch) | |
| tree | 0da04ba6d397277e7c8f55e0de8374886fbfa281 | |
| parent | 81013a6cdea31a04089729bfa15c607ef11a1f20 (diff) | |
| download | emacs-8cee983d52161ecda8b2af093f3280f75f87a6c4.tar.gz emacs-8cee983d52161ecda8b2af093f3280f75f87a6c4.zip | |
(tramp-completion-mode): defvar moved up.
| -rw-r--r-- | lisp/ChangeLog | 23 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 6 |
2 files changed, 26 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 224f1e39565..238c679d257 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,26 @@ | |||
| 1 | 2005-10-28 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-completion-mode): defvar moved up. | ||
| 4 | |||
| 5 | * emacs-lisp/easymenu.el (easy-menu-change): Doc fix. | ||
| 6 | |||
| 7 | * tool-bar.el (tool-bar-mode): Delete autoload cookie. | ||
| 8 | |||
| 9 | * files.el (find-file-noselect): Use %d to format large file size. | ||
| 10 | |||
| 11 | * bindings.el (help-echo): Add %e. | ||
| 12 | |||
| 13 | * loadup.el ("facemenu"): Load unconditionally. | ||
| 14 | ("image", "international/fontset", "dnd", "mwheel", "tool-bar"): | ||
| 15 | ("x-dnd"): Load, when appropriate. | ||
| 16 | |||
| 17 | * startup.el (command-line): Call before-init-hook earlier. | ||
| 18 | Warn about some bad characters in -u user name. | ||
| 19 | |||
| 20 | * textmodes/flyspell.el (flyspell-large-region): Pass -t if Tex file. | ||
| 21 | (flyspell-external-point-words): Error if misspelled word is not found. | ||
| 22 | Set flyspell-large-region-beg at end of word. | ||
| 23 | |||
| 1 | 2005-10-28 Andreas Schwab <schwab@suse.de> | 24 | 2005-10-28 Andreas Schwab <schwab@suse.de> |
| 2 | 25 | ||
| 3 | * view.el (View-revert-buffer-scroll-page-forward): Use | 26 | * view.el (View-revert-buffer-scroll-page-forward): Use |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index cc662770dcf..545fa9e94b1 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -4369,6 +4369,9 @@ necessary anymore." | |||
| 4369 | 4369 | ||
| 4370 | ;;; File name handler functions for completion mode | 4370 | ;;; File name handler functions for completion mode |
| 4371 | 4371 | ||
| 4372 | (defvar tramp-completion-mode nil | ||
| 4373 | "If non-nil, we are in file name completion mode.") | ||
| 4374 | |||
| 4372 | ;; Necessary because `tramp-file-name-regexp-unified' and | 4375 | ;; Necessary because `tramp-file-name-regexp-unified' and |
| 4373 | ;; `tramp-completion-file-name-regexp-unified' aren't different. | 4376 | ;; `tramp-completion-file-name-regexp-unified' aren't different. |
| 4374 | ;; If nil, `tramp-completion-run-real-handler' is called (i.e. forwarding to | 4377 | ;; If nil, `tramp-completion-run-real-handler' is called (i.e. forwarding to |
| @@ -4435,9 +4438,6 @@ necessary anymore." | |||
| 4435 | (substring | 4438 | (substring |
| 4436 | file (length (tramp-completion-handle-file-name-directory file)))) | 4439 | file (length (tramp-completion-handle-file-name-directory file)))) |
| 4437 | 4440 | ||
| 4438 | (defvar tramp-completion-mode nil | ||
| 4439 | "If non-nil, we are in file name completion mode.") | ||
| 4440 | |||
| 4441 | ;; Method, host name and user name completion. | 4441 | ;; Method, host name and user name completion. |
| 4442 | ;; `tramp-completion-dissect-file-name' returns a list of | 4442 | ;; `tramp-completion-dissect-file-name' returns a list of |
| 4443 | ;; tramp-file-name structures. For all of them we return possible completions. | 4443 | ;; tramp-file-name structures. For all of them we return possible completions. |