Avoid triggering bug in Emacs 20.7.

Detailed changes:
> 	* completing-read.el (lyskom-read-conf): Cancel magic in
> 	minibuffer-exit-hook to avoid triggering bugs in Gnu Emacs 20.7
> 	(and probably all earlier versions).
>

src/ChangeLog

 2003-08-14  David Byers  <byers@lysator.liu.se>
 
+	* completing-read.el (lyskom-read-conf): Cancel magic in
+	minibuffer-exit-hook to avoid triggering bugs in Gnu Emacs 20.7
+	(and probably all earlier versions).
+
 	Update NEWS file:
 	* NEWS-0.48: Updated to here.
 

src/completing-read.el

@@ -306,7 +306,11 @@ A string:    A name that matched nothing in the database."
                                   before-change-functions)
                             pre-command-hook (cons 'lyskom-read-from-minibuffer-pre-command pre-command-hook)
                             post-command-hook (cons 'lyskom-read-from-minibuffer-post-command post-command-hook)))
-                    minibuffer-setup-hook)))
+                    minibuffer-setup-hook))
+             (minibuffer-exit-hook
+              (cons 'lyskom-read-from-minibuffer-cancel-magic
+                    minibuffer-exit-hook)))
+
          (setq read-string (completing-read (cond ((stringp prompt) prompt)
                                                   ((symbolp prompt) (lyskom-get-string prompt))
                                                   (t (lyskom-get-string 'conf-prompt)))

src/english-strings.el

@@ -1782,9 +1782,9 @@ Number of sessions:  %21#1d (total)
                      %21#6d not logged on/secret/zombies\n")
     (server-status-first-text . "Oldest existing text:       %14#1n\n")
     (server-status-last-text  . "Youngest existing text:     %14#1n%#2?b%[ (%#2n at start)%]%[%]\n")
-    (server-status-texts .      "Number of texts:            %14#1d (%#2s, %#3d at start)\n")
-    (server-status-confs .      "Number of conferences:      %14#1d (%#2s, %#3d at start)\n")
-    (server-status-pers .       "Number of persons:          %14#1d (%#2s, %#3d at start)\n")
+    (server-status-texts .      "Number of texts:            %14#1d (%#2s now, %#3d at start)\n")
+    (server-status-confs .      "Number of conferences:      %14#1d (%#2s now, %#3d at start)\n")
+    (server-status-pers .       "Number of persons:          %14#1d (%#2s now, %#3d at start)\n")
     (server-status-has-motd . "\nThe server has a notice:\n")
     (server-status-time .      "Current server time:            %#1s\n")
     (server-status-boot-time . "Server start time:              %#1s\n")

src/swedish-strings.el

@@ -1817,9 +1817,9 @@ Antal sessioner:     %21#1d (totalt)
                      %21#6d ej inloggade/hemliga/zombies\n")
     (server-status-first-text . "ldsta befintliga text:     %14#1n\n")
     (server-status-last-text  . "Yngsta befintliga text:     %14#1n%#2?b%[ (%#2n vid start)%]%[%]\n")
-    (server-status-texts .      "Antal existerande inlgg:   %14#1d (%#2s, %#3d vid start)\n")
-    (server-status-confs .      "Antal existerande mten:    %14#1d (%#2s, %#3d vid start)\n")
-    (server-status-pers .       "Antal existerande personer: %14#1d (%#2s, %#3d vid start)\n")
+    (server-status-texts .      "Antal existerande inlgg:   %14#1d (%#2s just nu, %#3d vid start)\n")
+    (server-status-confs .      "Antal existerande mten:    %14#1d (%#2s just nu, %#3d vid start)\n")
+    (server-status-pers .       "Antal existerande personer: %14#1d (%#2s just nu, %#3d vid start)\n")
     (server-status-has-motd . "\nServern har en lapp p drren:\n")
     (server-status-time . "Serverns tid:                   %#1s\n")
     (server-status-boot-time . "Servern startades:              %#1s\n")