Commit 80336941 authored by David Kågedal's avatar David Kågedal
Browse files

lite fixar...

parent 7bc07b49
No preview for this file type
......@@ -82,7 +82,12 @@ vars.el: vars.el.in Makefile
sed 's/@@CLIENTVERSION@@/$(CLIENTVERSION)/' < vars.el.in > vars.el
chmod 444 vars.el
lyskom.elc: $(HEADER-ELC) $(SWEDISH-ELC) $(PARTS-ELC)
lyskom.elc: lyskom.el
$(EMACS-BATCH) -f batch-byte-compile lyskom.el
# For fast compiling
.PHONY: fast
fast: $(HEADER-ELC) $(SWEDISH-ELC) $(PARTS-ELC)
cat $(HEADER-ELC) $(SWEDISH-ELC) $(PARTS-ELC) > lyskom.elc
english-lyskom.elc: $(HEADER-ELC) $(ENGLISH-ELC) $(PARTS-ELC)
......@@ -123,8 +128,7 @@ installatlysator: lyskom-$(CLIENTVERSION).elc lyskom.el
cp lyskom.el /usr/local/var/elisp/lyskom.el
cp lyskom-$(CLIENTVERSION).elc /usr/gnu/lib/emacs/site-lisp/lyskom.elc
lyskom-$(CLIENTVERSION).elc: lyskom.el
$(EMACS-BATCH) -f batch-byte-compile lyskom.el
lyskom-$(CLIENTVERSION).elc: lyskom.elc
cp lyskom.elc lyskom-$(CLIENTVERSION).elc
lyskom.elc-compatibility: lyskom.el
......
......@@ -393,8 +393,8 @@ Returns t if it was possible, otherwise nil."
(if (= (conf-stat->conf-no pers-conf-stat)
lyskom-pers-no)
(progn ; Adding myself
(setq lyskom-last-conf-received
(1+ lyskom-last-conf-received))
;;(setq lyskom-last-conf-received
;; (1+ lyskom-last-conf-received))
(lyskom-add-membership
(blocking-do 'query-read-texts
lyskom-pers-no
......
......@@ -552,7 +552,7 @@ means send the message to everybody."
;;; Rehacked: Inge Wallin
(defun kom-list-news (num)
(defun kom-list-news (&optional num)
"Runs lyskom-start-of-command and then gets all conferences using
lyskom-prefetch-all-confs."
(interactive "P")
......
......@@ -559,9 +559,9 @@ Mark the envelope with \"LysKOM bug report\"\n\n")
(sent-by . " Posted by ")
(recieved-at . " Received: %#1s\n")
(written-by . "by %#1s")
(comment-to-text-by . "Comment to article %#1d %#2s\n")
(comment-to-text-by . "Comment to article %#1n by %#2P\n")
(footnote-to-text-by . "Footnote to article %#1d %#2s\n")
(comment-in-text-by . "Comment in article %#1d %#2s\n")
(comment-in-text-by . "Comment in article %#1n by %#2P\n")
(footnote-in-text-by . "Footnote in article %#1d %#2s\n")
; From async.el:
......@@ -578,24 +578,24 @@ but failed since all connections available to LysKOM are in
use. Please leave and return later if you are just waiting
for an article.
===========================================================\n")
(has-entered . "%#1s has entered LysKOM.")
(has-entered-r . "%#1s has entered LysKOM.\n")
(has-left . "%#1s has left LysKOM.")
(has-left-r . "%#1s has left LysKOM.\n")
(has-entered . "%#1:P has entered LysKOM.")
(has-entered-r . "%#1P has entered LysKOM.\n")
(has-left . "%#1:P has left LysKOM.")
(has-left-r . "%#1:P has left LysKOM.\n")
(unknown . "unknown")
(message-broadcast .
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Public message from %#1s (%#3s):
Public message from %#1P (%#3s):
%#2s
%#2t
----------------------------------------------------------------
")
(message-from .
"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Personal message from %#1s (%#3s):
Personal message from %#1P (%#3s):
%#2s
%#2t
----------------------------------------------------------------
")
(message-from-to .
......@@ -651,8 +651,8 @@ Group message to %#3s from %#2s (%#4s):
(all-conf-unread-r . "You have nothing unread.\n")
(all-conf-unread-s . "You have nothing unread. ")
(one-unread . " - one unread article\n")
(several-unread . " - %#1d unread articles\n")
(one-unread . "%#1M - one unread article\n")
(several-unread . "%#1M - %#2d unread articles\n")
(save-on-file-q . "Save which article in file: (%#1s) ")
(wait-for-prompt . "Wait for the prompt.")
......@@ -669,7 +669,7 @@ Group message to %#3s from %#2s (%#4s):
(go-to-next-conf-prompt . "Go to next conference")
(go-to-your-mailbox-prompt . "Go to your mailbox")
(the-command . "Command:%#1s")
(error-in-do-when-starting . "Error in your kom-do-when-starting. %#1s\n")
(error-in-login-hook . "There was an error in your kom-login-hook: %#1s\n")
(give-a-number . "Enter a number: ")
......
......@@ -239,9 +239,7 @@ If successful then set the buffer not-modified. Else print a warning."
(defun lyskom-read-options ()
"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."
"Reads the user-area and sets the variables according to the choises."
(if (and lyskom-pers-no
(not (zerop lyskom-pers-no)))
(let ((pers-stat (blocking-do 'get-pers-stat lyskom-pers-no)))
......@@ -249,9 +247,7 @@ or not."
(lyskom-insert-string 'you-dont-exist)
(setq lyskom-other-clients-user-areas)
(if (zerop (pers-stat->user-area pers-stat))
(prog1
(setq lyskom-do-when-starting kom-do-when-starting)
(run-hooks 'lyskom-login-hook)
(progn
(lyskom-tell-phrases-validate)
(setq lyskom-options-done t))
(lyskom-read-options-eval
......@@ -322,9 +318,7 @@ or not."
(setcdr (car pos) working)))))
(++ r))
(setq lyskom-do-when-starting kom-do-when-starting)
(setq lyskom-do-when-done (cons kom-do-when-done kom-do-when-done))
(run-hooks 'lyskom-login-hook)
;; Remove not found user-areas
(let ((pos lyskom-other-clients-user-areas))
(if pos
......
No preview for this file type
......@@ -215,7 +215,13 @@ See lyskom-mode for details."
;; If something failed, make sure we are someone
(if (null lyskom-pers-no) (setq lyskom-pers-no old-me))
(lyskom-end-of-command))))
(lyskom-end-of-command)))
;; Run the hook kom-login-hook. We don't want to hang the
;; login, just because something crashed here.
(condition-case err
(run-hooks 'kom-login-hook)
(error (lyskom-format-insert-before-prompt
'error-in-login-hook (format "%s" err)))))
(defun lyskom-refetch ()
......@@ -469,65 +475,65 @@ to see, set of call."
(server-name lyskom-server-name)
)
(kill-all-local-variables)
(make-local-variable 'lyskom-buffer)
(make-local-variable 'kom-login-hook)
(make-local-variable 'lyskom-blocking-return)
(make-local-variable 'lyskom-unparsed-buffer)
(make-local-variable 'lyskom-unparsed-marker)
(make-local-variable 'lyskom-is-writing)
(make-local-variable 'lyskom-pending-calls)
(make-local-variable 'lyskom-number-of-pending-calls)
(make-local-variable 'lyskom-errno)
(make-local-variable 'lyskom-pers-no)
(make-local-variable 'lyskom-session-no)
(make-local-variable 'lyskom-proc)
(make-local-variable 'lyskom-buffer)
(make-local-variable 'lyskom-command-to-do)
(make-local-variable 'lyskom-conf-cache)
(make-local-variable 'lyskom-pers-cache)
(make-local-variable 'lyskom-text-cache)
(make-local-variable 'lyskom-text-mass-cache)
(make-local-variable 'lyskom-server-info)
(make-local-variable 'lyskom-server-name)
(make-local-variable 'lyskom-default-user-name)
(make-local-variable 'lyskom-count-var)
(make-local-variable 'lyskom-current-conf)
(make-local-variable 'lyskom-current-subject)
(make-local-variable 'lyskom-current-text)
(make-local-variable 'lyskom-default-password)
(make-local-variable 'lyskom-who-info-cache)
(make-local-variable 'lyskom-who-info-buffer)
(make-local-variable 'lyskom-who-info-buffer-is-on)
(make-local-variable 'lyskom-prioritize-buffer)
(make-local-variable 'lyskom-marked-text-cache)
(make-local-variable 'lyskom-default-user-name)
(make-local-variable 'lyskom-do-when-done)
(make-local-variable 'lyskom-dont-change-prompt)
(make-local-variable 'lyskom-errno)
(make-local-variable 'lyskom-executing-command)
(make-local-variable 'lyskom-fetched-texts)
(make-local-variable 'lyskom-filter-list)
(make-local-variable 'lyskom-is-administrator)
(make-local-variable 'lyskom-is-parsing)
(make-local-variable 'lyskom-last-viewed)
(make-local-variable 'lyskom-prefetch-confs)
(make-local-variable 'lyskom-unread-confs)
(make-local-variable 'lyskom-is-waiting)
(make-local-variable 'lyskom-is-writing)
(make-local-variable 'lyskom-last-conf-done)
(make-local-variable 'lyskom-last-conf-fetched)
(make-local-variable 'lyskom-last-conf-received)
(make-local-variable 'lyskom-last-conf-done)
(make-local-variable 'lyskom-last-viewed)
(make-local-variable 'lyskom-list-of-edit-buffers)
(make-local-variable 'lyskom-marked-text-cache)
(make-local-variable 'lyskom-membership)
(make-local-variable 'lyskom-prefetch-texts)
(make-local-variable 'lyskom-prefetch-conf-tresh)
(make-local-variable 'lyskom-membership-is-read)
(make-local-variable 'lyskom-no-prompt)
(make-local-variable 'lyskom-number-of-pending-calls)
(make-local-variable 'lyskom-options-done)
(make-local-variable 'lyskom-other-clients-user-areas)
(make-local-variable 'lyskom-output-queue)
(make-local-variable 'lyskom-pending-calls)
(make-local-variable 'lyskom-pers-cache)
(make-local-variable 'lyskom-pers-no)
(make-local-variable 'lyskom-prefetch-conf-tresh)
(make-local-variable 'lyskom-prefetch-confs)
(make-local-variable 'lyskom-prefetch-texts)
(make-local-variable 'lyskom-previous-text)
(make-local-variable 'lyskom-prioritize-buffer)
(make-local-variable 'lyskom-proc)
(make-local-variable 'lyskom-reading-list)
(make-local-variable 'lyskom-to-do-list)
(make-local-variable 'lyskom-fetched-texts)
(make-local-variable 'lyskom-command-to-do)
(make-local-variable 'lyskom-server-info)
(make-local-variable 'lyskom-server-name)
(make-local-variable 'lyskom-session-no)
(make-local-variable 'lyskom-text-cache)
(make-local-variable 'lyskom-text-mass-cache)
(make-local-variable 'lyskom-to-be-printed-before-prompt)
(make-local-variable 'lyskom-other-clients-user-areas)
(make-local-variable 'lyskom-is-waiting)
(make-local-variable 'lyskom-to-do-list)
(make-local-variable 'lyskom-unparsed-buffer)
(make-local-variable 'lyskom-unparsed-marker)
(make-local-variable 'lyskom-unread-confs)
(make-local-variable 'lyskom-what-i-am-doing)
(make-local-variable 'lyskom-current-conf)
(make-local-variable 'lyskom-previous-text)
(make-local-variable 'lyskom-current-text)
(make-local-variable 'lyskom-current-subject)
(make-local-variable 'lyskom-executing-command)
(make-local-variable 'lyskom-membership-is-read)
(make-local-variable 'lyskom-dont-change-prompt)
(make-local-variable 'lyskom-count-var)
(make-local-variable 'lyskom-is-administrator)
(make-local-variable 'lyskom-do-when-starting)
(make-local-variable 'lyskom-do-when-done)
(make-local-variable 'lyskom-who-info-buffer)
(make-local-variable 'lyskom-who-info-buffer-is-on)
(make-local-variable 'lyskom-who-info-cache)
(make-local-variable 'mode-line-conf-name)
(make-local-variable 'lyskom-output-queue)
(make-local-variable 'lyskom-options-done)
(make-local-variable 'lyskom-list-of-edit-buffers)
(make-local-variable 'lyskom-filter-list)
(setq lyskom-proc proc)
(setq lyskom-pers-no pers-no)
(setq lyskom-membership membership)
......
......@@ -702,7 +702,7 @@ Gruppmeddelande till %#3s fr\345n %#2s (%#4s):
(go-to-next-conf-prompt . "G\345 till n\344sta m\366te")
(go-to-your-mailbox-prompt . "G\345 till din brevl\345da")
(the-command . "Kommandot:%#1s")
(error-in-do-when-starting . "Fel i din kom-do-when-starting. %#1s\n")
(error-in-login-hook . "Det fanns ett fel i din kom-login-hook: %#1s\n")
(give-a-number . "Mata in ett tal: ")
......
......@@ -115,13 +115,10 @@ If the value is 'express then texts are allowed to break in the middle of a
comment chain. Otherwise we dont let them in until the end of the comment
tree.")
(defvar kom-do-when-starting nil
(defvar kom-login-hook nil
"*What to do when logged in.
This is a list of commands that are executed after we have logged in but before
any command is accepted from the keyboard.
The syntax is the same as for the kom-do-when-starting variable except that the
last element is not remembered forever. These are executed as soon as we get a
new prompt i.e. non-stop at login.")
any command is accepted from the keyboard.")
(defvar kom-do-when-done '(kom-review-all-marked-texts kom-display-time)
"*What to do when all texts are read.
......@@ -276,7 +273,7 @@ he gets a y-or-n-p question for all recipients.")
(defconst lyskom-elisp-variables '(
kom-do-when-done
kom-do-when-starting
kom-login-hook
kom-mercial
kom-higher-priority-breaks
kom-membership-default-placement
......@@ -296,7 +293,6 @@ he gets a y-or-n-p question for all recipients.")
lyskom-who-info-has-changed-hook
lyskom-prompt-text
lyskom-prompt-executing-default-command-text
lyskom-login-hook
)
"Tells the client what flags and hooks that are to be saved in the server.
These are the flags that are saved in the elisp-client part of the server.")
......@@ -602,10 +598,6 @@ set the local variable no-message non-nil.")
"*Hook to run every time the who-info-buffer has changed.
The hook is run with current-buffer the lyskom buffer, not the who-info-buffer.")
(defvar lyskom-login-hook nil
"*Hook to run when we have logged in. Other purposes than kom-do-when-starting.
This could be set in the user-area.")
(defvar lyskom-personal-message-hook nil
"*Hook to run when a personal message is received.
When the hook is run 'sender' is bound to the pers-stat of the sender
......
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