# HG changeset patch
# User blanchet
# Date 1288002278 -7200
# Node ID 06191c5f36867a56b935ef10d0e67b99e8c29d89
# Parent  be8acf6e63bb247a688912fd56e31deb0e693c1f# Parent  03b97c64563b24624a06700727fe0ac7f7b4ab0d
merge

diff -r be8acf6e63bb -r 06191c5f3686 etc/isar-keywords.el
--- a/etc/isar-keywords.el	Mon Oct 25 11:42:05 2010 +0200
+++ b/etc/isar-keywords.el	Mon Oct 25 12:24:38 2010 +0200
@@ -95,7 +95,6 @@
     "find_consts"
     "find_theorems"
     "fix"
-    "fixpat"
     "fixrec"
     "from"
     "full_prf"
@@ -151,6 +150,7 @@
     "overloading"
     "parse_ast_translation"
     "parse_translation"
+    "partial_function"
     "pcpodef"
     "pr"
     "prefer"
@@ -464,7 +464,6 @@
     "extract"
     "extract_type"
     "finalconsts"
-    "fixpat"
     "fixrec"
     "fun"
     "hide_class"
@@ -537,6 +536,7 @@
     "nominal_inductive"
     "nominal_inductive2"
     "nominal_primrec"
+    "partial_function"
     "pcpodef"
     "quotient_type"
     "recdef_tc"