From dda69a38ccde9ef5fc75a60cfeddd83e19d06b8b Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Fri, 13 Dec 2002 22:37:32 +0000
Subject: [PATCH] > Bug 915: > * vars.el.in
(kom-builtin-server-aliases): Renamed from > kom-server-aliases. >
(kom-server-aliases): New variable. > > * startup.el
(lyskom-read-server-name): Use both > kom-server-aliases and
kom-builtin-server-aliases. > (lyskom): Same here. > > Fix
obsoleteness:
---
src/ChangeLog | 10 ++++++++++
src/startup.el | 7 ++++---
src/vars.el.in | 11 +++++++++--
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b7bf66d..46d7348a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
2002-12-13 David Byers <david.byers@swipnet.se>
+ Bug 915:
+ * vars.el.in (kom-builtin-server-aliases): Renamed from
+ kom-server-aliases.
+ (kom-server-aliases): New variable.
+
+ * startup.el (lyskom-read-server-name): Use both
+ kom-server-aliases and kom-builtin-server-aliases.
+ (lyskom): Same here.
+
+ Fix obsoleteness:
* lyskom-rest.el (lyskom-update-prompt): Change `insert-string' to
`insert' since the former is obsolete.
diff --git a/src/startup.el b/src/startup.el
index f61525b7..cf2b9182 100644
--- a/src/startup.el
+++ b/src/startup.el
@@ -97,7 +97,8 @@ clients of the event. See lyskom-mode for details on lyskom."
(or password (getenv "KOMPASSWORD")))
(if (zerop (length host))
(let* ((env-kom (getenv "KOMSERVER"))
- (canon (lyskom-string-rassoc env-kom kom-server-aliases)))
+ (canon (or (lyskom-string-rassoc env-kom kom-server-aliases)
+ (lyskom-string-rassoc env-kom kom-builtin-server-aliases))))
(setq host (or (car canon)
env-kom
lyskom-default-server))))
@@ -829,10 +830,10 @@ alias name is entered, the corresponding address is returned."
(let ((known-servers
(append (mapcar (function (lambda (pair)
(cons (car pair) (car pair))))
- kom-server-aliases)
+ (append kom-server-aliases kom-builtin-server-aliases))
(mapcar (function (lambda (pair)
(cons (cdr pair) (car pair))))
- kom-server-aliases)))
+ (append kom-server-aliases kom-builtin-server-aliases))))
(completion-ignore-case t)
server)
(setq server (lyskom-completing-read prompt
diff --git a/src/vars.el.in b/src/vars.el.in
index 7a652808..efdc9965 100644
--- a/src/vars.el.in
+++ b/src/vars.el.in
@@ -1273,7 +1273,13 @@ Do not use this variable for proxy authentication.")
-(def-kom-var kom-server-aliases
+(def-kom-var kom-server-aliases nil
+ "*An alist mapping server names to shorter identification strings.
+You can set this in init files before loading LysKOM.
+
+See `kom-builtin-server-aliases' for more information.")
+
+(def-kom-var kom-builtin-server-aliases
'(("kom.lysator.liu.se" . "LysKOM")
("com.lysator.liu.se" . "LysCOM (LysKOM in English)")
("kom.ludd.luth.se" . "LuddKOM")
@@ -1286,7 +1292,8 @@ Do not use this variable for proxy authentication.")
("community.roxen.com" . "Roxen Community KOM")
("kom.ds.hj.se" . "DSKOM")
("kom.sno.pp.se" . "SnoppKOM"))
- "*An alist mapping server names to shorter identification strings")
+ "*An alist mapping server names to shorter identification strings
+If you want to add to this list, use `kom-server-aliases' instead.")
(def-kom-var kom-ansaphone-on nil
"t if automatic replies to personal messages are in effect."
--
GitLab