annotate lisp/emacs-lisp/easy-mmode.el @ 64257:808b36b5395e

(tooltip-mode): Revert to previous implementation of its defcustom.
author Luc Teirlinck <teirllm@auburn.edu>
date Tue, 12 Jul 2005 20:14:40 +0000
parents 18a818a2ee7c
children f2e16ba201e0 f9a65d7ebd29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38324
diff changeset
1 ;;; easy-mmode.el --- easy definition for major and minor modes
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
61168
ef30a398bcbe (easy-mmode-define-global-mode, define-minor-mode): Call
Lute Kamstra <lute@gnu.org>
parents: 57882
diff changeset
3 ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005
ef30a398bcbe (easy-mmode-define-global-mode, define-minor-mode): Call
Lute Kamstra <lute@gnu.org>
parents: 57882
diff changeset
4 ;; Free Software Foundation, Inc.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
38455
802c948ddb3a *** empty log message ***
Pavel Janík <Pavel@Janik.cz>
parents: 38436
diff changeset
6 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
802c948ddb3a *** empty log message ***
Pavel Janík <Pavel@Janik.cz>
parents: 38436
diff changeset
7 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
802c948ddb3a *** empty log message ***
Pavel Janík <Pavel@Janik.cz>
parents: 38436
diff changeset
8
802c948ddb3a *** empty log message ***
Pavel Janík <Pavel@Janik.cz>
parents: 38436
diff changeset
9 ;; Keywords: extensions lisp
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; GNU Emacs is free software; you can redistribute it and/or modify
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; it under the terms of the GNU General Public License as published by
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 ;; the Free Software Foundation; either version 2, or (at your option)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16 ;; any later version.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; GNU General Public License for more details.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64085
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63786
diff changeset
25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63786
diff changeset
26 ;; Boston, MA 02110-1301, USA.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28 ;;; Commentary:
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30 ;; Minor modes are useful and common. This package makes defining a
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31 ;; minor mode easy, by focusing on the writing of the minor mode
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32 ;; functionalities themselves. Moreover, this package enforces a
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33 ;; conventional naming of user interface primitives, making things
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 ;; natural for the minor-mode end-users.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
36 ;; For each mode, easy-mmode defines the following:
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37 ;; <mode> : The minor mode predicate. A buffer-local variable.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 ;; <mode>-map : The keymap possibly associated to <mode>.
29039
d8bafae6beb2 Update copyright and commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28239
diff changeset
39 ;; see `define-minor-mode' documentation
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
40 ;;
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41 ;; eval
29039
d8bafae6beb2 Update copyright and commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28239
diff changeset
42 ;; (pp (macroexpand '(define-minor-mode <your-mode> <doc>)))
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43 ;; to check the result before using it.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45 ;; The order in which minor modes are installed is important. Keymap
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 ;; lookup proceeds down minor-mode-map-alist, and the order there
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47 ;; tends to be the reverse of the order in which the modes were
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
48 ;; installed. Perhaps there should be a feature to let you specify
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
49 ;; orderings.
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
51 ;; Additionally to `define-minor-mode', the package provides convenient
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
52 ;; ways to define keymaps, and other helper functions for major and minor modes.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
54 ;;; Code:
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
55
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
56 (eval-when-compile (require 'cl))
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
57
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
58 (defun easy-mmode-pretty-mode-name (mode &optional lighter)
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
59 "Turn the symbol MODE into a string intended for the user.
62149
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
60 If provided, LIGHTER will be used to help choose capitalization by,
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
61 replacing its case-insensitive matches with the literal string in LIGHTER."
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
62 (let* ((case-fold-search t)
62181
14a20ce36638 (easy-mmode-pretty-mode-name): Improve commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 62149
diff changeset
63 ;; Produce "Foo-Bar minor mode" from foo-bar-minor-mode.
32048
39617f078b9d (easy-mmode-pretty-mode-name): Prettier.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31981
diff changeset
64 (name (concat (replace-regexp-in-string
62181
14a20ce36638 (easy-mmode-pretty-mode-name): Improve commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 62149
diff changeset
65 ;; If the original mode name included "-minor" (some
14a20ce36638 (easy-mmode-pretty-mode-name): Improve commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 62149
diff changeset
66 ;; of them don't, e.g. auto-revert-mode), then
14a20ce36638 (easy-mmode-pretty-mode-name): Improve commentary.
Eli Zaretskii <eliz@gnu.org>
parents: 62149
diff changeset
67 ;; replace it with " minor".
32048
39617f078b9d (easy-mmode-pretty-mode-name): Prettier.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31981
diff changeset
68 "-Minor" " minor"
62149
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
69 ;; "foo-bar-minor" -> "Foo-Bar-Minor"
32048
39617f078b9d (easy-mmode-pretty-mode-name): Prettier.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31981
diff changeset
70 (capitalize (replace-regexp-in-string
62149
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
71 ;; "foo-bar-minor-mode" -> "foo-bar-minor"
32048
39617f078b9d (easy-mmode-pretty-mode-name): Prettier.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31981
diff changeset
72 "-mode\\'" "" (symbol-name mode))))
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
73 " mode")))
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
74 (if (not (stringp lighter)) name
62149
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
75 ;; Strip leading and trailing whitespace from LIGHTER.
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
76 (setq lighter (replace-regexp-in-string "\\`\\s-+\\|\\s-+\\'" ""
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
77 lighter))
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
78 ;; Replace any (case-insensitive) matches for LIGHTER in NAME
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
79 ;; with a literal LIGHTER. E.g., if NAME is "Iimage mode" and
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
80 ;; LIGHTER is " iImag", then this will produce "iImage mode".
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
81 ;; (LIGHTER normally comes from the mode-line string passed to
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
82 ;; define-minor-mode, and normally includes at least one leading
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
83 ;; space.)
e64f1e2ecec2 (easy-mmode-pretty-mode-name): Explain
Eli Zaretskii <eliz@gnu.org>
parents: 61861
diff changeset
84 (replace-regexp-in-string (regexp-quote lighter) lighter name t t))))
29399
addeae19bf96 (easy-mmode-derive-name): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29039
diff changeset
85
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 ;;;###autoload
26551
271f77895660 Changed maintainer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25408
diff changeset
87 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
271f77895660 Changed maintainer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25408
diff changeset
88 ;;;###autoload
271f77895660 Changed maintainer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25408
diff changeset
89 (defmacro define-minor-mode (mode doc &optional init-value lighter keymap &rest body)
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90 "Define a new minor mode MODE.
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
91 This function defines the associated control variable MODE, keymap MODE-map,
62433
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
92 and toggle command MODE.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94 DOC is the documentation for the mode toggle command.
26551
271f77895660 Changed maintainer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25408
diff changeset
95 Optional INIT-VALUE is the initial value of the mode's variable.
29039
d8bafae6beb2 Update copyright and commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28239
diff changeset
96 Optional LIGHTER is displayed in the modeline when the mode is on.
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
97 Optional KEYMAP is the default (defvar) keymap bound to the mode keymap.
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
98 If it is a list, it is passed to `easy-mmode-define-keymap'
33131
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
99 in order to build a valid keymap. It's generally better to use
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
100 a separate MODE-map variable than to use this argument.
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
101 The above three arguments can be skipped if keyword arguments are
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
102 used (see below).
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
103
26551
271f77895660 Changed maintainer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25408
diff changeset
104 BODY contains code that will be executed each time the mode is (dis)activated.
62433
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
105 It will be executed after any toggling but before running the hook variable
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
106 `mode-HOOK'.
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
107 Before the actual body code, you can write keyword arguments (alternating
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
108 keywords and values). These following keyword arguments are supported (other
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
109 keywords will be passed to `defcustom' if the minor mode is global):
47788
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
110 :group GROUP Custom group name to use in all generated `defcustom' forms.
61318
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
111 Defaults to MODE without the possible trailing \"-mode\".
61861
d60a6aee7c8d (define-minor-mode): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 61318
diff changeset
112 Don't use this default group name unless you have written a
d60a6aee7c8d (define-minor-mode): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 61318
diff changeset
113 `defgroup' to define that group properly.
47463
2b213bd55695 (define-minor-mode): Add a :require arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47043
diff changeset
114 :global GLOBAL If non-nil specifies that the minor mode is not meant to be
61318
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
115 buffer-local, so don't make the variable MODE buffer-local.
47788
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
116 By default, the mode is buffer-local.
47463
2b213bd55695 (define-minor-mode): Add a :require arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47043
diff changeset
117 :init-value VAL Same as the INIT-VALUE argument.
2b213bd55695 (define-minor-mode): Add a :require arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47043
diff changeset
118 :lighter SPEC Same as the LIGHTER argument.
51320
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
119 :keymap MAP Same as the KEYMAP argument.
47788
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
120 :require SYM Same as in `defcustom'.
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
121
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
122 For example, you could write
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
123 (define-minor-mode foo-mode \"If enabled, foo on you!\"
50300
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
124 :lighter \" Foo\" :require 'foo :global t :group 'hassle :version \"27.5\"
47788
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
125 ...BODY CODE...)"
51320
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
126 (declare (debug (&define name stringp
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
127 [&optional [&not keywordp] sexp
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
128 &optional [&not keywordp] sexp
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
129 &optional [&not keywordp] sexp]
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
130 [&rest [keywordp sexp]]
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
131 def-body)))
47788
1174e4c84d58 (define-minor-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 47657
diff changeset
132
33131
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
133 ;; Allow skipping the first three args.
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
134 (cond
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
135 ((keywordp init-value)
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
136 (setq body (list* init-value lighter keymap body)
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
137 init-value nil lighter nil keymap nil))
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
138 ((keywordp lighter)
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
139 (setq body (list* lighter keymap body) lighter nil keymap nil))
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
140 ((keywordp keymap) (push keymap body) (setq keymap nil)))
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
141
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
142 (let* ((mode-name (symbol-name mode))
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
143 (pretty-name (easy-mmode-pretty-mode-name mode lighter))
29039
d8bafae6beb2 Update copyright and commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28239
diff changeset
144 (globalp nil)
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
145 (group nil)
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
146 (extra-args nil)
50300
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
147 (extra-keywords nil)
47463
2b213bd55695 (define-minor-mode): Add a :require arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47043
diff changeset
148 (require t)
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
149 (hook (intern (concat mode-name "-hook")))
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
150 (hook-on (intern (concat mode-name "-on-hook")))
50300
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
151 (hook-off (intern (concat mode-name "-off-hook")))
51320
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
152 keyw keymap-sym)
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
153
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
154 ;; Check keys.
50300
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
155 (while (keywordp (setq keyw (car body)))
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
156 (setq body (cdr body))
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
157 (case keyw
33131
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
158 (:init-value (setq init-value (pop body)))
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
159 (:lighter (setq lighter (pop body)))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
160 (:global (setq globalp (pop body)))
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
161 (:extra-args (setq extra-args (pop body)))
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
162 (:group (setq group (nconc group (list :group (pop body)))))
47463
2b213bd55695 (define-minor-mode): Add a :require arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47043
diff changeset
163 (:require (setq require (pop body)))
51320
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
164 (:keymap (setq keymap (pop body)))
50300
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
165 (t (push keyw extra-keywords) (push (pop body) extra-keywords))))
32999
6bc392d6aef3 (define-minor-mode): Generate `turn-on-MODE' and `turn-off-MODE'
Miles Bader <miles@gnu.org>
parents: 32491
diff changeset
166
51320
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
167 (setq keymap-sym (if (and keymap (symbolp keymap)) keymap
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
168 (intern (concat mode-name "-map"))))
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
169
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
170 (unless group
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
171 ;; We might as well provide a best-guess default group.
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
172 (setq group
61318
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
173 `(:group ',(intern (replace-regexp-in-string
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
174 "-mode\\'" "" mode-name)))))
62635
a33f6ed6e52e (define-global-minor-mode): Use `after-change-major-mode-hook' instead
Luc Teirlinck <teirllm@auburn.edu>
parents: 62433
diff changeset
175
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
176 `(progn
25408
68c51b1a537f (easy-mmode-define-minor-mode):
Karl Heuer <kwzh@gnu.org>
parents: 24935
diff changeset
177 ;; Define the variable to enable or disable the mode.
29414
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
178 ,(if (not globalp)
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
179 `(progn
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
180 (defvar ,mode ,init-value ,(format "Non-nil if %s is enabled.
35562
6b8b7796f28b (define-minor-mode): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 34149
diff changeset
181 Use the command `%s' to change this variable." pretty-name mode))
29414
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
182 (make-variable-buffer-local ',mode))
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
183
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
184 (let ((curfile (or (and (boundp 'byte-compile-current-file)
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
185 byte-compile-current-file)
63141
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
186 load-file-name))
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
187 base-doc-string)
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
188 (setq base-doc-string "Non-nil if %s is enabled.
33131
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
189 See the command `%s' for a description of this minor-mode.
29039
d8bafae6beb2 Update copyright and commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28239
diff changeset
190 Setting this variable directly does not take effect;
63141
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
191 use either \\[customize] or the function `%s'.")
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
192 (if (null body)
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
193 (setq base-doc-string "Non-nil if %s is enabled.
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
194 See the command `%s' for a description of this minor-mode."))
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
195
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
196 `(defcustom ,mode ,init-value
c531a8daedc6 (define-minor-mode): If BODY is empty, give the variable a doc string
Richard M. Stallman <rms@gnu.org>
parents: 63023
diff changeset
197 ,(format base-doc-string pretty-name mode mode)
50300
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
198 :set 'custom-set-minor-mode
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
199 :initialize 'custom-initialize-default
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
200 ,@group
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
201 :type 'boolean
47463
2b213bd55695 (define-minor-mode): Add a :require arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47043
diff changeset
202 ,@(cond
2b213bd55695 (define-minor-mode): Add a :require arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47043
diff changeset
203 ((not (and curfile require)) nil)
63786
acf9926186d5 (define-minor-mode): Don't automatically add a :require to the defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 63141
diff changeset
204 ((not (eq require t)) `(:require ,require)))
50300
7e4e15b857f3 (define-minor-mode): Use custom-set-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49598
diff changeset
205 ,@(nreverse extra-keywords))))
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
206
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
207 ;; The actual function.
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
208 (defun ,mode (&optional arg ,@extra-args)
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
209 ,(or doc
33131
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
210 (format (concat "Toggle %s on or off.
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
211 Interactively, with no prefix argument, toggle the mode.
46900
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
212 With universal prefix ARG turn mode on.
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
213 With zero or negative ARG turn mode off.
33131
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
214 \\{%s}") pretty-name keymap-sym))
46900
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
215 ;; Use `toggle' rather than (if ,mode 0 1) so that using
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
216 ;; repeat-command still does the toggling correctly.
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
217 (interactive (list (or current-prefix-arg 'toggle)))
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
218 (setq ,mode
46900
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
219 (cond
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
220 ((eq arg 'toggle) (not ,mode))
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
221 (arg (> (prefix-numeric-value arg) 0))
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
222 (t
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
223 (if (null ,mode) t
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
224 (message
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
225 "Toggling %s off; better pass an explicit argument."
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
226 ',mode)
3c3d686b25fa (easy-mmode-define-global-mode): Use find-file-hook instead of find-file-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46873
diff changeset
227 nil))))
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
228 ,@body
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
229 ;; The on/off hooks are here for backward compatibility only.
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
230 (run-hooks ',hook (if ,mode ',hook-on ',hook-off))
57882
15493a81cb78 (define-minor-mode): Use called-interactively-p.
Richard M. Stallman <rms@gnu.org>
parents: 53733
diff changeset
231 (if (called-interactively-p)
47043
360c6fcdde04 (define-minor-mode): Use customize-mark-as-set for global minor modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46900
diff changeset
232 (progn
360c6fcdde04 (define-minor-mode): Use customize-mark-as-set for global minor modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46900
diff changeset
233 ,(if globalp `(customize-mark-as-set ',mode))
50635
e0775ee7f599 (define-minor-mode): Only echo a message if the body didn't do so already.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50300
diff changeset
234 (unless (current-message)
51320
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
235 (message ,(format "%s %%sabled" pretty-name)
50635
e0775ee7f599 (define-minor-mode): Only echo a message if the body didn't do so already.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50300
diff changeset
236 (if ,mode "en" "dis")))))
47043
360c6fcdde04 (define-minor-mode): Use customize-mark-as-set for global minor modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46900
diff changeset
237 (force-mode-line-update)
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
238 ;; Return the new setting.
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
239 ,mode)
51320
418f1ce2a14e (define-minor-mode): Add edebug spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50635
diff changeset
240
61318
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
241 ;; Autoloading a define-minor-mode autoloads everything
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
242 ;; up-to-here.
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
243 :autoload-end
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
244
29414
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
245 ;; Define the minor-mode keymap.
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
246 ,(unless (symbolp keymap) ;nil is also a symbol.
29414
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
247 `(defvar ,keymap-sym
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
248 (let ((m ,keymap))
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
249 (cond ((keymapp m) m)
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
250 ((listp m) (easy-mmode-define-keymap m))
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
251 (t (error "Invalid keymap %S" ,keymap))))
29414
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
252 ,(format "Keymap for `%s'." mode-name)))
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
253
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
254 (add-minor-mode ',mode ',lighter
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
255 ,(if keymap keymap-sym
30876
76bba9fc3c22 (define-minor-mode): Use `symbol-value' to keep the byte-compiler quiet.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29548
diff changeset
256 `(if (boundp ',keymap-sym)
76bba9fc3c22 (define-minor-mode): Use `symbol-value' to keep the byte-compiler quiet.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29548
diff changeset
257 (symbol-value ',keymap-sym))))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48838
diff changeset
258
29039
d8bafae6beb2 Update copyright and commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28239
diff changeset
259 ;; If the mode is global, call the function according to the default.
47657
e8df9e898436 (define-minor-mode): Don't add properties
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47463
diff changeset
260 ,(if globalp
e8df9e898436 (define-minor-mode): Don't add properties
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47463
diff changeset
261 `(if (and load-file-name (not (equal ,init-value ,mode)))
e8df9e898436 (define-minor-mode): Don't add properties
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47463
diff changeset
262 (eval-after-load load-file-name '(,mode (if ,mode 1 -1))))))))
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
263
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
264 ;;;
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
265 ;;; make global minor mode
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
266 ;;;
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
267
29414
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
268 ;;;###autoload
61175
ef26a481327e (define-global-minor-mode): Renamed from easy-mmode-define-global-mode.
Richard M. Stallman <rms@gnu.org>
parents: 61168
diff changeset
269 (defalias 'easy-mmode-define-global-mode 'define-global-minor-mode)
ef26a481327e (define-global-minor-mode): Renamed from easy-mmode-define-global-mode.
Richard M. Stallman <rms@gnu.org>
parents: 61168
diff changeset
270 ;;;###autoload
ef26a481327e (define-global-minor-mode): Renamed from easy-mmode-define-global-mode.
Richard M. Stallman <rms@gnu.org>
parents: 61168
diff changeset
271 (defmacro define-global-minor-mode (global-mode mode turn-on &rest keys)
33131
8d1ed5c84809 (define-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33001
diff changeset
272 "Make GLOBAL-MODE out of the buffer-local minor MODE.
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
273 TURN-ON is a function that will be called with no args in every buffer
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
274 and that should try to turn MODE on if applicable for that buffer.
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
275 KEYS is a list of CL-style keyword arguments:
63023
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
276 :group to specify the custom group.
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
277
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
278 If MODE's set-up depends on the major mode in effect when it was
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
279 enabled, then disabling and reenabling MODE should make MODE work
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
280 correctly with the current major mode. This is important to
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
281 prevent problems with derived modes, that is, major modes that
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
282 call another major mode in their body."
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
283
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
284 (let* ((global-mode-name (symbol-name global-mode))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
285 (pretty-name (easy-mmode-pretty-mode-name mode))
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
286 (pretty-global-name (easy-mmode-pretty-mode-name global-mode))
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
287 (group nil)
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
288 (extra-args nil)
63023
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
289 (MODE-buffers (intern (concat global-mode-name "-buffers")))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
290 (MODE-enable-in-buffers
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
291 (intern (concat global-mode-name "-enable-in-buffers")))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
292 (MODE-check-buffers
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
293 (intern (concat global-mode-name "-check-buffers")))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
294 (MODE-cmhh (intern (concat global-mode-name "-cmhh")))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
295 (MODE-major-mode (intern (concat (symbol-name mode) "-major-mode"))))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
296
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
297 ;; Check keys.
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
298 (while (keywordp (car keys))
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
299 (case (pop keys)
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
300 (:extra-args (setq extra-args (pop keys)))
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
301 (:group (setq group (nconc group (list :group (pop keys)))))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
302 (t (setq keys (cdr keys)))))
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
303
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
304 (unless group
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
305 ;; We might as well provide a best-guess default group.
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
306 (setq group
61318
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
307 `(:group ',(intern (replace-regexp-in-string
8c8c06fad8d3 (define-global-minor-mode): Don't use custom-current-group.
Lute Kamstra <lute@gnu.org>
parents: 61175
diff changeset
308 "-mode\\'" "" (symbol-name mode))))))
48838
e0689be193e2 (define-minor-mode): Use `custom-current-group'.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47788
diff changeset
309
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
310 `(progn
63023
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
311 (defvar ,MODE-major-mode nil)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
312 (make-variable-buffer-local ',MODE-major-mode)
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
313 ;; The actual global minor-mode
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
314 (define-minor-mode ,global-mode
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
315 ,(format "Toggle %s in every buffer.
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
316 With prefix ARG, turn %s on if and only if ARG is positive.
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
317 %s is actually not turned on in every buffer but only in those
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
318 in which `%s' turns it on."
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
319 pretty-name pretty-global-name pretty-name turn-on)
33162
ccf6cd7d4512 (define-minor-mode): Remove :toggle arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33131
diff changeset
320 :global t :extra-args ,extra-args ,@group
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
321
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
322 ;; Setup hook to handle future mode changes and new buffers.
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
323 (if ,global-mode
29414
b18a17d5d9c6 (easy-mmode-define-global-mode): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29411
diff changeset
324 (progn
63023
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
325 (add-hook 'after-change-major-mode-hook
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
326 ',MODE-enable-in-buffers)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
327 (add-hook 'find-file-hook ',MODE-check-buffers)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
328 (add-hook 'change-major-mode-hook ',MODE-cmhh))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
329 (remove-hook 'after-change-major-mode-hook ',MODE-enable-in-buffers)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
330 (remove-hook 'find-file-hook ',MODE-check-buffers)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
331 (remove-hook 'change-major-mode-hook ',MODE-cmhh))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
332
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
333 ;; Go through existing buffers.
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
334 (dolist (buf (buffer-list))
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
335 (with-current-buffer buf
33165
8b3f1e99c11a (easy-mmode-define-global-mode): Only turn mode off if it's on.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33162
diff changeset
336 (if ,global-mode (,turn-on) (when ,mode (,mode -1))))))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
337
62433
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
338 ;; Autoloading define-global-minor-mode autoloads everything
50ff61f0f99d (define-minor-mode): Don't generate a defcustom for the mode hook variable.
Lute Kamstra <lute@gnu.org>
parents: 62181
diff changeset
339 ;; up-to-here.
29548
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
340 :autoload-end
71b284c55162 (define-minor-mode): If KEYMAP is a symbol, just use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29414
diff changeset
341
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
342 ;; List of buffers left to process.
63023
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
343 (defvar ,MODE-buffers nil)
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
344
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
345 ;; The function that calls TURN-ON in each buffer.
63023
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
346 (defun ,MODE-enable-in-buffers ()
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
347 (dolist (buf ,MODE-buffers)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
348 (when (buffer-live-p buf)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
349 (with-current-buffer buf
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
350 (if ,mode
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
351 (unless (eq ,MODE-major-mode major-mode)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
352 (,mode -1)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
353 (,turn-on)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
354 (setq ,MODE-major-mode major-mode))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
355 (,turn-on)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
356 (setq ,MODE-major-mode major-mode))))))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
357 (put ',MODE-enable-in-buffers 'definition-name ',global-mode)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
358
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
359 (defun ,MODE-check-buffers ()
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
360 (,MODE-enable-in-buffers)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
361 (setq ,MODE-buffers nil)
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
362 (remove-hook 'post-command-hook ',MODE-check-buffers))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
363 (put ',MODE-check-buffers 'definition-name ',global-mode)
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
364
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
365 ;; The function that catches kill-all-local-variables.
63023
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
366 (defun ,MODE-cmhh ()
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
367 (add-to-list ',MODE-buffers (current-buffer))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
368 (add-hook 'post-command-hook ',MODE-check-buffers))
cc9dd228e2e6 (define-global-minor-mode): Make it keep track of which major mode it
Luc Teirlinck <teirllm@auburn.edu>
parents: 62635
diff changeset
369 (put ',MODE-cmhh 'definition-name ',global-mode))))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
370
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
371 ;;;
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
372 ;;; easy-mmode-defmap
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
373 ;;;
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
374
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
375 (if (fboundp 'set-keymap-parents)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
376 (defalias 'easy-mmode-set-keymap-parents 'set-keymap-parents)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
377 (defun easy-mmode-set-keymap-parents (m parents)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
378 (set-keymap-parent
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
379 m
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
380 (cond
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
381 ((not (consp parents)) parents)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
382 ((not (cdr parents)) (car parents))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
383 (t (let ((m (copy-keymap (pop parents))))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
384 (easy-mmode-set-keymap-parents m parents)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
385 m))))))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
386
31981
533a4e5f06e2 (easy-mmode-define-keymap): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30876
diff changeset
387 ;;;###autoload
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
388 (defun easy-mmode-define-keymap (bs &optional name m args)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
389 "Return a keymap built from bindings BS.
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
390 BS must be a list of (KEY . BINDING) where
29399
addeae19bf96 (easy-mmode-derive-name): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29039
diff changeset
391 KEY and BINDINGS are suitable for `define-key'.
addeae19bf96 (easy-mmode-derive-name): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29039
diff changeset
392 Optional NAME is passed to `make-sparse-keymap'.
addeae19bf96 (easy-mmode-derive-name): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29039
diff changeset
393 Optional map M can be used to modify an existing map.
33433
e8794ae4f856 (easy-mmode-define-keymap):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33358
diff changeset
394 ARGS is a list of additional keyword arguments."
50635
e0775ee7f599 (define-minor-mode): Only echo a message if the body didn't do so already.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50300
diff changeset
395 (let (inherit dense)
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
396 (while args
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
397 (let ((key (pop args))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
398 (val (pop args)))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
399 (case key
33433
e8794ae4f856 (easy-mmode-define-keymap):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33358
diff changeset
400 (:name (setq name val))
29411
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
401 (:dense (setq dense val))
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
402 (:inherit (setq inherit val))
232f7e558a38 Require CL during compilation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29406
diff changeset
403 (:group)
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
404 (t (message "Unknown argument %s in defmap" key)))))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
405 (unless (keymapp m)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
406 (setq bs (append m bs))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
407 (setq m (if dense (make-keymap name) (make-sparse-keymap name))))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
408 (dolist (b bs)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
409 (let ((keys (car b))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
410 (binding (cdr b)))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
411 (dolist (key (if (consp keys) keys (list keys)))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
412 (cond
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
413 ((symbolp key)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
414 (substitute-key-definition key binding m global-map))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
415 ((null binding)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
416 (unless (keymapp (lookup-key m key)) (define-key m key binding)))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
417 ((let ((o (lookup-key m key)))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
418 (or (null o) (numberp o) (eq o 'undefined)))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
419 (define-key m key binding))))))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
420 (cond
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
421 ((keymapp inherit) (set-keymap-parent m inherit))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
422 ((consp inherit) (easy-mmode-set-keymap-parents m inherit)))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
423 m))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
424
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
425 ;;;###autoload
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
426 (defmacro easy-mmode-defmap (m bs doc &rest args)
31981
533a4e5f06e2 (easy-mmode-define-keymap): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30876
diff changeset
427 `(defconst ,m
533a4e5f06e2 (easy-mmode-define-keymap): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30876
diff changeset
428 (easy-mmode-define-keymap ,bs nil (if (boundp ',m) ,m) ,(cons 'list args))
533a4e5f06e2 (easy-mmode-define-keymap): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 30876
diff changeset
429 ,doc))
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
430
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
431
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
432 ;;;
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
433 ;;; easy-mmode-defsyntax
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
434 ;;;
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
435
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
436 (defun easy-mmode-define-syntax (css args)
32491
2fc546f941df (easy-mmode-define-syntax): Use plist-get and allow :inherit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32199
diff changeset
437 (let ((st (make-syntax-table (plist-get args :copy)))
2fc546f941df (easy-mmode-define-syntax): Use plist-get and allow :inherit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32199
diff changeset
438 (parent (plist-get args :inherit)))
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
439 (dolist (cs css)
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
440 (let ((char (car cs))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
441 (syntax (cdr cs)))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
442 (if (sequencep char)
28086
9ff6e6a6c6b5 (easy-mmode-defmap, easy-mmode-defsyntax): Autoload the functions used.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28081
diff changeset
443 (mapcar (lambda (c) (modify-syntax-entry c syntax st)) char)
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
444 (modify-syntax-entry char syntax st))))
32491
2fc546f941df (easy-mmode-define-syntax): Use plist-get and allow :inherit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32199
diff changeset
445 (if parent (set-char-table-parent
2fc546f941df (easy-mmode-define-syntax): Use plist-get and allow :inherit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32199
diff changeset
446 st (if (symbolp parent) (symbol-value parent) parent)))
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
447 st))
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
448
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
449 ;;;###autoload
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
450 (defmacro easy-mmode-defsyntax (st css doc &rest args)
32491
2fc546f941df (easy-mmode-define-syntax): Use plist-get and allow :inherit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32199
diff changeset
451 "Define variable ST as a syntax-table.
37406
3886350a8826 (easy-mmode-defsyntax): Unquote `doc'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35562
diff changeset
452 CSS contains a list of syntax specifications of the form (CHAR . SYNTAX)."
28086
9ff6e6a6c6b5 (easy-mmode-defmap, easy-mmode-defsyntax): Autoload the functions used.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28081
diff changeset
453 `(progn
9ff6e6a6c6b5 (easy-mmode-defmap, easy-mmode-defsyntax): Autoload the functions used.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28081
diff changeset
454 (autoload 'easy-mmode-define-syntax "easy-mmode")
37406
3886350a8826 (easy-mmode-defsyntax): Unquote `doc'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35562
diff changeset
455 (defconst ,st (easy-mmode-define-syntax ,css ,(cons 'list args)) ,doc)))
28081
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
456
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
457
6360842e5962 (easy-mmode-define-keymap): Extend to allow more flexibility.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 26551
diff changeset
458
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
459 ;;;
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
460 ;;; easy-mmode-define-navigation
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
461 ;;;
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
462
53056
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
463 (defmacro easy-mmode-define-navigation (base re &optional name endfun narrowfun)
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
464 "Define BASE-next and BASE-prev to navigate in the buffer.
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
465 RE determines the places the commands should move point to.
33358
a86c95343fa5 (easy-mmode-define-navigation):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33165
diff changeset
466 NAME should describe the entities matched by RE. It is used to build
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
467 the docstrings of the two functions.
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
468 BASE-next also tries to make sure that the whole entry is visible by
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
469 searching for its end (by calling ENDFUN if provided or by looking for
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
470 the next entry) and recentering if necessary.
53056
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
471 ENDFUN should return the end position (with or without moving point).
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
472 NARROWFUN non-nil means to check for narrowing before moving, and if
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
473 found, do widen first and then call NARROWFUN with no args after moving."
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
474 (let* ((base-name (symbol-name base))
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
475 (prev-sym (intern (concat base-name "-prev")))
53056
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
476 (next-sym (intern (concat base-name "-next")))
53733
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
477 (check-narrow-maybe
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
478 (when narrowfun
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
479 '(setq was-narrowed
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
480 (prog1 (or (< (- (point-max) (point-min)) (buffer-size)))
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
481 (widen)))))
53056
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
482 (re-narrow-maybe (when narrowfun
53733
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
483 `(when was-narrowed (,narrowfun)))))
51643
3161ec452b93 (easy-mmode-define-navigation): Avoid
Andreas Schwab <schwab@suse.de>
parents: 51320
diff changeset
484 (unless name (setq name base-name))
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
485 `(progn
29406
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
486 (add-to-list 'debug-ignored-errors
f4b12c3efee8 (easy-mmode-define-toggle): Remove (inline into define-minor-mode).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29399
diff changeset
487 ,(concat "^No \\(previous\\|next\\) " (regexp-quote name)))
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
488 (defun ,next-sym (&optional count)
28239
21cd65af5197 (easy-mmode-define-navigation): Only use `ding' for interactive use
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28235
diff changeset
489 ,(format "Go to the next COUNT'th %s." name)
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
490 (interactive)
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
491 (unless count (setq count 1))
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
492 (if (< count 0) (,prev-sym (- count))
52881
a2ef3d8f83d4 (easy-mmode-define-navigation): Avoid
Dave Love <fx@gnu.org>
parents: 52401
diff changeset
493 (if (looking-at ,re) (setq count (1+ count)))
53733
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
494 (let (was-narrowed)
53056
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
495 ,check-narrow-maybe
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
496 (if (not (re-search-forward ,re nil t count))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
497 (if (looking-at ,re)
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
498 (goto-char (or ,(if endfun `(,endfun)) (point-max)))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
499 (error "No next %s" ,name))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
500 (goto-char (match-beginning 0))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
501 (when (and (eq (current-buffer) (window-buffer (selected-window)))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
502 (interactive-p))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
503 (let ((endpt (or (save-excursion
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
504 ,(if endfun `(,endfun)
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
505 `(re-search-forward ,re nil t 2)))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
506 (point-max))))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
507 (unless (pos-visible-in-window-p endpt nil t)
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
508 (recenter '(0))))))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
509 ,re-narrow-maybe)))
28235
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
510 (defun ,prev-sym (&optional count)
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
511 ,(format "Go to the previous COUNT'th %s" (or name base-name))
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
512 (interactive)
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
513 (unless count (setq count 1))
963f1d516e92 * derived.el (define-derived-mode): Don't autoload anymore.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28086
diff changeset
514 (if (< count 0) (,next-sym (- count))
53733
d5f680b60b41 (easy-mmode-define-navigation): Use a more robust check of widening.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53056
diff changeset
515 (let (was-narrowed)
53056
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
516 ,check-narrow-maybe
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
517 (unless (re-search-backward ,re nil t count)
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
518 (error "No previous %s" ,name))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
519 ,re-narrow-maybe))))))
a9d324df91c7 (easy-mmode-define-navigation): Take additional
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 52881
diff changeset
520
28086
9ff6e6a6c6b5 (easy-mmode-defmap, easy-mmode-defsyntax): Autoload the functions used.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28081
diff changeset
521
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
522 (provide 'easy-mmode)
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
523
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 51643
diff changeset
524 ;;; arch-tag: d48a5250-6961-4528-9cb0-3c9ea042a66a
18388
7e14277c51f3 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
525 ;;; easy-mmode.el ends here