From 2a3a044ce6b81e261862c1bebb8ce560e344bb91 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Thu, 31 Mar 2005 14:49:09 +0000 Subject: (easy-mmode-define-global-mode, define-minor-mode): Call custom-current-group at load-time. --- lisp/emacs-lisp/easy-mmode.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index b6b91710ed4..da93190f2e9 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -1,6 +1,7 @@ ;;; easy-mmode.el --- easy definition for major and minor modes -;; Copyright (C) 1997,2000,01,02,03,2004 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Georges Brun-Cottan ;; Maintainer: Stefan Monnier @@ -152,8 +153,8 @@ For example, you could write (unless group ;; We might as well provide a best-guess default group. (setq group - `(:group ',(or (custom-current-group) - (intern (replace-regexp-in-string + `(:group (or (custom-current-group) + ',(intern (replace-regexp-in-string "-mode\\'" "" mode-name)))))) `(progn @@ -278,8 +279,8 @@ KEYS is a list of CL-style keyword arguments: (unless group ;; We might as well provide a best-guess default group. (setq group - `(:group ',(or (custom-current-group) - (intern (replace-regexp-in-string + `(:group (or (custom-current-group) + ',(intern (replace-regexp-in-string "-mode\\'" "" (symbol-name mode))))))) `(progn -- cgit v1.2.3 From 39a27f952b3d1d7a08f4d747b0015e821c9ecc96 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 31 Mar 2005 21:16:54 +0000 Subject: (define-global-minor-mode): Renamed from easy-mmode-define-global-mode. (easy-mmode-define-global-mode): Alias for define-global-minor-mode. --- lisp/ChangeLog | 9 +++++++++ lisp/emacs-lisp/easy-mmode.el | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd2043e3f3a..0f142a5e255 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2005-03-31 Richard M. Stallman + + * emacs-lisp/easy-mmode.el (define-global-minor-mode): + Renamed from easy-mmode-define-global-mode. + (easy-mmode-define-global-mode): Alias for define-global-minor-mode. + + * progmodes/scheme.el (scheme-mode-syntax-table): Update + syntax of | and # for two-character comment syntax. + 2005-03-31 Lute Kamstra * emacs-lisp/easy-mmode.el (easy-mmode-define-global-mode) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index da93190f2e9..a96b1741139 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -254,8 +254,9 @@ With zero or negative ARG turn mode off. ;;; ;;;###autoload -(defmacro easy-mmode-define-global-mode (global-mode mode turn-on - &rest keys) +(defalias 'easy-mmode-define-global-mode 'define-global-minor-mode) +;;;###autoload +(defmacro define-global-minor-mode (global-mode mode turn-on &rest keys) "Make GLOBAL-MODE out of the buffer-local minor MODE. TURN-ON is a function that will be called with no args in every buffer and that should try to turn MODE on if applicable for that buffer. -- cgit v1.2.3 From 1b39b4933b600887cca06781b6e7ac678480a5b4 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 31 Mar 2005 21:17:40 +0000 Subject: (make-autoload): Handle define-global-minor-mode. --- lisp/emacs-lisp/autoload.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 0a75a43827e..68d1287d98c 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -72,7 +72,7 @@ or macro definition or a defcustom)." (let ((car (car-safe form)) expand) (cond ;; For complex cases, try again on the macro-expansion. - ((and (memq car '(easy-mmode-define-global-mode + ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode easy-mmode-define-minor-mode define-minor-mode)) (setq expand (let ((load-file-name file)) (macroexpand form))) (eq (car expand) 'progn) -- cgit v1.2.3