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

Tentative fix for bug 662. Other minor fixes

parent 70e5f819
2002-08-05 David Byers <david.byers@swipnet.se>
Bug 662:
* async.el (lyskom-add-new-text): When we get a new text in the
conference we're in, enter the info in lyskom-reading-list in the
proper priority order. Entering it first fscks up reviewing.
* english-strings.el (lyskom-en-prioritize-mode-map): Use kbd for
all bindings (how did we ever miss this).
2002-08-01 David Byers <david.byers@swipnet.se>
Fix bug 685:
......
......@@ -709,7 +709,7 @@ converted, before insertion."
"Unexpected misc-info in new text "
type))))))
(lyskom-prefetch-text-stat-all text-stat)
; (lyskom-prefetch-text-stat-all text-stat)
;; Give a message if the user is waiting. Update the prompt.
(lyskom-run 'async 'lyskom-default-new-text-hook text-stat)
......@@ -811,7 +811,7 @@ In that case, just discard this call."
(lyskom-create-text-list (list text-no)))))
(read-list-enter-read-info info lyskom-to-do-list)
(if (= lyskom-current-conf (conf-stat->conf-no recipient))
(read-list-enter-first info lyskom-reading-list)))
(read-list-enter-read-info info lyskom-reading-list)))
;; We don't have the membership yet. Treat it as an unread conf
;; and prefetch it. This might result in two prefetches of the
......
......@@ -2906,7 +2906,8 @@ Uses Protocol A version 8 calls"
format-string-2
""
(lyskom-return-username who-info)
(concat "(" (string-replace-match "\n" (who-info->doing-what who-info) " ") ")"))))
(concat "(" (or (string-replace-match "\n" (who-info->doing-what who-info) " " t t)
(who-info->doing-what who-info)")")))))
(setq who-list (cdr who-list)))
(lyskom-insert (concat (make-string (- (lyskom-window-width) 1) ?-)
......@@ -3036,7 +3037,8 @@ Uses Protocol A version 9 calls"
format-string-2
""
username
(concat "(" (string-replace-match "\n" (dynamic-session-info->what-am-i-doing who-info) " ")
(concat "(" (or (string-replace-match "\n" (dynamic-session-info->what-am-i-doing who-info) " " t t)
(dynamic-session-info->what-am-i-doing who-info))
")"))))
(if kom-show-since-and-when
(let ((active
......@@ -3459,8 +3461,7 @@ WHO-INFOS that are potential sessions."
(who-info->doing-what info))
(match-string 1 (who-info->doing-what info))
(who-info->doing-what info))))
(when (string-match "\n" string)
(string-replace-match "\n" string " "))
(setq string (or (string-replace-match "\n" string " " t t) string))
(if (string= string "")
(lyskom-get-string 'unknown-doing-what)
string))
......@@ -3508,8 +3509,7 @@ WHO-INFOS that are potential sessions."
(match-string
1 (dynamic-session-info->what-am-i-doing info))
(dynamic-session-info->what-am-i-doing info))))
(when (string-match "\n" string)
(string-replace-match "\n" string " "))
(setq string (or (string-replace-match "\n" string " " t t ) string))
(if (string= string "")
(lyskom-get-string 'unknown-doing-what)
string))
......
......@@ -2444,37 +2444,37 @@ Using the default face in place of these faces.
(define-key lyskom-en-prioritize-mode-map (kbd (lyskom-keys 'button3)) 'kom-popup-menu)
(define-key lyskom-en-prioritize-mode-map (kbd (lyskom-keys 'button2up)) 'kom-mouse-null)
(define-key lyskom-en-prioritize-mode-map (kbd (lyskom-keys 'button3up)) 'kom-mouse-null)
(define-key lyskom-en-prioritize-mode-map "*" 'kom-button-press)
(define-key lyskom-en-prioritize-mode-map "+" 'kom-menu-button-press)
(define-key lyskom-en-prioritize-mode-map "?" 'kom-prioritize-help)
(define-key lyskom-en-prioritize-mode-map "\C-k" 'kom-prioritize-select)
(define-key lyskom-en-prioritize-mode-map "\C-y" 'kom-prioritize-yank)
(define-key lyskom-en-prioritize-mode-map " " 'kom-prioritize-select)
(define-key lyskom-en-prioritize-mode-map "\C-m" 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map "\C-j" 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map "\C-?" 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map "\M-\C-?" 'kom-prioritize-deselect-all)
(define-key lyskom-en-prioritize-mode-map [down] 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map "\C-n" 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map [up] 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map "\C-p" 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map "p" 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map [(meta up)] 'kom-prioritize-move-up)
(define-key lyskom-en-prioritize-mode-map "\M-p" 'kom-prioritize-move-up)
(define-key lyskom-en-prioritize-mode-map "u" 'kom-prioritize-move-up)
(define-key lyskom-en-prioritize-mode-map [(meta down)] 'kom-prioritize-move-down)
(define-key lyskom-en-prioritize-mode-map "\M-n" 'kom-prioritize-move-down)
(define-key lyskom-en-prioritize-mode-map "d" 'kom-prioritize-move-down)
(define-key lyskom-en-prioritize-mode-map "\M-<" 'kom-prioritize-beginning)
(define-key lyskom-en-prioritize-mode-map "\M->" 'kom-prioritize-end)
(define-key lyskom-en-prioritize-mode-map "r" 'kom-prioritize-reprioritize)
(define-key lyskom-en-prioritize-mode-map "g" 'kom-prioritize-goto-priority)
(define-key lyskom-en-prioritize-mode-map "p" 'kom-prioritize-set-priority)
(define-key lyskom-en-prioritize-mode-map "s" 'kom-prioritize-save)
(define-key lyskom-en-prioritize-mode-map "q" 'kom-prioritize-quit)
(define-key lyskom-en-prioritize-mode-map "\C-c\C-c" 'kom-prioritize-quit)
(define-key lyskom-en-prioritize-mode-map "\t" 'kom-next-link)
(define-key lyskom-en-prioritize-mode-map "\M-\C-i" 'kom-previous-link)
(define-key lyskom-en-prioritize-mode-map (kbd "*") 'kom-button-press)
(define-key lyskom-en-prioritize-mode-map (kbd "+") 'kom-menu-button-press)
(define-key lyskom-en-prioritize-mode-map (kbd "?") 'kom-prioritize-help)
(define-key lyskom-en-prioritize-mode-map (kbd "C-k") 'kom-prioritize-select)
(define-key lyskom-en-prioritize-mode-map (kbd "C-y") 'kom-prioritize-yank)
(define-key lyskom-en-prioritize-mode-map (kbd "SPC") 'kom-prioritize-select)
(define-key lyskom-en-prioritize-mode-map (kbd "C-m") 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map (kbd "C-j") 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map (kbd "DEL") 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map (kbd "M-DEL") 'kom-prioritize-deselect-all)
(define-key lyskom-en-prioritize-mode-map (kbd "<down>") 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map (kbd "C-n") 'kom-prioritize-next-line)
(define-key lyskom-en-prioritize-mode-map (kbd "<up>") 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map (kbd "C-p") 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map (kbd "p") 'kom-prioritize-previous-line)
(define-key lyskom-en-prioritize-mode-map (kbd "M-<up>") 'kom-prioritize-move-up)
(define-key lyskom-en-prioritize-mode-map (kbd "M-p") 'kom-prioritize-move-up)
(define-key lyskom-en-prioritize-mode-map (kbd "u") 'kom-prioritize-move-up)
(define-key lyskom-en-prioritize-mode-map (kbd "M-<down>") 'kom-prioritize-move-down)
(define-key lyskom-en-prioritize-mode-map (kbd "M-n") 'kom-prioritize-move-down)
(define-key lyskom-en-prioritize-mode-map (kbd "d") 'kom-prioritize-move-down)
(define-key lyskom-en-prioritize-mode-map (kbd "M-<") 'kom-prioritize-beginning)
(define-key lyskom-en-prioritize-mode-map (kbd "M->") 'kom-prioritize-end)
(define-key lyskom-en-prioritize-mode-map (kbd "r") 'kom-prioritize-reprioritize)
(define-key lyskom-en-prioritize-mode-map (kbd "g") 'kom-prioritize-goto-priority)
(define-key lyskom-en-prioritize-mode-map (kbd "p") 'kom-prioritize-set-priority)
(define-key lyskom-en-prioritize-mode-map (kbd "s") 'kom-prioritize-save)
(define-key lyskom-en-prioritize-mode-map (kbd "q") 'kom-prioritize-quit)
(define-key lyskom-en-prioritize-mode-map (kbd "C-c C-c") 'kom-prioritize-quit)
(define-key lyskom-en-prioritize-mode-map (kbd "TAB") 'kom-next-link)
(define-key lyskom-en-prioritize-mode-map (kbd "M-C-i") 'kom-previous-link)
(define-key lyskom-en-prioritize-mode-map (kbd "M-TAB") 'kom-previous-link)
(define-key lyskom-en-prioritize-mode-map (kbd "<S-tab>") 'kom-previous-link)
)
......
......@@ -2503,8 +2503,8 @@ Anv
(define-key lyskom-sv-prioritize-mode-map (kbd "C-j") 'kom-prioritize-next-line)
(define-key lyskom-sv-prioritize-mode-map (kbd "<down>") 'kom-prioritize-next-line)
(define-key lyskom-sv-prioritize-mode-map (kbd "C-n") 'kom-prioritize-next-line)
(define-key lyskom-sv-prioritize-mode-map (kbd "C-?") 'kom-prioritize-previous-line)
(define-key lyskom-sv-prioritize-mode-map (kbd "M-C-?") 'kom-prioritize-deselect-all)
(define-key lyskom-sv-prioritize-mode-map (kbd "DEL") 'kom-prioritize-previous-line)
(define-key lyskom-sv-prioritize-mode-map (kbd "M-DEL") 'kom-prioritize-deselect-all)
(define-key lyskom-sv-prioritize-mode-map (kbd "<up>") 'kom-prioritize-previous-line)
(define-key lyskom-sv-prioritize-mode-map (kbd "C-p") 'kom-prioritize-previous-line)
(define-key lyskom-sv-prioritize-mode-map (kbd "p") 'kom-prioritize-previous-line)
......@@ -3631,8 +3631,8 @@ i servern. Annars sparas det i din .emacs.")
lsmarkera de inlgg som visas. I annat fall lmnar tersekommandona
din lshistorik orrd, precis som vanligt.")
(kom-auto-review-faqs-doc . "\
Om detta r pslaget s kommer olsta FAQer som inte att terses
automatiskt nr du loggar in eller gr till ett mte med en olst FAQ.")
Om detta r pslaget s kommer olsta FAQer inte att terses automatiskt
nr du loggar in eller gr till ett mte med en olst FAQ.")
(kom-auto-list-faqs-doc . "\
Om detta r pslaget s kommer olsta FAQer att listas automatiskt nr
du loggar in eller gr till ett mte med en olst FAQ.")
......
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