summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2006-06-23 13:33:47 +0000
committerEli Zaretskii <eliz@gnu.org>2006-06-23 13:33:47 +0000
commit18aa2c90a08402d77d5eaed2298710be67870642 (patch)
treed5dd1b92439f5d52c0041a6f8b3247ebf36e758b /lisp/net
parentaac5d1fdcef39ff30bdb47192791b4bf6c08b5d4 (diff)
downloademacs-18aa2c90a08402d77d5eaed2298710be67870642.tar.gz
(rcirc-default-user-full-name): Default to `rcirc-default-user-name' instead
of `rcirc-user-name' (which no longer exists). (rcirc-process-list): Check `buffer-live-p' before attempting to switch to a buffer.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/rcirc.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 683d7c6f3c1..1f051ffa9f2 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -74,7 +74,7 @@
:group 'rcirc)
(defcustom rcirc-default-user-full-name (if (string= (user-full-name) "")
- rcirc-user-name
+ rcirc-default-user-name
(user-full-name))
"The full name sent to the server when connecting."
:type 'string
@@ -469,7 +469,7 @@ Functions are called with PROCESS and SENTINEL arguments.")
"Return a list of rcirc processes."
(let (ps)
(mapc (lambda (p)
- (when (process-buffer p)
+ (when (buffer-live-p (process-buffer p))
(with-rcirc-process-buffer p
(when (eq major-mode 'rcirc-mode)
(setq ps (cons p ps))))))