aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wohler2006-03-31 17:44:40 +0000
committerBill Wohler2006-03-31 17:44:40 +0000
commit59e8810f09da1107f2f895b84b6b9179d3461093 (patch)
tree87a2b462da4a2e68a3155d77002ded4063297798
parent356dfa978842985993b8221fdb41f5ccea1785b1 (diff)
downloademacs-59e8810f09da1107f2f895b84b6b9179d3461093.tar.gz
emacs-59e8810f09da1107f2f895b84b6b9179d3461093.zip
(mh-strip-package-version): Move before use to avoid compiler error.
-rw-r--r--lisp/mh-e/ChangeLog5
-rw-r--r--lisp/mh-e/mh-e.el26
2 files changed, 18 insertions, 13 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 64876717392..51fdf8cce32 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
12006-03-31 Bill Wohler <wohler@newt.com>
2
3 * mh-e.el (mh-strip-package-version): Move before use to avoid
4 compiler error.
5
12006-03-30 Bill Wohler <wohler@newt.com> 62006-03-30 Bill Wohler <wohler@newt.com>
2 7
3 * mh-e.el (mh-defcustom, mh-defface, mh-defgroup): Macros to 8 * mh-e.el (mh-defcustom, mh-defface, mh-defgroup): Macros to
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index ce2db4fb66e..191cecb709a 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -895,6 +895,19 @@ necessary and can actually cause problems."
895 895
896;; Temporary function and data structure used customization. 896;; Temporary function and data structure used customization.
897;; These will be unbound after the options are defined. 897;; These will be unbound after the options are defined.
898(defun mh-strip-package-version (args)
899 "Strip :package-version keyword and its value from ARGS.
900In Emacs versions that support the :package-version keyword,
901ARGS is returned unchanged."
902 (if (boundp 'customize-package-emacs-version-alist)
903 args
904 (let (seen)
905 (loop for keyword in args
906 if (cond ((eq keyword ':package-version) (setq seen t) nil)
907 (seen (setq seen nil) nil)
908 (t t))
909 collect keyword))))
910
898(defmacro mh-defgroup (symbol members doc &rest args) 911(defmacro mh-defgroup (symbol members doc &rest args)
899 "Declare SYMBOL as a customization group containing MEMBERS. 912 "Declare SYMBOL as a customization group containing MEMBERS.
900See documentation for `defgroup' for a description of the arguments 913See documentation for `defgroup' for a description of the arguments
@@ -925,19 +938,6 @@ keyword, introduced in Emacs 22."
925 `(defface ,face ,spec ,doc ,@(mh-strip-package-version args))) 938 `(defface ,face ,spec ,doc ,@(mh-strip-package-version args)))
926(put 'mh-defface 'lisp-indent-function 'defun) 939(put 'mh-defface 'lisp-indent-function 'defun)
927 940
928(defun mh-strip-package-version (args)
929 "Strip :package-version keyword and its value from ARGS.
930In Emacs versions that support the :package-version keyword,
931ARGS is returned unchanged."
932 (if (boundp 'customize-package-emacs-version-alist)
933 args
934 (let (seen)
935 (loop for keyword in args
936 if (cond ((eq keyword ':package-version) (setq seen t) nil)
937 (seen (setq seen nil) nil)
938 (t t))
939 collect keyword))))
940
941 941
942 942
943;;; MH-E Customization 943;;; MH-E Customization