Synkning inför release av 0.47-BETA-2

doc/Makefile

@@ -22,7 +22,7 @@
 #
 # Please mail bug reports to bug-lyskom@lysator.liu.se.
 
-CLIENTVERSION = 0.47-BETA-1
+CLIENTVERSION = 0.47-BETA-2
 
 SHELL = /bin/sh
 RM = rm -f

src/ChangeLog

+2002-06-02  David Byers  <david.byers@swipnet.se>
+
+	* Release of 0.47-BETA-2
+
+2002-05-31  David Byers  <david.byers@swipnet.se>
+
+	Fix bug 235:
+	* parse.el (lyskom-parse-unparsed): When an error is signalled
+	from a handler, delete the parsed message.
+
 2002-06-01  Ulrik Haugen  <qha@lysator.liu.se>
 
 	* Makefile (DOCFILES): include NEWS for 0.47 instead of 0.46.

src/Makefile

@@ -36,7 +36,7 @@
 # Version of the client.
 #
 # Also remember to change version number in ../doc/Makefile!
-CLIENTVERSION = 0.47-BETA-1
+CLIENTVERSION = 0.47-BETA-2
 
 ######################################################################
 

src/commands2.el

@@ -2930,19 +2930,18 @@ interface (i.e. symbols whose name starts with \"lyskom\")."
         (case-fold-search t))
     (mapatoms
      (lambda (atom)
-       (let ((string nil))
-         (when (and (or (boundp atom) (fboundp atom))
-                    (or (and do-all (string-match "^lyskom-" (symbol-name atom)))
-                        (string-match "^kom-" (symbol-name atom)))
-                    (or (string-match re (symbol-name atom))
-                        (and (fboundp atom)
-                             (string-match re (or (documentation atom) "")))
-                        (and (boundp atom)
-                             (string-match re (or
-                                               (documentation-property 
-                                                atom 'variable-documentation)
-                                               "")))))
-           (setq result (cons atom result))))))
+       (when (and (or (boundp atom) (fboundp atom))
+                  (or (and do-all (string-match "^lyskom-" (symbol-name atom)))
+                      (string-match "^kom-" (symbol-name atom)))
+                  (or (string-match re (symbol-name atom))
+                      (and (fboundp atom)
+                           (string-match re (or (documentation atom) "")))
+                      (and (boundp atom)
+                           (string-match re (or
+                                             (documentation-property 
+                                              atom 'variable-documentation)
+                                             "")))))
+         (setq result (cons atom result)))))
     (setq result 
           (sort result (lambda (a b)
                          (string-lessp (symbol-name a)

src/help.el

@@ -103,11 +103,11 @@
   (let ((inhibit-read-only t))
     (cond ((symbolp (car data))
            (funcall (cdr (assq (car data) lyskom-help-format-handlers)) data))
-          (t (lyskom-traverse el data
-                              (let ((tag (lyskom-help-data-get-tag el))
-                                    (data (lyskom-help-data-get-data el)))
-                                (funcall (cdr (assq tag lyskom-help-format-handlers))
-                                         el)))))))
+          (t (lyskom-traverse el 
+                 data
+               (let ((tag (lyskom-help-data-get-tag el)))
+                 (funcall (cdr (assq tag lyskom-help-format-handlers))
+                          el)))))))
 
 (defun lyskom-help-format-text-properties (data props)
   (let ((start (point-marker)))

src/parse.el

@@ -1226,7 +1226,10 @@ functions and variables that are connected with the lyskom-buffer."
               ;; One reply is now parsed.
               (lyskom-protocol-error
                (delete-region (point-min) (min (point-max) (1+ lyskom-parse-pos)))
-               (signal 'lyskom-protocol-error err)))
+               (signal 'lyskom-protocol-error err))
+              (lyskom-parse-incomplete (signal (car err) (cdr err)))
+              (error (delete-region (point-min) lyskom-parse-pos)
+                     (signal (car err) (cdr err))))
             (goto-char (point-min))
             (if (looking-at "[ \n]+")
                 (delete-region (match-beginning 0) (match-end 0)))