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

Bug fixes to review.el, minor fixes elsewhere

parent 870ede0c
Thu May 2 16:37:53 1996 David Byers <davby@sen2.ida.liu.se>
* swedish-strings.el,english-strings.el (lyskom-commands): Lade in
kom-review-all (lyskom-mode-map): Lade in kom-review-all p "}A" och
"a ". Bytte ut ttabitarstecken mot oktala koder.
* review.el (kom-review-first): Hantera prefixargument.
(lyskom-review-by-to): Anvnd strngen everything fr att skriva ut
"alla". (lyskom-get-texts-generic): Hantera terse alla.
(lyskom-get-texts-by): Hantera terse alla.
(lyskom-get-texts-by-and-to): Returnera rtt antal inlgg vid terse
frsta. (lyskom-get-texts-by-and-to): Hantera terse alla.
(kom-review-all): Lade till detta kommando.
* english-strings.el,english-strings.el (lyskom-strings): Lade till
everything som strng.
* review.el (kom-review-first): Hantera prefixargument.
Thu May 2 15:20:19 1996 David Kgedal <davidk@lysator.liu.se>
* view-text.el (lyskom-print-delayed-header-comm): Klarade inte av
......
......@@ -55,3 +55,8 @@ Allm
Å K - Återse den text som den föregående texten kommenterade
Återinför Olästa
Man skall få en lista av alternativ om man matar in ett namn som
har flera kompletteringar när man loggar in. Skall vi använda en
riktig completing-read vid inloggningen? Se inlägg 1375140
(markerat av David Byers) i LysKOM.
......@@ -1384,7 +1384,11 @@ If MARK-NO == 0, review all marked texts."
((nil 12 25 nil nil nil) . xmasday)
((nil 1 1 nil nil nil) . newyearday)
((nil 12 31 11 nil nil) . newyearevelate)
((nil 12 31 nil nil nil) . newyeareve)))
((nil 12 31 nil nil nil) . newyeareve)
((nil 4 30 nil nil nil) . cgdag)
((nil 6 6 nil nil nil) . sixjune)
((nil 8 15 nil nil nil) . holdnose)
))
......
......@@ -762,6 +762,7 @@ Error message: %#1s**************************************************")
(no-such-text . "The article doesn't exist.\n")
(no-such-text-m . "The article doesn't exist.")
(everybody . "everyone")
(everything . "everything")
(anybody . "anyone")
(forward . "forward")
(backward . "backward")
......@@ -913,6 +914,7 @@ Text:
(kom-review-next "Review next")
(kom-find-root "Review original (article)")
(kom-review-by-to "Review last")
(kom-review-all "Review all")
(kom-view-commented-text "Review (the) commented (article)")
(kom-view-previous-commented-text
"Review (the) previouls commented (article)")
......@@ -1126,6 +1128,8 @@ Cf. paragraph-start.")
(define-key lyskom-mode-map "ru" 'kom-review-noconversion)
(define-key lyskom-mode-map "ro" 'kom-find-root)
(define-key lyskom-mode-map "rl" 'kom-review-by-to)
(define-key lyskom-mode-map "rf" 'kom-review-first)
(define-key lyskom-mode-map "rA" 'kom-review-all)
(define-key lyskom-mode-map "rg" 'kom-review-last-normally-read)
(define-key lyskom-mode-map "B" 'kom-review-backward)
(define-key lyskom-mode-map "rs" 'kom-review-stack)
......@@ -1133,6 +1137,7 @@ Cf. paragraph-start.")
(define-key lyskom-mode-map "rr" 'kom-find-root-review)
(define-key lyskom-mode-map "rm" 'kom-review-marked-texts)
(define-key lyskom-mode-map "ram" 'kom-review-all-marked-texts)
(define-key lyskom-mode-map "ra " 'kom-review-all)
(define-key lyskom-mode-map "sc" 'kom-status-conf)
(define-key lyskom-mode-map "su" 'kom-status-person)
......
......@@ -497,16 +497,21 @@ the same as the entry above it, but to not move it."
(where 1)
(elem nil))
(if (not (eq default prio-from))
(setq tmp nil))
(if (and prio-from prio-to)
(progn
(while (<= where (length lyskom-prioritize-entry-list))
(setq elem (lyskom-prioritize-get-entry-from-no where))
(if (= (prioritize-entry->priority elem) prio-from)
(set-prioritize-entry->priority elem prio-to))
(progn
(set-prioritize-entry->priority elem prio-to)
(if (null tmp) (setq tmp elem))))
(setq where (1+ where)))
(lyskom-prioritize-sort-entries)
(lyskom-prioritize-redraw-buffer)
(kom-prioritize-goto-priority prio-to)))))
(lyskom-prioritize-goto-entry tmp)))))
(defun kom-prioritize-yank ()
......
......@@ -60,9 +60,15 @@ The order of the list a is kept."
;;; ================================================================
;;; ]terse av, till - Review by X to Conference Y.
;;; Author: Linus Tolke, David Kågedal, David Byers
;;; Author: David Byers, David Kågedal, Linus Tolke
(def-kom-command kom-review-all ()
"Review every articles of an author written to a conference."
(interactive)
(lyskom-tell-internat 'kom-tell-review)
(lyskom-review-by-to 0))
(def-kom-command kom-review-first (&optional count)
"Reviews all articles of author that is written to conference recipient.
......@@ -74,7 +80,7 @@ chosen. If the argument is positive then the first -COUNT articles are chosen.
If the argument is zero the all articles are chosen.
No argument is equivalent to COUNT 1.
The defaults for this command is the conference that you are in."
(interactive)
(interactive "P")
(lyskom-tell-internat 'kom-tell-review)
(lyskom-review-by-to (- (or count
(lyskom-read-number
......@@ -106,7 +112,7 @@ The defaults for this command is the conference that you are in."
(setq count (car count)))
(cond ((zerop count)
(setq count nil)
(lyskom-get-string 'everybody))
(lyskom-get-string 'everything))
((> count 0)
(lyskom-format 'latest-n count))
((< count 0)
......@@ -129,9 +135,6 @@ The defaults for this command is the conference that you are in."
lyskom-current-conf)))
t)))
;; Since we fetch everything anyway we don't need to do this. If
;; we later choose to fetch all in small chunks we will have to do
;; this then.
(if (not (zerop to))
(cache-del-conf-stat to))
(if (not (zerop by))
......@@ -250,10 +253,14 @@ Args: persno confno num"
(increment 30)
(plow (pers-stat->first-created-text persstat))
(phigh (1- (+ plow (pers-stat->no-of-created-texts persstat))))
(pmark (if (< num 0) plow phigh))
(pmark (if (and num (< num 0)) plow phigh))
(clow (conf-stat->first-local-no confstat))
(chigh (1- (+ clow (conf-stat->no-of-texts confstat))))
(cmark (if (< num 0) clow chigh)))
(cmark (if (and num (< num 0)) clow chigh)))
(if (null num)
(setq num (1+ phigh)))
(while (and (or (and (<= pmark phigh)
(>= pmark plow))
......@@ -282,6 +289,7 @@ Args: persno confno num"
cmark
(max 0 (- cmark (1- increment))))
increment))))))
;;
;; Add intersection between new TO and old BYs
;; to the results list.
......@@ -339,7 +347,7 @@ Args: persno confno num"
(if (> num 0)
(nthcdr (- (length result-list) num) result-list)
(nfirst (- (length result-list) (- num)) result-list))))
(nfirst (- num) result-list))))
;;; ===============================================================
......@@ -358,6 +366,8 @@ Args: persno confno num"
LOW is the lowest local text number and HIGH the highest in the
conference or person map. GET-OPERATION is the blocking-do operation
to use to get texts (get-map or get-created-texts)."
(if (null num)
(setq num (1+ high)))
(let* ((result nil)
(increment (abs num))
(mark (if (< num 0) low high)))
......@@ -398,6 +408,10 @@ Args: persno confno num"
(remaining num)
(result-list nil))
(if (null num)
(setq num (1+ phigh)
remaining (1+ phigh)))
;; +++
;; Get segments of the user's map until we have enough results
;; FIXME: The code in lyskom-get-texts-generic should be moved to
......
......@@ -331,11 +331,15 @@ du har l\344st klart allting. Kom tillbaks senare.
"Du har inga markerade inl\344gg med markeringen %#1d.\n")
(time-is . "Klockan \344r %4#1d-%02#2d-%02#3d %02#4d:%02#5d:%02#6d %#7s(enligt servern).")
(xmaseve . "\nJulafton! Har du ppnat dina julklappar n?")
(xmaseve . "\nJulafton! Har du \345ppnat dina julklappar \344n?")
(xmasday . "Juldagen.")
(newyearday . "Gott nytt %#1d!")
(newyearevelate . "Mindre n en timme kvar...")
(newyeareve . "Gott nytt r!")
(newyearevelate . "Mindre \344n en timme kvar...")
(newyeareve . "Gott nytt \345r!")
(cgdag . "Konungens fdelsedag")
(sixjune . "Sveriges nationaldag och svenska flaggans dag")
(holdnose . "Hll fr nsan...")
(total-users . " Sammanlagt %#1d anv\344ndare.\n")
(who-to-add-q . "Vilket m\366te/person vill du addera som mottagare? ")
......@@ -575,7 +579,7 @@ M\344rk kuvertet \"LysKOM buggrapport f\366r elispklienten\".\n\n")
(already-sent . "Du har redan skickat denna text en g\345ng. S\344nd \344nd\345? ")
(subject . "\304rende: ")
(subject-prefix . "[\304\344\\{\\[]")
(enter-subject-idi . "Skriv ett rende.")
(enter-subject-idi . "Skriv ett \344rende.")
(which-text-include . "Vilken text skall vi inkludera? ")
(added-recipient . "Mottagare som skall adderas: ")
(added-carbon-copy . "Extra kopia till m\366te: ")
......@@ -583,7 +587,7 @@ M\344rk kuvertet \"LysKOM buggrapport f\366r elispklienten\".\n\n")
(still-want-to-add . "Vill du fortfarande addera m\366tet? ")
(could-not-create-text . "\nTexten kunde ej skapas. Felet: %#2s.\n")
(no-get-text . "Du fick inte h\344mta texten.")
(unknown-header . "Oknd information p raden")
(unknown-header . "Ok\344nd information p\345 raden")
; From view-text.el:
(line . " /1 rad/ ")
......@@ -603,7 +607,7 @@ M\344rk kuvertet \"LysKOM buggrapport f\366r elispklienten\".\n\n")
(today-time-format-string . "%#6s %02#4d:%02#5d")
(yesterday-time-format-string . "%#6s %02#4d:%02#5d")
(today . "idag")
(yesterday . "igr")
(yesterday . "ig\345r")
; used by lyskom-return-time
(time-yyyy-mm-dd-hh-mm . "%4#1d-%02#2d-%02#3d %02#4d:%02#5d")
(no-such-text-no . "Det finns ingen s\345dan text. (%#1n)\n")
......@@ -676,7 +680,7 @@ Gruppmeddelande till %#3M fr\345n %#2P (%#4s):
; From prioritize.el:
(cant-move-nothing-nowhere . "Kan inte flytta ingenting ngonstans.")
(cant-move-nothing-nowhere . "Kan inte flytta ingenting n\345gonstans.")
(priority-prompt . "Ny prioritet: ")
(beginning-of-list . "B\366rjan av listan")
(end-of-list . "Slutet av listan")
......@@ -688,7 +692,7 @@ Gruppmeddelande till %#3M fr\345n %#2P (%#4s):
(cannot-get-membership . "Kan ej h\344mta medlemsskap f\366r dig.")
(cannot-get-pers-stat . "Kan ej h\344mta personstatus f\366r dig.")
(prioritize-help .
"u,n Flytta mte, SPC markera, p prioritera markerade, q avsluta, C-h m hjlp")
"u,n Flytta m\345te, SPC markera, p prioritera markerade, q avsluta, C-h m hj\344lp")
(your-priorities . " Prioritet M\366tesnamn
----------------------------------------------------------------------------
")
......@@ -710,7 +714,7 @@ Gruppmeddelande till %#3M fr\345n %#2P (%#4s):
(could-not-set-user-area . "Kunde ej st\344lla om user-arean. Servern s\344ger felmeddelande: %#1d\n")
(you-dont-exist . "Du finns inte.\n")
(error-in-options . "Det fanns ett fel i en av dina variabler (%#1s)
Det stod \"%#2s\" i user-arean. Den stts till nil istllet.
Det stod \"%#2s\" i user-arean. Den s\344tts till nil ist\344llet.
Skicka en bugrapport.\n")
; From elib-string.el:
......@@ -783,6 +787,7 @@ Felmeddelande: %#1s**************************************************")
(no-such-text . "Det finns inget s\345dant inl\344gg.\n")
(no-such-text-m . "Det finns inget s\345dant inl\344gg.")
(everybody . "alla")
(everything . "allt")
(anybody . "vem som helst")
(forward . "fram\345t")
(backward . "bak\345t")
......@@ -812,7 +817,7 @@ Felmeddelande: %#1s**************************************************")
(filter-in-conf . "I vilket m\366te (Alla)? ")
(filter-subject . "Filtrera vilket \344rende? ")
(filter-which-text . "Filtrera inl\344gg som inneh\345ller: ")
(filter-author . "Filtrera vilken frfattare? ")
(filter-author . "Filtrera vilken f\345rfattare? ")
(permanent . "(permanent)")
(temporary . "(tillf\344llig)")
(filter-edit-buffer-name . "*LysKOM Filter Edit*")
......@@ -877,7 +882,7 @@ Text:
(remote-unknown-error . "Ok\344nt fel")
(remote-control-who . "Kontrollera vilken session? ")
(remote-control-autoreply . "Automatsvar p eller av? ")
(remote-control-autoreply . "Automatsvar p\345 eller av? ")
(state-on . "p\345slaget")
(state-off . "avslaget")
......@@ -937,6 +942,7 @@ Text:
(kom-find-root "\305terse urinl\344gget")
(kom-review-by-to "\305terse senaste")
(kom-review-first "\305terse f\366rsta")
(kom-review-all "\305terse alla")
(kom-view-commented-text "\305terse det kommenterade")
(kom-view-previous-commented-text
"\305terse det f\366reg\345ende kommenterade")
......@@ -1015,7 +1021,7 @@ Text:
"The swascii-versions of lyskom-commands.")
(defvar lyskom-onoff-table
'(("p" . on) ("av" . off))
'(("p\345" . on) ("av" . off))
"A completion table for on and off selections.")
(defvar lyskom-filter-predicate-list
......@@ -1046,7 +1052,7 @@ Text:
(defvar lyskom-swascii-filter-what nil
"The swascii version of lyskom-filter-what")
(defvar lyskom-text-start "[0-9]+ +\\(199[0-9]-[0-1][0-9]-[0-3][0-9]\\|idag\\|igr\\) +[0-2][0-9]:[0-5][0-9] +/[0-9]+ rad\\(er\\)?/ "
(defvar lyskom-text-start "[0-9]+ +\\(199[0-9]-[0-1][0-9]-[0-3][0-9]\\|idag\\|ig\345r\\) +[0-2][0-9]:[0-5][0-9] +/[0-9]+ rad\\(er\\)?/ "
"Regexp matching beginning of a text in lyskom buffer.
Cf. paragraph-start.")
......@@ -1189,13 +1195,15 @@ Cf. paragraph-start.")
(define-key lyskom-mode-map "}r" 'kom-find-root)
(define-key lyskom-mode-map "}u" 'kom-find-root)
(define-key lyskom-mode-map "}s" 'kom-review-by-to)
(define-key lyskom-mode-map "}A" 'kom-review-all)
(define-key lyskom-mode-map "}f" 'kom-review-first)
(define-key lyskom-mode-map "B" 'kom-review-backward)
(define-key lyskom-mode-map "}l" 'kom-review-stack)
(define-key lyskom-mode-map "}p" 'kom-review-presentation)
(define-key lyskom-mode-map "}t" 'kom-find-root-review)
(define-key lyskom-mode-map "}m" 'kom-review-marked-texts)
(define-key lyskom-mode-map "}am" 'kom-review-all-marked-texts)
(define-key lyskom-mode-map "}a " 'kom-review-all)
(define-key lyskom-mode-map "B" 'kom-review-backward)
(define-key lyskom-mode-map "sm" 'kom-status-conf)
(define-key lyskom-mode-map "sp" 'kom-status-person)
......@@ -1326,7 +1334,7 @@ Cf. paragraph-start.")
;;;; right.
(defvar kom-ansaphone-default-reply
"Jag l\344ser inte LysKOM just nu. Skicka grna ett brev i stllet."
"Jag l\344ser inte LysKOM just nu. Skicka g\344rna ett brev i st\344llet."
"*Default message to send when the ansaphone is on.
This variable is stored in the LysKOM server.")
......@@ -1342,9 +1350,9 @@ This variable is stored in the LysKOM server.")
'((text
text-text
lyskom-button-view-text
(("terse texten" . lyskom-button-view-text)
("terse trd" . lyskom-button-review-tree)
("terse urinlgget" . lyskom-button-find-root)
(("\305terse texten" . lyskom-button-view-text)
("\305terse tr\344d" . lyskom-button-review-tree)
("\305terse urinl\344gget" . lyskom-button-find-root)
("Kommentera texten" . lyskom-button-comment-text)
("Personligt svar" . lyskom-button-private-comment-text)
("Markera texten" . lyskom-button-mark-text)
......@@ -1356,11 +1364,11 @@ This variable is stored in the LysKOM server.")
conf-text
lyskom-button-view-conf-presentation
(("Visa presentation" . lyskom-button-view-conf-presentation)
("Visa mtesstatus" . lyskom-button-view-conf-status)
("G till mtet" . lyskom-button-goto-conf)
("Visa m\345tesstatus" . lyskom-button-view-conf-status)
("G\345 till m\345tet" . lyskom-button-goto-conf)
("Skicka gruppmeddelande" . lyskom-button-send-message)
("Bli medlem i mtet" . lyskom-button-add-self)
("Uttrd ur mtet" . lyskom-button-sub-self))
("Bli medlem i m\345tet" . lyskom-button-add-self)
("Uttr\344d ur m\345tet" . lyskom-button-sub-self))
((kom-list-news . lyskom-button-goto-conf)))
(pers
pers-text
......@@ -1369,12 +1377,12 @@ This variable is stored in the LysKOM server.")
lyskom-button-view-pers-presentation)
("Visa personstatus" . lyskom-button-view-pers-status)
("Skicka brev" . lyskom-button-mail)
("Snd meddelande" . lyskom-button-send-message))
("S\344nd meddelande" . lyskom-button-send-message))
nil)
(url
url-text
lyskom-button-open-url
(("ppna" . lyskom-button-open-url)
(("\326ppna" . lyskom-button-open-url)
("Kopiera" . lyskom-button-copy-url))
nil))
......
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