From 7bdd8beba6ae2debc950d824b55db09bd2325a56 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Fri, 10 Jun 2005 12:47:38 +0000 Subject: (eudc-hotlist-mode): Use run-mode-hooks. --- lisp/net/eudc-hotlist.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/net') diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index 9dc81ce2bc9..bede338b364 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -56,7 +56,8 @@ These are the special commands of this mode: (featurep 'menubar)) (set-buffer-menubar current-menubar) (add-submenu nil (cons "EUDC-Hotlist" (cdr (cdr eudc-hotlist-menu))))) - (setq buffer-read-only t)) + (setq buffer-read-only t) + (run-mode-hooks 'eudc-hotlist-mode-hook)) ;;;###autoload (defun eudc-edit-hotlist () -- cgit v1.2.1 From 028f45d230a788158b9e97e6371291a99913df8a Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 10 Jun 2005 14:13:42 +0000 Subject: (browse-url-xterm-program): Fix spellings in docstrings. --- lisp/net/browse-url.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/net') diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 5cd8701d1a5..d846234133d 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -487,7 +487,7 @@ enabled. The port number should be set in `browse-url-CCI-port'." (defcustom browse-url-xterm-program "xterm" "*The name of the terminal emulator used by `browse-url-lynx-xterm'. -This might, for instance, be a separate colour version of xterm." +This might, for instance, be a separate color version of xterm." :type 'string :group 'browse-url) -- cgit v1.2.1 From ccedb10b8baec10dfaf0d1a513c1fbe6a7c47823 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Tue, 14 Jun 2005 12:10:55 +0000 Subject: (internal-ange-ftp-mode): Use delay-mode-hooks and run-mode-hooks. Simplify. --- lisp/net/ange-ftp.el | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'lisp/net') diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 7fd07ebccfb..277da044c44 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1964,35 +1964,34 @@ on the gateway machine to do the ftp instead." \\{comint-mode-map}" (interactive) - (comint-mode) + (delay-mode-hooks (comint-mode)) (setq major-mode 'internal-ange-ftp-mode) (setq mode-name "Internal Ange-ftp") - (let ((proc (get-buffer-process (current-buffer)))) - (make-local-variable 'ange-ftp-process-string) - (setq ange-ftp-process-string "") - (make-local-variable 'ange-ftp-process-busy) - (make-local-variable 'ange-ftp-process-result) - (make-local-variable 'ange-ftp-process-msg) - (make-local-variable 'ange-ftp-process-multi-skip) - (make-local-variable 'ange-ftp-process-result-line) - (make-local-variable 'ange-ftp-process-continue) - (make-local-variable 'ange-ftp-hash-mark-count) - (make-local-variable 'ange-ftp-binary-hash-mark-size) - (make-local-variable 'ange-ftp-ascii-hash-mark-size) - (make-local-variable 'ange-ftp-hash-mark-unit) - (make-local-variable 'ange-ftp-xfer-size) - (make-local-variable 'ange-ftp-last-percent) - (setq ange-ftp-hash-mark-count 0) - (setq ange-ftp-xfer-size 0) - (setq ange-ftp-process-result-line "") - - (setq comint-prompt-regexp "^ftp> ") - (make-local-variable 'comint-password-prompt-regexp) - ;; This is a regexp that can't match anything. - ;; ange-ftp has its own ways of handling passwords. - (setq comint-password-prompt-regexp "^a\\'z") - (make-local-variable 'paragraph-start) - (setq paragraph-start comint-prompt-regexp))) + (make-local-variable 'ange-ftp-process-string) + (setq ange-ftp-process-string "") + (make-local-variable 'ange-ftp-process-busy) + (make-local-variable 'ange-ftp-process-result) + (make-local-variable 'ange-ftp-process-msg) + (make-local-variable 'ange-ftp-process-multi-skip) + (make-local-variable 'ange-ftp-process-result-line) + (make-local-variable 'ange-ftp-process-continue) + (make-local-variable 'ange-ftp-hash-mark-count) + (make-local-variable 'ange-ftp-binary-hash-mark-size) + (make-local-variable 'ange-ftp-ascii-hash-mark-size) + (make-local-variable 'ange-ftp-hash-mark-unit) + (make-local-variable 'ange-ftp-xfer-size) + (make-local-variable 'ange-ftp-last-percent) + (setq ange-ftp-hash-mark-count 0) + (setq ange-ftp-xfer-size 0) + (setq ange-ftp-process-result-line "") + (setq comint-prompt-regexp "^ftp> ") + (make-local-variable 'comint-password-prompt-regexp) + ;; This is a regexp that can't match anything. + ;; ange-ftp has its own ways of handling passwords. + (setq comint-password-prompt-regexp "^a\\'z") + (make-local-variable 'paragraph-start) + (setq paragraph-start comint-prompt-regexp) + (run-mode-hooks 'internal-ange-ftp-mode-hook)) (defcustom ange-ftp-raw-login nil "*Use raw ftp commands for login, if account password is not nil. -- cgit v1.2.1 From ff12e78d4ba17cb8e643a1e0c792f6d7c9a31e05 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 14 Jun 2005 15:22:35 +0000 Subject: (tramp-find-file-exists-command, tramp-find-shell): Follow error conventions. --- lisp/net/tramp.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/net') diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a5ee3c9bc04..5873efcb98a 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5095,7 +5095,7 @@ file exists and nonzero exit status otherwise." (and (setq tramp-file-exists-command "ls -d %s") (file-exists-p existing) (not (file-exists-p nonexisting)))) - (error "Couldn't find command to check if file exists.")))) + (error "Couldn't find command to check if file exists")))) ;; CCC test ksh or bash found for tilde expansion? @@ -5131,7 +5131,7 @@ file exists and nonzero exit status otherwise." 60 (format "\\(\\(%s\\)\\|\\(%s\\)\\)\\'" tramp-shell-prompt-pattern shell-prompt-pattern)) (pop-to-buffer (buffer-name)) - (error "Couldn't find remote `%s' prompt." shell)) + (error "Couldn't find remote `%s' prompt" shell)) (tramp-message 9 "Setting remote shell prompt...") ;; Douglas Gray Stephens says that we -- cgit v1.2.1