changeset 73616:a81e38c24e22

(org-mode-map): No longer copy `outline-mode-map' explicitly - this is already done by `define-derived-mode'.
author Carsten Dominik <dominik@science.uva.nl>
date Thu, 02 Nov 2006 08:41:57 +0000
parents 611bcdce16f1
children 7af864af10b6
files lisp/textmodes/org.el
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/textmodes/org.el	Thu Nov 02 08:40:56 2006 +0000
+++ b/lisp/textmodes/org.el	Thu Nov 02 08:41:57 2006 +0000
@@ -2897,11 +2897,8 @@
 
 ;;; Define the mode
 
-(defvar org-mode-map
-  (if (and (not (keymapp outline-mode-map)) (featurep 'allout))
-      (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.")
-    (copy-keymap outline-mode-map))
-  "Keymap for Org-mode.")
+(if (and (not (keymapp outline-mode-map)) (featurep 'allout))
+    (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."))
 
 (defvar org-struct-menu) ; defined later in this file
 (defvar org-org-menu) ; defined later in this file
@@ -2913,6 +2910,7 @@
   "Indicates that a table might need an update.
 This variable is set by `org-before-change-function'.
 `org-table-align' sets it back to nil.")
+(defvar org-mode-map)
 (defvar org-mode-hook nil)
 (defvar org-inhibit-startup nil)        ; Dynamically-scoped param.
 (defvar org-agenda-keep-modes nil)      ; Dynamically-scoped param.