Commit 75767a33 authored by Linus Tolke Y's avatar Linus Tolke Y
Browse files

Fixes, keymaps for emacs-19. next-kom.

parent 694ce148
No preview for this file type
...@@ -1389,7 +1389,26 @@ current conference to another session." ...@@ -1389,7 +1389,26 @@ current conference to another session."
(bury-buffer) (bury-buffer)
(while (and (string-match (regexp-quote session-name) (buffer-name (current-buffer))) (while (and (string-match (regexp-quote session-name) (buffer-name (current-buffer)))
(not (eq buffer (current-buffer)))) (not (eq buffer (current-buffer))))
(bury-buffer (current-buffer))))) (bury-buffer))))
(defun kom-next-kom ()
"Pop up the next lyskom-session."
(interactive)
(lyskom-tell-internat 'kom-tell-next-lyskom)
(let ((buffers (buffer-list)))
(while (and buffers
(or (eq (car buffers) (current-buffer))
(not (save-excursion
(set-buffer (car buffers))
(and (boundp 'lyskom-proc)
lyskom-proc
(processp lyskom-proc)
(memq (process-status lyskom-proc) '(run open))
(eq (current-buffer) (process-buffer lyskom-proc)))))))
(setq buffers (cdr buffers)))
(if buffers
(progn
(kom-bury)
(switch-to-buffer (car buffers))))))
...@@ -57,6 +57,12 @@ ...@@ -57,6 +57,12 @@
(define-key lyskom-edit-mode-map "\C-c?" 'lyskom-help) (define-key lyskom-edit-mode-map "\C-c?" 'lyskom-help)
(define-key lyskom-edit-mode-map "\C-c}" 'lyskom-edit-review-prefix) (define-key lyskom-edit-mode-map "\C-c}" 'lyskom-edit-review-prefix)
(define-key lyskom-edit-mode-map "\C-c]" 'lyskom-edit-review-prefix) (define-key lyskom-edit-mode-map "\C-c]" 'lyskom-edit-review-prefix)
;; emacs 19
(if (string-match "^19" emacs-version)
(progn
(define-key lyskom-edit-prefix [?\345] 'lyskom-edit-review-prefix)
(define-key lyskom-edit-prefix [?\305] 'lyskom-edit-review-prefix)
))
(define-key lyskom-edit-mode-map "\C-ci" 'lyskom-edit-insert-prefix) (define-key lyskom-edit-mode-map "\C-ci" 'lyskom-edit-insert-prefix)
(define-key lyskom-edit-mode-map "\C-c\C-c" 'kom-edit-send) (define-key lyskom-edit-mode-map "\C-c\C-c" 'kom-edit-send)
(define-key lyskom-edit-mode-map "\C-ck" 'kom-edit-quit) (define-key lyskom-edit-mode-map "\C-ck" 'kom-edit-quit)
...@@ -786,23 +792,35 @@ Cf. paragraph-start.") ...@@ -786,23 +792,35 @@ Cf. paragraph-start.")
(define-prefix-command 'lyskom-list-prefix) (define-prefix-command 'lyskom-list-prefix)
(define-prefix-command 'lyskom-get-prefix) (define-prefix-command 'lyskom-get-prefix)
(define-prefix-command 'lyskom-S-prefix) (define-prefix-command 'lyskom-S-prefix)
(define-key lyskom-mode-map "{" 'lyskom-change-prefix) (define-key lyskom-mode-map "{" 'lyskom-change-prefix) ; krullar
(define-key lyskom-mode-map "[" 'lyskom-change-prefix) (define-key lyskom-mode-map "[" 'lyskom-change-prefix)
(define-key lyskom-mode-map "\344" 'lyskom-change-prefix) ; 8-bit emacs.
(define-key lyskom-mode-map "\304" 'lyskom-change-prefix)
(define-key lyskom-mode-map "\033{" 'lyskom-change-prefix) ; 7(8)-bit emacs.
(define-key lyskom-mode-map "\033[" 'lyskom-change-prefix)
(define-key lyskom-mode-map "}" 'lyskom-review-prefix) (define-key lyskom-mode-map "}" 'lyskom-review-prefix)
(define-key lyskom-mode-map "]" 'lyskom-review-prefix) (define-key lyskom-mode-map "]" 'lyskom-review-prefix)
(define-key lyskom-mode-map "\344" 'lyskom-change-prefix) ; 8-bit keymap
(define-key lyskom-mode-map "\304" 'lyskom-change-prefix)
(define-key lyskom-mode-map "\345" 'lyskom-review-prefix) (define-key lyskom-mode-map "\345" 'lyskom-review-prefix)
(define-key lyskom-mode-map "\305" 'lyskom-review-prefix) (define-key lyskom-mode-map "\305" 'lyskom-review-prefix)
(define-key lyskom-mode-map "\033}" 'lyskom-review-prefix) ; 7(8)-bit emacs. (define-key lyskom-mode-map "\033{" 'lyskom-change-prefix) ; 7(8)-bit emacs.
(define-key lyskom-mode-map "\033[" 'lyskom-change-prefix)
(define-key lyskom-mode-map "\033}" 'lyskom-review-prefix)
(define-key lyskom-mode-map "\033]" 'lyskom-review-prefix) (define-key lyskom-mode-map "\033]" 'lyskom-review-prefix)
(define-key lyskom-mode-map "f" 'lyskom-get-prefix) (define-key lyskom-mode-map "f" 'lyskom-get-prefix)
(define-key lyskom-mode-map "n" 'lyskom-next-prefix) (define-key lyskom-mode-map "n" 'lyskom-next-prefix)
(define-key lyskom-mode-map "l" 'lyskom-list-prefix) (define-key lyskom-mode-map "l" 'lyskom-list-prefix)
(define-key lyskom-mode-map "s" 'lyskom-S-prefix) (define-key lyskom-mode-map "s" 'lyskom-S-prefix)
;; emacs 19
(if (string-match "^19" emacs-version)
(progn
(define-key lyskom-mode-map [\344] 'lyskom-change-prefix)
(define-key lyskom-mode-map [\304] 'lyskom-change-prefix)
(define-key lyskom-mode-map [\345] 'lyskom-review-prefix)
(define-key lyskom-mode-map [\304] 'lyskom-review-prefix)
(define-key lyskom-mode-map [?l ?\344] 'kom-list-summary)
(define-key lyskom-mode-map [?l ?\304] 'kom-list-summary)
))
;(define-key lyskom-mode-map "vi" 'vilka) ;(define-key lyskom-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.
...@@ -847,6 +865,7 @@ Cf. paragraph-start.") ...@@ -847,6 +865,7 @@ Cf. paragraph-start.")
(define-key lyskom-mode-map "A" 'kom-unmark-text) (define-key lyskom-mode-map "A" 'kom-unmark-text)
(define-key lyskom-mode-map "ni" 'kom-view-next-new-text) (define-key lyskom-mode-map "ni" 'kom-view-next-new-text)
(define-key lyskom-mode-map "nm" 'kom-go-to-next-conf) (define-key lyskom-mode-map "nm" 'kom-go-to-next-conf)
(define-key lyskom-mode-map "nl" 'kom-next-kom)
(define-key lyskom-mode-map "S" 'kom-quit) (define-key lyskom-mode-map "S" 'kom-quit)
(define-key lyskom-mode-map "q" 'kom-quit) (define-key lyskom-mode-map "q" 'kom-quit)
(define-key lyskom-mode-map "z" 'kom-bury) (define-key lyskom-mode-map "z" 'kom-bury)
......
...@@ -521,6 +521,7 @@ unread texts in list-unread.") ...@@ -521,6 +521,7 @@ unread texts in list-unread.")
(kom-tell-review "\305terser.") (kom-tell-review "\305terser.")
(kom-tell-change-name "Ändrar sitt namn till n\345got annat.") (kom-tell-change-name "Ändrar sitt namn till n\345got annat.")
(kom-tell-change-supervisor "Ändrar organisat\366r f\366r n\345got.") (kom-tell-change-supervisor "Ändrar organisat\366r f\366r n\345got.")
(kom-tell-next-lyskom "Hoppar till ett annat LysKOM.")
) )
"The variable kom-tell-phrases defaults to this value. "The variable kom-tell-phrases defaults to this value.
Users must not change this constant, but are encouraged to change Users must not change this constant, but are encouraged to change
......
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