[Emacs-diffs] Changes to emacs/lisp/net/net-utils.el

[Richard M. Stallman]

Index: emacs/lisp/net/net-utils.el
diff -c emacs/lisp/net/net-utils.el:1.10 emacs/lisp/net/net-utils.el:1.11
*** emacs/lisp/net/net-utils.el:1.10    Mon Nov 19 01:24:36 2001
--- emacs/lisp/net/net-utils.el Mon Dec 24 15:17:47 2001
***************
*** 456,479 ****
    (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."
--- 456,467 ----
***************
*** 526,540 ****
                (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)
  
--- 514,521 ----
***************
*** 585,596 ****
                (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
--- 566,573 ----
***************
*** 626,637 ****
    "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)
--- 603,608 ----
***************
*** 807,827 ****
    )
  
  (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)
!        )))
  
  ;;;###autoload
  (defun network-connection-to-service (host service)
--- 778,787 ----
    )
  
  (defun network-connection-mode-setup (host service)
!   (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)