CVS update by stephent packages/xemacs-packages/pgg ...

  User: stephent
  Date: 09/01/26 10:28:17

  Modified:    packages/xemacs-packages/pgg ChangeLog pgg-parse.el
Log:
Fix smoketest by reverting broken patch.

Revision  Changes    Path
1.28      +4 -0      XEmacs/packages/xemacs-packages/pgg/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ChangeLog	2009/01/25 22:06:41	1.27
+++ ChangeLog	2009/01/26 09:28:16	1.28
@@ -1,3 +1,7 @@
+2009-01-26  Stephen J. Turnbull  <[email protected]>
+
+	* Revert Aidan's last commit.
+
 2007-12-23  Aidan Kehoe  <[email protected]>
 
 	* pgg-parse.el (pgg-parse-crc24): 



1.7       +18 -35    XEmacs/packages/xemacs-packages/pgg/pgg-parse.el

Index: pgg-parse.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pgg/pgg-parse.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pgg-parse.el	2009/01/25 22:06:42	1.6
+++ pgg-parse.el	2009/01/26 09:28:16	1.7
@@ -35,7 +35,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl) (when (featurep 'mule) (require 'ccl)))
+(eval-when-compile (require 'cl))
 
 (defgroup pgg-parse ()
   "OpenPGP packet parsing."
@@ -159,42 +159,25 @@
 (defmacro pgg-set-alist (alist key value)
   `(setq ,alist (nconc ,alist (list (cons ,key ,value)))))
 
-(defconst pgg-parse-crc24 
-  (eval-when-compile
-    (let ((pre-existing
-	   [1 30 14 114744 114775 0 161 131127 1 148217 15 82167 1 1848
-	   131159 1 1595 5 256 114743 390 114775 19707 1467 16 7 183 1 -5628
-	   -7164 22]))
-      (when (fboundp #'ccl-compile)
-	(assert
-	 (equal
-	  pre-existing
-	  (ccl-compile 
-	   '(1
-	     ((loop
-		(read r0) (r1 ^= r0) (r2 ^= 0)
-		(r5 = 0)
-		(loop
-		  (r1 <<= 1)
-		  (r1 += ((r2 >> 15) & 1))
-		  (r2 <<= 1)
-		  (if (r1 & 256)
-		      ((r1 ^= 390) (r2 ^= 19707)))
-		  (if (r5 < 7)
-		      ((r5 += 1)
-		       (repeat))))
-		(repeat))))))
-	 nil
-	 "The pre-compiled CCL program appears broken, or the implementation
-of `ccl-compile' has changed versus to when this code was written.  "))
-      pre-existing))
-  "A CCL program to parse CRC 24 checksums.  See `define-ccl-program'.")
+(when (fboundp 'define-ccl-program)
 
-(put 'pgg-parse-crc24 'ccl-program-idx
-     (register-ccl-program 'pgg-parse-crc24 pgg-parse-crc24))
+  (define-ccl-program pgg-parse-crc24
+    '(1
+      ((loop
+	(read r0) (r1 ^= r0) (r2 ^= 0)
+	(r5 = 0)
+	(loop
+	 (r1 <<= 1)
+	 (r1 += ((r2 >> 15) & 1))
+	 (r2 <<= 1)
+	 (if (r1 & 256)
+	     ((r1 ^= 390) (r2 ^= 19707)))
+	 (if (r5 < 7)
+	     ((r5 += 1)
+	      (repeat))))
+	(repeat)))))
 
-(defun pgg-parse-crc24-string (string)
-  (when (fboundp #'ccl-execute-on-string)
+  (defun pgg-parse-crc24-string (string)
     (let ((h (vector nil 183 1230 nil nil nil nil nil nil)))
       (ccl-execute-on-string pgg-parse-crc24 h string)
       (format "%c%c%c"