Mercurial > emacs
changeset 108220:0b37f86b040e
Use define-minor-mode where applicable.
* mh-show.el (mh-showing-mode): Move function to mh-e.el.
* mh-e.el (mh-showing-mode):
* url-dired.el (url-dired-minor-mode):
* org-table.el (orgtbl-mode):
* view.el (view-mode):
* type-break.el (type-break-query-mode)
(type-break-mode-line-message-mode):
* textmodes/reftex.el (reftex-mode):
* term/vt100.el (vt100-wide-mode):
* tar-mode.el (tar-subfile-mode):
* savehist.el (savehist-mode):
* ibuf-ext.el (ibuffer-auto-mode):
* composite.el (auto-composition-mode):
* progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode):
Use define-minor-mode.
(vhdl-mode): Use static mode-line format.
(vhdl-mode-line-update): Delete.
(vhdl-create-mode-menu, vhdl-activate-customizations)
(vhdl-hs-minor-mode): Don't bother calling it.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 02 May 2010 22:29:46 -0400 |
| parents | 252a60daa4fb |
| children | 0df783a4f40a |
| files | lisp/ChangeLog lisp/composite.el lisp/ibuf-ext.el lisp/mh-e/ChangeLog lisp/mh-e/mh-e.el lisp/mh-e/mh-show.el lisp/org/ChangeLog lisp/org/org-table.el lisp/progmodes/vhdl-mode.el lisp/savehist.el lisp/tar-mode.el lisp/term/vt100.el lisp/textmodes/reftex.el lisp/type-break.el lisp/url/ChangeLog lisp/url/url-dired.el lisp/view.el |
| diffstat | 17 files changed, 136 insertions(+), 301 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun May 02 19:23:42 2010 -0700 +++ b/lisp/ChangeLog Sun May 02 22:29:46 2010 -0400 @@ -1,3 +1,22 @@ +2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> + + Use define-minor-mode where applicable. + * view.el (view-mode): + * type-break.el (type-break-query-mode) + (type-break-mode-line-message-mode): + * textmodes/reftex.el (reftex-mode): + * term/vt100.el (vt100-wide-mode): + * tar-mode.el (tar-subfile-mode): + * savehist.el (savehist-mode): + * ibuf-ext.el (ibuffer-auto-mode): + * composite.el (auto-composition-mode): + * progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode): + Use define-minor-mode. + (vhdl-mode): Use static mode-line format. + (vhdl-mode-line-update): Delete. + (vhdl-create-mode-menu, vhdl-activate-customizations) + (vhdl-hs-minor-mode): Don't bother calling it. + 2010-05-02 Stefan Monnier <monnier@iro.umontreal.ca> * simple.el (with-wrapper-hook): Move.
--- a/lisp/composite.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/composite.el Sun May 02 22:29:46 2010 -0400 @@ -745,14 +745,13 @@ (setq func 'compose-gstring-for-terminal)) (funcall func gstring)))) -(make-variable-buffer-local 'auto-composition-mode) (put 'auto-composition-mode 'permanent-local t) (make-variable-buffer-local 'auto-composition-function) (setq-default auto-composition-function 'auto-compose-chars) ;;;###autoload -(defun auto-composition-mode (&optional arg) +(define-minor-mode auto-composition-mode "Toggle Auto Composition mode. With ARG, turn Auto Composition mode off if and only if ARG is a non-positive number; if ARG is nil, toggle Auto Composition mode; anything else turns Auto @@ -762,12 +761,7 @@ by functions registered in `composition-function-table' (which see). You can use `global-auto-composition-mode' to turn on -Auto Composition mode in all buffers (this is the default)." - (interactive "P") - (setq auto-composition-mode - (if arg - (or (not (integerp arg)) (> arg 0)) - (not auto-composition-mode)))) +Auto Composition mode in all buffers (this is the default).") ;;;###autoload (defun global-auto-composition-mode (&optional arg)
--- a/lisp/ibuf-ext.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/ibuf-ext.el Sun May 02 22:29:46 2010 -0400 @@ -91,11 +91,6 @@ (defvar ibuffer-tmp-show-regexps nil "A list of regexps which should match buffer names to always show.") -(defvar ibuffer-auto-mode nil - "If non-nil, Ibuffer auto-mode should be enabled for this buffer. -Do not set this variable directly! Use the function -`ibuffer-auto-mode' instead.") - (defvar ibuffer-auto-buffers-changed nil) (defcustom ibuffer-saved-filters '(("gnus" @@ -220,6 +215,16 @@ (ibuffer-included-in-filters-p buf ibuffer-filtering-qualifiers) (ibuffer-buf-matches-predicates buf ibuffer-always-show-predicates))))) +;;;###autoload +(define-minor-mode ibuffer-auto-mode + "Toggle use of Ibuffer's auto-update facility. +With numeric ARG, enable auto-update if and only if ARG is positive." + nil nil nil + (unless (derived-mode-p 'ibuffer-mode) + (error "This buffer is not in Ibuffer mode")) + (frame-or-buffer-changed-p 'ibuffer-auto-buffers-changed) ; Initialize state vector + (add-hook 'post-command-hook 'ibuffer-auto-update-changed)) + (defun ibuffer-auto-update-changed () (when (frame-or-buffer-changed-p 'ibuffer-auto-buffers-changed) (dolist (buf (buffer-list)) @@ -230,20 +235,6 @@ (ibuffer-update nil t))))))) ;;;###autoload -(defun ibuffer-auto-mode (&optional arg) - "Toggle use of Ibuffer's auto-update facility. -With numeric ARG, enable auto-update if and only if ARG is positive." - (interactive) - (unless (derived-mode-p 'ibuffer-mode) - (error "This buffer is not in Ibuffer mode")) - (set (make-local-variable 'ibuffer-auto-mode) - (if arg - (plusp arg) - (not ibuffer-auto-mode))) - (frame-or-buffer-changed-p 'ibuffer-auto-buffers-changed) ; Initialize state vector - (add-hook 'post-command-hook 'ibuffer-auto-update-changed)) - -;;;###autoload (defun ibuffer-mouse-filter-by-mode (event) "Enable or disable filtering by the major mode chosen via mouse." (interactive "e")
--- a/lisp/mh-e/ChangeLog Sun May 02 19:23:42 2010 -0700 +++ b/lisp/mh-e/ChangeLog Sun May 02 22:29:46 2010 -0400 @@ -1,3 +1,8 @@ +2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * mh-show.el (mh-showing-mode): Move function to mh-e.el. + * mh-e.el (mh-showing-mode): Use define-minor-mode. + 2010-03-24 Juanma Barranquero <lekktu@gmail.com> * mh-scan.el (mh-scan-cmd-note-width): Doc fix.
--- a/lisp/mh-e/mh-e.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/mh-e/mh-e.el Sun May 02 22:29:46 2010 -0400 @@ -287,8 +287,10 @@ (defvar mh-show-buffer nil "Buffer that displays message for this folder.") -(defvar mh-showing-mode nil - "If non-nil, show the message in a separate window.") +(define-minor-mode mh-showing-mode + "Minor mode to show the message in a separate window." + ;; FIXME: maybe this should be moved to mh-show.el. + :lighter " Show") (defvar mh-view-ops nil "Stack of operations that change the folder view.
--- a/lisp/mh-e/mh-show.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/mh-e/mh-show.el Sun May 02 22:29:46 2010 -0400 @@ -170,16 +170,6 @@ (run-hooks 'mh-show-hook))) ;;;###mh-autoload -(defun mh-showing-mode (&optional arg) - "Change whether messages should be displayed. - -With ARG, display messages if ARG is positive, otherwise don't display them." - (setq mh-showing-mode - (if (null arg) - (not mh-showing-mode) - (> (prefix-numeric-value arg) 0)))) - -;;;###mh-autoload (defun mh-start-of-uncleaned-message () "Position uninteresting headers off the top of the window." (let ((case-fold-search t))
--- a/lisp/org/ChangeLog Sun May 02 19:23:42 2010 -0700 +++ b/lisp/org/ChangeLog Sun May 02 22:29:46 2010 -0400 @@ -1,8 +1,11 @@ +2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * org-table.el (orgtbl-mode): Use define-minor-mode. + 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> - * org.el (org-insert-link): Find the link buffer on visible - frames. - (org-export-latex-default-packages-alist): hyperref must be loaded + * org.el (org-insert-link): Find the link buffer on visible frames. + (org-export-latex-default-packages-alist): Hyperref must be loaded late. (org-open-file): More care with the new matching for file links.
--- a/lisp/org/org-table.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/org/org-table.el Sun May 02 22:29:46 2010 -0400 @@ -3401,11 +3401,6 @@ ;; active, this binding is ignored inside tables and replaced with a ;; modified self-insert. -(defvar orgtbl-mode nil - "Variable controlling `orgtbl-mode', a minor mode enabling the `org-mode' -table editor in arbitrary modes.") -(make-variable-buffer-local 'orgtbl-mode) - (defvar orgtbl-mode-map (make-keymap) "Keymap for `orgtbl-mode'.") @@ -3426,49 +3421,51 @@ 0 (quote 'org-table) 'prepend)) "Extra font-lock-keywords to be added when orgtbl-mode is active.") +;; Install it as a minor mode. +(put 'orgtbl-mode :included t) +(put 'orgtbl-mode :menu-tag "Org Table Mode") ;;;###autoload -(defun orgtbl-mode (&optional arg) +(define-minor-mode orgtbl-mode "The `org-mode' table editor as a minor mode for use in other modes." - (interactive) + :lighter " OrgTbl" :keymap orgtbl-mode-map (org-load-modules-maybe) - (if (org-mode-p) - ;; Exit without error, in case some hook functions calls this - ;; by accident in org-mode. - (message "Orgtbl-mode is not useful in org-mode, command ignored") - (setq orgtbl-mode - (if arg (> (prefix-numeric-value arg) 0) (not orgtbl-mode))) - (if orgtbl-mode - (progn - (and (orgtbl-setup) (defun orgtbl-setup () nil)) - ;; Make sure we are first in minor-mode-map-alist - (let ((c (assq 'orgtbl-mode minor-mode-map-alist))) - (and c (setq minor-mode-map-alist - (cons c (delq c minor-mode-map-alist))))) - (org-set-local (quote org-table-may-need-update) t) - (org-add-hook 'before-change-functions 'org-before-change-function - nil 'local) - (org-set-local 'org-old-auto-fill-inhibit-regexp - auto-fill-inhibit-regexp) - (org-set-local 'auto-fill-inhibit-regexp - (if auto-fill-inhibit-regexp - (concat orgtbl-line-start-regexp "\\|" - auto-fill-inhibit-regexp) - orgtbl-line-start-regexp)) - (org-add-to-invisibility-spec '(org-cwidth)) - (when (fboundp 'font-lock-add-keywords) - (font-lock-add-keywords nil orgtbl-extra-font-lock-keywords) - (org-restart-font-lock)) - (easy-menu-add orgtbl-mode-menu) - (run-hooks 'orgtbl-mode-hook)) - (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp) - (org-table-cleanup-narrow-column-properties) - (org-remove-from-invisibility-spec '(org-cwidth)) - (remove-hook 'before-change-functions 'org-before-change-function t) - (when (fboundp 'font-lock-remove-keywords) - (font-lock-remove-keywords nil orgtbl-extra-font-lock-keywords) - (org-restart-font-lock)) - (easy-menu-remove orgtbl-mode-menu) - (force-mode-line-update 'all)))) + (cond + ((org-mode-p) + ;; Exit without error, in case some hook functions calls this + ;; by accident in org-mode. + (message "Orgtbl-mode is not useful in org-mode, command ignored")) + (orgtbl-mode + (and (orgtbl-setup) (defun orgtbl-setup () nil)) ;; FIXME: Yuck!?! + ;; Make sure we are first in minor-mode-map-alist + (let ((c (assq 'orgtbl-mode minor-mode-map-alist))) + ;; FIXME: maybe it should use emulation-mode-map-alists? + (and c (setq minor-mode-map-alist + (cons c (delq c minor-mode-map-alist))))) + (org-set-local (quote org-table-may-need-update) t) + (org-add-hook 'before-change-functions 'org-before-change-function + nil 'local) + (org-set-local 'org-old-auto-fill-inhibit-regexp + auto-fill-inhibit-regexp) + (org-set-local 'auto-fill-inhibit-regexp + (if auto-fill-inhibit-regexp + (concat orgtbl-line-start-regexp "\\|" + auto-fill-inhibit-regexp) + orgtbl-line-start-regexp)) + (org-add-to-invisibility-spec '(org-cwidth)) + (when (fboundp 'font-lock-add-keywords) + (font-lock-add-keywords nil orgtbl-extra-font-lock-keywords) + (org-restart-font-lock)) + (easy-menu-add orgtbl-mode-menu)) + (t + (setq auto-fill-inhibit-regexp org-old-auto-fill-inhibit-regexp) + (org-table-cleanup-narrow-column-properties) + (org-remove-from-invisibility-spec '(org-cwidth)) + (remove-hook 'before-change-functions 'org-before-change-function t) + (when (fboundp 'font-lock-remove-keywords) + (font-lock-remove-keywords nil orgtbl-extra-font-lock-keywords) + (org-restart-font-lock)) + (easy-menu-remove orgtbl-mode-menu) + (force-mode-line-update 'all)))) (defun org-table-cleanup-narrow-column-properties () "Remove all properties related to narrow-column invisibility." @@ -3483,11 +3480,6 @@ (while (setq s (text-property-any s (point-max) 'invisible 'org-cwidth)) (remove-text-properties s (1+ s) '(invisible t))))) -;; Install it as a minor mode. -(put 'orgtbl-mode :included t) -(put 'orgtbl-mode :menu-tag "Org Table Mode") -(add-minor-mode 'orgtbl-mode " OrgTbl" orgtbl-mode-map) - (defun orgtbl-make-binding (fun n &rest keys) "Create a function for binding in the table minor mode. FUN is the command to call inside a table. N is used to create a unique
--- a/lisp/progmodes/vhdl-mode.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/progmodes/vhdl-mode.el Sun May 02 22:29:46 2010 -0400 @@ -199,21 +199,6 @@ "Customizations for modes." :group 'vhdl) -(defcustom vhdl-electric-mode t - "*Non-nil enables electrification (automatic template generation). -If nil, template generators can still be invoked through key bindings and -menu. Is indicated in the modeline by \"/e\" after the mode name and can be -toggled by `\\[vhdl-electric-mode]'." - :type 'boolean - :group 'vhdl-mode) - -(defcustom vhdl-stutter-mode t - "*Non-nil enables stuttering. -Is indicated in the modeline by \"/s\" after the mode name and can be toggled -by `\\[vhdl-stutter-mode]'." - :type 'boolean - :group 'vhdl-mode) - (defcustom vhdl-indent-tabs-mode nil "*Non-nil means indentation can insert tabs. Overrides local variable `indent-tabs-mode'." @@ -3466,13 +3451,11 @@ ("Mode" ["Electric Mode" (progn (customize-set-variable 'vhdl-electric-mode - (not vhdl-electric-mode)) - (vhdl-mode-line-update)) + (not vhdl-electric-mode))) :style toggle :selected vhdl-electric-mode :keys "C-c C-m C-e"] ["Stutter Mode" (progn (customize-set-variable 'vhdl-stutter-mode - (not vhdl-stutter-mode)) - (vhdl-mode-line-update)) + (not vhdl-stutter-mode))) :style toggle :selected vhdl-stutter-mode :keys "C-c C-m C-s"] ["Indent Tabs Mode" (progn (customize-set-variable 'vhdl-indent-tabs-mode @@ -4670,7 +4653,10 @@ (interactive) (kill-all-local-variables) (setq major-mode 'vhdl-mode) - (setq mode-name "VHDL") + (setq mode-name '("VHDL" + (vhdl-electric-mode "/" (vhdl-stutter-mode "/")) + (vhdl-electric-mode "e") + (vhdl-stutter-mode "s"))) ;; set maps and tables (use-local-map vhdl-mode-map) @@ -4737,7 +4723,6 @@ ;; miscellaneous (vhdl-ps-print-init) (vhdl-write-file-hooks-init) - (vhdl-mode-line-update) (message "VHDL Mode %s.%s" vhdl-version (if noninteractive "" " See menu for documentation and release notes.")) @@ -4757,8 +4742,7 @@ (vhdl-write-file-hooks-init) (vhdl-update-mode-menu) (vhdl-hideshow-init) - (run-hooks 'menu-bar-update-hook) - (vhdl-mode-line-update)) + (run-hooks 'menu-bar-update-hook)) (defun vhdl-write-file-hooks-init () "Add/remove hooks when buffer is saved." @@ -8055,31 +8039,15 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Enabling/disabling -(defun vhdl-mode-line-update () - "Update the modeline string for VHDL major mode." - (setq mode-name (concat "VHDL" - (and (or vhdl-electric-mode vhdl-stutter-mode) "/") - (and vhdl-electric-mode "e") - (and vhdl-stutter-mode "s"))) - (force-mode-line-update t)) - -(defun vhdl-electric-mode (arg) +(define-minor-mode vhdl-electric-mode "Toggle VHDL electric mode. Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil." - (interactive "P") - (setq vhdl-electric-mode - (cond ((or (not arg) (zerop arg)) (not vhdl-electric-mode)) - ((> arg 0) t) (t nil))) - (vhdl-mode-line-update)) - -(defun vhdl-stutter-mode (arg) + :global t) + +(define-minor-mode vhdl-stutter-mode "Toggle VHDL stuttering mode. Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil." - (interactive "P") - (setq vhdl-stutter-mode - (cond ((or (not arg) (zerop arg)) (not vhdl-stutter-mode)) - ((> arg 0) t) (t nil))) - (vhdl-mode-line-update)) + :global t) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Stuttering @@ -12533,7 +12501,7 @@ (add-hook 'hs-minor-mode-hook 'hs-hide-all) (remove-hook 'hs-minor-mode-hook 'hs-hide-all)) (hs-minor-mode arg) - (vhdl-mode-line-update))) ; hack to update menu bar + (force-mode-line-update))) ; hack to update menu bar ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/savehist.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/savehist.el Sun May 02 22:29:46 2010 -0400 @@ -59,17 +59,6 @@ :version "22.1" :group 'minibuffer) -;;;###autoload -(defcustom savehist-mode nil - "Mode for automatic saving of minibuffer history. -Set this by calling the `savehist-mode' function or using the customize -interface." - :type 'boolean - :set (lambda (symbol value) (savehist-mode (or value 0))) - :initialize 'custom-initialize-default - :require 'savehist - :group 'savehist) - (defcustom savehist-save-minibuffer-history t "If non-nil, save all recorded minibuffer histories. If you want to save only specific histories, use `savehist-save-hook' to @@ -181,7 +170,7 @@ ;; Functions. ;;;###autoload -(defun savehist-mode (arg) +(define-minor-mode savehist-mode "Toggle savehist-mode. Positive ARG turns on `savehist-mode'. When on, savehist-mode causes minibuffer history to be saved periodically and when exiting Emacs. @@ -191,11 +180,7 @@ This mode should normally be turned on from your Emacs init file. Calling it at any other time replaces your current minibuffer histories, which is probably undesirable." - (interactive "P") - (setq savehist-mode - (if (null arg) - (not savehist-mode) - (> (prefix-numeric-value arg) 0))) + :global t (if (not savehist-mode) (savehist-uninstall) (when (and (not savehist-loaded) @@ -214,11 +199,7 @@ (setq savehist-mode nil) (savehist-uninstall) (signal (car errvar) (cdr errvar))))) - (savehist-install) - (run-hooks 'savehist-mode-hook)) - ;; Return the new setting. - savehist-mode) -(add-minor-mode 'savehist-mode "") + (savehist-install))) (defun savehist-load () "Load the variables stored in `savehist-file' and turn on `savehist-mode'.
--- a/lisp/tar-mode.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/tar-mode.el Sun May 02 22:29:46 2010 -0400 @@ -137,7 +137,6 @@ (defvar tar-parse-info nil) (defvar tar-superior-buffer nil) (defvar tar-superior-descriptor nil) -(defvar tar-subfile-mode nil) (defvar tar-file-name-coding-system nil) (put 'tar-superior-buffer 'permanent-local t) @@ -672,29 +671,21 @@ (signal (car err) (cdr err))))) -(defun tar-subfile-mode (p) +(define-minor-mode tar-subfile-mode "Minor mode for editing an element of a tar-file. This mode arranges for \"saving\" this buffer to write the data into the tar-file buffer that it came from. The changes will actually appear on disk when you save the tar-file's buffer." - (interactive "P") + ;; Don't do this, because it is redundant and wastes mode line space. + ;; :lighter " TarFile" + nil nil nil (or (and (boundp 'tar-superior-buffer) tar-superior-buffer) (error "This buffer is not an element of a tar file")) - ;; Don't do this, because it is redundant and wastes mode line space. - ;; (or (assq 'tar-subfile-mode minor-mode-alist) - ;; (setq minor-mode-alist (append minor-mode-alist - ;; (list '(tar-subfile-mode " TarFile"))))) - (make-local-variable 'tar-subfile-mode) - (setq tar-subfile-mode - (if (null p) - (not tar-subfile-mode) - (> (prefix-numeric-value p) 0))) (cond (tar-subfile-mode (add-hook 'write-file-functions 'tar-subfile-save-buffer nil t) ;; turn off auto-save. (auto-save-mode -1) - (setq buffer-auto-save-file-name nil) - (run-hooks 'tar-subfile-mode-hook)) + (setq buffer-auto-save-file-name nil)) (t (remove-hook 'write-file-functions 'tar-subfile-save-buffer t))))
--- a/lisp/term/vt100.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/term/vt100.el Sun May 02 22:29:46 2010 -0400 @@ -41,19 +41,13 @@ (tty-run-terminal-initialization (selected-frame) "lk201")) ;;; Controlling the screen width. -(defvar vt100-wide-mode (= (frame-width) 132) - "t if vt100 is in 132-column mode.") - -(defun vt100-wide-mode (&optional arg) +(define-minor-mode vt100-wide-mode "Toggle 132/80 column mode for vt100s. With positive argument, switch to 132-column mode. With negative argument, switch to 80-column mode." - (interactive "P") - (setq vt100-wide-mode - (if (null arg) (not vt100-wide-mode) - (> (prefix-numeric-value arg) 0))) - (send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l")) - (set-frame-width terminal-frame (if vt100-wide-mode 132 80))) + :global t :initial-value (= (frame-width) 132) + (send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l")) + (set-frame-width terminal-frame (if vt100-wide-mode 132 80))) ;; arch-tag: 9ff41f24-a7c9-4dee-9cf2-fbaa951eb840 ;;; vt100.el ends here
--- a/lisp/textmodes/reftex.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/textmodes/reftex.el Sun May 02 22:29:46 2010 -0400 @@ -305,10 +305,6 @@ (defconst reftex-version "RefTeX version 4.31" "Version string for RefTeX.") -(defvar reftex-mode nil - "Determines if RefTeX mode is active.") -(make-variable-buffer-local 'reftex-mode) - (defvar reftex-mode-map (make-sparse-keymap) "Keymap for RefTeX mode.") @@ -504,8 +500,10 @@ "Turn on RefTeX mode." (reftex-mode t)) +(put 'reftex-mode :included '(memq major-mode '(latex-mode tex-mode))) +(put 'reftex-mode :menu-tag "RefTeX Mode") ;;;###autoload -(defun reftex-mode (&optional arg) +(define-minor-mode reftex-mode "Minor mode with distinct support for \\label, \\ref and \\cite in LaTeX. \\<reftex-mode-map>A Table of Contents of the entire (multifile) document with browsing @@ -535,11 +533,7 @@ on the menu bar. ------------------------------------------------------------------------------" - - (interactive "P") - (setq reftex-mode (not (or (and (null arg) reftex-mode) - (<= (prefix-numeric-value arg) 0)))) - + :lighter " Ref" :keymap reftex-mode-map (if reftex-mode (progn ;; Mode was turned on @@ -565,24 +559,10 @@ (modify-syntax-entry ?\' "." reftex-syntax-table-for-bib) (modify-syntax-entry ?\" "." reftex-syntax-table-for-bib) (modify-syntax-entry ?\[ "." reftex-syntax-table-for-bib) - (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib) - - (run-hooks 'reftex-mode-hook)) + (modify-syntax-entry ?\] "." reftex-syntax-table-for-bib)) ;; Mode was turned off (easy-menu-remove reftex-mode-menu))) -(if (fboundp 'add-minor-mode) - ;; Use it so that we get the extras - (progn - (put 'reftex-mode :included '(memq major-mode '(latex-mode tex-mode))) - (put 'reftex-mode :menu-tag "RefTeX Mode") - (add-minor-mode 'reftex-mode " Ref" reftex-mode-map)) - ;; The standard way - (unless (assoc 'reftex-mode minor-mode-alist) - (push '(reftex-mode " Ref") minor-mode-alist)) - (unless (assoc 'reftex-mode minor-mode-map-alist) - (push (cons 'reftex-mode reftex-mode-map) minor-mode-map-alist))) - (defvar reftex-docstruct-symbol) (defun reftex-kill-buffer-hook () "Save RefTeX's parse file for this buffer if the information has changed." @@ -625,11 +605,11 @@ ;;; ;;; Multibuffer Variables ;;; -;;; Technical notes: These work as follows: We keep just one list -;;; of labels for each master file - this can save a lot of memory. -;;; `reftex-master-index-list' is an alist which connects the true file name -;;; of each master file with the symbols holding the information on that -;;; document. Each buffer has local variables which point to these symbols. +;; Technical notes: These work as follows: We keep just one list +;; of labels for each master file - this can save a lot of memory. +;; `reftex-master-index-list' is an alist which connects the true file name +;; of each master file with the symbols holding the information on that +;; document. Each buffer has local variables which point to these symbols. ;; List of variables which handle the multifile stuff. ;; This list is used to tie, untie, and reset these symbols.
--- a/lisp/type-break.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/type-break.el Sun May 02 22:29:46 2010 -0400 @@ -152,13 +152,6 @@ :type 'sexp :group 'type-break) -(defcustom type-break-query-mode t - "Non-nil means ask whether or not to prompt user for breaks. -If so, call the function specified in the value of the variable -`type-break-query-function' to do the asking." - :type 'boolean - :group 'type-break) - (defcustom type-break-query-function 'yes-or-no-p "Function to use for making query for a typing break. It should take a string as an argument, the prompt. @@ -245,14 +238,6 @@ ;; Mode line frobs -(defcustom type-break-mode-line-message-mode nil - "Non-nil means put type-break related messages in the mode line. -Otherwise, messages typically go in the echo area. - -See also `type-break-mode-line-format' and its members." - :type 'boolean - :group 'type-break) - (defvar type-break-mode-line-format '(type-break-mode-line-message-mode ("" @@ -447,7 +432,7 @@ (message "Type Break mode is disabled"))))) type-break-mode) -(defun type-break-mode-line-message-mode (&optional prefix) +(define-minor-mode type-break-mode-line-message-mode "Enable or disable warnings in the mode line about typing breaks. A negative PREFIX argument disables this mode. @@ -462,16 +447,9 @@ `global-mode-string' `type-break-mode-line-break-message' `type-break-mode-line-warning'" - (interactive "P") - (setq type-break-mode-line-message-mode - (>= (prefix-numeric-value prefix) 0)) - (and (called-interactively-p 'interactive) - (if type-break-mode-line-message-mode - (message "type-break-mode-line-message-mode is enabled") - (message "type-break-mode-line-message-mode is disabled"))) - type-break-mode-line-message-mode) + :global t) -(defun type-break-query-mode (&optional prefix) +(define-minor-mode type-break-query-mode "Enable or disable warnings in the mode line about typing breaks. When enabled, the user is periodically queried about whether to take a @@ -483,14 +461,7 @@ The user may also enable or disable this mode simply by setting the variable of the same name." - (interactive "P") - (setq type-break-query-mode - (>= (prefix-numeric-value prefix) 0)) - (and (called-interactively-p 'interactive) - (if type-break-query-mode - (message "type-break-query-mode is enabled") - (message "type-break-query-mode is disabled"))) - type-break-query-mode) + :global t) ;;; session file functions
--- a/lisp/url/ChangeLog Sun May 02 19:23:42 2010 -0700 +++ b/lisp/url/ChangeLog Sun May 02 22:29:46 2010 -0400 @@ -1,3 +1,7 @@ +2010-05-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * url-dired.el (url-dired-minor-mode): Use define-minor-mode. + 2010-03-24 Teodor Zlatanov <tzz@lifelogs.com> * url-http.el (url-http-parse-headers): Fix wrong variable name.
--- a/lisp/url/url-dired.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/url/url-dired.el Sun May 02 22:29:46 2010 -0400 @@ -31,11 +31,6 @@ map) "Keymap used when browsing directories.") -(defvar url-dired-minor-mode nil - "Whether we are in url-dired-minor-mode.") - -(make-variable-buffer-local 'url-dired-minor-mode) - (defun url-dired-find-file () "In dired, visit the file or directory named on this line." (interactive) @@ -48,39 +43,9 @@ (mouse-set-point event) (url-dired-find-file)) -(defun url-dired-minor-mode (&optional arg) +(define-minor-mode url-dired-minor-mode "Minor mode for directory browsing." - (interactive "P") - (cond - ((null arg) - (setq url-dired-minor-mode (not url-dired-minor-mode))) - ((equal 0 arg) - (setq url-dired-minor-mode nil)) - (t - (setq url-dired-minor-mode t)))) - -(if (not (fboundp 'add-minor-mode)) - (defun add-minor-mode (toggle name &optional keymap after toggle-fun) - "Add a minor mode to `minor-mode-alist' and `minor-mode-map-alist'. -TOGGLE is a symbol which is used as the variable which toggle the minor mode, -NAME is the name that should appear in the modeline (it should be a string -beginning with a space), KEYMAP is a keymap to make active when the minor -mode is active, and AFTER is the toggling symbol used for another minor -mode. If AFTER is non-nil, then it is used to position the new mode in the -minor-mode alists. TOGGLE-FUN specifies an interactive function that -is called to toggle the mode on and off; this affects what appens when -button2 is pressed on the mode, and when button3 is pressed somewhere -in the list of modes. If TOGGLE-FUN is nil and TOGGLE names an -interactive function, TOGGLE is used as the toggle function. - -Example: (add-minor-mode 'view-minor-mode \" View\" view-mode-map)" - (if (not (assq toggle minor-mode-alist)) - (setq minor-mode-alist (cons (list toggle name) minor-mode-alist))) - (if (and keymap (not (assq toggle minor-mode-map-alist))) - (setq minor-mode-map-alist (cons (cons toggle keymap) - minor-mode-map-alist))))) - -(add-minor-mode 'url-dired-minor-mode " URL" url-dired-minor-mode-map) + :lighter " URL" :keymap url-dired-minor-mode-map) (defun url-find-file-dired (dir) "\"Edit\" directory DIR, but with additional URL-friendly bindings."
--- a/lisp/view.el Sun May 02 19:23:42 2010 -0700 +++ b/lisp/view.el Sun May 02 22:29:46 2010 -0400 @@ -161,14 +161,6 @@ "Overlay used to display where a search operation found its match. This is local in each buffer, once it is used.") (make-variable-buffer-local 'view-overlay) - -(unless (assq 'view-mode minor-mode-alist) - (setq minor-mode-alist - (cons (list 'view-mode - (propertize " View" - 'local-map mode-line-minor-mode-keymap - 'help-echo "mouse-3: minor mode menu")) - minor-mode-alist))) ;; Define keymap inside defvar to make it easier to load changes. ;; Some redundant "less"-like key bindings below have been commented out. @@ -230,10 +222,6 @@ (define-key map "?" 'describe-mode) ; Maybe do as less instead? See above. (define-key map "h" 'describe-mode) map)) - -(or (assq 'view-mode minor-mode-map-alist) - (setq minor-mode-map-alist - (cons (cons 'view-mode view-mode-map) minor-mode-map-alist))) ;;; Commands that enter or exit view mode. @@ -393,7 +381,7 @@ exit-action))) ;;;###autoload -(defun view-mode (&optional arg) +(define-minor-mode view-mode ;; In the following documentation string we have to use some explicit key ;; bindings instead of using the \\[] construction. The reason for this ;; is that most commands have more than one key binding. @@ -473,11 +461,8 @@ then \\[View-leave], \\[View-quit] and \\[View-kill-and-leave] will return to that buffer. Entry to view-mode runs the normal hook `view-mode-hook'." - (interactive "P") - (unless (and arg ; Do nothing if already OK. - (if (> (prefix-numeric-value arg) 0) view-mode (not view-mode))) - (if view-mode (view-mode-disable) - (view-mode-enable)))) + :lighter " View" :keymap view-mode-map + (if view-mode (view-mode-enable) (view-mode-disable))) (defun view-mode-enable () "Turn on View mode."