Commit f5c43851 authored by Linus Tolke Y's avatar Linus Tolke Y
Browse files

Various small fixes.

parent 0a341169
No preview for this file type
......@@ -285,13 +285,18 @@ INSERT-FUNCTION is a function that given a string inserts it into the
current buffer."
(lyskom-handle-as-personal-message
(if (= recipient 0)
(lyskom-format 'message-broadcast
(cond
((stringp sender) sender)
(sender (conf-stat->name sender))
(t (lyskom-get-string 'unknown)))
message
(substring (current-time-string) 11 19))
(progn
(if (eq t kom-ding-on-personal-messages)
(beep))
(lyskom-format 'message-broadcast
(cond
((stringp sender) sender)
(sender (conf-stat->name sender))
(t (lyskom-get-string 'unknown)))
message
(substring (current-time-string) 11 19)))
(if kom-ding-on-personal-messages
(beep))
(lyskom-format 'message-from
(cond
((stringp sender) sender)
......@@ -319,10 +324,7 @@ The text is converted, before insertion."
string
(iso-8859-1-to-swascii string)))))
(if kom-pop-personal-messages
(display-buffer (current-buffer))))
(if (and kom-ding-on-personal-messages
(/= lyskom-pers-no from))
(beep)))
(display-buffer (current-buffer)))))
;;; ================================================================
......
......@@ -490,7 +490,13 @@ the name of the person."
(lyskom-start-of-command 'kom-sub-self)
(lyskom-completing-read 'main 'lyskom-sub-member-2
(lyskom-get-string 'leave-what-conf)
nil nil ""
nil nil
(let ((ccn (if (zerop lyskom-current-conf)
""
(conf-stat->name
(blocking-do 'get-conf-stat
lyskom-current-conf)))))
(or ccn ""))
lyskom-pers-no))
......@@ -947,22 +953,29 @@ If optional argument is non-nil then dont ask for confirmation."
"Change presentation for a person or a conference."
(interactive)
(lyskom-start-of-command 'kom-change-presentation)
(lyskom-completing-read
'main 'lyskom-change-presentation-or-motd
(lyskom-get-string 'what-to-change-pres-you)
nil 'empty "" 'pres))
(lyskom-change-pres-or-motd-2
(let ((no (lyskom-read-conf-no (lyskom-get-string 'what-to-change-pres-you)
'all t)))
(if (zerop no)
(setq no lyskom-pers-no))
(blocking-do 'get-conf-stat no))
'pres))
(defun kom-change-conf-motd ()
"Change motd for a person or a conference."
(interactive)
(lyskom-start-of-command 'kom-change-conf-motd)
(lyskom-completing-read
'main 'lyskom-change-presentation-or-motd
(lyskom-get-string 'who-to-put-motd-for)
nil 'empty "" 'motd))
(lyskom-change-pres-or-motd-2
(let ((no (lyskom-read-conf-no (lyskom-get-string 'who-to-put-motd-for)
'all t)))
(if (zerop no)
(setq no lyskom-pers-no))
(blocking-do 'get-conf-stat no))
'motd))
;;; Obsolet
(defun lyskom-change-presentation-or-motd (conf-no type)
"Change the presentation or motd of CONF-NO.
TYPE is either 'pres or 'motd, depending on what should be changed."
......@@ -977,18 +990,18 @@ TYPE is either 'pres or 'motd, depending on what should be changed."
TYPE is either 'pres or 'motd, depending on what should be changed."
(cond
((null conf-stat) ;+++ annan felhantering
(lyskom-insert-string 'cant-get-conf-stat)
(lyskom-end-of-command))
(lyskom-insert-string 'cant-get-conf-stat)
(lyskom-end-of-command))
((or lyskom-is-administrator
(lyskom-member-p (conf-stat->supervisor conf-stat))
(= lyskom-pers-no (conf-stat->conf-no conf-stat)))
(initiate-get-text 'main 'lyskom-change-pres-or-motd-3
(cond
((eq type 'pres)
(conf-stat->presentation conf-stat))
((eq type 'motd)
(conf-stat->msg-of-day conf-stat)))
conf-stat type))
(lyskom-change-pres-or-motd-3
(blocking-do 'get-text (cond
((eq type 'pres)
(conf-stat->presentation conf-stat))
((eq type 'motd)
(conf-stat->msg-of-day conf-stat))))
conf-stat type))
(t
(lyskom-format-insert 'not-supervisor-for
(conf-stat->name conf-stat))
......@@ -1015,7 +1028,8 @@ TYPE is either 'pres or 'motd, depending on what should be changed."
(if (and text-mass
(string-match "\n" (text->text-mass text-mass)))
(substring (text->text-mass text-mass) (match-end 0))
(if (eq type 'pres)
(if (and (eq type 'pres)
(conf-type->letterbox (conf-stat->conf-type conf-stat)))
(lyskom-get-string 'presentation-form)
""))
(cond
......
......@@ -644,7 +644,7 @@ When a text is received the new text is displayed."
(read-info->priority
(read-list->first lyskom-to-do-list))
-2)))
(lyskom-tell-internat 'kom-tell-wait)
(lyskom-tell-server kom-mercial)
(if (= waitfor -2)
(lyskom-insert-string 'waiting-for-anything)
(lyskom-format-insert 'waiting-higher-than waitfor))
......
......@@ -74,6 +74,13 @@ Does lyskom-end-of-command."
(switch-to-buffer buffer))
((eq kom-write-texts-in-window 'other)
(switch-to-buffer-other-window buffer))
((and (eq kom-write-texts-in-window 'other-frame)
(not (eq (selected-frame) (next-frame))))
(select-frame (next-frame)))
((eq kom-write-texts-in-window 'new-frame)
(make-local-variable 'lyskom-is-dedicated-edit-window)
(setq lyskom-is-dedicated-edit-window t)
(switch-to-buffer-other-frame buffer))
(t
(switch-to-buffer buffer)))
(if (boundp 'lyskom-filter-old-buffer)
......@@ -221,6 +228,22 @@ First element is a type-tag."
;;; ================================================================
;;; lyskom-edit-mode
(defvar lyskom-edit-mode-hook nil
"*List of functions to be called when entering lyskom-edit-mode.
Watch out! None of these functions are allowed to do kill-all-local-variables
because kom-edit-send and other functions depend on some variables to be able
to enter the text in the correct lyskom-process.")
(defvar lyskom-edit-mode-mode-hook nil
"*List of functions to be called when entering lyskom-edit-mode.
Watch out! None of these functions are allowed to do kill-all-local-variables
because kom-edit-send and other functions depend on some variables to be able
to enter the text in the correct lyskom-process.
This one differs from lyskom-edit-mode-hook in that it is called before
the lyskom-special key bindings are added.")
(defun lyskom-edit-mode ()
"\\<lyskom-edit-mode-map>Mode for editing texts for LysKOM.
Commands:
......@@ -304,6 +327,11 @@ Entry to this mode runs lyskom-edit-mode-hook."
buffer)))
(if kom-dont-restore-window-after-editing
(bury-buffer)
(save-excursion
(if (boundp 'lyskom-is-dedicated-edit-window)
(condition-case error
(delete-frame)
(error))))
(set-window-configuration lyskom-edit-return-to-configuration)
(set-buffer (window-buffer (selected-window))))
(goto-char (point-max)))))
......@@ -313,9 +341,16 @@ Entry to this mode runs lyskom-edit-mode-hook."
"Kill the text (if any) written so far and continue reading."
(interactive)
(let ((edit-buffer (current-buffer)))
;; Select the old configuration.
(set-window-configuration lyskom-edit-return-to-configuration)
(set-buffer (window-buffer (selected-window)))
(if kom-dont-restore-window-after-editing
(bury-buffer)
;; Select the old configuration.
(save-excursion
(if (boundp 'lyskom-is-dedicated-edit-window)
(condition-case error
(delete-frame)
(error))))
(set-window-configuration lyskom-edit-return-to-configuration)
(set-buffer (window-buffer (selected-window))))
(goto-char (point-max))
(setq lyskom-is-writing nil)
(lyskom-tell-internat 'kom-tell-regret)
......
......@@ -159,6 +159,7 @@ If successful then set the buffer not-modified. Else print a warning."
"Reads the user-area and sets the variables according to the choises.
Also run lyskom-login-hook (regardless of whether the person has a userarea
or not."
(lyskom-halt 'main)
(if (and lyskom-pers-no
(not (zerop lyskom-pers-no)))
(initiate-get-pers-stat 'options 'lyskom-read-options-2 lyskom-pers-no)))
......@@ -173,6 +174,7 @@ or not."
(prog1
(setq lyskom-do-when-starting kom-do-when-starting)
(run-hooks 'lyskom-login-hook)
(lyskom-resume 'main)
(setq lyskom-options-done t))
(initiate-get-text 'options 'lyskom-read-options-eval
(pers-stat->user-area pers-stat))))
......@@ -252,6 +254,7 @@ or not."
(while (stringp (cdr (car (cdr pos))))
(setq pos (cdr pos)))
(setcdr pos nil))))))
(lyskom-resume 'main)
(setq lyskom-options-done t))
......
No preview for this file type
......@@ -254,14 +254,14 @@ Optional argument CONF-STAT is used to check for a msg-of-day on the person."
(zerop (conf-stat->presentation conf-stat))
(not (zerop (conf-stat->no-of-texts conf-stat))))
(lyskom-insert-string 'presentation-encouragement))
(lyskom-read-options)
(lyskom-collect 'main)
(initiate-get-membership 'main nil pers-no)
(initiate-get-unread-confs 'main nil pers-no)
(initiate-get-marks 'main nil)
(initiate-who-is-on 'main nil)
(initiate-who-am-i 'main nil)
(lyskom-use 'main 'lyskom-prefetch nil)
(lyskom-read-options))))
(lyskom-use 'main 'lyskom-prefetch nil))))
(defun lyskom-refetch ()
......@@ -374,10 +374,17 @@ WANT-PERSONS is t for persons, nil for confs."
(setq lyskom-executing-command nil)
(kom-start-anew))
(t
(initiate-login 'main 'lyskom-start-anew-login-2
(initiate-login 'main 'lyskom-add-for-new-person
pers-no password pers-no lyskom-pers-no)
)))
(defun lyskom-add-for-new-person (reply pers-no lyskom-pers-no)
"Add a news person as member in the default presentation conference."
(initiate-add-member 'main 'lyskom-start-anew-login-2
(server-info->conf-pres-conf lyskom-server-info)
pers-no 100 1
pers-no lyskom-pers-no))
;;; ================================================================
;;; The LysKOM mode.
......
......@@ -615,7 +615,7 @@ Personligt meddelande fr\345n %#1s (%#3s):
(new-prio . "%6#1d")
; From flags.el:
(saving-settings . "Sparar flaggorna")
(saving-settings . "Sparar inst\344llningarna")
(hang-on . "V\344nta ett tag...\n")
(could-not-create-area . "Kunde ej skapa texten.\n")
(could-not-set-user-area . "Kunde ej st\344lla om user-arean. Servern s\344ger felmeddelande: %#1d\n")
......@@ -1041,7 +1041,7 @@ Users are encouraged to use their best sense of humor.")
(34 . "F\366r m\345nga kommentarer")
(35 . "F\366r m\345nga fotnoter")
(36 . "F\366r m\345nga markeringar")
(37 . "Du \344r inte f\366rfattare till texten")
(37 . "Du \344r inte f\366rfattare till den fotnoterade texten")
(38 . "Du kan inte koppla upp dig till servern")
(39 . "Minnet slut")
(40 . "Servern har ballat ur")
......
......@@ -83,7 +83,10 @@ entering a conference.")
(defvar kom-presence-messages t
"*If non-nil, lyskom prints continuous info about what other people are doing.
Info is printed on the message line and never in the buffer. If minibuffer is
used then no message is printed.")
used then no message is printed.
If you want the messages in the buffer you could set the variable
kom-presence-messages-in-buffer.")
(defvar kom-presence-messages-in-buffer nil
"*If t, lyskom prints information about what other people are doing in buffer.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment