Commit 5427fd68 authored by Ulrik Haugen's avatar Ulrik Haugen
Browse files

Hoppas det här inte krockar med något David redan fixat...

        * startup.el (lyskom-read-server-name): Updated docstring wrt.
	kom-builtin-server-aliases.

	* lyskom-rest.el (lyskom-update-prompt, lyskom-format-prompt)
	(lyskom-mode-name-from-host): Use both kom-server-aliases and
	kom-builtin-server-aliases.

	* commands2.el (kom-modeline-select-unread-kom)
	(kom-status-server): Use both kom-server-aliases and
	kom-builtin-server-aliases.

	* async.el (lyskom-show-logged-in-person)
	(lyskom-show-logged-out-person): Use both kom-server-aliases and
	kom-builtin-server-aliases.
parent 13e44c33
2002-12-17 Ulrik Haugen <qha@lysator.liu.se>
* startup.el (lyskom-read-server-name): Updated docstring wrt.
kom-builtin-server-aliases.
* lyskom-rest.el (lyskom-update-prompt, lyskom-format-prompt)
(lyskom-mode-name-from-host): Use both kom-server-aliases and
kom-builtin-server-aliases.
* commands2.el (kom-modeline-select-unread-kom)
(kom-status-server): Use both kom-server-aliases and
kom-builtin-server-aliases.
* async.el (lyskom-show-logged-in-person)
(lyskom-show-logged-out-person): Use both kom-server-aliases and
kom-builtin-server-aliases.
2002-12-16 David Byers <david.byers@swipnet.se>
Fix bug 701:
......
......@@ -353,8 +353,10 @@ according to the value of FLAG."
(defun lyskom-show-logged-in-person (conf-stat)
"Visa p} kommandoraden vem som loggat in."
(let ((server (or (cdr (lyskom-string-assoc lyskom-server-name
kom-server-aliases))
(let ((server (or (cdr (lyskom-string-assoc
lyskom-server-name
(append kom-server-aliases
kom-builtin-server-aliases)))
lyskom-server-name)))
(cond
((lyskom-is-in-minibuffer))
......@@ -385,8 +387,10 @@ according to the value of FLAG."
(defun lyskom-show-logged-out-person (conf-stat session-no)
"Visa p} kommandoraden vem som loggat ut."
(let ((server (or (cdr (lyskom-string-assoc lyskom-server-name
kom-server-aliases))
(let ((server (or (cdr (lyskom-string-assoc
lyskom-server-name
(append kom-server-aliases
kom-builtin-server-aliases)))
lyskom-server-name)))
(cond
((lyskom-is-in-minibuffer))
......
......@@ -1888,8 +1888,10 @@ Return-value: 'no-session if there is no suitable session to switch to
(vector
(lyskom-format "%#1P, %#2s%#3?b%[ (%#4s)%]%[%]"
lyskom-pers-no
(or (cdr (assoc lyskom-server-name
kom-server-aliases))
(or (cdr (assoc
lyskom-server-name
(append kom-server-aliases
kom-builtin-server-aliases)))
lyskom-server-name)
(memq buffer lyskom-sessions-with-unread-letters)
(lyskom-get-string 'unread-letters))
......@@ -2769,13 +2771,15 @@ to the first text that NEW is a comment or footnote to."
;; ----------------------------------------
;; Print header
(lyskom-format-insert 'server-status-header
(cond ((cdr (lyskom-string-assoc lyskom-server-name kom-server-aliases)))
((cdr (lyskom-string-rassoc lyskom-server-name kom-server-aliases)))
(t lyskom-server-name))
(cond ((car (lyskom-string-rassoc lyskom-server-name kom-server-aliases)))
(t lyskom-server-name))
lyskom-server-port)
(let ((lyskom-both-server-aliases (append kom-server-aliases
kom-builtin-server-aliases)))
(lyskom-format-insert 'server-status-header
(cond ((cdr (lyskom-string-assoc lyskom-server-name lyskom-both-server-aliases)))
((cdr (lyskom-string-rassoc lyskom-server-name lyskom-both-server-aliases)))
(t lyskom-server-name))
(cond ((car (lyskom-string-rassoc lyskom-server-name lyskom-both-server-aliases)))
(t lyskom-server-name))
lyskom-server-port))
;; ----------------------------------------
;; Print software name and version
......
......@@ -2745,8 +2745,10 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing."
(save-excursion
(set-buffer (lyskom-get-prioritized-session))
(list
(or (cdr (lyskom-string-assoc lyskom-server-name
kom-server-aliases))
(or (cdr (lyskom-string-assoc
lyskom-server-name
(append kom-server-aliases
kom-builtin-server-aliases)))
lyskom-server-name)))))
((eq to-do 'next-pri-text)
......@@ -2941,8 +2943,10 @@ Set lyskom-current-prompt accordingly. Tell server what I am doing."
lyskom-current-conf)))
((eq format-letter ?S) lyskom-server-name)
((eq format-letter ?s)
(or (cdr (assoc lyskom-server-name
kom-server-aliases))
(or (cdr (assoc
lyskom-server-name
(append kom-server-aliases
kom-builtin-server-aliases)))
lyskom-server-name))
((eq format-letter ?p)
(or (conf-stat->name
......@@ -3978,7 +3982,9 @@ One parameter - the prompt string."
(defun lyskom-mode-name-from-host ()
"Calculate what to identify the buffer with."
(let ((server (process-name (get-buffer-process (current-buffer)))))
(or (cdr (assoc server kom-server-aliases))
(or (cdr (assoc server
(append kom-server-aliases
kom-builtin-server-aliases)))
(format "LysKOM(%s)" server))))
......
......@@ -822,8 +822,9 @@ WANT-PERSONS is t for persons, nil for confs."
(defun lyskom-read-server-name (prompt)
"Read the name of a LysKOM server.
Copmpletion is done on the servers i kom-server-aliases. If an
alias name is entered, the corresponding address is returned."
Copmpletion is done on the servers i kom-server-aliases and
kom-builtin-server-aliases. If an alias name is entered, the
corresponding address is returned."
;; Create a completion table like
;; (("kom.lysator.liu.se" . "kom.lysator.liu.se")
;; ("LysKOM" . "kom.lysator.liu.se"))
......
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