2000-11-08 Bj\e,Av\e(Brn Torkelsson <torkel@hpc2n.umu.se>

	* gpg.el: In Xemacs it is called point-at-eol, not
	line-end-position

	* gpg.el (gpg-key-lessp): use string-lessp instead of
	compare-strings (not available on XEmacs)

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b5b3458..f512ae6 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,4 +1,16 @@
+2000-11-08  Bj\e,Av\e(Brn Torkelsson  <torkel@hpc2n.umu.se>
+
+       * gpg.el: In Xemacs it is called point-at-eol, not
+       line-end-position
+
+       * gpg.el (gpg-key-lessp): use string-lessp instead of
+       compare-strings (not available on XEmacs)
+       
 2000-11-16  Simon Josefsson  <sj@extundo.com>
 
        * gpg.el (gpg-command-verify-cleartext): New variable.
        (gpg-verify-cleartext): New function.
+       
+;; Local Variables:
+;; coding: iso-2022-7bit
+;; End:

diff --git a/contrib/gpg.el b/contrib/gpg.el
index 8f55f32..f885330 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -7,7 +7,7 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 
-;; $Id: gpg.el,v 1.1 2000/11/04 12:22:17 zsh Exp $
+;; $Id: gpg.el,v 1.2 2000/11/18 20:57:13 jas Exp $
 
 ;; This file is NOT (yet?) part of GNU Emacs.
 
@@ -112,6 +112,10 @@
 (eval-when-compile 
   (require 'cl))
 
+
+(if (featurep 'xemacs)
+         (defalias 'line-end-position 'point-at-eol))
+
 ;;;; Customization:
 
 ;;; Customization: Groups:
@@ -1079,12 +1083,7 @@ documentation for details)."
 
 (defun gpg-key-lessp (a b)
   "Returns t if primary user ID of A is less than B."
-  (let ((res (compare-strings (gpg-key-primary-user-id a) 0 nil
-                             (gpg-key-primary-user-id b) 0 nil
-                             t)))
-    (if (eq res t)
-       nil
-      (< res 0))))
+  (string-lessp (gpg-key-primary-user-id a) (gpg-key-primary-user-id b) ))
 
 ;;; Accessing the key database: