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

Better handling och quitting.

parent 123e58fd
No preview for this file type
......@@ -85,7 +85,7 @@
CONF can be either a conf-no or a conf-stat."
(cond ;+++ error handling should be better
((lyskom-conf-stat-p conf)
(if (ja-or-nej-p
(if (lyskom-ja-or-nej-p
(lyskom-format 'confirm-delete-pers-or-conf
(if (conf-type->letterbox (conf-stat->conf-type
conf))
......@@ -250,7 +250,7 @@ as TYPE. If no such misc-info, return NIL"
(recenter 0)
(lyskom-format-insert 'has-motd (conf-stat->name conf-stat))
(lyskom-view-text 'main (conf-stat->msg-of-day conf-stat))
(if (j-or-n-p (lyskom-get-string 'motd-persist-q))
(if (lyskom-j-or-n-p (lyskom-get-string 'motd-persist-q))
t
(lyskom-end-of-command)
nil)))
......@@ -774,7 +774,7 @@ CCREP is a list of all recipients that are going to be cc-recipients."
(car (cdr data))))))))
(let ((new-data nil))
(while data
(if (j-or-n-p (lyskom-format 'comment-keep-recpt-p
(if (lyskom-j-or-n-p (lyskom-format 'comment-keep-recpt-p
(conf-stat->name (car data))))
(setq new-data (cons (car data) new-data)))
(setq data (cdr data)))
......@@ -917,10 +917,11 @@ If optional argument is non-nil then dont ask for confirmation."
(cond
((and (lyskom-count-down-edits)
(display-buffer (car lyskom-list-of-edit-buffers))
(not (ja-or-nej-p (lyskom-get-string 'quit-in-spite-of-unsent))))
(not (lyskom-ja-or-nej-p
(lyskom-get-string 'quit-in-spite-of-unsent))))
(lyskom-end-of-command))
((or arg
(ja-or-nej-p (lyskom-get-string 'really-quit))
(lyskom-ja-or-nej-p (lyskom-get-string 'really-quit))
)
(initiate-logout 'main nil)
(set-process-sentinel lyskom-proc nil)
......@@ -1105,7 +1106,7 @@ Allowed conferences are conferences and the mailboxes you are member of."
(lyskom-format-insert 'not-member-of-conf
(conf-stat->name conf))
(lyskom-scroll)
(if (j-or-n-p (lyskom-get-string 'want-become-member))
(if (lyskom-j-or-n-p (lyskom-get-string 'want-become-member))
(lyskom-add-member-2 (conf-stat->conf-no conf)
lyskom-pers-no
'lyskom-fixup-and-go-to-conf
......
......@@ -245,7 +245,7 @@ Calls initiate-get-conf-stat and prints using lyskom-status-conf."
(defun lyskom-status-conf-2 (conf-stat)
"Show all members of CONF-STAT if the user so wishes."
(lyskom-scroll)
(if (null (j-or-n-p (lyskom-get-string 'show-members-list-also-q)))
(if (null (lyskom-j-or-n-p (lyskom-get-string 'show-members-list-also-q)))
(lyskom-end-of-command)
(initiate-get-members 'main 'lyskom-status-conf-3
(conf-stat->conf-no conf-stat)
......@@ -410,7 +410,7 @@ is the one we are interested in."
(defun lyskom-status-pers-3 (conf-stat)
"Show all conferences CONF-STAT is a member of if the user so wishes."
(lyskom-scroll)
(if (null (j-or-n-p (lyskom-get-string 'show-membership-list-also-q)))
(if (null (lyskom-j-or-n-p (lyskom-get-string 'show-membership-list-also-q)))
(lyskom-end-of-command)
(initiate-get-membership 'main 'lyskom-status-pers-4
(conf-stat->conf-no conf-stat)
......@@ -1207,7 +1207,7 @@ Args: SUPER-CONF CONF_STAT TYPE"
"Shutdown the LysKOM server."
(interactive)
(lyskom-start-of-command 'kom-shutdown-server)
(if (ja-or-nej-p (lyskom-get-string 'really-shutdown))
(if (lyskom-ja-or-nej-p (lyskom-get-string 'really-shutdown))
(progn
(lyskom-insert-string 'closing-server)
(initiate-shutdown 'main 'lyskom-handle-command-answer 0))
......
No preview for this file type
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