Commit 861ddb33 authored by David Byers's avatar David Byers

Fixed bug 1608

parent 933e1c35
2007-06-24 <David Byers@GULAG>
Fixed bug 1608:
* async.el (lyskom-show-logged-in-person): Applied modified patch
from Per Jonsson (unlike the original patch, still print the
server name).
Fix bug 1620:
* commands2.el (lyskom-send-message): Applicerade patch frn Per
* commands2.el (lyskom-send-message): Applied patch from Per
Jonsson.
2007-06-13 <David Byers@GULAG>
......
......@@ -403,7 +403,11 @@ according to the value of FLAG."
(defun lyskom-show-logged-in-person (conf-stat)
"Visa p} kommandoraden vem som loggat in."
(let ((server (lyskom-session-nickname)))
(let ((server (lyskom-session-nickname))
(login-when-date (let ((kom-print-relative-dates nil))
(lyskom-format-time 'date)))
(login-when-time (let ((kom-print-relative-dates nil))
(lyskom-format-time 'time))))
(cond
((lyskom-is-in-minibuffer))
((lyskom-show-presence (conf-stat->conf-no conf-stat)
......@@ -419,21 +423,24 @@ according to the value of FLAG."
(cond
((lyskom-show-presence (conf-stat->conf-no conf-stat)
kom-presence-messages-in-buffer)
(if conf-stat
(lyskom-format-insert-before-prompt 'has-entered-r conf-stat
(and kom-text-properties
`(face ,kom-presence-face))
server)
(lyskom-format-insert-before-prompt 'has-entered-r
(lyskom-get-string 'unknown-person)
(and kom-text-properties
`(face ,kom-presence-face))
server))))))
(lyskom-format-insert-before-prompt 'has-entered-r
(or conf-stat
(lyskom-get-string
'unknown-person))
(and kom-text-properties
(list 'face kom-presence-face))
server
login-when-date
login-when-time)))))
(defun lyskom-show-logged-out-person (conf-stat session-no)
"Visa p} kommandoraden vem som loggat ut."
(let ((server (lyskom-session-nickname)))
(let ((server (lyskom-session-nickname))
(logout-when-date (let ((kom-print-relative-dates nil))
(lyskom-format-time 'date)))
(logout-when-time (let ((kom-print-relative-dates nil))
(lyskom-format-time 'time))))
(cond
((lyskom-is-in-minibuffer))
((lyskom-show-presence (conf-stat->conf-no conf-stat)
......@@ -446,16 +453,15 @@ according to the value of FLAG."
(cond
((lyskom-show-presence (conf-stat->conf-no conf-stat)
kom-presence-messages-in-buffer)
(if conf-stat
(lyskom-format-insert-before-prompt 'has-left-r conf-stat
(and kom-text-properties
`(face ,kom-presence-face))
server)
(lyskom-format-insert-before-prompt 'has-left-r
(lyskom-get-string 'unknown-person)
(and kom-text-properties
`(face ,kom-presence-face))
server))))))
(lyskom-format-insert-before-prompt 'has-left-r
(or conf-stat
(lyskom-get-string
'unknown-person))
(and kom-text-properties
(list 'face kom-presence-face))
server
logout-when-date
logout-when-time)))))
......
......@@ -1091,9 +1091,9 @@ for a text.
===============================================================================
")
(has-entered . "%#1:P has entered %#2s.")
(has-entered-r . "%#2@%#1P has entered %#3s.\n")
(has-entered-r . "%#2@%#1P has entered %#3s (%#4s %#5s).\n")
(has-left . "%#1:P has left %#2s.")
(has-left-r . "%#2@%#1P has left %#3s.\n")
(has-left-r . "%#2@%#1P has left %#3s (%#4s %#5s).\n")
(Unknown . "Unknown")
(unknown . "unknown")
(Unknown2 . "Unknown")
......@@ -1303,7 +1303,7 @@ You should set it to a better value.\n")
%#2s
LysKOM session killed abnormally
Error message: %#1s**************************************************")
(closed-connection-other-buf . "
(closed-connection-other-buf . "\
**************************************************
The LysKOM session %#1s was killed abnormally.
**************************************************
......
......@@ -1134,9 +1134,9 @@ upptagna. Logga ut och kom tillbaks senare om du v
===============================================================================
")
(has-entered . "Nu har %#1:P gtt in i %#2s.")
(has-entered-r . "%#2@Nu har %#1P gtt in i %#3s.\n")
(has-entered-r . "%#2@Nu har %#1P gtt in i %#3s (%#4s %#5s).\n")
(has-left . "Nu har %#1:P gtt ur %#2s.")
(has-left-r . "%#2@Nu har %#1P gtt ur %#3s.\n")
(has-left-r . "%#2@Nu har %#1P gtt ur %#3s (%#4s %#5s).\n")
(Unknown . "Oknd")
(unknown . "oknd")
(Unknown2 . "Oknt")
......@@ -1349,7 +1349,7 @@ Du b
%#2s
LysKOM-sessionen onormalt stngd.
Felmeddelande: %#1s**************************************************")
(closed-connection-other-buf . "
(closed-connection-other-buf . "\
**************************************************
LysKOM-sessionen %#1s stngdes onormalt.
**************************************************
......
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