diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-04-08 16:25:22 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-04-08 16:25:22 +0000 |
| commit | 1b9ab2508610fea57aa777956de14ee84d66862f (patch) | |
| tree | 81ea3750f64077094896b304ce977f065aed57c2 /lisp/emacs-lisp | |
| parent | ee00ea6e18c2aeae86e262fae703f67f4705032a (diff) | |
| parent | 5b4879885e61279efd5a779369deeddfeea8c1fd (diff) | |
| download | emacs-1b9ab2508610fea57aa777956de14ee84d66862f.tar.gz emacs-1b9ab2508610fea57aa777956de14ee84d66862f.tar.bz2 emacs-1b9ab2508610fea57aa777956de14ee84d66862f.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 56-58, 232-239)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-232
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-233
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-234
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-235
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-236
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-237
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-238
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-239
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-56
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-57
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-58
Collapse feature addition/removal within single ChangeLog entry
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-325
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/copyright.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index 0be9d139fd2..c2d3303c825 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -112,7 +112,7 @@ When this is `function', only ask when called non-interactively." (concat "Add " copyright-current-year " to copyright? ")))) (if replace - (replace-match copyright-current-year t t nil 1) + (replace-match copyright-current-year t t nil 2) (let ((size (save-excursion (skip-chars-backward "0-9")))) (if (and (eq (% (- (string-to-number copyright-current-year) (string-to-number (buffer-substring diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index a96b1741139..01935c9d5e8 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -94,8 +94,11 @@ BODY contains code that will be executed each time the mode is (dis)activated. These following keyword arguments are supported (other keywords will be passed to `defcustom' if the minor mode is global): :group GROUP Custom group name to use in all generated `defcustom' forms. + Defaults to MODE without the possible trailing \"-mode\". + (This default may not be a valid customization group defined + with `defgroup'. Make sure it is.) :global GLOBAL If non-nil specifies that the minor mode is not meant to be - buffer-local, so don't make the variable MODE buffer-local. + buffer-local, so don't make the variable MODE buffer-local. By default, the mode is buffer-local. :init-value VAL Same as the INIT-VALUE argument. :lighter SPEC Same as the LIGHTER argument. @@ -153,10 +156,9 @@ 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 - "-mode\\'" "" mode-name)))))) - + `(:group ',(intern (replace-regexp-in-string + "-mode\\'" "" mode-name))))) + `(progn ;; Define the variable to enable or disable the mode. ,(if (not globalp) @@ -220,8 +222,8 @@ With zero or negative ARG turn mode off. ;; Return the new setting. ,mode) - ;; Autoloading an easy-mmode-define-minor-mode autoloads - ;; everything up-to-here. + ;; Autoloading a define-minor-mode autoloads everything + ;; up-to-here. :autoload-end ;; The toggle's hook. @@ -280,9 +282,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 - "-mode\\'" "" (symbol-name mode))))))) + `(:group ',(intern (replace-regexp-in-string + "-mode\\'" "" (symbol-name mode)))))) `(progn ;; The actual global minor-mode |