aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-07-15 01:23:01 +0000
committerJuanma Barranquero2005-07-15 01:23:01 +0000
commitfea34e9fc2b1c75868182a38f3be4ff76331cb28 (patch)
tree67790681c2f26bbfcecb74aeefa63b8554cb5a6c
parent2d5324c520af20bfb115b7c1318a22437b24dbdd (diff)
downloademacs-fea34e9fc2b1c75868182a38f3be4ff76331cb28.tar.gz
emacs-fea34e9fc2b1c75868182a38f3be4ff76331cb28.zip
(derived-mode-run-hooks): Remove.
(derived-mode-hook-name): Doc fix.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/derived.el15
2 files changed, 6 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 257843eb7ff..d92000d3d47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-07-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs-lisp/derived.el (derived-mode-run-hooks): Remove.
4 (derived-mode-hook-name): Doc fix.
5
12005-07-14 Dan Nicolaescu <dann@ics.uci.edu> 62005-07-14 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * term.el (term-mode): Disable cua-mode for term buffers. 8 * term.el (term-mode): Disable cua-mode for term buffers.
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index ef8e3288bbc..244e3fb368c 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -96,7 +96,7 @@
96;;; PRIVATE: defsubst must be defined before they are first used 96;;; PRIVATE: defsubst must be defined before they are first used
97 97
98(defsubst derived-mode-hook-name (mode) 98(defsubst derived-mode-hook-name (mode)
99 "Construct the mode hook name based on mode name MODE." 99 "Construct a mode-hook name based on a MODE name."
100 (intern (concat (symbol-name mode) "-hook"))) 100 (intern (concat (symbol-name mode) "-hook")))
101 101
102(defsubst derived-mode-map-name (mode) 102(defsubst derived-mode-map-name (mode)
@@ -382,19 +382,6 @@ Always merge its parent into it, since the merge is non-destructive."
382 (derived-mode-merge-abbrev-tables old-table new-table) 382 (derived-mode-merge-abbrev-tables old-table new-table)
383 (setq local-abbrev-table new-table))) 383 (setq local-abbrev-table new-table)))
384 384
385;;;(defun derived-mode-run-setup-function (mode)
386;;; "Run the setup function if it exists."
387
388;;; (let ((fname (derived-mode-setup-function-name mode)))
389;;; (if (fboundp fname)
390;;; (funcall fname))))
391
392(defun derived-mode-run-hooks (mode)
393 "Run the mode hook for MODE."
394 (let ((hooks-name (derived-mode-hook-name mode)))
395 (if (boundp hooks-name)
396 (run-hooks hooks-name))))
397
398;; Functions to merge maps and tables. 385;; Functions to merge maps and tables.
399 386
400(defun derived-mode-merge-keymaps (old new) 387(defun derived-mode-merge-keymaps (old new)