[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] erc-bbdb: Make it easier to cancel mergin
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] erc-bbdb: Make it easier to cancel merging /whois info |
Date: |
Sun, 14 Oct 2007 00:48:52 -0400 |
commit 7f82b9c1e10009f38a76b5685f850ead0eb57720
Author: Michael Olson <address@hidden>
Date: Sat Mar 31 04:17:49 2007 +0000
erc-bbdb: Make it easier to cancel merging /whois info
2007-03-31 Michael Olson <address@hidden>
* erc-bbdb.el (erc-bbdb-search-name-and-create): Make prompt more
informative about how to skip merging.
(erc-bbdb-insinuate-and-show-entry-1): Move contents of
erc-bbdb-insinuate-and-show-entry here.
(erc-bbdb-insinuate-and-show-entry): Run
erc-bbdb-insinuate-and-show-entry-1 "outside" of the calling
function, so that we can avoid triggering a process-filter error
if the user hits C-g.
git-archimport-id: address@hidden/erc--main--0--patch-125
diff --git a/ChangeLog b/ChangeLog
index 06500dc..5d4b348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-31 Michael Olson <address@hidden>
+
+ * erc-bbdb.el (erc-bbdb-search-name-and-create): Make prompt more
+ informative about how to skip merging.
+ (erc-bbdb-insinuate-and-show-entry-1): Move contents of
+ erc-bbdb-insinuate-and-show-entry here.
+ (erc-bbdb-insinuate-and-show-entry): Run
+ erc-bbdb-insinuate-and-show-entry-1 "outside" of the calling
+ function, so that we can avoid triggering a process-filter error
+ if the user hits C-g.
+
2007-03-30 Michael Olson <address@hidden>
* FOR-RELEASE: Solve C-c C-SPC keybinding dilemma.
diff --git a/erc-bbdb.el b/erc-bbdb.el
index dd8f8b5..fd5535b 100644
--- a/erc-bbdb.el
+++ b/erc-bbdb.el
@@ -130,7 +130,7 @@ their \"displayed name\"."
(bbdb-search (bbdb-records) nil nil nil finger)
(unless silent
(bbdb-completing-read-one-record
- "Merge using record of: "))
+ "Merge using record of (C-g to skip, RET for new): "))
(when create-p
(bbdb-create-internal (or name
"John Doe")
@@ -152,7 +152,7 @@ their \"displayed name\"."
'visible))))))
(bbdb-display-records (list record)))))
-(defun erc-bbdb-insinuate-and-show-entry (create-p proc nick name finger-host
silent &optional chan new-nick)
+(defun erc-bbdb-insinuate-and-show-entry-1 (create-p proc nick name
finger-host silent &optional chan new-nick)
(let ((record (erc-bbdb-search-name-and-create
create-p nil nick finger-host silent))) ;; don't search for a
name
(when record
@@ -166,6 +166,13 @@ their \"displayed name\"."
(erc-bbdb-highlight-record record)
(erc-bbdb-show-entry record chan proc))))
+(defun erc-bbdb-insinuate-and-show-entry (create-p proc nick name finger-host
silent &optional chan new-nick)
+ ;; run this outside of the IRC filter process, to avoid an annoying
+ ;; error when the user hits C-g
+ (run-at-time nil nil
+ #'erc-bbdb-insinuate-and-show-entry-1
+ create-p proc nick name finger-host silent chan new-nick))
+
(defun erc-bbdb-whois (proc parsed)
(let (; We could use server name too, probably
(nick (second (erc-response.command-args parsed)))
diff --git a/erc.texi b/erc.texi
index a75a986..d098782 100644
--- a/erc.texi
+++ b/erc.texi
@@ -306,17 +306,49 @@ channel on Freenode.
@item Connect to Freenode
+Run @kbd{M-x erc}. Use ``irc.freenode.net'' as the IRC server, ``6667''
+as the port, and choose a nickname.
+
@item Get used to the interface
+Switch to the ``irc.freenode.net:6667'' buffer, if you're not already
+there. You will see first some messages about checking for ident, and
+then a bunch of other messages that describe the current IRC server.
+
@item Join the #emacs channel
+In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}. Depending
+on how you've set up ERC, either a new buffer for ``#emacs'' will be
+displayed, or a new buffer called ``#emacs'' will be created in the
+background. If the latter, switch to the ``#emacs'' buffer. You will
+see the channel topic and a list of the people who are currently on the
+channel.
+
@item Register your nickname with Freenode
+If you would like to be able to talk with people privately on the
+Freenode network, you will have to ``register'' your nickname. To do
+so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg
+NickServ register <password>'', replacing ``<password>'' with your
+desired password. It should tell you that the operation was successful.
+
@item Talk to people in the channel
+If you switch back to the ``#emacs'' buffer, you can type a message, and
+everyone on the channel will see it.
+
@item Open a query buffer to talk to someone
address@hidden (must identify first in FreeNode)
+If you want to talk with someone in private (this should usually not be
+done for technical help, only for personal questions), type ``/query
+<nick>'', replacing ``<nick>'' with the nickname of the person you would
+like to talk to. Depending on how ERC is set up, you will either see a
+new buffer with the name of the person, or such a buffer will be created
+in the background and you will have to switch to it. Begin typing
+messages, and you will be able to have a conversation.
+
+Note that if the other person is not registered, you will not be able to
+talk with them.
@end itemize
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] erc-bbdb: Make it easier to cancel merging /whois info,
mwolson <=