[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103863: rlogin.el trivia.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103863: rlogin.el trivia. |
Date: |
Thu, 07 Apr 2011 20:11:31 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103863
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-04-07 20:11:31 -0700
message:
rlogin.el trivia.
* lisp/net/rlogin.el (rlogin-process-connection-type): Simplify.
(rlogin-mode-map): Initialize in the defvar.
(rlogin): Use ignore-errors.
modified:
lisp/ChangeLog
lisp/net/rlogin.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-04-08 03:05:58 +0000
+++ b/lisp/ChangeLog 2011-04-08 03:11:31 +0000
@@ -1,5 +1,9 @@
2011-04-08 Glenn Morris <address@hidden>
+ * net/rlogin.el (rlogin-process-connection-type): Simplify.
+ (rlogin-mode-map): Initialize in the defvar.
+ (rlogin): Use ignore-errors.
+
* replace.el (occur-mode-map): Some fixes for menu items.
2011-04-07 Aaron S. Hawley <address@hidden>
=== modified file 'lisp/net/rlogin.el'
--- a/lisp/net/rlogin.el 2011-01-25 04:08:28 +0000
+++ b/lisp/net/rlogin.el 2011-04-08 03:11:31 +0000
@@ -60,14 +60,9 @@
:group 'rlogin)
(defcustom rlogin-process-connection-type
- (save-match-data
- ;; Solaris 2.x `rlogin' will spew a bunch of ioctl error messages if
- ;; stdin isn't a tty.
- (cond ((and (boundp 'system-configuration)
- (stringp system-configuration)
- (string-match "-solaris2" system-configuration))
- t)
- (t nil)))
+ ;; Solaris 2.x `rlogin' will spew a bunch of ioctl error messages if
+ ;; stdin isn't a tty.
+ (and (string-match-p "-solaris2" system-configuration) t)
"If non-nil, use a pty for the local rlogin process.
If nil, use a pipe (if pipes are supported on the local system).
@@ -115,19 +110,19 @@
:type '(choice (const nil) string)
:group 'rlogin)
-;; Initialize rlogin mode map.
-(defvar rlogin-mode-map '())
-(cond
- ((null rlogin-mode-map)
- (setq rlogin-mode-map (if (consp shell-mode-map)
- (cons 'keymap shell-mode-map)
- (copy-keymap shell-mode-map)))
- (define-key rlogin-mode-map "\C-c\C-c" 'rlogin-send-Ctrl-C)
- (define-key rlogin-mode-map "\C-c\C-d" 'rlogin-send-Ctrl-D)
- (define-key rlogin-mode-map "\C-c\C-z" 'rlogin-send-Ctrl-Z)
- (define-key rlogin-mode-map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash)
- (define-key rlogin-mode-map "\C-d" 'rlogin-delchar-or-send-Ctrl-D)
- (define-key rlogin-mode-map "\C-i" 'rlogin-tab-or-complete)))
+(defvar rlogin-mode-map
+ (let ((map (if (consp shell-mode-map)
+ (cons 'keymap shell-mode-map)
+ (copy-keymap shell-mode-map))))
+ (define-key rlogin-mode-map "\C-c\C-c" 'rlogin-send-Ctrl-C)
+ (define-key rlogin-mode-map "\C-c\C-d" 'rlogin-send-Ctrl-D)
+ (define-key rlogin-mode-map "\C-c\C-z" 'rlogin-send-Ctrl-Z)
+ (define-key rlogin-mode-map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash)
+ (define-key rlogin-mode-map "\C-d" 'rlogin-delchar-or-send-Ctrl-D)
+ (define-key rlogin-mode-map "\C-i" 'rlogin-tab-or-complete)
+ map)
+ "Keymap for `rlogin-mode'.")
+
;;;###autoload (add-hook 'same-window-regexps (purecopy
"^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)"))
@@ -175,7 +170,6 @@
(read-from-minibuffer "rlogin arguments (hostname first): "
nil nil nil 'rlogin-history)
current-prefix-arg))
-
(let* ((process-connection-type rlogin-process-connection-type)
(args (if rlogin-explicit-args
(append (split-string input-args)
@@ -192,7 +186,6 @@
(buffer-name (if (string= user (user-login-name))
(format "*rlogin-%s*" host)
(format "address@hidden" user host))))
-
(cond ((null buffer))
((stringp buffer)
(setq buffer-name buffer))
@@ -202,32 +195,26 @@
(setq buffer-name (format "%s<%d>" buffer-name buffer)))
(t
(setq buffer-name (generate-new-buffer-name buffer-name))))
-
(setq buffer (get-buffer-create buffer-name))
(pop-to-buffer buffer-name)
-
(unless (comint-check-proc buffer-name)
(comint-exec buffer buffer-name rlogin-program nil args)
-
(rlogin-mode)
-
(make-local-variable 'rlogin-host)
(setq rlogin-host host)
(make-local-variable 'rlogin-remote-user)
(setq rlogin-remote-user user)
-
- (condition-case ()
- (cond ((eq rlogin-directory-tracking-mode t)
- ;; Do this here, rather than calling the tracking mode
- ;; function, to avoid a gratuitous resync check; the default
- ;; should be the user's home directory, be it local or remote.
- (setq comint-file-name-prefix
- (concat "/" rlogin-remote-user "@" rlogin-host ":"))
- (cd-absolute comint-file-name-prefix))
- ((null rlogin-directory-tracking-mode))
- (t
- (cd-absolute (concat comint-file-name-prefix "~/"))))
- (error nil)))))
+ (ignore-errors
+ (cond ((eq rlogin-directory-tracking-mode t)
+ ;; Do this here, rather than calling the tracking mode
+ ;; function, to avoid a gratuitous resync check; the default
+ ;; should be the user's home directory, be it local or remote.
+ (setq comint-file-name-prefix
+ (concat "/" rlogin-remote-user "@" rlogin-host ":"))
+ (cd-absolute comint-file-name-prefix))
+ ((null rlogin-directory-tracking-mode))
+ (t
+ (cd-absolute (concat comint-file-name-prefix "~/"))))))))
(put 'rlogin-mode 'mode-class 'special)
@@ -302,8 +289,7 @@
(process-send-string nil "\C-\\"))
(defun rlogin-delchar-or-send-Ctrl-D (arg)
- "\
-Delete ARG characters forward, or send a C-d to process if at end of buffer."
+ "Delete ARG characters forward, or send a C-d to process if at end of
buffer."
(interactive "p")
(if (eobp)
(rlogin-send-Ctrl-D)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103863: rlogin.el trivia.,
Glenn Morris <=