Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-33

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 223-227)

   - Update from CVS
This commit is contained in:
Miles Bader 2005-04-02 22:40:25 +00:00
commit 4a2283bcc7
62 changed files with 1363 additions and 616 deletions

View file

@ -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)

View file

@ -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 <Georges.Brun-Cottan@inria.fr>
;; Maintainer: Stefan Monnier <monnier@gnu.org>
@ -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
@ -253,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.
@ -278,8 +280,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