Commit d63bedff authored by David Byers's avatar David Byers
Browse files

Fix bug 522

parent f206cb19
2002-09-18 David Byers <david.byers@swipnet.se> 2002-09-18 David Byers <david.byers@swipnet.se>
Fix bug 522:
* startup.el (lyskom): Print motd of lyskom sort of like a normal
text. Don't print the header because it distracts attention. Do
print the footer using whatever settings are currently loaded
(usually the defaults).
Fix bug 757: Fix bug 757:
* compatibility.el (make-temp-file): Removed last argument from * compatibility.el (make-temp-file): Removed last argument from
write-region since the parameter lists in Gnu Emacs and XEmacs write-region since the parameter lists in Gnu Emacs and XEmacs
......
...@@ -293,12 +293,43 @@ clients of the event. See lyskom-mode for details on lyskom." ...@@ -293,12 +293,43 @@ clients of the event. See lyskom-mode for details on lyskom."
(text-stat (get-text-stat (text-stat (get-text-stat
(server-info->motd-of-lyskom (server-info->motd-of-lyskom
lyskom-server-info)))) lyskom-server-info))))
(lyskom-format-insert "%#1t\n" (let* ((conf-stat (and text-stat (blocking-do 'get-conf-stat (text-stat->author text-stat))))
(if (and text text-stat) (str (and text text-stat (text->decoded-text-mass text text-stat))))
(text->decoded-text-mass text text-stat) (if (null text-stat)
(lyskom-get-string 'lyskom-motd-was-garbed)) (lyskom-get-string 'lyskom-motd-was-garbed)
(lyskom-insert (lyskom-get-string 'server-has-motd))
(when (string-match "\n" str)
(setq str (substring str (match-end 0))))
(lyskom-format-insert
"%#2$%#1s\n"
(if kom-dashed-lines
(make-string kom-text-header-dash-length ?-)
"")
(when kom-highlight-dashed-lines
'(face kom-dashed-lines-face)))
(lyskom-format-insert "%#2$%#1t\n"
str
(when kom-highlight-text-body
'(face kom-text-body-face))
(when kom-highlight-text-body (when kom-highlight-text-body
'(face kom-text-body-face))))) '(face kom-text-body-face)))
(lyskom-format-insert
"%#2$%#1s\n"
(lyskom-format-text-footer
text-stat
conf-stat
(cond ((eq (text-stat->author text-stat) 0)
(lyskom-get-string 'person-is-anonymous))
(conf-stat (conf-stat->name conf-stat))
(t (lyskom-format 'person-does-not-exist
(text-stat->author text-stat))))
kom-text-footer-format
lyskom-last-text-format-flags)
(when kom-highlight-dashed-lines
'(face kom-dashed-lines-face)))
))))
;; Can't use lyskom-end-of-command here. ;; Can't use lyskom-end-of-command here.
(setq lyskom-executing-command nil) (setq lyskom-executing-command nil)
......
...@@ -158,6 +158,7 @@ kan skapa en ny:\n") ...@@ -158,6 +158,7 @@ kan skapa en ny:\n")
(wrong-password-email . "* %#1t\n") (wrong-password-email . "* %#1t\n")
(are-logged-in . "Du r nu inloggad. Vnta ett tag.\n") (are-logged-in . "Du r nu inloggad. Vnta ett tag.\n")
(you-have-motd . "\nDu har en lapp p drren:\n\n") (you-have-motd . "\nDu har en lapp p drren:\n\n")
(server-has-motd . "Servern har ett loginmeddelande:\n")
(lyskom-motd-was-garbed . "\nLoginmeddelandet finns inte! (lyskom-motd-was-garbed . "\nLoginmeddelandet finns inte!
Det meddelande som ska visas efter inloggning har frsvunnit. Det meddelande som ska visas efter inloggning har frsvunnit.
Kontakta LysKOM-administratren.\n") Kontakta LysKOM-administratren.\n")
......
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