[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100566: * lisp/net/rcirc.el (rcirc-s
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100566: * lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve |
Date: |
Wed, 09 Jun 2010 21:10:04 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100566
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2010-06-09 21:10:04 -0400
message:
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
merge conflict, giving preference to the emacs-23 version of the code.
modified:
lisp/ChangeLog
lisp/net/rcirc.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-06-10 01:04:45 +0000
+++ b/lisp/ChangeLog 2010-06-10 01:10:04 +0000
@@ -1,3 +1,8 @@
+2010-06-10 Stefan Monnier <address@hidden>
+
+ * net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
+ merge conflict, giving preference to the emacs-23 version of the code.
+
2010-06-09 Stefan Monnier <address@hidden>
* emacs-lisp/advice.el (ad-compile-function):
=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2010-06-09 22:34:08 +0000
+++ b/lisp/net/rcirc.el 2010-06-10 01:10:04 +0000
@@ -81,15 +81,16 @@
VALUE must be a string. If absent, `rcirc-default-user-name' is
used.
+`:password'
+
+VALUE must be a string. If absent, no PASS command will be sent
+to the server.
+
`:full-name'
VALUE must be a string. If absent, `rcirc-default-full-name' is
used.
-`:pass'
-
-VALUE must be a string.
-
`:channels'
VALUE must be a list of strings describing which channels to join
@@ -99,8 +100,8 @@
:value-type (plist :options ((:nick string)
(:port integer)
(:user-name string)
+ (:password string)
(:full-name string)
- (:pass string)
(:channels (repeat string)))))
:group 'rcirc)
@@ -406,8 +407,8 @@
(or (plist-get server-plist :user-name)
rcirc-default-user-name)
'rcirc-user-name-history))
- (pass (read-passwd "IRC Password: " nil
- (plist-get server-plist :pass)))
+ (password (read-passwd "IRC Password: " nil
+ (plist-get server-plist :password)))
(channels (split-string
(read-string "IRC Channels: "
(mapconcat 'identity
@@ -415,9 +416,9 @@
:channels)
" "))
"[, ]+" t)))
- (rcirc-connect server port nick user-name pass
+ (rcirc-connect server port nick user-name
rcirc-default-full-name
- channels))
+ channels password))
;; connect to servers in `rcirc-server-alist'
(let (connected-servers)
(dolist (c rcirc-server-alist)
@@ -426,10 +427,10 @@
(port (or (plist-get (cdr c) :port) rcirc-default-port))
(user-name (or (plist-get (cdr c) :user-name)
rcirc-default-user-name))
- (pass (plist-get (cdr c) :pass))
(full-name (or (plist-get (cdr c) :full-name)
rcirc-default-full-name))
- (channels (plist-get (cdr c) :channels)))
+ (channels (plist-get (cdr c) :channels))
+ (password (plist-get (cdr c) :password)))
(when server
(let (connected)
(dolist (p (rcirc-process-list))
@@ -437,8 +438,8 @@
(setq connected p)))
(if (not connected)
(condition-case e
- (rcirc-connect server port nick user-name pass
- full-name channels)
+ (rcirc-connect server port nick user-name
+ full-name channels password)
(quit (message "Quit connecting to %s" server)))
(with-current-buffer (process-buffer connected)
(setq connected-servers
@@ -469,8 +470,8 @@
(defvar rcirc-process nil)
;;;###autoload
-(defun rcirc-connect (server &optional port nick user-name pass
- full-name startup-channels)
+(defun rcirc-connect (server &optional port nick user-name
+ full-name startup-channels password)
(save-excursion
(message "Connecting to %s..." server)
(let* ((inhibit-eol-conversion)
@@ -519,8 +520,8 @@
(add-hook 'auto-save-hook 'rcirc-log-write)
;; identify
- (when pass
- (rcirc-send-string process (concat "PASS " pass)))
+ (when password
+ (rcirc-send-string process (concat "PASS " password)))
(rcirc-send-string process (concat "NICK " nick))
(rcirc-send-string process (concat "USER " user-name
" 0 * :" full-name))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100566: * lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve,
Stefan Monnier <=