Commit 88f9cfd0 authored by David Byers's avatar David Byers
Browse files

> 2002-12-13 David Byers <david.byers@swipnet.se>

>
> 	* lyskom-rest.el (lyskom-update-prompt): Change `insert-string' to
> 	`insert' since the former is obsolete.
>
> 	Bog 928:
> 	* commands1.el (lyskom-times): Added Lucia.
>
> 	Finished bug 924:
> 	* option-edit.el (lyskom-nameday-widget): New widget type.
>
> 	* vars.el.in (kom-url-transformation-rules): Improved the
> 	Aftonbladet regexp.
>
> 2002-12-11  David Byers  <david.byers@swipnet.se>
>
> 	* swedish-strings.el (lyskom-sv-mode-map): Define swedish chars
> 	using all possible methods.
>
> 	* macros.el (lyskom-try-define-key): New macro.
>
parent 5eb1e2b5
2002-12-13 David Byers <david.byers@swipnet.se>
* lyskom-rest.el (lyskom-update-prompt): Change `insert-string' to
`insert' since the former is obsolete.
Bog 928:
* commands1.el (lyskom-times): Added Lucia.
Finished bug 924:
* option-edit.el (lyskom-nameday-widget): New widget type.
* vars.el.in (kom-url-transformation-rules): Improved the
Aftonbladet regexp.
2002-12-11 David Byers <david.byers@swipnet.se>
* swedish-strings.el (lyskom-sv-mode-map): Define swedish chars
using all possible methods.
* macros.el (lyskom-try-define-key): New macro.
2002-12-09 David Byers <david.byers@swipnet.se> 2002-12-09 David Byers <david.byers@swipnet.se>
Work on bug 924: Work on bug 924:
......
...@@ -551,7 +551,7 @@ If optional USE-PRIORITY is non-nil then use that as the priority. ...@@ -551,7 +551,7 @@ If optional USE-PRIORITY is non-nil then use that as the priority.
(let ((priority (let ((priority
(if (/= lyskom-pers-no (conf-stat->conf-no pers-conf-stat)) (if (/= lyskom-pers-no (conf-stat->conf-no pers-conf-stat))
(lyskom-read-num-range 0 255 (lyskom-read-num-range 0 255
(lyskom-get-string 'priority-q) (lyskom-get-string 'other-priority-q)
nil 100) nil 100)
(if (and (numberp kom-membership-default-priority) (if (and (numberp kom-membership-default-priority)
(< kom-membership-default-priority 256) (< kom-membership-default-priority 256)
...@@ -2276,6 +2276,7 @@ If MARK-NO is nil, review all marked texts." ...@@ -2276,6 +2276,7 @@ If MARK-NO is nil, review all marked texts."
((nil 8 15 nil nil nil) . holdnose) ((nil 8 15 nil nil nil) . holdnose)
((nil 10 24 nil nil nil) . fnday) ((nil 10 24 nil nil nil) . fnday)
((nil 11 1 nil nil nil) . allhelgonadag) ((nil 11 1 nil nil nil) . allhelgonadag)
((nil 12 13 nil nil nil) . luciaday)
((nil 12 24 nil nil nil) . xmaseve) ((nil 12 24 nil nil nil) . xmaseve)
((nil 12 25 nil nil nil) . xmasday) ((nil 12 25 nil nil nil) . xmasday)
((nil 12 28 nil nil nil) . varnlosdag) ((nil 12 28 nil nil nil) . varnlosdag)
......
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
(lyskom-language-missing-string lyskom-message fnday en) (lyskom-language-missing-string lyskom-message fnday en)
(lyskom-language-missing-string lyskom-message allhelgonadag en) (lyskom-language-missing-string lyskom-message allhelgonadag en)
(lyskom-language-missing-string lyskom-message varnlosdag en) (lyskom-language-missing-string lyskom-message varnlosdag en)
(lyskom-language-missing-string lyskom-message luciaday en)
(lyskom-language-ending-mismatch lyskom-message carbon-copy-prefix en sv) (lyskom-language-ending-mismatch lyskom-message carbon-copy-prefix en sv)
(lyskom-language-ending-mismatch lyskom-message blank-carbon-copy-prefix en sv) (lyskom-language-ending-mismatch lyskom-message blank-carbon-copy-prefix en sv)
...@@ -304,6 +305,7 @@ instead of removing it.") ...@@ -304,6 +305,7 @@ instead of removing it.")
(where-to-add . "To which conference? ") (where-to-add . "To which conference? ")
(where-to-add-self . "Join which conference? ") (where-to-add-self . "Join which conference? ")
(priority-q . "Priority of your membership? (0 (low) - 255 (high)) ") (priority-q . "Priority of your membership? (0 (low) - 255 (high)) ")
(other-priority-q . "Priority of the membership? (0 (low) - 255 (high)) ")
(done . "done.\n") (done . "done.\n")
(cancelled . "cancelled.\n") (cancelled . "cancelled.\n")
(nope . "didn't work.\n") (nope . "didn't work.\n")
...@@ -2743,6 +2745,10 @@ Select whether to execute command or keyboard macro.") ...@@ -2743,6 +2745,10 @@ Select whether to execute command or keyboard macro.")
(url-transform-regexp . "From (regexp):") (url-transform-regexp . "From (regexp):")
(url-transform-newtext . " To:") (url-transform-newtext . " To:")
(default-namedays . "Namedays for current language")
(specific-namedays . "Specific name list:")
;; ;;
;; Misc doc strings ;; Misc doc strings
;; ;;
...@@ -3403,8 +3409,9 @@ be saved in the server. Otherwise it will be saved in your .emacs.") ...@@ -3403,8 +3409,9 @@ be saved in the server. Otherwise it will be saved in your .emacs.")
instead.") instead.")
(kom-show-namedays-doc . "\ (kom-show-namedays-doc . "\
This only works in Swedish. If you're running LysKOM in Swedish, turning When this is on, display the name of the day. You can choose to display
this on causes today's names to be shown when you ask for the time.") names from a list appropriate to the currently selected language. You
can also choose a specific list of names.")
(kom-show-week-number-doc . "\ (kom-show-week-number-doc . "\
The Time command shows week numbers if this is on.") The Time command shows week numbers if this is on.")
......
...@@ -2852,7 +2852,7 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing." ...@@ -2852,7 +2852,7 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing."
(add-text-properties 0 (length prompt-text) (add-text-properties 0 (length prompt-text)
'(read-only t rear-nonsticky t) '(read-only t rear-nonsticky t)
prompt-text)) prompt-text))
(insert-string prompt-text) (insert prompt-text)
;; Delete the old prompt ;; Delete the old prompt
(when lyskom-current-prompt (when lyskom-current-prompt
(if (and lyskom-slow-mode (if (and lyskom-slow-mode
......
...@@ -257,6 +257,11 @@ the current buffer, and its value is copied from the LysKOM buffer." ...@@ -257,6 +257,11 @@ the current buffer, and its value is copied from the LysKOM buffer."
(lyskom-default-value (quote (, keymap)))) (lyskom-default-value (quote (, keymap))))
(use-local-map (, keymap))))) (use-local-map (, keymap)))))
(defmacro lyskom-try-define-key (map seq fn)
`(condition-case nil
(define-key ,map ,seq ,fn)
(error nil)))
;;; ============================================================ ;;; ============================================================
;;; Widget gunk ;;; Widget gunk
......
...@@ -77,7 +77,8 @@ DATA is nameday data" ...@@ -77,7 +77,8 @@ DATA is nameday data"
(lyskom-define-namedays 'sv (lyskom-define-namedays 'sv
"Sverige" "Sverige"
"Namnsdagar ur svenska sprknmndens nya namnlngd." "\
Namnsdagar enligt svenska sprknmndens nya namnlngd."
'((1 . ((1 . ()) '((1 . ((1 . ())
(2 . ("Svea")) (2 . ("Svea"))
(3 . ("Alfred" "Alfrida")) (3 . ("Alfred" "Alfrida"))
...@@ -455,9 +456,11 @@ DATA is nameday data" ...@@ -455,9 +456,11 @@ DATA is nameday data"
(30 . ("Abel" "Set")) (30 . ("Abel" "Set"))
(31 . ("Sylvester")))))) (31 . ("Sylvester"))))))
(lyskom-define-namedays 'sv_1901 (lyskom-define-namedays 'sv-1901
"Sverge (fre 1901)" "Sverige (fre 1901)"
"Svenska namnlngden fr 1901" "\
Namnsdagar enligt namnlngd frn fre 1901, med uppenbara helgdagar
borttagna"
'((1 . ((1 . ()) '((1 . ((1 . ())
(2 . ("Abel" "Set")) (2 . ("Abel" "Set"))
(3 . ("Enoch")) (3 . ("Enoch"))
...@@ -848,8 +851,12 @@ DATA is nameday data" ...@@ -848,8 +851,12 @@ DATA is nameday data"
)))) ))))
(lyskom-define-namedays 'fi (lyskom-define-namedays 'fi
"Suomi" "Finska"
"Finska namnsdagar" "\
Namnsdagar ur ngon finsk namnlngd. Eftersom utvecklarna inte
kan finska r beskrivningen p svenska, med frhoppningen att
ngon som kan finska kommer att reta sig p den och skriva om
texten p rtt sprk."
'((1 . ((1 . ()) '((1 . ((1 . ())
(2 . ("Aapeli")) (2 . ("Aapeli"))
(3 . ("Elmeri" "Elmer" "Elmo")) (3 . ("Elmeri" "Elmer" "Elmo"))
...@@ -1239,9 +1246,10 @@ DATA is nameday data" ...@@ -1239,9 +1246,10 @@ DATA is nameday data"
(31 . ("Sylvester" "Silvo")) (31 . ("Sylvester" "Silvo"))
)))) ))))
(lyskom-define-namedays 'fi_sv (lyskom-define-namedays 'fi-sv
"Finlandssvenska" "Finlandssvenska"
"Finlandssvenska namnsdagar" "\
Namnsdagar enligt ngon finlandssvenskt namnlngd."
'((1 . ((1 . ()) '((1 . ((1 . ())
(2 . ("Gehard" "Gert")) (2 . ("Gehard" "Gert"))
(3 . ("Elmer" "Helmer")) (3 . ("Elmer" "Helmer"))
...@@ -1631,9 +1639,13 @@ DATA is nameday data" ...@@ -1631,9 +1639,13 @@ DATA is nameday data"
(31 . ("Sylvester")) (31 . ("Sylvester"))
)))) ))))
(lyskom-define-namedays 'fi_orthodox (lyskom-define-namedays 'fi-orthodox
"Suomi (ortodox)" "Finska (ortodoxa)"
"Ortodoxa namnsdagar frn finland" "\
Namnsdagar ur ngon finsk ortodox namnlngd. Eftersom
utvecklarna inte kan finska r beskrivningen p svenska, med
frhoppningen att ngon som kan finska kommer att reta sig
p den och skriva om texten p rtt sprk."
'((1 . ((1 . ("Vasili" "Vilho" "Pasi")) '((1 . ((1 . ("Vasili" "Vilho" "Pasi"))
(2 . ("Sylvester" "Tapio" "Serafim")) (2 . ("Sylvester" "Tapio" "Serafim"))
(3 . ("Malakia" "Harto")) (3 . ("Malakia" "Harto"))
...@@ -2025,7 +2037,7 @@ DATA is nameday data" ...@@ -2025,7 +2037,7 @@ DATA is nameday data"
(defun lyskom-list-nameday-lists () (defun kom-list-nameday-lists ()
(interactive) (interactive)
(with-output-to-temp-buffer "*Help*" (with-output-to-temp-buffer "*Help*"
(princ (princ
......
...@@ -661,7 +661,9 @@ customize buffer but do not save them to the server." ...@@ -661,7 +661,9 @@ customize buffer but do not save them to the server."
:indent 4)) :indent 4))
(kom-self-control (toggle (yes no))) (kom-self-control (toggle (yes no)))
(kom-ispell-dictionary (ispell-dictionary)) (kom-ispell-dictionary (ispell-dictionary))
(kom-show-namedays (toggle (on off))) (kom-show-namedays (choice ((const (off nil))
(const (default-namedays t))
(nameday nil :tag specific-namedays))))
(kom-show-week-number (toggle (on off))) (kom-show-week-number (toggle (on off)))
(kom-membership-default-placement (choice ((const (last last)) (kom-membership-default-placement (choice ((const (last last))
...@@ -741,6 +743,7 @@ customize buffer but do not save them to the server." ...@@ -741,6 +743,7 @@ customize buffer but do not save them to the server."
(const . lyskom-item-widget) (const . lyskom-item-widget)
(repeat . lyskom-repeat-widget) (repeat . lyskom-repeat-widget)
(cons . lyskom-cons-widget) (cons . lyskom-cons-widget)
(nameday . lyskom-nameday-widget)
(kbd-macro . lyskom-kbd-macro-widget) (kbd-macro . lyskom-kbd-macro-widget)
(url-viewer . lyskom-url-viewer-widget) (url-viewer . lyskom-url-viewer-widget)
(ispell-dictionary . lyskom-ispell-dictionary-widget) (ispell-dictionary . lyskom-ispell-dictionary-widget)
...@@ -918,6 +921,21 @@ customize buffer but do not save them to the server." ...@@ -918,6 +921,21 @@ customize buffer but do not save them to the server."
lyskom-languages)) lyskom-languages))
propl)) propl))
(defun lyskom-nameday-widget (type &optional args propl)
(lyskom-build-simple-widget-spec
'menu-choice
(list ':format "%[%t%] %v"
':case-fold t
':args
(mapcar
(lambda (x)
(list 'item
':tag (nameday-data->name (cdr x))
':format "%t"
':value (nameday-data->code (cdr x))))
lyskom-namedays))
propl))
(defun lyskom-ispell-dictionary-widget (type &optional args propl) (defun lyskom-ispell-dictionary-widget (type &optional args propl)
(let ((tmp-dictionary-alist nil)) (let ((tmp-dictionary-alist nil))
(condition-case nil (condition-case nil
......
...@@ -703,8 +703,8 @@ Put the requests on QUEUE." ...@@ -703,8 +703,8 @@ Put the requests on QUEUE."
(defun lyskom-prefetch-membership-handler (memberships pers-no queue) (defun lyskom-prefetch-membership-handler (memberships pers-no queue)
"Handle the return of the membership prefetch call." "Handle the return of the membership prefetch call."
(lyskom-stop-prefetch) (lyskom-stop-prefetch)
(let ((size (length memberships)) ;;; (let ((size (length memberships))
(i 0) ;;; (i 0)
;;; Commented out 1999-06-28 byers ;;; Commented out 1999-06-28 byers
;;; Used by removed code below ;;; Used by removed code below
;;; (old-mships (mapcar (lambda (mship) ;;; (old-mships (mapcar (lambda (mship)
...@@ -712,7 +712,7 @@ Put the requests on QUEUE." ...@@ -712,7 +712,7 @@ Put the requests on QUEUE."
;;; (membership->conf-no mship)) ;;; (membership->conf-no mship))
;;; (membership->conf-no mship))) ;;; (membership->conf-no mship)))
;;; memberships)) ;;; memberships))
) ;;; )
(lyskom-insert-memberships-in-membership memberships) (lyskom-insert-memberships-in-membership memberships)
;;; (while (< i size) ;;; (while (< i size)
;;; (let ((membership (aref memberships i))) ;;; (let ((membership (aref memberships i)))
...@@ -736,7 +736,8 @@ Put the requests on QUEUE." ...@@ -736,7 +736,8 @@ Put the requests on QUEUE."
(setq lyskom-membership-is-read (+ lyskom-membership-is-read (setq lyskom-membership-is-read (+ lyskom-membership-is-read
lyskom-fetch-membership-length)) lyskom-fetch-membership-length))
(lyskom-prefetch-membership pers-no queue) (lyskom-prefetch-membership pers-no queue)
)) )
;;;)
(lyskom-queue-enter queue 'FINISHED) (lyskom-queue-enter queue 'FINISHED)
(-- lyskom-pending-prefetch) (-- lyskom-pending-prefetch)
(lyskom-start-prefetch)) (lyskom-start-prefetch))
......
...@@ -85,10 +85,12 @@ ...@@ -85,10 +85,12 @@
(define-key lyskom-sv-edit-prefix (kbd "]") 'lyskom-sv-edit-review-prefix) (define-key lyskom-sv-edit-prefix (kbd "]") 'lyskom-sv-edit-review-prefix)
(define-key lyskom-sv-edit-prefix (kbd "C-]") 'lyskom-sv-edit-review-prefix) (define-key lyskom-sv-edit-prefix (kbd "C-]") 'lyskom-sv-edit-review-prefix)
(define-key lyskom-sv-edit-prefix (kbd "C-}") 'lyskom-sv-edit-review-prefix) (define-key lyskom-sv-edit-prefix (kbd "C-}") 'lyskom-sv-edit-review-prefix)
(define-key lyskom-sv-edit-prefix (lyskom-keys 'C-) 'lyskom-sv-edit-review-prefix) (define-key lyskom-sv-edit-prefix (lyskom-keys 'C-) 'lyskom-sv-edit-review-prefix)
(define-key lyskom-sv-edit-prefix (lyskom-keys 'C-) 'lyskom-sv-edit-review-prefix) (define-key lyskom-sv-edit-prefix (lyskom-keys 'C-) 'lyskom-sv-edit-review-prefix)
(define-key lyskom-sv-edit-prefix [(control )] 'lyskom-sv-edit-review-prefix) (define-key lyskom-sv-edit-prefix [(control )] 'lyskom-sv-edit-review-prefix)
(define-key lyskom-sv-edit-prefix [(control )] 'lyskom-sv-edit-review-prefix) (define-key lyskom-sv-edit-prefix [(control )] 'lyskom-sv-edit-review-prefix)
(define-key lyskom-sv-edit-prefix (kbd "*") 'kom-button-press) (define-key lyskom-sv-edit-prefix (kbd "*") 'kom-button-press)
(define-key lyskom-sv-edit-prefix (kbd "=") 'kom-menu-button-press) (define-key lyskom-sv-edit-prefix (kbd "=") 'kom-menu-button-press)
(define-key lyskom-sv-edit-prefix (kbd "C-i") 'lyskom-sv-edit-insert-prefix) (define-key lyskom-sv-edit-prefix (kbd "C-i") 'lyskom-sv-edit-insert-prefix)
...@@ -278,6 +280,7 @@ f ...@@ -278,6 +280,7 @@ f
(where-to-add . "Vilket mte skall han/hon adderas till? ") (where-to-add . "Vilket mte skall han/hon adderas till? ")
(where-to-add-self . "Vilket mte vill du bli medlem i? ") (where-to-add-self . "Vilket mte vill du bli medlem i? ")
(priority-q . "Prioritet p ditt medlemskap i mtet? (0 (lg) - 255 (hg)) ") (priority-q . "Prioritet p ditt medlemskap i mtet? (0 (lg) - 255 (hg)) ")
(other-priority-q . "Prioritet p den adderades medlemskap i mtet? (0 (lg) - 255 (hg)) ")
(done . "klart.\n") (done . "klart.\n")
(cancelled . "avbrutet.\n") (cancelled . "avbrutet.\n")
(nope . "det gick inte.\n") (nope . "det gick inte.\n")
...@@ -499,6 +502,7 @@ i svensk datorhistoria. L ...@@ -499,6 +502,7 @@ i svensk datorhistoria. L
(fnday . "FN-dagen.") (fnday . "FN-dagen.")
(allhelgonadag . "Allhelgonadagen.") (allhelgonadag . "Allhelgonadagen.")
(varnlosdag . "Vrnlsa barns dag.") (varnlosdag . "Vrnlsa barns dag.")
(luciaday . "\nLuciadagen! Glm inte att lussa fr dina kollegor.")
(total-users . " Sammanlagt %#1d anvndare (%#2s).\n") (total-users . " Sammanlagt %#1d anvndare (%#2s).\n")
(total-users-sans-date . " Sammanlagt %#1d anvndare\n") (total-users-sans-date . " Sammanlagt %#1d anvndare\n")
...@@ -2281,6 +2285,8 @@ teckenkodning. ...@@ -2281,6 +2285,8 @@ teckenkodning.
(defvar lyskom-sv-list-prefix nil) (defvar lyskom-sv-list-prefix nil)
(defvar lyskom-sv-fast-reply-prefix nil) (defvar lyskom-sv-fast-reply-prefix nil)
(defvar lyskom-sv-filter-get-prefix nil) (defvar lyskom-sv-filter-get-prefix nil)
(defvar lyskom-sv-change-prefix nil)
(defvar lyskom-sv-review-prefix nil)
(if lyskom-sv-mode-map (if lyskom-sv-mode-map
nil nil
...@@ -2301,14 +2307,30 @@ teckenkodning. ...@@ -2301,14 +2307,30 @@ teckenkodning.
(define-key lyskom-sv-mode-map (kbd "s") 'lyskom-sv-S-prefix) (define-key lyskom-sv-mode-map (kbd "s") 'lyskom-sv-S-prefix)
(define-key lyskom-sv-mode-map (kbd "r") 'lyskom-sv-fast-reply-prefix) (define-key lyskom-sv-mode-map (kbd "r") 'lyskom-sv-fast-reply-prefix)
(define-key lyskom-sv-mode-map (kbd "v") 'lyskom-sv-who-prefix) (define-key lyskom-sv-mode-map (kbd "v") 'lyskom-sv-who-prefix)
(define-key lyskom-sv-mode-map (lyskom-keys ') 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map (lyskom-keys ') 'lyskom-sv-change-prefix) (lyskom-try-define-key lyskom-sv-mode-map (kbd "") 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map (lyskom-keys ') 'lyskom-sv-review-prefix) (lyskom-try-define-key lyskom-sv-mode-map (kbd "{") 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map (lyskom-keys ') 'lyskom-sv-review-prefix) (lyskom-try-define-key lyskom-sv-mode-map (kbd "[") 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map [] 'lyskom-sv-change-prefix) (lyskom-try-define-key lyskom-sv-mode-map [adiaeresis] 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map [] 'lyskom-sv-change-prefix) (lyskom-try-define-key lyskom-sv-mode-map [Adiaeresis] 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map [] 'lyskom-sv-review-prefix) (lyskom-try-define-key lyskom-sv-mode-map [228] 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map [] 'lyskom-sv-review-prefix) (lyskom-try-define-key lyskom-sv-mode-map [196] 'lyskom-sv-change-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [2276] 'lyskom-sv-change-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [2244] 'lyskom-sv-change-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [3908] 'lyskom-sv-change-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [3940] 'lyskom-sv-change-prefix)
(lyskom-try-define-key lyskom-sv-mode-map (kbd "") 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map (kbd "}") 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map (kbd "]") 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [aring] 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [Aring] 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [229] 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [197] 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [2277] 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [2245] 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [3909] 'lyskom-sv-review-prefix)
(lyskom-try-define-key lyskom-sv-mode-map [3941] 'lyskom-sv-review-prefix)
(define-key lyskom-sv-mode-map (kbd "M-m") 'kom-toggle-mark-as-read-prefix) (define-key lyskom-sv-mode-map (kbd "M-m") 'kom-toggle-mark-as-read-prefix)
...@@ -2324,12 +2346,6 @@ teckenkodning. ...@@ -2324,12 +2346,6 @@ teckenkodning.
(define-key lyskom-sv-mode-map (kbd "C-i") 'kom-next-link) (define-key lyskom-sv-mode-map (kbd "C-i") 'kom-next-link)
(define-key lyskom-sv-mode-map (kbd "M-C-i") 'kom-previous-link) (define-key lyskom-sv-mode-map (kbd "M-C-i") 'kom-previous-link)
(define-key lyskom-sv-mode-map (kbd "{") 'lyskom-sv-change-prefix) ; krullar
(define-key lyskom-sv-mode-map (kbd "[") 'lyskom-sv-change-prefix)
(define-key lyskom-sv-mode-map (kbd "}") 'lyskom-sv-review-prefix)
(define-key lyskom-sv-mode-map (kbd "]") 'lyskom-sv-review-prefix)
;;(define-key lyskom-sv-mode-map "vi" 'vilka) ;;(define-key lyskom-sv-mode-map "vi" 'vilka)
;; These should be first in order to be last in the menu of alternatives. ;; These should be first in order to be last in the menu of alternatives.
...@@ -2370,12 +2386,19 @@ teckenkodning. ...@@ -2370,12 +2386,19 @@ teckenkodning.
(define-key lyskom-sv-mode-map (kbd "l p") 'kom-list-persons) (define-key lyskom-sv-mode-map (kbd "l p") 'kom-list-persons)
(define-key lyskom-sv-mode-map (kbd "l r") 'kom-list-re) (define-key lyskom-sv-mode-map (kbd "l r") 'kom-list-re)
(define-key lyskom-sv-mode-map (kbd "l s") 'kom-membership) (define-key lyskom-sv-mode-map (kbd "l s") 'kom-membership)
(define-key lyskom-sv-list-prefix (lyskom-keys ') 'kom-list-summary)
(define-key lyskom-sv-list-prefix (lyskom-keys ') 'kom-list-summary) (lyskom-try-define-key lyskom-sv-list-prefix (kbd "") 'kom-list-summary)
(define-key lyskom-sv-list-prefix [] 'kom-list-summary) (lyskom-try-define-key lyskom-sv-list-prefix (kbd "{") 'kom-list-summary)
(define-key lyskom-sv-list-prefix [] 'kom-list-summary) (lyskom-try-define-key lyskom-sv-list-prefix (kbd "[") 'kom-list-summary)
(define-key lyskom-sv-mode-map (kbd "l {") 'kom-list-summary) (lyskom-try-define-key lyskom-sv-list-prefix [adiaeresis] 'kom-list-summary)
(define-key lyskom-sv-mode-map (kbd "l [") 'kom-list-summary) (lyskom-try-define-key lyskom-sv-list-prefix [Adiaeresis] 'kom-list-summary)
(lyskom-try-define-key lyskom-sv-list-prefix [228] 'kom-list-summary)
(lyskom-try-define-key lyskom-sv-list-prefix [196] 'kom-list-summary)
(lyskom-try-define-key lyskom-sv-list-prefix [2276] 'kom-list-summary)
(lyskom-try-define-key lyskom-sv-list-prefix [2244] 'kom-list-summary)
(lyskom-try-define-key lyskom-sv-list-prefix [3908] 'kom-list-summary)
(lyskom-try-define-key lyskom-sv-list-prefix [3940] 'kom-list-summary)
(define-key lyskom-sv-mode-map (kbd "l f") 'kom-list-filters) (define-key lyskom-sv-mode-map (kbd "l f") 'kom-list-filters)
(define-key lyskom-sv-mode-map (kbd "m") 'kom-add-self) (define-key lyskom-sv-mode-map (kbd "m") 'kom-add-self)
(define-key lyskom-sv-mode-map (kbd "M") 'kom-mark-text) (define-key lyskom-sv-mode-map (kbd "M") 'kom-mark-text)
...@@ -2394,12 +2417,19 @@ teckenkodning. ...@@ -2394,12 +2417,19 @@ teckenkodning.
(define-key lyskom-sv-mode-map (kbd "f s") 'kom-get-abuse) (define-key lyskom-sv-mode-map (kbd "f s") 'kom-get-abuse)
(define-key lyskom-sv-mode-map (kbd "f t") 'kom-move-text) (define-key lyskom-sv-mode-map (kbd "f t") 'kom-move-text)
(define-key lyskom-sv-mode-map (kbd "f T") 'kom-move-text-tree) (define-key lyskom-sv-mode-map (kbd "f T") 'kom-move-text-tree)
(define-key lyskom-sv-filter-get-prefix (lyskom-keys ') 'kom-filter-subject)
(define-key lyskom-sv-filter-get-prefix (lyskom-keys ') 'kom-filter-subject) (lyskom-try-define-key lyskom-sv-filter-get-prefix (kbd "") 'kom-filter-subject)
(define-key lyskom-sv-filter-get-prefix [] 'kom-filter-subject) (lyskom-try-define-key lyskom-sv-filter-get-prefix (kbd "{") 'kom-filter-subject)
(define-key lyskom-sv-filter-get-prefix [] 'kom-filter-subject) (lyskom-try-define-key lyskom-sv-filter-get-prefix (kbd "[") 'kom-filter-subject)
(define-key lyskom-sv-mode-map (kbd "f {") 'kom-filter-subject) (lyskom-try-define-key lyskom-sv-filter-get-prefix [adiaeresis] 'kom-filter-subject)
(define-key lyskom-sv-mode-map (kbd "f [") 'kom-filter-subject) (lyskom-try-define-key lyskom-sv-filter-get-prefix [Adiaeresis] 'kom-filter-subject)
(lyskom-try-define-key lyskom-sv-filter-get-prefix [228] 'kom-filter-subject)
(lyskom-try-define-key lyskom-sv-filter-get-prefix [196] 'kom-filter-subject)
(lyskom-try-define-key lyskom-sv-filter-get-prefix [2276] 'kom-filter-subject)
(lyskom-try-define-key lyskom-sv-filter-get-prefix [2244] 'kom-filter-subject)
(lyskom-try-define-key lyskom-sv-filter-get-prefix [3908] 'kom-filter-subject)
(lyskom-try-define-key lyskom-sv-filter-get-prefix [3940] 'kom-filter-subject)
(define-key lyskom-sv-mode-map (kbd "f f") 'kom-filter-author) (define-key lyskom-sv-mode-map (kbd "f f") 'kom-filter-author)
(define-key lyskom-sv-mode-map (kbd "f i") 'kom-filter-text) (define-key lyskom-sv-mode-map (kbd "f i") 'kom-filter-text)
(define-key lyskom-sv-mode-map (kbd "f m") 'kom-filter-recipient) (define-key lyskom-sv-mode-map (kbd "f m") 'kom-filter-recipient)
...@@ -2409,56 +2439,62 @@ teckenkodning. ...@@ -2409,56 +2439,62 @@ teckenkodning.
(define-key lyskom-sv-mode-map (kbd "v v") 'kom-who-is-on-and-friend) (define-key lyskom-sv-mode-map (kbd "v v") 'kom-who-is-on-and-friend)
(define-key lyskom-sv-mode-map (kbd "J") 'kom-who-am-i) (define-key lyskom-sv-mode-map (kbd "J") 'kom-who-am-i)
(define-key lyskom-sv-mode-map (kbd "V") 'kom-busy-wait) (define-key lyskom-sv-mode-map (kbd "V") 'kom-busy-wait)
(define-key lyskom-sv-mode-map (kbd "{ p") 'kom-change-presentation) (define-key lyskom-sv-change-prefix (kbd "p") 'kom-change-presentation)
(define-key lyskom-sv-mode-map (kbd "{ q") 'kom-change-conf-faq) (define-key lyskom-sv-change-prefix (kbd "q") 'kom-change-conf-faq)
(define-key lyskom-sv-mode-map (kbd "{ f") 'kom-filter-edit) (define-key lyskom-sv-change-prefix (kbd "f") 'kom-filter-edit)
(define-key lyskom-sv-mode-map (kbd "{ m") 'kom-change-auto-reply) (define-key lyskom-sv-change-prefix (kbd "m") 'kom-change-auto-reply)
(define-key lyskom-sv-mode-map (kbd "} SPC") 'kom-view) (define-key lyskom-sv-review-prefix (kbd "SPC") 'kom-view)
(define-key lyskom-sv-mode-map (kbd "} 0") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "0") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 1") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "1") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 2") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "2") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 3") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "3") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 4") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "4") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 5") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "5") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 6") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "6") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 7") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "7") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 8") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "8") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} 9") 'kom-initial-digit-view) (define-key lyskom-sv-review-prefix (kbd "9") 'kom-initial-digit-view)
(define-key lyskom-sv-mode-map (kbd "} k") 'kom-view-commented-text) (define-key lyskom-sv-review-prefix (kbd "k") 'kom-view-commented-text)
(define-key lyskom-sv-mode-map (kbd "} K") 'kom-view-previous-commented-text) (define-key lyskom-sv-review-prefix (kbd "K") 'kom-view-previous-commented-text)
(define-key lyskom-sv-mode-map (kbd "} a ?") 'lyskom-help) (define-key lyskom-sv-review-prefix (kbd "a ?") 'lyskom-help)
(define-key lyskom-sv-mode-map (kbd "} a k") 'kom-review-comments) (define-key lyskom-sv-review-prefix (kbd "a k") 'kom-review-comments)
(define-key lyskom-sv-mode-map (kbd "} a r") 'kom-review-tree) (define-key lyskom-sv-review-prefix (kbd "a r") 'kom-review-tree)
(define-key lyskom-sv-mode-map (kbd "} h") 'kom-review-clear) (define-key lyskom-sv-review-prefix (kbd "h") 'kom-review-clear)
(define-key lyskom-sv-mode-map (kbd "} i") 'kom-review-last-normally-read) (define-key lyskom-sv-review-prefix (kbd "i") 'kom-review-last-normally-read)
(define-key lyskom-sv-mode-map (kbd "} n") 'kom-review-next) (define-key lyskom-sv-review-prefix (kbd "n") 'kom-review-next)
(define-key lyskom-sv-mode-map (kbd "} o") 'kom-review-noconversion) (define-key lyskom-sv-review-prefix (kbd "o") 'kom-review-noconversion)
(define-key lyskom-sv-mode-map (kbd "} r") 'kom-find-root) (define-key lyskom-sv-review-prefix (kbd "r") 'kom-find-root)
(define-key lyskom-sv-mode-map (kbd "} u") 'kom-find-root) (define-key lyskom-sv-review-prefix (kbd "u") 'kom-find-root)
(define-key lyskom-sv-mode-map (kbd "} s") 'kom-review-by-to) (define-key lyskom-sv-review-prefix (kbd "s") 'kom-review-by-to)
(define-key lyskom-sv-mode-map (kbd "} y") 'kom-review-more) (define-key lyskom-sv-review-prefix (kbd "y") 'kom-review-more)
(define-key lyskom-sv-mode-map (kbd "} A") 'kom-review-all) (define-key lyskom-sv-review-prefix (kbd "A") 'kom-review-all)
(define-key lyskom-sv-mode-map (kbd "} f") 'kom-review-first) (define-key lyskom-sv-review-prefix (kbd "f") 'kom-review-first)
(define-key lyskom-sv-mode-map (kbd "} l") 'kom-review-stack) (define-key lyskom-sv-review-prefix (kbd "l") 'kom-review-stack)
(define-key lyskom-sv-mode-map (kbd "} p") 'kom-review-presentation) (define-key lyskom-sv-review-prefix (kbd "p") 'kom-review-presentation)
(define-key lyskom-sv-mode-map (kbd "} t") 'kom-find-root-review) (define-key lyskom-sv-review-prefix (kbd "t") 'kom-find-root-review)
(define-key lyskom-sv-mode-map (kbd "} m") 'kom-review-marked-texts) (define-key lyskom-sv-review-prefix (kbd "m") 'kom-review-marked-texts)
(define-key lyskom-sv-mode-map (kbd "} q") 'kom-review-faq) (define-key lyskom-sv-review-prefix (kbd "q") 'kom-review-faq)
(define-key lyskom-sv-mode-map (kbd "} Q") 'kom-review-server-faq) (define-key lyskom-sv-review-prefix (kbd "Q") 'kom-review-server-faq)
(define-key lyskom-sv-mode-map (kbd "} a m") 'kom-review-all-marked-texts) (define-key lyskom-sv-review-prefix (kbd "a m") 'kom-review-all-marked-texts)
(define-key lyskom-sv-mode-map (kbd "} a SPC") 'kom-review-all) (define-key lyskom-sv-review-prefix (kbd "a SPC") 'kom-review-all)
(define-key lyskom-sv-mode-map (kbd "} b") 'kom-review-mail-headers) (define-key lyskom-sv-review-prefix (kbd "b") 'kom-review-mail-headers)
(define-key lyskom-sv-mode-map (kbd "B") 'kom-review-backward) (define-key lyskom-sv-mode-map (kbd "B") 'kom-review-backward)
(define-key lyskom-sv-mode-map (kbd "s m") 'kom-status-conf) (define-key lyskom-sv-mode-map (kbd "s m") 'kom-status-conf)
(define-key lyskom-sv-mode-map (kbd "s p") 'kom-status-person) (define-key lyskom-sv-mode-map (kbd "s p") 'kom-status-person)
(define-key lyskom-sv-mode-map (kbd "s s") 'kom-status-session) (define-key lyskom-sv-mode-map (kbd "s s") 'kom-status-session)
(define-key lyskom-sv-mode-map (kbd "s k") 'kom-status-server) (define-key lyskom-sv-mode-map (kbd "s k") 'kom-status-server)
(define-key lyskom-sv-S-prefix (lyskom-keys ') 'kom-send-message)