aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2011-02-02 23:14:02 -0800
committerGlenn Morris2011-02-02 23:14:02 -0800
commit2d7d6439d208c5669332d4ecf6078966b893bf6b (patch)
treee862afe24e353f4040ac8c989a474406a725bcab /lisp
parent8aa8876085ebc42907997d234ff55bc8910f08d4 (diff)
downloademacs-2d7d6439d208c5669332d4ecf6078966b893bf6b.tar.gz
emacs-2d7d6439d208c5669332d4ecf6078966b893bf6b.zip
rcirc.el trivia.
* lisp/net/rcirc.el (rcirc-nick-completion-format): Add :version tag. (rcirc-log-directory, rcirc-log-flag): Move definitions before use.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/net/rcirc.el23
2 files changed, 15 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de6463feeab..2b0d50139ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-02-03 Glenn Morris <rgm@gnu.org> 12011-02-03 Glenn Morris <rgm@gnu.org>
2 2
3 * net/rcirc.el (rcirc-nick-completion-format): Add :version tag.
4 (rcirc-log-directory, rcirc-log-flag): Move definitions before use.
5
3 * strokes.el (strokes-fill-current-buffer-with-whitespace): 6 * strokes.el (strokes-fill-current-buffer-with-whitespace):
4 Move definition before use. 7 Move definition before use.
5 (strokes-report-bug): Make it obsolete. 8 (strokes-report-bug): Make it obsolete.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 678aba598b7..0e44508641b 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -328,6 +328,7 @@ and the cdr part is used for encoding."
328The format string is only used when completing at the beginning 328The format string is only used when completing at the beginning
329of a line. The string is passed as the first argument to 329of a line. The string is passed as the first argument to
330`format' with the nickname as the second argument." 330`format' with the nickname as the second argument."
331 :version "24.1"
331 :type 'string 332 :type 'string
332 :group 'rcirc) 333 :group 'rcirc)
333 334
@@ -1034,6 +1035,17 @@ If ALL is non-nil, update prompts in all IRC buffers."
1034 (or (eq (aref target 0) ?#) 1035 (or (eq (aref target 0) ?#)
1035 (eq (aref target 0) ?&)))) 1036 (eq (aref target 0) ?&))))
1036 1037
1038(defcustom rcirc-log-directory "~/.emacs.d/rcirc-log"
1039 "Directory to keep IRC logfiles."
1040 :type 'directory
1041 :group 'rcirc)
1042
1043(defcustom rcirc-log-flag nil
1044 "Non-nil means log IRC activity to disk.
1045Logfiles are kept in `rcirc-log-directory'."
1046 :type 'boolean
1047 :group 'rcirc)
1048
1037(defun rcirc-kill-buffer-hook () 1049(defun rcirc-kill-buffer-hook ()
1038 "Part the channel when killing an rcirc buffer." 1050 "Part the channel when killing an rcirc buffer."
1039 (when (eq major-mode 'rcirc-mode) 1051 (when (eq major-mode 'rcirc-mode)
@@ -1364,17 +1376,6 @@ is found by looking up RESPONSE in `rcirc-response-formats'."
1364(defvar rcirc-last-sender nil) 1376(defvar rcirc-last-sender nil)
1365(make-variable-buffer-local 'rcirc-last-sender) 1377(make-variable-buffer-local 'rcirc-last-sender)
1366 1378
1367(defcustom rcirc-log-directory "~/.emacs.d/rcirc-log"
1368 "Directory to keep IRC logfiles."
1369 :type 'directory
1370 :group 'rcirc)
1371
1372(defcustom rcirc-log-flag nil
1373 "Non-nil means log IRC activity to disk.
1374Logfiles are kept in `rcirc-log-directory'."
1375 :type 'boolean
1376 :group 'rcirc)
1377
1378(defcustom rcirc-omit-threshold 100 1379(defcustom rcirc-omit-threshold 100
1379 "Number of lines since last activity from a nick before `rcirc-omit-responses' are omitted." 1380 "Number of lines since last activity from a nick before `rcirc-omit-responses' are omitted."
1380 :type 'integer 1381 :type 'integer