aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Dominik2006-11-02 08:41:57 +0000
committerCarsten Dominik2006-11-02 08:41:57 +0000
commit98644ad4a01f5400f8ae3538aa3debbf69727fbd (patch)
tree8bc0172ce2005dd2b8afb037b232f3dd8104bc31
parent661ca46f27a8a15b93c26262e22bba2c08f2887b (diff)
downloademacs-98644ad4a01f5400f8ae3538aa3debbf69727fbd.tar.gz
emacs-98644ad4a01f5400f8ae3538aa3debbf69727fbd.zip
(org-mode-map): No longer copy `outline-mode-map' explicitly
- this is already done by `define-derived-mode'.
-rw-r--r--lisp/textmodes/org.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index caca6a6ae7d..8e0bccfb708 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -2897,11 +2897,8 @@ Also put tags into group 4 if tags are present.")
2897 2897
2898;;; Define the mode 2898;;; Define the mode
2899 2899
2900(defvar org-mode-map 2900(if (and (not (keymapp outline-mode-map)) (featurep 'allout))
2901 (if (and (not (keymapp outline-mode-map)) (featurep 'allout)) 2901 (error "Conflict with outdated version of allout.el. Load org.el before allout.el, or ugrade to newer allout, for example by switching to Emacs 22."))
2902 (error "Conflict with outdated version of allout.el. Load org.el before allout.el, or ugrade to newer allout, for example by switching to Emacs 22.")
2903 (copy-keymap outline-mode-map))
2904 "Keymap for Org-mode.")
2905 2902
2906(defvar org-struct-menu) ; defined later in this file 2903(defvar org-struct-menu) ; defined later in this file
2907(defvar org-org-menu) ; defined later in this file 2904(defvar org-org-menu) ; defined later in this file
@@ -2913,6 +2910,7 @@ Also put tags into group 4 if tags are present.")
2913 "Indicates that a table might need an update. 2910 "Indicates that a table might need an update.
2914This variable is set by `org-before-change-function'. 2911This variable is set by `org-before-change-function'.
2915`org-table-align' sets it back to nil.") 2912`org-table-align' sets it back to nil.")
2913(defvar org-mode-map)
2916(defvar org-mode-hook nil) 2914(defvar org-mode-hook nil)
2917(defvar org-inhibit-startup nil) ; Dynamically-scoped param. 2915(defvar org-inhibit-startup nil) ; Dynamically-scoped param.
2918(defvar org-agenda-keep-modes nil) ; Dynamically-scoped param. 2916(defvar org-agenda-keep-modes nil) ; Dynamically-scoped param.