Commits

youngs  committed 67ffb28

2002-04-30 Steve Youngs <youngs@xemacs.org>

* Makefile (REQUIRES): Add xemacs-base for *-kbd-macro functions.

* macedit.el (edit-last-kbd-macro): Comment out, function is
defined in `edmacro.el'.
(edit-kbd-macro): Ditto.
(read-kbd-macro): Ditto.

* Makefile (VERSION): XEmacs package 1.21 released.

  • Participants
  • Parent commits 089fe89

Comments (0)

Files changed (3)

 2002-04-30  Steve Youngs  <youngs@xemacs.org>
 
+	* Makefile (REQUIRES): Add xemacs-base for *-kbd-macro functions.
+
+	* macedit.el (edit-last-kbd-macro): Comment out, function is
+	defined in `edmacro.el'.
+	(edit-kbd-macro): Ditto.
+	(read-kbd-macro): Ditto.
+
 	* Makefile (VERSION): XEmacs package 1.21 released.
 
 2002-04-25  Steve Youngs  <youngs@xemacs.org>
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = calc
 PKG_TYPE = regular
-REQUIRES =
+REQUIRES = xemacs-base
 CATEGORY = standard
 
 ELCS = calc-macs.elc calc.elc calc-aent.elc calc-alg-2.elc calc-alg-3.elc \
 ;;   (autoload 'edit-last-kbd-macro "macedit" "Edit a keyboard macro" t)
 ;;   (autoload 'read-kbd-macro "macedit" "Parse region as keyboard macro" t)
 
-
+;; Note: In XEmacs (at least) these functions are defined in
+;; `edmacro.el' so as to not pollute the namespace they have been
+;; commented out here. youngs@xemacs.org 2002-04-30
 
 ;; To use, type `M-x edit-last-kbd-macro' to edit the most recently
 ;; defined keyboard macro.  If you have used `M-x name-last-kbd-macro'
 
 ;;; The user-level commands for editing macros.
 
-;;;###autoload
-(defun edit-last-kbd-macro (&optional prefix buffer hook)
-  "Edit the most recently defined keyboard macro."
-  (interactive "P")
-  (MacEdit-edit-macro last-kbd-macro
-		      (function (lambda (x arg) (setq last-kbd-macro x)))
-		      prefix buffer hook)
-)
+;; These functions are all defined in `edmacro.el'. youngs@xemacs.org
+;; 2002-04-30
 
-;;;###autoload
-(defun edit-kbd-macro (cmd &optional prefix buffer hook in-hook out-hook)
-  "Edit a keyboard macro which has been assigned a name by name-last-kbd-macro.
-\(See also edit-last-kbd-macro.)"
-  (interactive "CCommand name: \nP")
-  (and cmd
-       (MacEdit-edit-macro (if in-hook
-			       (funcall in-hook cmd)
-			     (symbol-function cmd))
-			   (or out-hook
-			       (list 'lambda '(x arg)
-				     (list 'fset
-					   (list 'quote cmd)
-					   'x)))
-			   prefix buffer hook cmd))
-)
+;; (defun edit-last-kbd-macro (&optional prefix buffer hook)
+;;   "Edit the most recently defined keyboard macro."
+;;   (interactive "P")
+;;   (MacEdit-edit-macro last-kbd-macro
+;; 		      (function (lambda (x arg) (setq last-kbd-macro x)))
+;; 		      prefix buffer hook)
+;; )
 
-;;;###autoload
-(defun read-kbd-macro (start &optional end)
-  "Read the region as a keyboard macro definition.
-The region is interpreted as spelled-out keystrokes, e.g., `M-x abc RET'.
-The resulting macro is installed as the \"current\" keyboard macro.
 
-Symbols:  RET, SPC, TAB, DEL, LFD, NUL; C-key; M-key.  (Must be uppercase.)
-          REM marks the rest of a line as a comment.
-          Whitespace is ignored; other characters are copied into the macro."
-  (interactive "r")
-  (if (stringp start)
-      (setq last-kbd-macro (MacEdit-parse-keys start))
-    (setq last-kbd-macro (MacEdit-parse-keys (buffer-substring start end)))
-    (if (and (string-match "\\`\C-x(" last-kbd-macro)
-	     (string-match "\C-x)\\'" last-kbd-macro))
-	(setq last-kbd-macro (substring last-kbd-macro 2 -2))))
-)
+;; (defun edit-kbd-macro (cmd &optional prefix buffer hook in-hook out-hook)
+;;   "Edit a keyboard macro which has been assigned a name by name-last-kbd-macro.
+;; \(See also edit-last-kbd-macro.)"
+;;   (interactive "CCommand name: \nP")
+;;   (and cmd
+;;        (MacEdit-edit-macro (if in-hook
+;; 			       (funcall in-hook cmd)
+;; 			     (symbol-function cmd))
+;; 			   (or out-hook
+;; 			       (list 'lambda '(x arg)
+;; 				     (list 'fset
+;; 					   (list 'quote cmd)
+;; 					   'x)))
+;; 			   prefix buffer hook cmd))
+;; )
+
+
+;; (defun read-kbd-macro (start &optional end)
+;;   "Read the region as a keyboard macro definition.
+;; The region is interpreted as spelled-out keystrokes, e.g., `M-x abc RET'.
+;; The resulting macro is installed as the \"current\" keyboard macro.
+
+;; Symbols:  RET, SPC, TAB, DEL, LFD, NUL; C-key; M-key.  (Must be uppercase.)
+;;           REM marks the rest of a line as a comment.
+;;           Whitespace is ignored; other characters are copied into the macro."
+;;   (interactive "r")
+;;   (if (stringp start)
+;;       (setq last-kbd-macro (MacEdit-parse-keys start))
+;;     (setq last-kbd-macro (MacEdit-parse-keys (buffer-substring start end)))
+;;     (if (and (string-match "\\`\C-x(" last-kbd-macro)
+;; 	     (string-match "\C-x)\\'" last-kbd-macro))
+;; 	(setq last-kbd-macro (substring last-kbd-macro 2 -2))))
+;; )