Commits

Anonymous committed 88249b3

fix color handling in xpm.el, fix ebola concat in folding.el

Comments (0)

Files changed (4)

+1999-04-22  John H Palmieri  <palmieri@member.ams.org>
+
+	* xpm-mode.el (xpm-parse-color):
+	Handle s and m fields correctly if before the c field.
+	Read color correctly from c field if before s and/or m fields.
+
+1999-04-08  Sam Mikes  <smikes@alumni.hmc.edu>
+
+	* folding.el: (fold-mouse-call-original) use `int-to-string' in `concat'
+
 1999-02-15  SL Baur  <steve@xemacs.org>
 
 	* Makefile (ELCS): Add htmlize.elc.
 
 # This XEmacs package contains independent single file lisp packages
 
-VERSION = 1.18
+VERSION = 1.19
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = text-modes
                     (vector
                      (append (event-modifiers event)
                              (list (intern (concat "button"
-                                                   (event-button event))))))))
+                                                   (int-to-string (event-button event)))))))))
              (t
               (error "This version of Emacs can't handle events.")))
 
       (if (re-search-forward
 	   ;; Generate a regexp on the fly
 	   (concat "\"\\(" (make-string xpm-chars-per-pixel ?.) "\\)" ; chars
-		   "\\s-+\\([c]\\)"	; there are more classes than 'c'
-		   "\\s-+\\([^\"]+\\)\"")
+		   "\\(\\s-+[sm]\\s-+\\S-*\\)*"   ; s and m classes
+		   "\\s-+\\([c]\\)"	          ; c class
+		   "\\s-+\\([^ \t\"]+\\)")
 	   end t)
 	  (progn 
-	    (xpm-store-color (match-string 1) (match-string 3))
-	    (list (match-string 1) (match-string 3)))
+	    (xpm-store-color (match-string 1) (match-string 4))
+	    (list (match-string 1) (match-string 4)))
 	(error "Unable to parse color")))))
 
 (defun xpm-add-color (str color)