* riece-filter.el (riece-filter): Modified regexp.

[riece] / lisp / riece-misc.el

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index e3ff301..2e2a912 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -31,6 +31,7 @@
 (require 'riece-channel)
 (require 'riece-server)
 (require 'riece-user)
+(require 'riece-mode)
 
 (defun riece-get-buffer-create (name &optional init-major-mode)
   (let ((buffer (get-buffer name)))
@@ -68,12 +69,20 @@
       (set-buffer (car buffers))
       (let ((inhibit-read-only t)
            buffer-read-only
-           (start (goto-char (point-max))))
+           (start (goto-char (point-max)))
+           window
+           point)
        (insert (format-time-string "%H:%M") " " string)
+       (setq point (point))
        (if (and (not (riece-frozen (current-buffer)))
-                (get-buffer-window (current-buffer)))
-           (set-window-point (get-buffer-window (current-buffer))
-                             (point)))
+                (setq window (get-buffer-window (current-buffer)))
+                (not (pos-visible-in-window-p point window)))
+           (save-excursion             ;save-selected-window changes
+                                       ;current buffer
+             (save-selected-window
+               (select-window window)
+               (goto-char point)       ;select-window changes current point
+               (recenter riece-window-center-line))))
        (run-hook-with-args 'riece-after-insert-functions start (point))))
     (setq buffers (cdr buffers))))
 
@@ -124,11 +133,12 @@
        (while (string-match "^\\([^ ]+\\) +" string)
          (setq parameters (nconc parameters (list (match-string 1 string)))
                string (substring string (match-end 0)))
-         (and (not (equal "" string)) (eq ?: (aref string 0))
-              (setq string (substring string 1))
-              (throw 'done nil))))
-      (or (equal "" string)
-         (setq parameters (nconc parameters (list string))))
+         (when (and (not (equal "" string)) (eq ?: (aref string 0)))
+           (setq string (substring string 1)
+                 parameters (nconc parameters (list string)))
+           (throw 'done nil)))
+       (or (equal "" string)
+           (setq parameters (nconc parameters (list string)))))
       parameters)))
 
 (defun riece-concat-channel-topic (target string)
@@ -143,7 +153,16 @@
   (riece-with-server-buffer (riece-identity-server target)
     (let ((modes (riece-channel-get-modes (riece-identity-prefix target))))
       (if modes
-         (concat string " [" (apply #'string modes) "]")
+         (concat string " ["
+                 (mapconcat
+                  (lambda (mode)
+                    (if (riece-mode-parameter mode)
+                        (format "%c(%s)"
+                                (riece-mode-flag mode)
+                                (riece-mode-parameter mode))
+                      (char-to-string (riece-mode-flag mode))))
+                  modes "")
+                 "]")
        string))))
 
 (defun riece-concat-message (string message)
@@ -155,7 +174,16 @@
 (defun riece-concat-server-name (string)
   (if (equal riece-server-name "")
       string
-    (concat string " (from " riece-server-name ")")))
+    (let ((server-name (concat " (from " riece-server-name ")")))
+      (put-text-property 0 (length server-name)
+                        'riece-server-name riece-server-name
+                        server-name)
+      (concat string server-name))))
+
+(defun riece-concat-user-status (status string)
+  (if status
+      (concat string " [" (mapconcat #'identity status ", ") "]")
+    string))
 
 (defun riece-prefix-user-at-host (prefix)
   (if (string-match "!" prefix)