Survive presence of macedit if edmacro has the right definitions.

src/ChangeLog

+2002-04-28  David Byers  <david.byers@swipnet.se>
+
+	* header.el: When detecting a buggy read-kbd-macro, attempt to
+	load good definitions from known libraries rather than just bail.
+
+	* vars.el.in (lyskom-face-schemes): Added scheme "bark".
+
+2002-04-28  David Byers  <david.byers@swipnet.se>
+
+	* edit-text.el (lyskom-edit-fcc-text): Delete the add button when
+	fcc-ing texts.
+
+	* services.el (initiate-set-pers-flags): New function.
+
+	* commands1.el (kom-who-is-on): Improve documentation.
+
 2002-04-27  Per Cederqvist  <ceder@ceder.dyndns.org>
 
 	* commands2.el (kom-obsolete-extended-command-binding): Use ding

src/commands1.el

@@ -2711,11 +2711,16 @@ If MARK-NO is nil, review all marked texts."
      '(error lyskom-error lyskom-no-users))
 
 (def-kom-command kom-who-is-on (&optional arg)
-  "Display a list of all connected users.
-The prefix arg controls the idle limit of the sessions showed. If the
-prefix is negative, invisible sessions are also shown.
+  "Display a list of active connected users.
+With a positive prefix argument ARG, list sessions who have been active 
+in the last ARG minutes.
 
-If the prefix is 0, all visible sessions are shown."
+With a positive zero prefix argument ARG, list all visible sessions.
+
+With a negative nonzero prefix argument ARG, list both visible and
+invisible sessions who have been active in the last -ARG minutes.
+
+With a negative zero prefix argument (C-u -), list all sessions."
   (interactive "P")
   (condition-case nil
       (if (lyskom-have-feature dynamic-session-info)

src/edit-text.el

@@ -1736,6 +1736,12 @@ Point must be located on the line where the subject is."
           (goto-char (point-min))
           (when (lyskom-edit-find-separator t)
             (delete-region (match-beginning 0) (match-end 0))
+            (unless kom-edit-hide-add-button
+              (save-excursion
+                (beginning-of-line)
+                (forward-line -2)
+                (delete-region (progn (beginning-of-line) (point))
+                               (progn (forward-line 1) (point)))))
             (insert (make-string kom-text-header-dash-length ?-))
             (forward-line 1)
             (beginning-of-line)

src/header.el

@@ -64,14 +64,28 @@
 
 ;;; Check some basic misfeatures that are still all too common
 
+
+
 (eval-and-compile
-  (if (and (stringp (read-kbd-macro "<SPC>"))
-           (string-equal (read-kbd-macro "<SPC>") "<SPC>"))
-      (let ((elc-location (locate-library "macedit.elc"))
-            (el-location (locate-library "macedit.el"))
-            (elz-location (locate-library "macedit.el.gz")))
-        (cond ((or el-location elc-location)
-               (message "\
+  (defmacro lyskom-detect-read-kbd-macro-bug ()
+    `(and (stringp (read-kbd-macro "<SPC>"))
+          (string-equal (read-kbd-macro "<SPC>") "<SPC>")))
+
+  (let ((libraries-to-try '("edmacro")))
+    (while libraries-to-try
+      (if (lyskom-detect-read-kbd-macro-bug)
+          (progn (condition-case nil
+                     (load-library (car libraries-to-try))
+                   (error nil))
+                 (setq libraries-to-try (cdr libraries-to-try)))
+        (setq libraries-to-try nil)))
+
+    (if (lyskom-detect-read-kbd-macro-bug)
+        (let ((elc-location (locate-library "macedit.elc"))
+              (el-location (locate-library "macedit.el"))
+              (elz-location (locate-library "macedit.el.gz")))
+          (cond ((or el-location elc-location)
+                 (message "\
 
 You probably have a file named macedit.elc in Emacs' load path.
 
@@ -92,16 +106,16 @@ loaddefs.el, located elsewhere.
 With Gnu Emacs you may be successful in removing references
 by using the command update-autoloads-from-directories.
 "
-                      (mapconcat (lambda (x) (or x "")) 
-                                 (list elc-location el-location elz-location) 
-                                 "\n"))
-               (error "Unable to run or compile due to obsolete macedit package."))
-              (t
-               (message "\
+                          (mapconcat (lambda (x) (or x "")) 
+                                     (list elc-location el-location elz-location) 
+                                     "\n"))
+                 (error "Unable to run or compile due to obsolete macedit package."))
+                (t
+                 (message "\
 
 Your definition of read-kbd-macro appears to be obsolete. This
 is usually caused by having a package called macedit in Emacs
 load path, but I am unable to find this package. LysKOM cannot
 run with your version of read-kbd-macro.
 ")
-               (error "Unable to run or compile due to obsolete definition of read-kbd-macro."))))))
+                 (error "Unable to run or compile due to obsolete definition of read-kbd-macro.")))))))

src/services.el

@@ -1259,6 +1259,12 @@ Args: KOM-QUEUE HANDLER SESSION-NO &rest DATA"
    (lyskom-send-packet kom-queue (lyskom-format-objects 105 conf-no keep))
    (cache-del-conf-stat conf-no)))
 
+(defun initiate-set-pers-flags (kom-queue handler pers-no flags &rest data)
+  (lyskom-server-call
+    (lyskom-call kom-queue lyskom-ref-no handler data 'lyskom-parse-void)
+    (lyskom-send-packet kom-queue (lyskom-format-objects 106 pers-no flags))
+    (cache-del-pers-stat pers-no)))
+
 
 
 ;;; ================================================================

src/vars.el.in

@@ -2829,6 +2829,24 @@ the value of  kom-tell-phrases for fun.")
      (kom-dim-face default "gray" nil)
      (kom-dashed-lines-face nil nil "#e8e8ff")
      )
+    (bark
+     (kom-active-face default "Gold" "Black")
+     (kom-mark-face default "White" nil)
+     (kom-url-face default "Gold" "Black")
+     (kom-me-face default "Gold" "Black")
+     (kom-highlight-face default "PaleGreen" nil)
+     (kom-text-face default nil nil)
+     (kom-subject-face default "Gold" nil)
+     (kom-text-no-face default nil nil)
+     (kom-presence-face default "Gold" nil)
+     (kom-first-line-face bold nil nil)
+     (kom-dashed-lines-face nil nil "#0a0a0a")
+     (kom-text-body-face nil nil "#181818")
+     (kom-dim-face nil "DarkSlateGray")
+     (kom-friends-face nil "Gold" "Black")
+     (kom-morons-face nil "Gold" "Black")
+     (kom-warning-face 'bold "Red" nil)
+     )
     (black-and-tan
       (kom-text-body-face nil nil "#f8f8f0")
       (kom-active-face default "#602000" nil)
@@ -2926,9 +2944,9 @@ schemes in LysKOM. The car of each element is the scheme key, a
 symbol, and the cdr is a list of face definitions. Each face
 definition in turn is a list of four elements: the face name, the base
 face, foreground color and background color. When LysKOM defines a
-face from such a specification, the base face is first copied and then
-the foreground and background colors are set. If it permissible to
-substitute nil for any element except the face name.
+face from such a specification, the base face is first copied (unless
+it is nil) and then the foreground and background colors are set. If
+it permissible to substitute nil for any element except the face name.
 
 For instance, (kom-me-face bold \"yellow\" \"red\") will cause kom-me-face
 to be bold with yellow text on a red background."