Mercurial > emacs
diff lisp/net/net-utils.el @ 42303:c5ddbcd62234
(ftp-mode-abbrev-table): Don't define it.
(nslookup-mode-abbrev-table): Don't define it.
(smbclient-mode-abbrev-table): Don't define it.
(ftp-mode): Don't use ftp-mode-abbrev-table; don't enable Abbrev mode.
(nslookup-mode, smbclient-mode): Likewise.
(network-connection-service-abbrev-alist): Variable deleted.
(network-connection-mode-setup): Don't set up abbrev table.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 24 Dec 2001 20:18:36 +0000 |
parents | 0605a90581d4 |
children | 3eb9f60af733 |
line wrap: on
line diff
--- a/lisp/net/net-utils.el Mon Dec 24 18:01:56 2001 +0000 +++ b/lisp/net/net-utils.el Mon Dec 24 20:18:36 2001 +0000 @@ -456,24 +456,12 @@ (set (make-local-variable 'font-lock-defaults) '((nslookup-font-lock-keywords))) - (setq local-abbrev-table nslookup-mode-abbrev-table) - (abbrev-mode t) (setq comint-prompt-regexp nslookup-prompt-regexp) (setq comint-input-autoexpand t) ) (define-key nslookup-mode-map "\t" 'comint-dynamic-complete) -(define-abbrev nslookup-mode-abbrev-table "e" "exit") -(define-abbrev nslookup-mode-abbrev-table "f" "finger") -(define-abbrev nslookup-mode-abbrev-table "h" "help") -(define-abbrev nslookup-mode-abbrev-table "lse" "lserver") -(define-abbrev nslookup-mode-abbrev-table "q" "exit") -(define-abbrev nslookup-mode-abbrev-table "r" "root") -(define-abbrev nslookup-mode-abbrev-table "s" "set") -(define-abbrev nslookup-mode-abbrev-table "se" "server") -(define-abbrev nslookup-mode-abbrev-table "v" "viewer") - ;;;###autoload (defun dig (host) "Run dig program." @@ -526,15 +514,8 @@ (default-value 'comint-output-filter-functions)) (add-hook 'comint-output-filter-functions 'comint-watch-for-password-prompt nil t)) - (setq local-abbrev-table ftp-mode-abbrev-table) - (abbrev-mode t) ) -(define-abbrev ftp-mode-abbrev-table "q" "quit") -(define-abbrev ftp-mode-abbrev-table "g" "get") -(define-abbrev ftp-mode-abbrev-table "p" "prompt") -(define-abbrev ftp-mode-abbrev-table "anon" "anonymous") - ;; Occasionally useful (define-key ftp-mode-map "\t" 'comint-dynamic-complete) @@ -585,12 +566,8 @@ (default-value 'comint-output-filter-functions)) (add-hook 'comint-output-filter-functions 'comint-watch-for-password-prompt nil t)) - (setq local-abbrev-table smbclient-mode-abbrev-table) - (abbrev-mode t) ) -(define-abbrev smbclient-mode-abbrev-table "q" "quit") - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Network Connections @@ -626,12 +603,6 @@ "Alist of services and associated TCP port numbers. This list is not complete.") -(defvar network-connection-service-abbrev-alist nil - "Alist of (SERVICE . ABBREVTABLE) for various network services. -SERVICE can be either a symbol or a number appearing in -`network-connection-service-alist'. ABBREVTABLE is the abbrev table -to use in buffers that talk to that network service.") - ;; Workhorse macro (defmacro run-network-program (process-name host port &optional initial-string) @@ -807,21 +778,10 @@ ) (defun network-connection-mode-setup (host service) - (let ((network-abbrev-table - (or - (assoc service network-connection-service-abbrev-alist) - (and (rassoc service network-connection-service-alist) - (assoc - (elt (rassoc service network-connection-service-alist) 0) - network-connection-service-abbrev-alist))))) - (make-local-variable 'network-connection-host) - (setq network-connection-host host) - (make-local-variable 'network-connection-service) - (setq network-connection-service service) - (and network-abbrev-table - (setq local-abbrev-table (cdr network-abbrev-table)) - (abbrev-mode t) - ))) + (make-local-variable 'network-connection-host) + (setq network-connection-host host) + (make-local-variable 'network-connection-service) + (setq network-connection-service service))) ;;;###autoload (defun network-connection-to-service (host service)