Changeset 4161 for trunk/lisp/net/rcirc.el

Timestamp:

09/09/06 16:30:10 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/net/rcirc.el (modified) (33 diffs)

trunk/lisp/net/rcirc.el

@@ -40 +40 @@
-;; Open a new irc connection with:
-;; M-x irc RET
+
+;;; Todo:
-
-;;; Code:
@@ -139 +141 @@
-  :type '(choice (const :tag "No truncation" nil)
-                 (integer :tag "Number of lines"))
+  :group 'rcirc)
+
+(defcustom rcirc-show-maximum-output t
+  "*If non-nil, scroll buffer to keep the point at the bottom of
+the window."
+  :type 'boolean
-  :group 'rcirc)
-
@@ -195 +203 @@
-  :group 'rcirc)
-
+(defcustom rcirc-keywords nil
+  "List of keywords to highlight in message text."
+  :type '(repeat string)
+  :group 'rcirc)
+
-(defcustom rcirc-ignore-list ()
-  "List of ignored nicks.
@@ -207 +220 @@
-parts.")
-
--regexp
-Regexp matching
+s
+List of
-See `rcirc-bright-nick' face."
-regexp
-
-
--regexp
-Regexp matching
+(repeat string)
+
+
+s
+List of
-See `rcirc-dim-nick' face."
-regexp
+(repeat string)
-  :group 'rcirc)
-
@@ -241 +254 @@
-
-(defcustom rcirc-coding-system-alist nil
-file
+channel
-The format is ((PATTERN . VAL) ...).
-PATTERN is either a string or a cons of strings.
@@ -298 +311 @@
-(defvar rcirc-urls nil
-  "List of urls seen in the current buffer.")
+(put 'rcirc-urls 'permanent-local t)
-
-(defvar rcirc-keepalive-seconds 60
@@ -522 +536 @@
-    (message "UNHANDLED: %s" text)))
-
-
+
+
+
+
-  "Generic server response handler."
-
-
+
+
+
-
-(defun rcirc-send-string (process string)
@@ -540 +558 @@
-  "Return the process associated with channel BUFFER.
-With no argument or nil as argument, use the current buffer."
-
+
+
+
+
-
-(defun rcirc-server-name (process)
@@ -602 +623 @@
-(defvar rcirc-nick-completions nil)
-(defvar rcirc-nick-completion-start-offset nil)
+
-(defun rcirc-complete-nick ()
-  "Cycle through nick completions from list of nicks in channel."
-  (interactive)
-'rcirc-complete-nick
+this-command
-      (setq rcirc-nick-completions
-            (append (cdr rcirc-nick-completions)
@@ -627 +649 @@
-  (let ((completion (car rcirc-nick-completions)))
-    (when completion
+      (rcirc-put-nick-channel (rcirc-buffer-process) completion rcirc-target)
-      (delete-region (+ rcirc-prompt-end-marker
-                        
-                
+                       
+               
-      (insert (concat completion
-                      (if (= (+ rcirc-prompt-end-marker
@@ -710 +733 @@
-  (setq rcirc-short-buffer-name nil)
-  (make-local-variable 'rcirc-urls)
-  (setq rcirc-urls nil)
-  (setq use-hard-newlines t)
-
@@ -738 +760 @@
-  ;; if the user changes the major mode or kills the buffer, there is
-  ;; cleanup work to do
-make-local-variable 'change-major-mode-hook
-change-major-mode-hook 'rcirc-change-major-mode-hook
-
-kill-buffer-hook 'rcirc-kill-buffer-hook
+add-hook 'change-major-mode-hook 'rcirc-change-major-mode-hook nil t
+kill-buffer-hook 'rcirc-kill-buffer-hook nil t
+
+window-scroll-functions 'rcirc-scroll-to-bottom nil t
-
-  ;; add to buffer list, and update buffer abbrevs
@@ -928 +950 @@
-            (funcall fun args process rcirc-target)
-          (rcirc-send-string process
-
+:
-
-(defvar rcirc-parent-buffer nil)
@@ -1060 +1082 @@
-                  ((or (eq key ?n) (eq key ?N))
-                   ;; %n/%N -- nick
-
+
+
-                                                      rcirc-server)
-                                                    sender)
@@ -1071 +1094 @@
-                                     (cond ((string= sender (rcirc-nick process))
-                                            'rcirc-my-nick)
-
-
+
+
+
+
-                                            'rcirc-bright-nick)
-
-
+
+
+
+
-                                            'rcirc-dim-nick)
-                                           (t
-                                            'rcirc-other-nick))))))
-
+ 
-                   ;; %T -- timestamp
-                   (rcirc-facify
@@ -1086 +1113 @@
-                  ((eq key ?m)
-                   ;; %m -- message text
-
-
-
-
-
+
-                  ((eq key ?t)
-                   ;; %t -- target
@@ -1139 +1162 @@
-               (rcirc-any-buffer process))))))
-
-
-
+s
+s
-(defvar rcirc-last-sender nil)
-(make-variable-buffer-local 'rcirc-last-sender)
-
-
+
+
+
+
+
+
+
+
+
-(defun rcirc-print (process sender response target text &optional activity)
-  "Print TEXT in the buffer associated with TARGET.
@@ -1239 +1269 @@
-
-        ;; record modeline activity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-        (sit-for 0)                     ; displayed text before hook
@@ -1476 +1496 @@
-                          (t2 (with-current-buffer b2 rcirc-last-post-time)))
-                      (time-less-p t2 t1)))))
-
-
+
-      (rcirc-update-activity-string)))
-  (run-hook-with-args 'rcirc-activity-hooks buffer))
@@ -1485 +1504 @@
-  (setq rcirc-activity (delete buffer rcirc-activity))
-  (with-current-buffer buffer
-
+s
-
-(defun rcirc-split-activity (activity)
@@ -1493 +1512 @@
-      (with-current-buffer buf
-        (if (and rcirc-low-priority-flag
-eq rcirc-activity-type 'nick
+member 'nick rcirc-activity-types
-            (add-to-list 'lopri buf t)
-          (add-to-list 'hipri buf t))))
@@ -1505 +1524 @@
-         (hipri (cdr pair)))
-    (setq rcirc-activity-string
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun rcirc-activity-string (buffers)
-  (mapconcat (lambda (b)
-rcirc-short-buffer-name b
+substring-no-properties (rcirc-short-buffer-name b)
-                 (with-current-buffer b
-
-
-
+
+
+
+
+
+
+
-             buffers ","))
-
@@ -1539 +1564 @@
-    (walk-windows (lambda (w)
-                    (let ((buf (window-buffer w)))
-
-
+
+
+
-                        (when (eq buf rcirc-current-buffer)
-)
+
-    ;; add overlay arrow if the buffer isn't displayed
-
+
+
+
-      (with-current-buffer rcirc-current-buffer
-
-  (marker-position overlay-arrow-position
+and (
+          (marker-position overlay-arrow-position)
-          (set-marker overlay-arrow-position nil)))))
-
@@ -1765 +1793 @@
-                                     target args)))
-
+(defun rcirc-add-or-remove (set &optional elt)
+  (if (and elt (not (string= "" elt)))
+      (if (member-ignore-case elt set)
+          (delete elt set)
+        (cons elt set))
+    set))
+
-(defun-rcirc-command ignore (nick)
-  "Manage the ignore list.
@@ -1771 +1806 @@
-ones added to the list automatically are marked with an asterisk."
-  (interactive "sToggle ignoring of nick: ")
-
-
-
-
-
+
+
-               (mapconcat
-                (lambda (nick)
@@ -1783 +1815 @@
-                rcirc-ignore-list " ")))
-
+(defun-rcirc-command bright (nick)
+  "Manage the bright nick list."
+  (interactive "sToggle emphasis of nick: ")
+  (setq rcirc-bright-nicks (rcirc-add-or-remove rcirc-bright-nicks nick))
+  (rcirc-print process nil "BRIGHT" target 
+               (mapconcat 'identity rcirc-bright-nicks " ")))
+
+(defun-rcirc-command dim (nick)
+  "Manage the dim nick list."
+  (interactive "sToggle deemphasis of nick: ")
+  (setq rcirc-dim-nicks (rcirc-add-or-remove rcirc-dim-nicks nick))
+  (rcirc-print process nil "DIM" target 
+               (mapconcat 'identity rcirc-dim-nicks " ")))
+
+(defun-rcirc-command keyword (keyword)
+  "Manage the keyword list.
+Mark KEYWORD, unmark KEYWORD if already marked, or list marked
+keywords when no KEYWORD is given."
+  (interactive "sToggle highlighting of keyword: ")
+  (setq rcirc-keywords (rcirc-add-or-remove rcirc-keywords keyword))
+  (rcirc-print process nil "KEYWORD" target 
+               (mapconcat 'identity rcirc-keywords " ")))
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-(defun rcirc-facify (string face)
-  "Return a copy of STRING with FACE property added."
-
+
+
+
-
-(defvar rcirc-url-regexp
@@ -1801 +1866 @@
-                  "www.")
-              (1+ (char "-a-zA-Z0-9_."))
+              (1+ (char "-a-zA-Z0-9_"))
-              (optional ":" (1+ (char "0-9"))))
-             (and (1+ (char "-a-zA-Z0-9_."))
@@ -1807 +1873 @@
-         (optional 
-          (and "/"
-
-
+()
+()
-  "Regexp matching URLs.  Set to nil to disable URL features in rcirc.")
-
@@ -1824 +1890 @@
-  "Send URL at point to `browse-url'."
-  (interactive "d")
-point
+(1+ point)
-        (end (next-single-property-change point 'mouse-face)))
-    (browse-url (buffer-substring-no-properties beg end))))
@@ -1835 +1901 @@
-      (rcirc-browse-url-at-point (posn-point position)))))
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  "Return TEXT with properties added based on various patterns."
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-;;; handlers
@@ -2247 +2344 @@
-    (((class color) (min-colors 8)) (:foreground "magenta"))
-    (t (:weight bold :underline t)))
--regexp
+s
-  :group 'rcirc-faces)
-
-(defface rcirc-dim-nick
-  '((t :inherit default))
-matched by `rcirc-dim-nick-regexp
+in `rcirc-dim-nicks
-  :group 'rcirc-faces)
-
@@ -2301 +2398 @@
-    (((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
-    (t (:weight bold)))
-
+your 
-  :group 'rcirc-faces)
+
+(defface rcirc-nick-in-message-full-line
+  '((t (:bold t)))
+  "The face used emphasize the entire message when your nick is mentioned."
+  :group 'rcirc-faces)  
-
-(defface rcirc-prompt                   ; comint-highlight-prompt
@@ -2311 +2413 @@
-  :group 'rcirc-faces)
-
-
+
+
+
+
+
+
+
+
+
+
+
-  '((t (:bold t)))
-
+
+
+
+
+
+
-  :group 'rcirc-faces)
-