Mercurial > emacs
comparison lisp/vc/ediff-mult.el @ 112213:6e613fbf73d7
Use run-mode-hooks for major mode hooks.
* lisp/textmodes/reftex-toc.el (reftex-toc-mode-map):
Rename from reftex-toc-map.
(reftex-toc-mode): Use define-derived-mode.
* lisp/textmodes/reftex-sel.el (reftex-select-shared-map): New map.
(reftex-select-label-mode-map, reftex-select-bib-mode-map):
Rename from reftex-select-(label|bib)-map. Move init into declaration.
(reftex-select-label-mode, reftex-select-bib-mode):
Use define-derived-mode.
* lisp/textmodes/reftex-index.el (reftex-index-phrases-mode-map)
(reftex-index-mode-map): Rename from reftex-index(-phrases)-map.
Move init into delcaration.
(reftex-index-mode, reftex-index-phrases-mode):
Use define-derived-mode.
* lisp/speedbar.el (speedbar-mode-syntax-table): Renaqme from
speedbar-syntax-table. Move init into declaration.
(speedbar-mode-map): Rename from speedbar-key-map.
Move init into declaration.
(speedbar-file-key-map): Move init into declaration.
(speedbar-mode): Use define-derived-mode.
* lisp/recentf.el (recentf-mode): Don't run hook (or message) redundantly.
* lisp/net/rcirc.el (rcirc-mode): Use run-mode-hooks.
* lisp/emacs-lisp/chart.el (chart-mode-map): Rename from chart-map.
(chart-face-list): Move initialization into declaration.
(chart-mode): Use define-derived-mode.
* lisp/calculator.el (calculator-mode-map): Move init into declaration.
(calculator-mode): Use define-derived-mode.
* lisp/cedet/srecode/srt-mode.el (srecode-template-mode):
Use define-derived-mode.
* lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode):
Use run-mode-hooks.
* lisp/erc/erc.el (erc-mode):
* lisp/erc/erc-dcc.el (erc-dcc-chat-mode): Use define-derived-mode.
* lisp/org/org-remember.el (org-remember-mode):
* lisp/org/org-capture.el (org-capture-mode): Don't run hook redundantly.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 13 Jan 2011 18:14:30 -0500 |
| parents | 280c8ae2476d |
| children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
| 112212:966cc18ff805 | 112213:6e613fbf73d7 |
|---|---|
| 1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff | 1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff |
| 2 | 2 |
| 3 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 3 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
| 4 ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 |
| 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 7 ;; Package: ediff | 7 ;; Package: ediff |
| 8 | 8 |
| 9 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |
| 456 `ediff-merge-directory-revisions-with-ancestor' | 456 `ediff-merge-directory-revisions-with-ancestor' |
| 457 `edir-merge-revisions-with-ancestor' | 457 `edir-merge-revisions-with-ancestor' |
| 458 | 458 |
| 459 Commands: | 459 Commands: |
| 460 \\{ediff-meta-buffer-map}" | 460 \\{ediff-meta-buffer-map}" |
| 461 ;; FIXME: Use define-derived-mode. | |
| 461 (kill-all-local-variables) | 462 (kill-all-local-variables) |
| 462 (setq major-mode 'ediff-meta-mode) | 463 (setq major-mode 'ediff-meta-mode) |
| 463 (setq mode-name "MetaEdiff") | 464 (setq mode-name "MetaEdiff") |
| 464 ;; don't use run-mode-hooks here! | 465 ;; don't use run-mode-hooks here! |
| 465 (run-hooks 'ediff-meta-mode-hook)) | 466 (run-hooks 'ediff-meta-mode-hook)) |