[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Doc fixes, some code cleanup and fixes.
|
From: |
mwolson |
|
Subject: |
[Erc-commit] [commit][emacs22] Doc fixes, some code cleanup and fixes. |
|
Date: |
Sun, 14 Oct 2007 00:48:28 -0400 |
commit d1c32588aa7cc00dc72b04f500eb806f156ff5a0
Author: Diane Murray <address@hidden>
Date: Thu Sep 7 15:35:51 2006 +0000
Doc fixes, some code cleanup and fixes.
* erc.el: Updated Commentary and URL.
(erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
(erc-arrange-session-in-multiple-windows): No need to check if
`erc-server-process' is bound.
(erc-server-buffer-live-p): Doc fix.
(erc-part-from-channel): Don't use any initial contents at prompt.
(erc-format-nick, address@hidden): Doc fix. Use `when'.
(s367): Fixed to support only banmask and channel which is the
standard. Also, there's no reason to add a message to each banned
user entry trying to persuade the user to use /banlist instead of
/mode #channel +b. That part of the message was a little
confusing, anyways.
(s367-set-by): New catalog entry. The user who set the ban and
the time of ban seem to be specific to only certain servers such
as freenode.
* erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
* erc-backend.el (erc-server-process-alive): No need to check if
`erc-server-process' is bound.
(367): Use s367 or s367-set-by where appropriate.
* erc-compat.el: Fixed URL.
* erc-dcc.el: Updated copyright years. Added Usage section.
Changed supported Emacs version number from 21.3.50 to 22 in
Commentary.
* erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
to check if `erc-server-process' is bound.
* erc-nicklist.el: Added to the Commentary section an explanation
that `erc-nicklist-quit' should be called from within the nicklist
buffer. Set file coding to utf-8 so a contributor's name is
displayed correctly.
(erc-nicklist-icons-directory): Use customize type directory
instead of string.
(erc-nicklist-insert-contents): Set bbdb-nick to an empty string
if it wasn't found. This fixes a bug where an error would occur
when using `string=' on bbdb-nick if it was nil.
* erc-replace.el: Removed URL from file information since it
doesn't exist.
* erc-sound.el: Updated copyright years. Fixed Commentary and
added Usage section.
(define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
`erc-ctcp-query-SOUND-hook' here. Removed the keybinding
definitions.
(erc-play-sound, erc-default-sound, erc-cmd-SOUND)
(erc-ctcp-query-SOUND): Doc fix.
(erc-play-command): Removed, not necessary anymore.
(erc-ctcp-query-SOUND-hook): Set to nil as default. Moved up
higher in code, added docstring.
(erc-play-sound): Use `play-sound-file'. It exists in GNU Emacs
as well since version 21 or earlier. Removed commented-out older
version of function.
* NEWS: Fixed formatting, added channel tracking change.
* README: Fixed typo. Added more information to Installation
section. Updated URL.
git-archimport-id: address@hidden/erc--main--0--patch-49
diff --git a/ChangeLog b/ChangeLog
index edcd70b..c9f7924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+2006-09-07 Diane Murray <address@hidden>
+
+ * erc.el: Updated Commentary and URL.
+ (erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes)
+ (erc-arrange-session-in-multiple-windows): No need to check if
+ `erc-server-process' is bound.
+ (erc-server-buffer-live-p): Doc fix.
+ (erc-part-from-channel): Don't use any initial contents at prompt.
+ (erc-format-nick, address@hidden): Doc fix. Use `when'.
+ (s367): Fixed to support only banmask and channel which is the
+ standard. Also, there's no reason to add a message to each banned
+ user entry trying to persuade the user to use /banlist instead of
+ /mode #channel +b. That part of the message was a little
+ confusing, anyways.
+ (s367-set-by): New catalog entry. The user who set the ban and
+ the time of ban seem to be specific to only certain servers such
+ as freenode.
+
+ * erc-autoaway.el (erc-autoaway-idletimer): Doc fix.
+
+ * erc-backend.el (erc-server-process-alive): No need to check if
+ `erc-server-process' is bound.
+ (367): Use s367 or s367-set-by where appropriate.
+
+ * erc-compat.el: Fixed URL.
+
+ * erc-dcc.el: Updated copyright years. Added Usage section.
+ Changed supported Emacs version number from 21.3.50 to 22 in
+ Commentary.
+
+ * erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need
+ to check if `erc-server-process' is bound.
+
+ * erc-nicklist.el: Added to the Commentary section an explanation
+ that `erc-nicklist-quit' should be called from within the nicklist
+ buffer. Set file coding to utf-8 so a contributor's name is
+ displayed correctly.
+ (erc-nicklist-icons-directory): Use customize type directory
+ instead of string.
+ (erc-nicklist-insert-contents): Set bbdb-nick to an empty string
+ if it wasn't found. This fixes a bug where an error would occur
+ when using `string=' on bbdb-nick if it was nil.
+
+ * erc-replace.el: Removed URL from file information since it
+ doesn't exist.
+
+ * erc-sound.el: Updated copyright years. Fixed Commentary and
+ added Usage section.
+ (define-erc-module): Add and remove `erc-ctcp-query-SOUND' to
+ `erc-ctcp-query-SOUND-hook' here. Removed the keybinding
+ definitions.
+ (erc-play-sound, erc-default-sound, erc-cmd-SOUND)
+ (erc-ctcp-query-SOUND): Doc fix.
+ (erc-play-command): Removed, not necessary anymore.
+ (erc-ctcp-query-SOUND-hook): Set to nil as default. Moved up
+ higher in code, added docstring.
+ (erc-play-sound): Use `play-sound-file'. It exists in GNU Emacs
+ as well since version 21 or earlier. Removed commented-out older
+ version of function.
+
+ * NEWS: Fixed formatting, added channel tracking change.
+
+ * README: Fixed typo. Added more information to Installation
+ section. Updated URL.
+
2006-09-03 Diane Murray <address@hidden>
* erc.el: M-x erc RET can now be used to start ERC.
diff --git a/NEWS b/NEWS
index 4c69e9e..03d7be1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,8 +11,15 @@ known as `erc' is now `erc-open'.
** New modules
*** Capab identify (erc-capab.el)
+Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
-**** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
+** Changes and additions to modules
+
+*** Channel tracking (erc-track.el)
+
+**** Use mouse-face and help-echo for channel names in the mode-line.
+This helps people using a mouse know that they are buttons and can be
+clicked on.
* Changes in ERC 5.1.4
diff --git a/README b/README
index 33b30e4..6c56123 100644
--- a/README
+++ b/README
@@ -1,13 +1,17 @@
-This is the README file for the ERC.
+This is the README file for ERC.
ERC is a powerful, modular, and extensible IRC client for Emacs.
Installation
------------
-Type `make install'. If you wish to install to someplace other than
-/usr/local/share/emacs/site-lisp/erc, edit the PREFIX, ELISPDIR,
+Type `make install'. This will compile all the emacs-lisp files and
+install them in the directory /usr/local/share/emacs/site-lisp/erc.
+The info manual will be installed to /usr/local/info. You'll most
+likely need to be the root user to install to these locations.
+
+If you wish to install to someplace else, edit the PREFIX, ELISPDIR,
and/or INFODIR options in Makefile.
QuickStart
@@ -42,7 +46,7 @@ versions of it.
Additional documentation is kept on the Emacs Wiki, and may be added
to by anyone.
-* http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
+* http://www.emacswiki.org/cgi-bin/wiki/ERC
License information
-------------------
diff --git a/erc-autoaway.el b/erc-autoaway.el
index fe8a667..983f4e4 100644
--- a/erc-autoaway.el
+++ b/erc-autoaway.el
@@ -38,7 +38,7 @@ yourself back when you type something."
(defvar erc-autoaway-idletimer nil
"The Emacs idletimer.
-This is only used when `erc-autoaway-use-emacs-idle' is non-nil.")
+This is only used when `erc-autoaway-idle-method' is set to 'emacs.")
(defvar erc-autoaway-last-sent-time (erc-current-time)
"The last time the user sent something.")
diff --git a/erc-backend.el b/erc-backend.el
index 442b60c..622248e 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -453,7 +453,7 @@ The current buffer is given by BUFFER."
(defun erc-server-process-alive ()
"Return non-nil when `erc-server-process' is open or running."
- (and (boundp 'erc-server-process)
+ (and erc-server-process
(processp erc-server-process)
(memq (process-status erc-server-process) '(run open))))
@@ -1645,11 +1645,16 @@ See `erc-display-server-message'." nil
"Channel ban list entries" nil
(multiple-value-bind (channel banmask setter time)
(cdr (erc-response.command-args parsed))
- (erc-display-message parsed 'notice 'active 's367
- ?c channel
- ?b banmask
- ?s setter
- ?t time)))
+ ;; setter and time are not standard
+ (if setter
+ (erc-display-message parsed 'notice 'active 's367-set-by
+ ?c channel
+ ?b banmask
+ ?s setter
+ ?t (or time ""))
+ (erc-display-message parsed 'notice 'active 's367
+ ?c channel
+ ?b banmask))))
(define-erc-response-handler (368)
"End of channel ban list" nil
diff --git a/erc-compat.el b/erc-compat.el
index 2d2e790..8250252 100644
--- a/erc-compat.el
+++ b/erc-compat.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
;; Author: Alex Schroeder <address@hidden>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
+;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
;; This file is part of GNU Emacs.
diff --git a/erc-dcc.el b/erc-dcc.el
index 82a8759..076b002 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -1,6 +1,6 @@
;;; erc-dcc.el --- CTCP DCC module for ERC
-;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004
+;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006
;; Free Software Foundation, Inc.
;; Author: Ben A. Mesander <address@hidden>
@@ -35,7 +35,9 @@
;; rewritten to support the way how ERC operates. Server socket support
;; was added for DCC CHAT and SEND afterwards. Thanks
;; to the original authors for their work.
-;;
+
+;;; Usage:
+
;; To use this file, put
;; (require 'erc-dcc)
;; in your .emacs.
@@ -49,7 +51,7 @@
;; /dcc send nick file - Offer DCC SEND to nick
;;
;; Please note that offering DCC connections (offering chats and sending
-;; files) is only supported with Emacs 21.3.50 (CVS).
+;; files) is only supported with Emacs 22.
;;; Code:
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index 8255b4b..792a595 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -91,14 +91,14 @@
" "))
(define-ibuffer-column erc-server-name (:name "Server")
- (if (and (boundp 'erc-server-process) (processp erc-server-process))
+ (if (and erc-server-process (processp erc-server-process))
(with-current-buffer (process-buffer erc-server-process)
(or erc-server-announced-name erc-session-server))
""))
(define-ibuffer-column erc-target (:name "Target")
(if (eq major-mode 'erc-mode)
- (cond ((and (boundp 'erc-server-process) (processp erc-server-process)
+ (cond ((and erc-server-process (processp erc-server-process)
(eq (current-buffer) (process-buffer erc-server-process)))
(concat "Server " erc-session-server ":"
(erc-port-to-string erc-session-port)))
@@ -125,7 +125,7 @@
""))
(define-ibuffer-column erc-away (:name "A")
- (if (and (boundp 'erc-server-process)
+ (if (and erc-server-process
(processp erc-server-process)
(erc-away-time))
"A"
diff --git a/erc-nicklist.el b/erc-nicklist.el
index 5599565..45041b3 100644
--- a/erc-nicklist.el
+++ b/erc-nicklist.el
@@ -29,7 +29,7 @@
;; This provides a minimal mIRC style nicklist buffer for ERC. To
;; activate, do M-x erc-nicklist RET in the channel buffer you want
;; the nicklist to appear for. To close and quit the nicklist
-;; buffer, do M-x erc-nicklist-quit RET.
+;; buffer, do M-x erc-nicklist-quit RET from within the nicklist buffer.
;;
;; TODO:
;; o Somehow associate nicklist windows with channel windows so they
@@ -97,7 +97,7 @@ By \"chat medium\", we mean IRC, AOL, MSN, ICQ, etc."
"*Directory of the PNG files for chat icons.
Icons are displayed if `erc-nicklist-use-icons' is non-nil."
:group 'erc-nicklist
- :type 'string)
+ :type 'directory)
(defcustom erc-nicklist-voiced-position 'bottom
"*Position of voiced nicks in the nicklist.
@@ -207,7 +207,8 @@ Seach for the BBDB record of this contact. If not found,
return nil."
(channels (erc-server-user-buffers server-user))
(op (erc-channel-user-op channel-user))
(voice (erc-channel-user-voice channel-user))
- (bbdb-nick (erc-nicklist-search-for-nick (concat login "@" host)))
+ (bbdb-nick (or (erc-nicklist-search-for-nick (concat login "@" host))
+ "")
(away-status (if voice "" "\n(Away)"))
(balloon-text (concat bbdb-nick (if (string= "" bbdb-nick)
"" "\n")
@@ -406,6 +407,7 @@ list has all the voiced users according to
;; Local Variables:
;; indent-tabs-mode: t
;; tab-width: 8
+;; coding: utf-8
;; End:
;; arch-tag: db37a256-87a7-4544-bd90-e5f16c9f5ca5
diff --git a/erc-replace.el b/erc-replace.el
index 07e8cd1..3e60d7a 100644
--- a/erc-replace.el
+++ b/erc-replace.el
@@ -5,7 +5,6 @@
;; Author: Andreas Fuchs <address@hidden>
;; Maintainer: Mario Lang (address@hidden)
;; Keywords: IRC, client, Internet
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcReplace
;; This file is part of GNU Emacs.
diff --git a/erc-sound.el b/erc-sound.el
index c5b0f81..e152d8e 100644
--- a/erc-sound.el
+++ b/erc-sound.el
@@ -1,6 +1,6 @@
;;; erc-sound.el --- CTCP SOUND support for ERC
-;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@ -21,9 +21,26 @@
;;; Commentary:
-;; This used to be in erc.el, I (Jorgen) just extracted it from there
-;; and put it in this file. Bugs and features are those of the
-;; original author.
+;; Play sounds when users send you CTCP SOUND messages.
+
+;; This file also defines the command /sound so that you can send
+;; sound requests to other users.
+
+;;; Usage:
+
+;; Add the following to your .emacs if you want to play sounds.
+;;
+;; (require 'erc-soud)
+;; (erc-sound-enable)
+;;
+;; To send requests to other users from within query buffers, type the
+;; following:
+;;
+;; /sound filename optional-message-text
+;;
+;; You can also type the following:
+;;
+;; /ctcp nickname sound filename optional-message
;;; Code:
@@ -34,9 +51,11 @@
"In ERC sound mode, the client will respond to CTCP SOUND requests
and play sound files as requested."
;; Enable:
- ((define-key erc-mode-map "\C-c\C-s" 'erc-toggle-sound))
+ ((add-hook 'erc-ctcp-query-SOUND-hook 'erc-ctcp-query-SOUND)
+ (define-key erc-mode-map "\C-c\C-s" 'erc-toggle-sound))
;; Disable:
- ((define-key erc-mode-map "\C-c\C-s" 'undefined)))
+ ((remove-hook 'erc-ctcp-query-SOUND-hook 'erc-ctcp-query-SOUND)
+ (define-key erc-mode-map "\C-c\C-s" 'undefined)))
(erc-define-catalog-entry 'english 'CTCP-SOUND "%n (address@hidden) plays
%s:%m")
@@ -45,7 +64,7 @@ and play sound files as requested."
:group 'erc)
(defcustom erc-play-sound t
- "*Play sound on SOUND ctcp requests (used in ICQ chat)."
+ "*Play sounds when you receive CTCP SOUND requests."
:group 'erc-sound
:type 'boolean)
@@ -55,18 +74,22 @@ and play sound files as requested."
:type '(repeat directory))
(defcustom erc-default-sound nil
- "Play this sound if the requested file was not found."
+ "Play this sound if the requested file was not found.
+If this is set to nil or the file doesn't exist a beep will sound."
:group 'erc-sound
:type '(choice (const nil)
file))
-(defcustom erc-play-command "play"
- "Command for playing sound samples."
- :group 'erc-sound
- :type 'string)
+(defvar erc-ctcp-query-SOUND-hook nil
+ "Hook to run after receiving a CTCP SOUND request.")
(defun erc-cmd-SOUND (line &optional force)
- "Play the sound given in LINE."
+ "Send a CTCP SOUND message to the default target.
+If `erc-play-sound' is non-nil, play the sound as well.
+
+/sound filename optional-message-text
+
+LINE is the text entered, including the command."
(cond
((string-match "^\\s-*\\(\\S-+\\)\\(\\s-.*\\)?$" line)
(let ((file (match-string 1 line))
@@ -84,8 +107,8 @@ and play sound files as requested."
t))
(t nil)))
-(defvar erc-ctcp-query-SOUND-hook '(erc-ctcp-query-SOUND))
(defun erc-ctcp-query-SOUND (proc nick login host to msg)
+ "Display a CTCP SOUND message and play sound if `erc-play-sound' is non-nil."
(when (string-match
"^SOUND\\s-+\\(\\S-+\\)\\(\\(\\s-+.*\\)\\|\\(\\s-*\\)\\)$" msg)
(let ((sound (match-string 1 msg))
(comment (match-string 2 msg)))
@@ -96,42 +119,16 @@ and play sound files as requested."
nil)
(defun erc-play-sound (file)
- "Plays a sound file located in one of the directories in `erc-sound-path'
-with a command `erc-play-command'."
+ "Play a sound file located in one of the directories in `erc-sound-path'.
+See also `play-sound-file'."
(let ((filepath (erc-find-file file erc-sound-path)))
(if (and (not filepath) erc-default-sound)
(setq filepath erc-default-sound))
(cond ((and filepath (file-exists-p filepath))
- (if (and (fboundp 'device-sound-enabled-p)
- (device-sound-enabled-p))
- ; For XEmacs
- (play-sound-file filepath)
-; (start-process "erc-sound" nil erc-play-command filepath)
- (start-process "erc-sound" nil "/bin/tcsh" "-c"
- (concat erc-play-command " " filepath))))
+ (play-sound-file filepath))
(t (beep)))
(erc-log (format "Playing sound file %S" filepath))))
-;(defun erc-play-sound (file)
-; "Plays a sound file located in one of the directories in `erc-sound-path'
-; with a command `erc-play-command'."
-; (let ((filepath nil)
-; (paths erc-sound-path))
-; (while (and paths
-; (progn (setq filepath (expand-file-name file (car paths)))
-; (not (file-exists-p filepath))))
-; (setq paths (cdr paths)))
-; (if (and (not (and filepath (file-exists-p filepath)))
-; erc-default-sound)
-; (setq filepath erc-default-sound))
-; (cond ((and filepath (file-exists-p filepath))
-;; (start-process "erc-sound" nil erc-play-command filepath)
-; (start-process "erc-sound" nil "/bin/tcsh" "-c"
-; (concat erc-play-command " " filepath))
-; )
-; (t (beep)))
-; (erc-log (format "Playing sound file %S" filepath))))
-
(defun erc-toggle-sound (&optional arg)
"Toggles playing sounds on and off. With positive argument,
turns them on. With any other argument turns sounds off."
diff --git a/erc.el b/erc.el
index aac6edb..0cc6561 100644
--- a/erc.el
+++ b/erc.el
@@ -33,11 +33,11 @@
;;; Commentary:
-;; ERC is an IRC client for Emacs.
+;; ERC is a powerful, modular, and extensible IRC client for Emacs.
;; For more information, see the following URLs:
;; * http://sv.gnu.org/projects/erc/
-;; * http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
+;; * http://www.emacswiki.org/cgi-bin/wiki/ERC
;; As of 2006-06-13, ERC development is now hosted on Savannah
;; (http://sv.gnu.org/projects/erc). I invite everyone who wants to
@@ -60,7 +60,7 @@
;; M-x erc RET
;;
;; After you are connected to a server, you can use C-h m or have a look at
-;; the IRC menu.
+;; the ERC menu.
;;; History:
;;
@@ -1325,8 +1325,7 @@ the process buffer."
(process-buffer erc-server-process)))
(defun erc-server-buffer-live-p ()
- "Return t if the buffer associated with `erc-server-process'
-has not been killed."
+ "Return t if the server buffer has not been killed."
(and (processp erc-server-process)
(buffer-live-p (process-buffer erc-server-process))))
@@ -1688,8 +1687,7 @@ needs to be active for this function to work."
(mapcar 'buffer-name
(erc-buffer-list
nil
- (when (and arg (boundp 'erc-server-process))
- erc-server-process)))))))
+ (when arg erc-server-process)))))))
(switch-to-buffer
(iswitchb-read-buffer
"Switch-to: "
@@ -2348,9 +2346,8 @@ If STRING is nil, the function does nothing."
((listp buffer) buffer)
((processp buffer) (list (process-buffer buffer)))
((eq 'all buffer)
- (and (boundp 'erc-server-process)
- ;; Hmm, or all of the same session server?
- (erc-buffer-list nil erc-server-process)))
+ ;; Hmm, or all of the same session server?
+ (erc-buffer-list nil erc-server-process))
((and (eq 'active buffer) (erc-active-buffer))
(list (erc-active-buffer)))
((erc-server-buffer-live-p)
@@ -3566,9 +3563,8 @@ If `point' is at the beginning of a channel name, use
that as default."
(list
(if (and (boundp 'reason) (stringp reason) (not (string= reason "")))
reason
- (read-from-minibuffer (concat "Leave " (erc-default-target)
- ", Reason? ")
- (cons "No reason" 0)))))
+ (read-from-minibuffer (concat "Reason for leaving " (erc-default-target)
+ ": ")))))
(erc-cmd-PART (concat (erc-default-target)" " reason)))
(defun erc-set-topic (topic)
@@ -3878,22 +3874,19 @@ and as second argument the event parsed as a vector."
:type 'function)
(defun erc-format-nick (&optional user channel-data)
- "Standard nickname formatting function. Only returns the value
-of NICK."
- (if user
- (erc-server-user-nickname user)))
+ "Return the nickname of USER.
+See also `erc-format-nick-function'."
+ (when user (erc-server-user-nickname user)))
(defun address@hidden (&optional user channel-data)
- "Format a nickname such that @ or + are prefix for the NICK
-if OP or VOICE are t respectively."
- (if user
- (let (op voice)
- (if channel-data
- (setq op (erc-channel-user-op channel-data)
- voice (erc-channel-user-voice channel-data)))
- (concat (if voice "+" "")
- (if op "@" "")
- (erc-server-user-nickname user)))))
+ "Format the nickname of USER showing if USER is an operator or has voice.
+Operators have \"@\" and users with voice have \"+\" as a prefix.
+Use CHANNEL-DATA to determine op and voice status.
+See also `erc-format-nick-function'."
+ (when user
+ (let ((op (and channel-data (erc-channel-user-op channel-data) "@"))
+ (voice (and channel-data (erc-channel-user-voice channel-data) "+")))
+ (concat voice op (erc-server-user-nickname user)))))
(defun erc-format-my-nick ()
"Return the beginning of this user's message, correctly propertized"
@@ -4585,7 +4578,7 @@ TOPIC string to the current topic."
;; list of triples: (mode-char 'on/'off argument)
(arg-modes (nth 2 modes)))
(cond ((erc-channel-p tgt); channel modes
- (let ((buf (and (boundp 'erc-server-process) erc-server-process
+ (let ((buf (and erc-server-process
(erc-get-buffer tgt erc-server-process))))
(when buf
(with-current-buffer buf
@@ -4677,7 +4670,7 @@ person who changed the modes."
(arg-modes (nth 2 modes)))
;; now parse the modes changes and do the updates
(cond ((erc-channel-p tgt); channel modes
- (let ((buf (and (boundp 'erc-server-process) erc-server-process
+ (let ((buf (and erc-server-process
(erc-get-buffer tgt erc-server-process))))
(when buf
;; FIXME! This used to have an original buffer
@@ -5920,8 +5913,8 @@ If optional argument HERE is non-nil, insert version
number at point."
All windows are opened in the current frame."
(interactive)
- (unless (boundp 'erc-server-process)
- (error "No erc-process found in current buffer"))
+ (unless erc-server-process
+ (error "No erc-server-process found in current buffer"))
(let ((bufs (erc-buffer-list nil erc-server-process)))
(when bufs
(delete-other-windows)
@@ -6053,7 +6046,8 @@ All windows are opened in the current frame."
(s341 . "Inviting %n to channel %c")
(s352 . "%-11c %-10n %-4a address@hidden (%f)")
(s353 . "Users on %c: %u")
- (s367 . "Ban on %b on %c set by %s on %t (Use /banlist!)")
+ (s367 . "Ban for %b on %c")
+ (s367-set-by . "Ban for %b on %c set by %s on %t")
(s368 . "Banlist of %c ends.")
(s379 . "%c: Forwarded to %f")
(s391 . "The time at %s is %t")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Doc fixes, some code cleanup and fixes.,
mwolson <=