Rearrange.

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

diff --git a/lisp/liece-message.el b/lisp/liece-message.el
index 245ccd0..de35c33 100644 (file)
--- a/lisp/liece-message.el
+++ b/lisp/liece-message.el
@@ -34,7 +34,7 @@
   :prefix "liece-"
   :group 'liece)
 
-(defcustom liece-message-blackets
+(defcustom liece-message-brackets
   '(((type notice)
      ("-" "-"))
     ((and (type action) (direction outgoing))
@@ -49,7 +49,7 @@
      ("(" ")"))
     (t
      ("<" ">")))
-  "Blackets."
+  "Brackets."
   :group 'liece-message)
 
 (defcustom liece-message-tags
@@ -72,11 +72,6 @@
 (defvar liece-message-target nil)
 (defvar liece-message-speaker nil)
 (defvar liece-message-direction nil)
-(defvar liece-message-encrypted-p nil)
-(defvar liece-message-suspicious-p nil)
-(defvar liece-message-garbled-p nil)
-(defvar liece-message-fingerprint nil)
-(defvar liece-message-timestamp nil)
 
 (defun liece-message-predicate (val)
   (cond
@@ -118,19 +113,15 @@
    (t
     (liece-eval-form val))))
 
-(defun liece-message-blackets-function ()
-  (let* ((specs liece-message-blackets) spec
-        (blackets
+(defun liece-message-brackets-function ()
+  (let* ((specs liece-message-brackets) spec
+        (brackets
          (catch 'found
            (while specs
              (setq spec (pop specs))
              (if (liece-message-predicate (car spec))
                  (throw 'found (cadr spec)))))))
-    ;; if message is encrypted just concatenate each blacket, two times.
-    (if liece-message-encrypted-p
-       (setq blackets (mapcar (function (lambda (b) (concat b b)))
-                              blackets)))
-    blackets))
+    brackets))
   
 (defun liece-message-tags-function ()
   (let* ((specs liece-message-tags) spec
@@ -173,16 +164,16 @@
 
 ;;;###liece-autoload
 (defun liece-display-message (temp)
-  (let* ((blackets (liece-message-blackets-function))
+  (let* ((brackets (liece-message-brackets-function))
         (tags (liece-message-tags-function))
         (buffer (liece-message-buffer-function))
         (parent (liece-message-parent-buffer buffer)))
     (liece-insert buffer
-                  (concat (car blackets) (car tags) (cadr blackets)
+                  (concat (car brackets) (car tags) (cadr brackets)
                           " " temp "\n"))
     (liece-insert parent
-                  (concat (car blackets) (cadr tags) (cadr blackets)
-                          " " temp "\n"))
+                 (concat (car brackets) (cadr tags) (cadr brackets)
+                         " " temp "\n"))
     (run-hook-with-args 'liece-display-message-hook temp)))
    
 (provide 'liece-message)