update.

[elisp/apel.git] / calist.el

diff --git a/calist.el b/calist.el
index 36fe8de..22cb3ec 100644 (file)
--- a/calist.el
+++ b/calist.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -48,7 +48,7 @@
              (if (intern-soft (symbol-name sym)
                               calist-field-match-method-obarray)
                  (signal 'conflict-of-calist-symbol
-                         (list (format "Conflict of symbol %s")))
+                         (list (format "Conflict of symbol %s" sym)))
                (if (fboundp sym)
                    (define-calist-field-match-method
                      sym (symbol-function sym))
@@ -81,12 +81,14 @@
          ((equal (cdr s-field) field-value)
           calist))))
 
-(define-calist-field-match-method t #'calist-default-field-match-method)
+(define-calist-field-match-method t (function calist-default-field-match-method))
 
 (defsubst calist-field-match-method (field-type)
   (symbol-function
-   (or (intern-soft
-       (symbol-name field-type) calist-field-match-method-obarray)
+   (or (intern-soft (if (symbolp field-type)
+                       (symbol-name field-type)
+                     field-type)
+                   calist-field-match-method-obarray)
        (intern-soft "t" calist-field-match-method-obarray))))
 
 (defsubst calist-field-match (calist field-type field-value)
@@ -323,6 +325,7 @@ even if other rules are matched for ALIST."
 ;;; @ end
 ;;;
 
-(provide 'calist)
+(require 'product)
+(product-provide (provide 'calist) (require 'apel-ver))
 
 ;;; calist.el ends here