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

Ett antal smärre fixar.

parent 279aa3ac
...@@ -27,7 +27,7 @@ $Id$ ...@@ -27,7 +27,7 @@ $Id$
@hyphenation{data-bas-filen default-prio-ri-tet} @hyphenation{data-bas-filen default-prio-ri-tet}
@hyphenation{email-adress even-tu-ella} @hyphenation{email-adress even-tu-ella}
@hyphenation{emacs-lisp-biblioteket} @hyphenation{emacs-lisp-biblioteket}
@hypgenation{emacs-lisp-program} @hyphenation{emacs-lisp-program}
@hyphenation{förut-sätt-ningar} @hyphenation{förut-sätt-ningar}
@hyphenation{inlogg-ningarna} @hyphenation{inlogg-ningarna}
@hyphenation{klient-modell} @hyphenation{klient-modell}
...@@ -1491,7 +1491,7 @@ I n ...@@ -1491,7 +1491,7 @@ I n
olika möten beroende på om mötet är skrivskyddat eller kommentarsskyddat. olika möten beroende på om mötet är skrivskyddat eller kommentarsskyddat.
@end table @end table
@node Meddelande, Prioritera, Ändra mötesuppgifter, Kommandon @node Meddelande, Filtrera, Ändra mötesuppgifter, Kommandon
@comment node-name, next, previous, up @comment node-name, next, previous, up
@subsection Meddelande @subsection Meddelande
...@@ -1571,10 +1571,10 @@ Radera den rad mark ...@@ -1571,10 +1571,10 @@ Radera den rad mark
@item @kbd{D, M-d} @item @kbd{D, M-d}
Radera det filter markören står i. Radera det filter markören står i.
@item @kbd{i} @item @kbd{i, I}
Lägg till en rad i ett filter. Frågar efter filterfunktion. Lägg till en rad i ett filter. Frågar efter filterfunktion.
@item @kbd{I, M-i} @item @kbd{M-i}
Lägg till ett filter. Frågar efter filtertyp och tidsbegränsning. Lägg till ett filter. Frågar efter filtertyp och tidsbegränsning.
@item @kbd{a} @item @kbd{a}
...@@ -2123,7 +2123,7 @@ funktionen. En knapp skapas p ...@@ -2123,7 +2123,7 @@ funktionen. En knapp skapas p
REGEXP innehåller en @code{\(\)}-konstruktion, den text som matchas av REGEXP innehåller en @code{\(\)}-konstruktion, den text som matchas av
den första sådana konstruktionen. den första sådana konstruktionen.
@item{kom-mosaic-command} @item @code{kom-mosaic-command}
@itemx @code{"/usr/local/bin/mosaic"} (@code{elisp}) @itemx @code{"/usr/local/bin/mosaic"} (@code{elisp})
@vindex kom-mosaic-command @vindex kom-mosaic-command
Variabeln anger var mosaic finns. Variabeln anger var mosaic finns.
......
No preview for this file type
...@@ -628,8 +628,7 @@ to be read, give the priority as a prefix argument. ...@@ -628,8 +628,7 @@ to be read, give the priority as a prefix argument.
When a text is received the new text is displayed." When a text is received the new text is displayed."
(interactive "P") (interactive "P")
(lyskom-start-of-command 'kom-busy-wait) (lyskom-start-of-command 'kom-busy-wait)
(if (not (read-list-isempty lyskom-reading-list)) (unwind-protect
(set-read-list-empty lyskom-reading-list))
(let ((waitfor (or (cond (let ((waitfor (or (cond
((integerp arg) arg) ((integerp arg) arg)
((listp arg) (car arg))) ((listp arg) (car arg)))
...@@ -637,6 +636,8 @@ When a text is received the new text is displayed." ...@@ -637,6 +636,8 @@ When a text is received the new text is displayed."
(read-list->first lyskom-to-do-list)) (read-list->first lyskom-to-do-list))
-2))) -2)))
(lyskom-tell-server kom-mercial) (lyskom-tell-server kom-mercial)
(if (not (read-list-isempty lyskom-reading-list))
(set-read-list-empty lyskom-reading-list))
(if (= waitfor -2) (if (= waitfor -2)
(lyskom-insert-string 'waiting-for-anything) (lyskom-insert-string 'waiting-for-anything)
(lyskom-format-insert 'waiting-higher-than waitfor)) (lyskom-format-insert 'waiting-higher-than waitfor))
...@@ -648,7 +649,21 @@ When a text is received the new text is displayed." ...@@ -648,7 +649,21 @@ When a text is received the new text is displayed."
(read-info->priority (read-info->priority
(read-list->first lyskom-to-do-list)) (read-list->first lyskom-to-do-list))
257) 257)
waitfor)))) waitfor))
(while lyskom-is-waiting
;; This is a bit trial-and-error stuff at the momemt.
;; o How to make personal messages appear *fast*
;; o How to enable C-g with a quick response
(accept-process-output nil 1)
(sit-for 0)
(if lyskom-quit-flag
(signal 'quit nil))))
(lyskom-end-of-command))
;; We are done waiting
(ding)
(if (read-list-isempty lyskom-reading-list)
(kom-go-to-next-conf))
(kom-next-command))
...@@ -1298,8 +1313,8 @@ membership info." ...@@ -1298,8 +1313,8 @@ membership info."
(interactive) (interactive)
(let ((session-name (buffer-name (current-buffer))) (let ((session-name (buffer-name (current-buffer)))
(buffer (current-buffer))) (buffer (current-buffer)))
(if lyskom-debug-communications-to-buffer ;;; (if lyskom-debug-communications-to-buffer
(bury-buffer lyskom-debug-communications-to-buffer)) ;;; (bury-buffer lyskom-debug-communications-to-buffer-buffer))
(if lyskom-who-info-buffer (if lyskom-who-info-buffer
(bury-buffer lyskom-who-info-buffer)) (bury-buffer lyskom-who-info-buffer))
(bury-buffer) (bury-buffer)
......
...@@ -692,7 +692,9 @@ Point must be located on the line where the subject is." ...@@ -692,7 +692,9 @@ Point must be located on the line where the subject is."
(initiate-get-text-stat 'background 'lyskom-mark-as-read (initiate-get-text-stat 'background 'lyskom-mark-as-read
text-no) text-no)
(lyskom-run 'background 'set 'lyskom-dont-change-prompt nil) (lyskom-run 'background 'set 'lyskom-dont-change-prompt nil)
(lyskom-run 'background 'lyskom-set-mode-line))) (lyskom-run 'background 'lyskom-set-mode-line))
(t
(setq lyskom-dont-change-prompt nil)))
(set-buffer edit-buffer) ;Need local variables. (set-buffer edit-buffer) ;Need local variables.
......
...@@ -357,15 +357,17 @@ with big strings." ...@@ -357,15 +357,17 @@ with big strings."
nil) nil)
(file-error (file-error
(if lyskom-debug-communications-to-buffer (if lyskom-debug-communications-to-buffer
(save-excursion (lyskom-debug-insert process "Error: " (format "%s" err))
(set-buffer (get-buffer-create ;;; (save-excursion
lyskom-debug-communications-to-buffer-buffer)) ;;; (set-buffer (get-buffer-create
(save-excursion ;;; lyskom-debug-communications-to-buffer-buffer))
(goto-char (point-max)) ;;; (save-excursion
(insert "\n" ;;; (goto-char (point-max))
(format "%s" process) ;;; (insert "\n"
(concat "Error: " (format "%s" err)))) ;;; (format "%s" process)
(set-buffer (process-buffer process)))) ;;; (concat "Error: " (format "%s" err))))
;;; (set-buffer (process-buffer process)))
)
(cond (cond
((and (string= "writing to process" (car (cdr err))) ((and (string= "writing to process" (car (cdr err)))
(or (string= "message too long" (car (cdr (cdr err)))) (or (string= "message too long" (car (cdr (cdr err))))
...@@ -401,15 +403,16 @@ is sent with each packet. If STRING is longer it is splitted." ...@@ -401,15 +403,16 @@ is sent with each packet. If STRING is longer it is splitted."
process process
(progn (progn
(if lyskom-debug-communications-to-buffer (if lyskom-debug-communications-to-buffer
(save-excursion (lyskom-debug-insert process ">>>>>> " string))
(set-buffer (get-buffer-create ;;; (save-excursion
lyskom-debug-communications-to-buffer-buffer)) ;;; (set-buffer (get-buffer-create
(save-excursion ;;; lyskom-debug-communications-to-buffer-buffer))
(goto-char (point-max)) ;;; (save-excursion
(insert "\n" ;;; (goto-char (point-max))
(format "%s" process) ;;; (insert "\n"
(concat ">>>>>> " string))) ;;; (format "%s" process)
(set-buffer (process-buffer process)))) ;;; (concat ">>>>>> " string)))
;;; (set-buffer (process-buffer process)))
string))) string)))
(t (t
(let ((i 0)) (let ((i 0))
......
No preview for this file type
...@@ -136,11 +136,13 @@ See lyskom-mode for details." ...@@ -136,11 +136,13 @@ See lyskom-mode for details."
(defun lyskom-connect-filter (proc output) (defun lyskom-connect-filter (proc output)
"Receive connection acknowledgement from server." "Receive connection acknowledgement from server."
(if lyskom-debug-communications-to-buffer (if lyskom-debug-communications-to-buffer
(save-excursion (lyskom-debug-insert proc "-----> " output)
(set-buffer ;;; (save-excursion
(get-buffer-create lyskom-debug-communications-to-buffer-buffer)) ;;; (set-buffer
(goto-char (point-max)) ;;; (get-buffer-create lyskom-debug-communications-to-buffer-buffer))
(insert "\n" (format "%s" proc) "-----> " output))) ;;; (goto-char (point-max))
;;; (insert "\n" (format "%s" proc) "-----> " output))
)
(cond (cond
((string-match "^LysKOM\n" output) ((string-match "^LysKOM\n" output)
(set-process-filter proc 'lyskom-filter)))) (set-process-filter proc 'lyskom-filter))))
...@@ -564,4 +566,5 @@ to see, set of call." ...@@ -564,4 +566,5 @@ to see, set of call."
(setq lyskom-do-when-done (cons kom-do-when-done kom-do-when-done)) (setq lyskom-do-when-done (cons kom-do-when-done kom-do-when-done))
(setq lyskom-output-queue (lyskom-queue-create)) (setq lyskom-output-queue (lyskom-queue-create))
(setq lyskom-list-of-edit-buffers nil) (setq lyskom-list-of-edit-buffers nil)
(setq lyskom-pending-calls nil)
(lyskom-set-mode-line (lyskom-get-string 'not-present-anywhere)))) (lyskom-set-mode-line (lyskom-get-string 'not-present-anywhere))))
...@@ -115,6 +115,9 @@ If the value is 'express then texts are allowed to break in the middle of a ...@@ -115,6 +115,9 @@ 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 comment chain. Otherwise we dont let them in until the end of the comment
tree.") tree.")
(defvar kom-after-load-hook nil
"Hook to run once after lyskom is loaded.")
(defvar kom-login-hook nil (defvar kom-login-hook nil
"*What to do when logged in. "*What to do when logged in.
This is a list of commands that are executed after we have logged in but before This is a list of commands that are executed after we have logged in but before
......
...@@ -55,6 +55,7 @@ lyskom-reading-list to read the comments to this." ...@@ -55,6 +55,7 @@ lyskom-reading-list to read the comments to this."
(todo nil)) (todo nil))
(cond ((eq filter 'skip-text) (lyskom-filter-prompt text-no 'filter-text) (cond ((eq filter 'skip-text) (lyskom-filter-prompt text-no 'filter-text)
(setq todo 'next-text) (setq todo 'next-text)
(lyskom-mark-as-read (blocking-do 'get-text-stat text-no))
'next-text) 'next-text)
((eq filter 'skip-tree) ((eq filter 'skip-tree)
(lyskom-filter-prompt text-no 'filter-tree) (lyskom-filter-prompt text-no 'filter-tree)
......
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