* slow.el: Ny fil.

(kom-expand-slow-command): Använd lyskom-strings.

* swedish-strings.el,english-strings.el (lyskom-strings): La till
no-such-command och command-completions.

src/ChangeLog

+Fri Aug 30 05:52:09 1996  David Kgedal  <kg@infovav.se>
+
+	* slow.el: Ny fil.
+	(kom-expand-slow-command): Anvnd lyskom-strings.
+
+	* swedish-strings.el,english-strings.el (lyskom-strings): La till
+ 	no-such-command och command-completions.
+
 Thu Aug 29 22:31:04 1996  David Kgedal  <kg@infovav.se>
 
 	* deferred-insert.el (lyskom-replace-deferred): Frsk inte

src/Makefile

@@ -50,6 +50,7 @@ PARTS-EL = komtypes.el clienttypes.el  deferred-insert.el utilities.el \
 	filter.el filter-edit.el lyskom-buttons.el \
 	view-text.el async.el completing-read.el \
 	prioritize.el flags.el messages.el ansaphone.el remote-control.el \
+	slow.el \
 	elib-string.el  \
 	lyskom-rest.el
 HEADER-EL = vars.el macros.el
@@ -66,7 +67,7 @@ SRC-ELC = komtypes.elc clienttypes.elc deferred-insert.elc utilities.elc \
 	filter.elc filter-edit.elc lyskom-buttons.elc \
 	view-text.elc async.elc completing-read.elc \
 	prioritize.elc flags.elc messages.elc ansaphone.elc \
-	remote-control.elc elib-string.elc \
+	remote-control.elc slow.elc elib-string.elc \
 	lyskom-rest.elc 
 PARTS-ELC = $(SRC-ELC)
 

src/english-strings.el

@@ -963,6 +963,10 @@ On since %#8s%#9s")
     (unknown-doing-what . "Exists")
     (doing-where-conn . "in")
     (doing-nowhere-conn . "but is")
+
+    ;; From slow.el
+    (no-such-command . "There is no such command.\n")
+    (command-completions . "You may mean one of the following:\n %#1s\n")
     )
   "Assoc list containing pairs of atoms and strings")
 

src/slow.el

+;;;;;
+;;;;; $Id$
+;;;;; Copyright (C) 1996  Lysator Academic Computer Association.
+;;;;;
+;;;;; This file is part of the LysKOM server.
+;;;;; 
+;;;;; LysKOM is free software; you can redistribute it and/or modify it
+;;;;; under the terms of the GNU General Public License as published by 
+;;;;; the Free Software Foundation; either version 2, or (at your option) 
+;;;;; any later version.
+;;;;; 
+;;;;; LysKOM is distributed in the hope that it will be useful, but WITHOUT
+;;;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;;;;; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+;;;;; for more details.
+;;;;; 
+;;;;; You should have received a copy of the GNU General Public License
+;;;;; along with LysKOM; see the file COPYING.  If not, write to
+;;;;; Lysator, c/o ISY, Linkoping University, S-581 83 Linkoping, SWEDEN,
+;;;;; or the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, 
+;;;;; MA 02139, USA.
+;;;;;
+;;;;; Please mail bug reports to bug-lyskom@lysator.liu.se. 
+;;;;;
+;;;; ================================================================
+;;;; ================================================================
+;;;;
+;;;; File: slow.el
+;;;;
+;;;; This file contains the code that makes it possible to run a 
+;;;; long-commands mode in the lyskom-buffer.
+;;;;
+;;;; ================================================================
+;;;;
+
+;;; Author: Linus Tolke
+;;; Modified by: David Kågedal
+
+(defvar lyskom-slow-mode-map
+  (make-sparse-keymap)
+  "Mode map for the `slow' lyskom command mode.")
+
+(define-key lyskom-slow-mode-map "\r" 'kom-parse-command-and-execute)
+(define-key lyskom-slow-mode-map "\t" 'kom-expand-slow-command)
+(define-key lyskom-slow-mode-map " " 'kom-expand-slow-or-next-command)
+
+(defun lyskom-get-entered-slow-command ()
+  "Get the text that the user has entered after the last prompt.
+Note that this function leaves point at the end of the prompt.
+
+If no text is entered, nil is returned."
+  (goto-char (point-max))
+  (save-restriction
+    (narrow-to-region lyskom-last-viewed (point-max))
+    (search-backward lyskom-prompt-text))
+  (forward-char (length lyskom-prompt-text))
+  (while (looking-at "\\s-")
+    (forward-char 1))
+  (if (= (point) (point-max))
+      nil
+    (buffer-substring (point) (point-max))))
+
+(defun kom-expand-slow-command ()
+  "Tries to complete the command at point.
+If the completion was exact return a pair `(COMMAND . POINT)' where
+COMMAND is the command and POINT is the point where the command text
+starts.
+
+If the completion was not exact it returns nil."
+  (interactive)
+  (let* ((text (lyskom-get-entered-slow-command))
+	 (completion-ignore-case t)
+	 (alternatives (mapcar 'reverse
+			       (if kom-emacs-knows-iso-8859-1
+				   lyskom-commands
+				 lyskom-swascii-commands)))
+	 (completes (and text (all-completions text alternatives)))
+	 (command nil))
+    (cond
+     ((null text)
+      (lyskom-beep t))
+     ((null completes)
+      (lyskom-insert-before-prompt (lyskom-get-string 'no-such-command))
+      (lyskom-beep t))
+     ((= (length completes) 1)
+      (setq command (cons (car (reverse-assoc (car completes)
+					      (if kom-emacs-knows-iso-8859-1
+						  lyskom-commands
+						lyskom-swascii-commands)))
+			  (point)))
+      (delete-region (point) (point-max))
+      (insert (car completes)))
+     ((> (length completes) 1)
+      (let ((longest (try-completion text alternatives)))
+	(cond
+	 ((eq longest 't)
+	  (delete-region (point) (point-max))
+	  (insert (car completes)))
+	 ((stringp longest)
+	  (if (string= (upcase longest) (upcase text))
+	      (lyskom-format-insert-before-prompt
+	       'command-completions
+	       (mapconcat 'identity completes "\n ")))
+	  (delete-region (point) (point-max))
+	  (insert longest))
+	 (t (signal 'lyskom-internal-error '()))))))
+    command))
+
+
+(defun kom-expand-slow-or-next-command ()
+  "If any part of a slow command has been entered, call
+`kom-expand-slow-command'. Otherwise, do `kom-next-command'."
+  (interactive)
+  (if (lyskom-get-entered-slow-command)
+      (kom-expand-slow-command)
+    (kom-next-command)))
+
+
+(defun kom-parse-command-and-execute ()
+  "Reads a command from the last line in the buffer and executes it."
+  (interactive)
+  (let* ((text (lyskom-get-entered-slow-command))
+	 (command (and text (kom-expand-slow-command))))
+    (cond
+     ((null text)
+      (call-interactively 'kom-next-command))
+     (command
+      (delete-region (cdr command) (point-max))
+      (call-interactively (car command))))))
+
+
+(defun kom-slow-mode ()
+  "Starts the slow-command-mode."
+  (interactive)
+  (lyskom-start-of-command 'kom-slow-mode)
+  (use-local-map lyskom-slow-mode-map)
+  (lyskom-end-of-command))
+
+(defun kom-quick-mode ()
+  "Starts the quick-command-mode."
+  (interactive)
+  (lyskom-start-of-command 'kom-quick-mode)
+  (use-local-map lyskom-mode-map)
+  (lyskom-end-of-command))
+
+

src/swedish-strings.el

@@ -990,6 +990,10 @@ Uppkopplad sedan %#8s%#9s")
     (unknown-doing-what . "Existerar")
     (doing-where-conn . "i")
     (doing-nowhere-conn . "men r")
+
+    ;; From slow.el
+    (no-such-command . "Det finns inget s\345dant kommando.\n")
+    (command-completions . "Du kan mena n\345gon av f\366ljande:\n %#1s\n")
     )
   "Assoc list containing pairs of atoms and strings")
 
@@ -1640,122 +1644,6 @@ This variable is stored in the LysKOM server.")
 
 
      
-;;;; This file contains the code that makes it possible to run a 
-;;;; long-commands mode in the lyskom-buffer.
-;;;;
-
-;;; Author: Linus Tolke 
-
-(defvar lyskom-slow-mode-map
-  (make-sparse-keymap)
-  "Mode map for the `slow' lyskom command mode.")
-
-(define-key lyskom-slow-mode-map "\r" 'kom-parse-command-and-execute)
-(define-key lyskom-slow-mode-map "\t" 'kom-expand-slow-command)
-(define-key lyskom-slow-mode-map " " 'kom-expand-slow-or-next-command)
-
-(defun lyskom-get-entered-slow-command ()
-  "Get the text that the user has entered after the last prompt.
-Note that this function leaves point at the end of the prompt.
-
-If no text is entered, nil is returned."
-  (goto-char (point-max))
-  (save-restriction
-    (narrow-to-region lyskom-last-viewed (point-max))
-    (search-backward lyskom-prompt-text))
-  (forward-char (length lyskom-prompt-text))
-  (while (looking-at "\\s-")
-    (forward-char 1))
-  (if (= (point) (point-max))
-      nil
-    (buffer-substring (point) (point-max))))
-
-(defun kom-expand-slow-command ()
-  "Tries to complete the command at point.
-If the completion was exact return a pair `(COMMAND . POINT)' where
-COMMAND is the command and POINT is the point where the command text
-starts.
-
-If the completion was not exact it returns nil."
-  (interactive)
-  (let* ((text (lyskom-get-entered-slow-command))
-	 (completion-ignore-case t)
-	 (alternatives (mapcar 'reverse
-			       (if kom-emacs-knows-iso-8859-1
-				   lyskom-commands
-				 lyskom-swascii-commands)))
-	 (completes (and text (all-completions text alternatives)))
-	 (command nil))
-    (cond
-     ((null text)
-      (lyskom-beep t))
-     ((null completes)
-      (lyskom-insert-before-prompt
-       "Det finns inget s\345dant kommando.\n")
-      (lyskom-beep t))
-     ((= (length completes) 1)
-      (setq command (cons (car (reverse-assoc (car completes)
-					      (if kom-emacs-knows-iso-8859-1
-						  lyskom-commands
-						lyskom-swascii-commands)))
-			  (point)))
-      (delete-region (point) (point-max))
-      (insert (car completes)))
-     ((> (length completes) 1)
-      (let ((longest (try-completion text alternatives)))
-	(cond
-	 ((eq longest 't)
-	  (delete-region (point) (point-max))
-	  (insert (car completes)))
-	 ((stringp longest)
-	  (if (string= (upcase longest) (upcase text))
-	      (lyskom-insert-before-prompt
-	       (concat "Du kan mena n\345gon av f\366ljande:\n "
-		       (mapconcat 'identity completes "\n ")
-		       "\n")))
-	  (delete-region (point) (point-max))
-	  (insert longest))
-	 (t (signal 'lyskom-internal-error '()))))))
-    command))
-
-
-(defun kom-expand-slow-or-next-command ()
-  "If any part of a slow command has been entered, call
-`kom-expand-slow-command'. Otherwise, do `kom-next-command'."
-  (interactive)
-  (if (lyskom-get-entered-slow-command)
-      (kom-expand-slow-command)
-    (kom-next-command)))
-
-
-(defun kom-parse-command-and-execute ()
-  "Reads a command from the last line in the buffer and executes it."
-  (interactive)
-  (let* ((text (lyskom-get-entered-slow-command))
-	 (command (and text (kom-expand-slow-command))))
-    (cond
-     ((null text)
-      (call-interactively 'kom-next-command))
-     (command
-      (delete-region (cdr command) (point-max))
-      (call-interactively (car command))))))
-
-
-(defun kom-slow-mode ()
-  "Starts the slow-command-mode."
-  (interactive)
-  (lyskom-start-of-command 'kom-slow-mode)
-  (use-local-map lyskom-slow-mode-map)
-  (lyskom-end-of-command))
-
-(defun kom-quick-mode ()
-  "Starts the quick-command-mode."
-  (interactive)
-  (lyskom-start-of-command 'kom-quick-mode)
-  (use-local-map lyskom-mode-map)
-  (lyskom-end-of-command))
-
-
 ;; Review a non-converted text
 ;; Author: Linus Tolke