Fix the last change.

[elisp/liece.git] / lisp / liece-misc.el

diff --git a/lisp/liece-misc.el b/lisp/liece-misc.el
index 496a372..79f6cea 100644 (file)
--- a/lisp/liece-misc.el
+++ b/lisp/liece-misc.el
@@ -104,6 +104,15 @@
   (if liece-display-frame-title
       (liece-set-frame-title-format)))
 
+(defun liece-set-beep (buffer &optional arg)
+  (with-current-buffer buffer
+    (setq liece-beep (if arg (plusp arg) (not liece-beep))
+          liece-beep-indicator (if liece-beep "B" "-"))
+    (force-mode-line-update)))
+
+(defmacro liece-beep (&optional arg)
+  (list 'funcall 'liece-beep-function arg))
+
 (defun liece-freeze (buffer &optional arg)
   (with-current-buffer buffer
     (setq liece-freeze (if arg (plusp arg) (not liece-freeze))
@@ -170,10 +179,10 @@
          (setq args (nconc args (list line))))
       args))))
 
-(defmacro liece-message (&rest msg)
+(defmacro liece-message (&rest message)
   `(message "%s: %s"
            (product-name (product-find 'liece-version))
-           (format ,@msg)))
+           (format ,@message)))
 
 (defmacro liece-insert-change (buffer msg)
   `(liece-insert ,buffer (concat liece-change-prefix ,msg)))
@@ -271,7 +280,10 @@
 (defmacro liece-server-host ()
   '(if (listp liece-server)
        (plist-get liece-server ':host)
-     liece-server))
+     (if (or (string-match "^\\[\\([^]]+\\)\\]:?[0-9]*" liece-server)
+            (string-match "^\\([^:]+\\):?[0-9]*" liece-server))
+         (match-string 1 liece-server)
+       liece-server)))
 
 (defmacro liece-clean-hostname (hostname)
   "Return the arg HOSTNAME, but if is a dotted-quad, put brackets around it."