Moved definition of kbd to compatibility.el

src/compatibility.el

@@ -135,6 +135,22 @@ of the lyskom-provide-* functions instead."
 
 (put 'lyskom-xemacs-or-gnu 'edebug-form-spec '(form form))
 
+
+
+;;; ======================================================================
+;;; Defining keys
+;;;
+
+(lyskom-provide-macro kbd (keys)
+  "Convert KEYS to the internal Emacs key representation.
+KEYS should be a string in the format used for saving keyboard macros
+\(see `insert-kbd-macro')."
+  (if (or (stringp keys)
+	  (vectorp keys))
+      (read-kbd-macro keys)
+    `(read-kbd-macro ,keys)))
+
+
 ;;; ======================================================================
 ;;; ======================================================================
 ;;; ======================================================================

src/macros.el

@@ -44,23 +44,6 @@
 (require 'custom)
 (require 'widget)
 
-
-
-;;; ======================================================================
-;;; Defining keys
-;;;
-
-(or (fboundp 'kbd)
-    (defmacro kbd (keys)
-      "Convert KEYS to the internal Emacs key representation.
-KEYS should be a string in the format used for saving keyboard macros
-\(see `insert-kbd-macro')."
-      (if (or (stringp keys)
-              (vectorp keys))
-          (read-kbd-macro keys)
-        `(read-kbd-macro ,keys))))
-
-
 ;;; ======================================================================
 ;;; lyskom-traverse - traverse a sequence.
 ;;;
@@ -127,7 +110,7 @@ Value returned is always nil."
 	      '(set-buffer __buffer__))))
 
 (put 'lyskom-save-excursion 'edebug-form-spec t)
-(put 'lyskom-provide-macro 'lisp-indent-hook 2)
+(put 'lyskom-save-excursion 'lisp-indent-hook 0)
 
 ;;; ======================================================================
 ;;; Some useful macros to make the code more readable.