[Emacs-diffs] /srv/bzr/emacs/trunk r108213: Move define-obsolete-variable-alias before the var's definition.

[Stefan Monnier]

------------------------------------------------------------
revno: 108213
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2012-05-12 23:05:06 -0400
message:
  Move define-obsolete-variable-alias before the var's definition.
  * lisp/vc/log-edit.el (vc-comment-ring, vc-comment-ring-index):
  * lisp/tooltip.el (tooltip-hook):
  * lisp/textmodes/reftex-toc.el (reftex-toc-map):
  * lisp/textmodes/reftex-sel.el (reftex-select-label-map)
  (reftex-select-bib-map):
  * lisp/textmodes/reftex-index.el (reftex-index-map)
  (reftex-index-phrases-map):
  * lisp/speedbar.el (speedbar-syntax-table, speedbar-key-map):
  * lisp/progmodes/meta-mode.el (meta-mode-map):
  * lisp/novice.el (disabled-command-hook):
  * lisp/loadhist.el (unload-hook-features-list):
  * lisp/frame.el (blink-cursor):
  * lisp/files.el (find-file-not-found-hooks, write-file-hooks)
  (write-contents-hooks):
  * lisp/emulation/tpu-edt.el (GOLD-map):
  * lisp/emacs-lock.el (emacs-lock-from-exiting):
  * lisp/emacs-lisp/generic.el (generic-font-lock-defaults):
  * lisp/emacs-lisp/chart.el (chart-map):
  * lisp/dos-fns.el (register-name-alist):
  * lisp/dired-x.el (dired-omit-files-p):
  * lisp/desktop.el (desktop-enable):
  * lisp/cus-edit.el (custom-mode-hook):
  * lisp/buff-menu.el (buffer-menu-mode-hook):
  * lisp/bookmark.el (bookmark-read-annotation-text-func)
  (bookmark-exit-hooks):
  * lisp/allout.el (allout-mode-deactivate-hook)
  (allout-exposure-change-hook, allout-structure-added-hook)
  (allout-structure-deleted-hook, allout-structure-shifted-hook):
  * lisp/dirtrack.el (dirtrack-toggle, dirtrackp, dirtrack-debug-toggle)
  (dirtrack-debug): Move call to define-obsolete-variable-alias so it
  comes before the corresponding variable's definition.
modified:
  lisp/ChangeLog
  lisp/allout.el
  lisp/bookmark.el
  lisp/buff-menu.el
  lisp/cus-edit.el
  lisp/desktop.el
  lisp/dired-x.el
  lisp/dirtrack.el
  lisp/dos-fns.el
  lisp/emacs-lisp/chart.el
  lisp/emacs-lisp/generic.el
  lisp/emacs-lock.el
  lisp/emulation/tpu-edt.el
  lisp/files.el
  lisp/frame.el
  lisp/loadhist.el
  lisp/novice.el
  lisp/progmodes/meta-mode.el
  lisp/speedbar.el
  lisp/textmodes/reftex-index.el
  lisp/textmodes/reftex-sel.el
  lisp/textmodes/reftex-toc.el
  lisp/tooltip.el
  lisp/vc/log-edit.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-12 15:04:11 +0000
+++ b/lisp/ChangeLog    2012-05-13 03:05:06 +0000
@@ -1,3 +1,38 @@
+2012-05-13  Stefan Monnier  <address@hidden>
+
+       Move define-obsolete-variable-alias before the var's definition.
+       * vc/log-edit.el (vc-comment-ring, vc-comment-ring-index):
+       * tooltip.el (tooltip-hook):
+       * textmodes/reftex-toc.el (reftex-toc-map):
+       * textmodes/reftex-sel.el (reftex-select-label-map)
+       (reftex-select-bib-map):
+       * textmodes/reftex-index.el (reftex-index-map)
+       (reftex-index-phrases-map):
+       * speedbar.el (speedbar-syntax-table, speedbar-key-map):
+       * progmodes/meta-mode.el (meta-mode-map):
+       * novice.el (disabled-command-hook):
+       * loadhist.el (unload-hook-features-list):
+       * frame.el (blink-cursor):
+       * files.el (find-file-not-found-hooks, write-file-hooks)
+       (write-contents-hooks):
+       * emulation/tpu-edt.el (GOLD-map):
+       * emacs-lock.el (emacs-lock-from-exiting):
+       * emacs-lisp/generic.el (generic-font-lock-defaults):
+       * emacs-lisp/chart.el (chart-map):
+       * dos-fns.el (register-name-alist):
+       * dired-x.el (dired-omit-files-p):
+       * desktop.el (desktop-enable):
+       * cus-edit.el (custom-mode-hook):
+       * buff-menu.el (buffer-menu-mode-hook):
+       * bookmark.el (bookmark-read-annotation-text-func)
+       (bookmark-exit-hooks):
+       * allout.el (allout-mode-deactivate-hook)
+       (allout-exposure-change-hook, allout-structure-added-hook)
+       (allout-structure-deleted-hook, allout-structure-shifted-hook):
+       * dirtrack.el (dirtrack-toggle, dirtrackp, dirtrack-debug-toggle)
+       (dirtrack-debug): Move call to define-obsolete-variable-alias so it
+       comes before the corresponding variable's definition.
+
 2012-05-12  Chong Yidong  <address@hidden>
 
        * buff-menu.el (Buffer-menu-buffer+size-width): Doc fix (Bug#11454).

=== modified file 'lisp/allout.el'
--- a/lisp/allout.el    2012-05-02 10:57:03 +0000
+++ b/lisp/allout.el    2012-05-13 03:05:06 +0000
@@ -1405,15 +1405,17 @@
 (defvar allout-mode-hook nil
   "Hook run when allout mode starts.")
 ;;;_   = allout-mode-deactivate-hook
+(define-obsolete-variable-alias 'allout-mode-deactivate-hook
+  'allout-mode-off-hook "24.1")
 (defvar allout-mode-deactivate-hook nil
   "Hook run when allout mode ends.")
-(define-obsolete-variable-alias 'allout-mode-deactivate-hook
-  'allout-mode-off-hook "24.1")
 ;;;_   = allout-exposure-category
 (defvar allout-exposure-category nil
   "Symbol for use as allout invisible-text overlay category.")
 
 ;;;_   = allout-exposure-change-functions
+(define-obsolete-variable-alias 'allout-exposure-change-hook
+  'allout-exposure-change-functions "24.2")
 (defcustom allout-exposure-change-functions nil
   "Abnormal hook run after allout outline subtree exposure changes.
 It is run at the conclusion of `allout-flag-region'.
@@ -1429,10 +1431,9 @@
   :group 'allout
   :version "24.2")
 
-(define-obsolete-variable-alias 'allout-exposure-change-hook
-  'allout-exposure-change-functions "24.2")
-
 ;;;_   = allout-structure-added-functions
+(define-obsolete-variable-alias 'allout-structure-added-hook
+  'allout-structure-added-functions "24.2")
 (defcustom allout-structure-added-functions nil
   "Abnormal hook run after adding items to an Allout outline.
 Functions on the hook should take two arguments:
@@ -1445,10 +1446,9 @@
   :group 'allout
   :version "24.2")
 
-(define-obsolete-variable-alias 'allout-structure-added-hook
-  'allout-structure-added-functions "24.2")
-
 ;;;_   = allout-structure-deleted-functions
+(define-obsolete-variable-alias 'allout-structure-deleted-hook
+  'allout-structure-deleted-functions "24.2")
 (defcustom allout-structure-deleted-functions nil
   "Abnormal hook run after deleting subtrees from an Allout outline.
 Functions on the hook must take two arguments:
@@ -1464,10 +1464,9 @@
   :group 'allout
   :version "24.2")
 
-(define-obsolete-variable-alias 'allout-structure-deleted-hook
-  'allout-structure-deleted-functions "24.2")
-
 ;;;_   = allout-structure-shifted-functions
+(define-obsolete-variable-alias 'allout-structure-shifted-hook
+  'allout-structure-shifted-functions "24.2")
 (defcustom allout-structure-shifted-functions nil
   "Abnormal hook run after shifting items in an Allout outline.
 Functions on the hook should take two arguments:
@@ -1483,9 +1482,6 @@
   :group 'allout
   :version "24.2")
 
-(define-obsolete-variable-alias 'allout-structure-shifted-hook
-  'allout-structure-shifted-functions "24.2")
-
 ;;;_   = allout-after-copy-or-kill-hook
 (defcustom allout-after-copy-or-kill-hook nil
   "Normal hook run after copying outline text.."

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2012-02-28 08:17:21 +0000
+++ b/lisp/bookmark.el  2012-05-13 03:05:06 +0000
@@ -828,11 +828,11 @@
          "#  Date:    " (current-time-string) "\n"))
 
 
+(define-obsolete-variable-alias 'bookmark-read-annotation-text-func
+  'bookmark-edit-annotation-text-func "23.1")
 (defvar bookmark-edit-annotation-text-func 'bookmark-default-annotation-text
   "Function to return default text to use for a bookmark annotation.
 It takes one argument, the name of the bookmark, as a string.")
-(define-obsolete-variable-alias 'bookmark-read-annotation-text-func
-  'bookmark-edit-annotation-text-func "23.1")
 
 (defvar bookmark-edit-annotation-mode-map
   (let ((map (make-sparse-keymap)))
@@ -2164,11 +2164,11 @@
   "Hook run at the end of loading library `bookmark.el'.")
 
 ;; Exit Hook, called from kill-emacs-hook
+(define-obsolete-variable-alias 'bookmark-exit-hooks
+  'bookmark-exit-hook "22.1")
 (defvar bookmark-exit-hook nil
   "Hook run when Emacs exits.")
 
-(define-obsolete-variable-alias 'bookmark-exit-hooks 'bookmark-exit-hook 
"22.1")
-
 (defun bookmark-exit-hook-internal ()
   "Save bookmark state, if necessary, at Emacs exit time.
 This also runs `bookmark-exit-hook'."

=== modified file 'lisp/buff-menu.el'
--- a/lisp/buff-menu.el 2012-05-12 15:04:11 +0000
+++ b/lisp/buff-menu.el 2012-05-13 03:05:06 +0000
@@ -199,6 +199,9 @@
     map)
   "Local keymap for `Buffer-menu-mode' buffers.")
 
+(define-obsolete-variable-alias 'buffer-menu-mode-hook
+  'Buffer-menu-mode-hook "23.1")
+
 (define-derived-mode Buffer-menu-mode tabulated-list-mode "Buffer Menu"
   "Major mode for Buffer Menu buffers.
 The Buffer Menu is invoked by the commands \\[list-buffers], \\[buffer-menu], 
and
@@ -207,9 +210,6 @@
        (lambda (&optional _noconfirm) 'fast))
   (add-hook 'tabulated-list-revert-hook 'list-buffers--refresh nil t))
 
-(define-obsolete-variable-alias 'buffer-menu-mode-hook
-  'Buffer-menu-mode-hook "23.1")
-
 (defun buffer-menu (&optional arg)
   "Switch to the Buffer Menu.
 By default, all buffers are listed except those whose names start

=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el  2012-05-04 23:16:47 +0000
+++ b/lisp/cus-edit.el  2012-05-13 03:05:06 +0000
@@ -4825,6 +4825,7 @@
     (set (make-local-variable 'widget-link-suffix) ""))
   (setq show-trailing-whitespace nil))
 
+(define-obsolete-variable-alias 'custom-mode-hook 'Custom-mode-hook "23.1")
 (define-derived-mode Custom-mode nil "Custom"
   "Major mode for editing customization buffers.
 
@@ -4873,7 +4874,6 @@
   (Custom-mode))
 (make-obsolete 'custom-mode 'Custom-mode "23.1")
 (put 'custom-mode 'mode-class 'special)
-(define-obsolete-variable-alias 'custom-mode-hook 'Custom-mode-hook "23.1")
 
 (add-to-list 'debug-ignored-errors "^Invalid face:? ")
 

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2012-02-10 15:59:29 +0000
+++ b/lisp/desktop.el   2012-05-13 03:05:06 +0000
@@ -145,6 +145,8 @@
   "Save status of Emacs when you exit."
   :group 'frames)
 
+;; Maintained for backward compatibility
+(define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1")
 ;;;###autoload
 (define-minor-mode desktop-save-mode
   "Toggle desktop saving (Desktop Save mode).
@@ -158,10 +160,6 @@
   :global t
   :group 'desktop)
 
-;; Maintained for backward compatibility
-(define-obsolete-variable-alias 'desktop-enable
-                                'desktop-save-mode "22.1")
-
 (defun desktop-save-mode-off ()
   "Disable `desktop-save-mode'.  Provided for use in hooks."
   (desktop-save-mode 0))

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2012-02-22 04:02:44 +0000
+++ b/lisp/dired-x.el   2012-05-13 03:05:06 +0000
@@ -132,6 +132,8 @@
   :type '(choice (const :tag "no maximum" nil) integer)
   :group 'dired-x)
 
+;; For backward compatibility
+(define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1")
 (define-minor-mode dired-omit-mode
   "Toggle omission of uninteresting files in Dired (Dired-Omit mode).
 With a prefix argument ARG, enable Dired-Omit mode if ARG is
@@ -157,9 +159,6 @@
 
 (put 'dired-omit-mode 'safe-local-variable 'booleanp)
 
-;; For backward compatibility
-(define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1")
-
 (defcustom dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.$"
   "Filenames matching this regexp will not be displayed.
 This only has effect when `dired-omit-mode' is t.  See interactive function

=== modified file 'lisp/dirtrack.el'
--- a/lisp/dirtrack.el  2012-02-08 02:12:24 +0000
+++ b/lisp/dirtrack.el  2012-05-13 03:05:06 +0000
@@ -179,6 +179,8 @@
     dir))
 
 
+(define-obsolete-function-alias 'dirtrack-toggle 'dirtrack-mode "23.1")
+(define-obsolete-variable-alias 'dirtrackp 'dirtrack-mode "23.1")
 ;;;###autoload
 (define-minor-mode dirtrack-mode
   "Toggle directory tracking in shell buffers (Dirtrack mode).
@@ -198,10 +200,10 @@
       (add-hook 'comint-preoutput-filter-functions 'dirtrack nil t)
     (remove-hook 'comint-preoutput-filter-functions 'dirtrack t)))
 
-(define-obsolete-function-alias 'dirtrack-toggle 'dirtrack-mode "23.1")
-(define-obsolete-variable-alias 'dirtrackp 'dirtrack-mode "23.1")
-
-
+
+(define-obsolete-function-alias 'dirtrack-debug-toggle 'dirtrack-debug-mode
+  "23.1")
+(define-obsolete-variable-alias 'dirtrack-debug 'dirtrack-debug-mode "23.1")
 (define-minor-mode dirtrack-debug-mode
   "Toggle Dirtrack debugging.
 With a prefix argument ARG, enable Dirtrack debugging if ARG is
@@ -211,11 +213,6 @@
   (if dirtrack-debug-mode
       (display-buffer (get-buffer-create dirtrack-debug-buffer))))
 
-(define-obsolete-function-alias 'dirtrack-debug-toggle 'dirtrack-debug-mode
-  "23.1")
-(define-obsolete-variable-alias 'dirtrack-debug 'dirtrack-debug-mode "23.1")
-
-
 (defun dirtrack-debug-message (msg1 msg2)
   "Insert strings at the end of `dirtrack-debug-buffer'."
   (when dirtrack-debug-mode

=== modified file 'lisp/dos-fns.el'
--- a/lisp/dos-fns.el   2012-01-19 07:21:25 +0000
+++ b/lisp/dos-fns.el   2012-05-13 03:05:06 +0000
@@ -233,15 +233,15 @@
 
 (add-hook 'before-init-hook 'dos-reevaluate-defcustoms)
 
+(define-obsolete-variable-alias
+  'register-name-alist 'dos-register-name-alist "24.1")
+
 (defvar dos-register-name-alist
   '((ax . 0) (bx . 1) (cx . 2) (dx . 3) (si . 4) (di . 5)
     (cflag . 6) (flags . 7)
     (al . (0 . 0)) (bl . (1 . 0)) (cl . (2 . 0)) (dl . (3 . 0))
     (ah . (0 . 1)) (bh . (1 . 1)) (ch . (2 . 1)) (dh . (3 . 1))))
 
-(define-obsolete-variable-alias
-  'register-name-alist 'dos-register-name-alist "24.1")
-
 (defun dos-make-register ()
   (make-vector 8 0))
 

=== modified file 'lisp/emacs-lisp/chart.el'
--- a/lisp/emacs-lisp/chart.el  2012-04-09 13:05:48 +0000
+++ b/lisp/emacs-lisp/chart.el  2012-05-13 03:05:06 +0000
@@ -62,8 +62,8 @@
 (require 'eieio)
 
 ;;; Code:
+(define-obsolete-variable-alias 'chart-map 'chart-mode-map "24.1")
 (defvar chart-mode-map (make-sparse-keymap) "Keymap used in chart mode.")
-(define-obsolete-variable-alias 'chart-map 'chart-mode-map "24.1")
 
 (defvar chart-local-object nil
   "Local variable containing the locally displayed chart object.")

=== modified file 'lisp/emacs-lisp/generic.el'
--- a/lisp/emacs-lisp/generic.el        2012-01-19 07:21:25 +0000
+++ b/lisp/emacs-lisp/generic.el        2012-05-13 03:05:06 +0000
@@ -97,10 +97,11 @@
 ;; Internal Variables
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(define-obsolete-variable-alias 'generic-font-lock-defaults
+  'generic-font-lock-keywords "22.1")
 (defvar generic-font-lock-keywords nil
   "Keywords for `font-lock-defaults' in a generic mode.")
 (make-variable-buffer-local 'generic-font-lock-keywords)
-(define-obsolete-variable-alias 'generic-font-lock-defaults 
'generic-font-lock-keywords "22.1")
 
 ;;;###autoload
 (defvar generic-mode-list nil

=== modified file 'lisp/emacs-lock.el'
--- a/lisp/emacs-lock.el        2012-04-14 03:11:18 +0000
+++ b/lisp/emacs-lock.el        2012-05-13 03:05:06 +0000
@@ -186,6 +186,8 @@
                ;; anything else (turn off)
                mode))))
 
+(define-obsolete-variable-alias 'emacs-lock-from-exiting
+  'emacs-lock-mode "24.1")
 ;;;###autoload
 (define-minor-mode emacs-lock-mode
   "Toggle Emacs Lock mode in the current buffer.
@@ -245,8 +247,6 @@
 
 ;;; Compatibility
 
-(define-obsolete-variable-alias 'emacs-lock-from-exiting 'emacs-lock-mode 
"24.1")
-
 (defun toggle-emacs-lock ()
   "Toggle `emacs-lock-from-exiting' for the current buffer."
   (interactive)

=== modified file 'lisp/emulation/tpu-edt.el'
--- a/lisp/emulation/tpu-edt.el 2012-02-28 08:17:21 +0000
+++ b/lisp/emulation/tpu-edt.el 2012-05-13 03:05:06 +0000
@@ -315,6 +315,7 @@
 ;;;  Global Keymaps
 ;;;
 
+(define-obsolete-variable-alias 'GOLD-map 'tpu-gold-map "23.1")
 (defvar tpu-gold-map
   (let ((map (make-keymap)))
     ;; Previously we used escape sequences here.  We now instead presume
@@ -494,7 +495,6 @@
     map)
   "Maps the function keys on the VT100 keyboard preceded by PF1.
 GOLD is the ASCII 7-bit escape sequence <ESC>OP.")
-(define-obsolete-variable-alias 'GOLD-map 'tpu-gold-map "23.1")
 
 (defvar tpu-global-map
   (let ((map (make-sparse-keymap)))

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-05-09 03:06:08 +0000
+++ b/lisp/files.el     2012-05-13 03:05:06 +0000
@@ -415,13 +415,13 @@
 
 ;;;It is not useful to make this a local variable.
 ;;;(put 'find-file-not-found-hooks 'permanent-local t)
+(define-obsolete-variable-alias 'find-file-not-found-hooks
+    'find-file-not-found-functions "22.1")
 (defvar find-file-not-found-functions nil
   "List of functions to be called for `find-file' on nonexistent file.
 These functions are called as soon as the error is detected.
 Variable `buffer-file-name' is already set up.
 The functions are called in the order given until one of them returns 
non-nil.")
-(define-obsolete-variable-alias 'find-file-not-found-hooks
-    'find-file-not-found-functions "22.1")
 
 ;;;It is not useful to make this a local variable.
 ;;;(put 'find-file-hooks 'permanent-local t)
@@ -435,6 +435,7 @@
   :options '(auto-insert)
   :version "22.1")
 
+(define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1")
 (defvar write-file-functions nil
   "List of functions to be called before writing out a buffer to a file.
 If one of them returns non-nil, the file is considered already written
@@ -451,13 +452,14 @@
 node `(elisp)Saving Buffers'.)  To perform various checks or
 updates before the buffer is saved, use `before-save-hook'.")
 (put 'write-file-functions 'permanent-local t)
-(define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1")
 
 (defvar local-write-file-hooks nil)
 (make-variable-buffer-local 'local-write-file-hooks)
 (put 'local-write-file-hooks 'permanent-local t)
 (make-obsolete-variable 'local-write-file-hooks 'write-file-functions "22.1")
 
+(define-obsolete-variable-alias 'write-contents-hooks
+    'write-contents-functions "22.1")
 (defvar write-contents-functions nil
   "List of functions to be called before writing out a buffer to a file.
 If one of them returns non-nil, the file is considered already written
@@ -475,8 +477,6 @@
 To perform various checks or updates before the buffer is saved,
 use `before-save-hook'.")
 (make-variable-buffer-local 'write-contents-functions)
-(define-obsolete-variable-alias 'write-contents-hooks
-    'write-contents-functions "22.1")
 
 (defcustom enable-local-variables t
   "Control use of local variables in files you visit.

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2012-04-16 18:41:38 +0000
+++ b/lisp/frame.el     2012-05-13 03:05:06 +0000
@@ -1612,6 +1612,8 @@
     (cancel-timer blink-cursor-timer)
     (setq blink-cursor-timer nil)))
 
+(define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1")
+
 (define-minor-mode blink-cursor-mode
   "Toggle cursor blinking (Blink Cursor mode).
 With a prefix argument ARG, enable Blink Cursor mode if ARG is
@@ -1638,8 +1640,6 @@
                                blink-cursor-delay
                                'blink-cursor-start))))
 
-(define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1")
-
 
 ;;;; Key bindings
 
@@ -1652,7 +1652,8 @@
 ;; Misc.
 
 ;; Only marked as obsolete in 24.2.
-(define-obsolete-variable-alias 'automatic-hscrolling 'auto-hscroll-mode 
"22.1")
+(define-obsolete-variable-alias 'automatic-hscrolling
+  'auto-hscroll-mode "22.1")
 
 (make-variable-buffer-local 'show-trailing-whitespace)
 

=== modified file 'lisp/loadhist.el'
--- a/lisp/loadhist.el  2012-01-19 07:21:25 +0000
+++ b/lisp/loadhist.el  2012-05-13 03:05:06 +0000
@@ -143,13 +143,13 @@
 `-hook' or `-hooks', from which `unload-feature' should try to remove
 pertinent symbols.")
 
+(define-obsolete-variable-alias 'unload-hook-features-list
+    'unload-function-defs-list "22.2")
 (defvar unload-function-defs-list nil
   "List of definitions in the Lisp library being unloaded.
 
 This is meant to be used by `FEATURE-unload-function'; see the
 documentation of `unload-feature' for details.")
-(define-obsolete-variable-alias 'unload-hook-features-list
-    'unload-function-defs-list "22.2")
 
 (defun unload--set-major-mode ()
   (save-current-buffer

=== modified file 'lisp/novice.el'
--- a/lisp/novice.el    2012-01-19 07:21:25 +0000
+++ b/lisp/novice.el    2012-05-13 03:05:06 +0000
@@ -36,13 +36,13 @@
 (eval-when-compile (require 'cl))
 
 ;;;###autoload
+(define-obsolete-variable-alias 'disabled-command-hook
+  'disabled-command-function "22.1")
+;;;###autoload
 (defvar disabled-command-function 'disabled-command-function
   "Function to call to handle disabled commands.
 If nil, the feature is disabled, i.e., all commands work normally.")
 
-;;;###autoload
-(define-obsolete-variable-alias 'disabled-command-hook 
'disabled-command-function "22.1")
-
 ;; It is ok here to assume that this-command is a symbol
 ;; because we won't get called otherwise.
 ;;;###autoload

=== modified file 'lisp/progmodes/meta-mode.el'
--- a/lisp/progmodes/meta-mode.el       2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/meta-mode.el       2012-05-13 03:05:06 +0000
@@ -829,6 +829,7 @@
     st)
   "Syntax table used in Metafont or MetaPost mode.")
 
+(define-obsolete-variable-alias 'meta-mode-map 'meta-common-mode-map "24.1")
 (defvar meta-common-mode-map
   (let ((map (make-sparse-keymap)))
     ;; Comment Paragraphs:
@@ -858,7 +859,6 @@
     ;; (define-key map "\C-c\C-l"  'meta-recenter-output)
     map)
   "Keymap used in Metafont or MetaPost mode.")
-(define-obsolete-variable-alias 'meta-mode-map 'meta-common-mode-map "24.1")
 
 (easy-menu-define
  meta-mode-menu meta-common-mode-map

=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el  2012-04-28 21:59:08 +0000
+++ b/lisp/speedbar.el  2012-05-13 03:05:06 +0000
@@ -774,6 +774,8 @@
 (defvar speedbar-update-flag-disable nil
   "Permanently disable changing of the update flag.")
 
+(define-obsolete-variable-alias
+  'speedbar-syntax-table 'speedbar-mode-syntax-table "24.1")
 (defvar speedbar-mode-syntax-table
   (let ((st (make-syntax-table)))
     ;; Turn off paren matching around here.
@@ -787,10 +789,9 @@
     (modify-syntax-entry ?\]  " " st)
     st)
   "Syntax-table used on the speedbar.")
-(define-obsolete-variable-alias
-  'speedbar-syntax-table 'speedbar-mode-syntax-table "24.1")
-
-
+
+
+(define-obsolete-variable-alias 'speedbar-key-map 'speedbar-mode-map "24.1")
 (defvar speedbar-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map t)
@@ -825,7 +826,6 @@
     (dframe-update-keymap map)
     map)
   "Keymap used in speedbar buffer.")
-(define-obsolete-variable-alias 'speedbar-key-map 'speedbar-mode-map "24.1")
 
 (defun speedbar-make-specialized-keymap ()
   "Create a keymap for use with a speedbar major or minor display mode.

=== modified file 'lisp/textmodes/reftex-index.el'
--- a/lisp/textmodes/reftex-index.el    2012-01-19 07:21:25 +0000
+++ b/lisp/textmodes/reftex-index.el    2012-05-13 03:05:06 +0000
@@ -274,6 +274,8 @@
     (and newtag (cdr cell) (not (member newtag (cdr cell)))
          (push newtag (cdr cell)))))
 
+(define-obsolete-variable-alias
+  'reftex-index-map 'reftex-index-mode-map "24.1")
 (defvar reftex-index-mode-map
   (let ((map (make-sparse-keymap)))
     ;; Index map
@@ -377,8 +379,6 @@
 
     map)
   "Keymap used for *Index* buffers.")
-(define-obsolete-variable-alias
-  'reftex-index-map 'reftex-index-mode-map "24.1")
 
 (defvar reftex-index-menu)
 
@@ -1179,6 +1179,8 @@
   "Font lock keywords for reftex-index-phrases-mode.")
 (defvar reftex-index-phrases-font-lock-defaults nil
   "Font lock defaults for reftex-index-phrases-mode.")
+(define-obsolete-variable-alias
+  'reftex-index-phrases-map 'reftex-index-phrases-mode-map "24.1")
 (defvar reftex-index-phrases-mode-map
   (let ((map (make-sparse-keymap)))
     ;; Keybindings and Menu for phrases buffer
@@ -1244,8 +1246,6 @@
 
     map)
   "Keymap used for *toc* buffer.")
-(define-obsolete-variable-alias
-  'reftex-index-phrases-map 'reftex-index-phrases-mode-map "24.1")
 
 
 (defun reftex-index-phrase-selection-or-word (arg)

=== modified file 'lisp/textmodes/reftex-sel.el'
--- a/lisp/textmodes/reftex-sel.el      2012-01-19 07:21:25 +0000
+++ b/lisp/textmodes/reftex-sel.el      2012-05-13 03:05:06 +0000
@@ -71,6 +71,8 @@
     (define-key map "-" 'negative-argument)
     map))
 
+(define-obsolete-variable-alias
+  'reftex-select-label-map 'reftex-select-label-mode-map "24.1")
 (defvar reftex-select-label-mode-map
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map reftex-select-shared-map)
@@ -102,8 +104,6 @@
   "Keymap used for *RefTeX Select* buffer, when selecting a label.
 This keymap can be used to configure the label selection process which is
 started with the command \\[reftex-reference].")
-(define-obsolete-variable-alias
-  'reftex-select-label-map 'reftex-select-label-mode-map "24.1")
 
 (define-derived-mode reftex-select-label-mode fundamental-mode "LSelect"
   "Major mode for selecting a label in a LaTeX document.
@@ -126,6 +126,8 @@
   ;; We do not set a local map - reftex-select-item does this.
   )
 
+(define-obsolete-variable-alias
+  'reftex-select-bib-map 'reftex-select-bib-mode-map "24.1")
 (defvar reftex-select-bib-mode-map
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map reftex-select-shared-map)
@@ -147,8 +149,6 @@
   "Keymap used for *RefTeX Select* buffer, when selecting a BibTeX entry.
 This keymap can be used to configure the BibTeX selection process which is
 started with the command \\[reftex-citation].")
-(define-obsolete-variable-alias
-  'reftex-select-bib-map 'reftex-select-bib-mode-map "24.1")
 
 (define-derived-mode reftex-select-bib-mode fundamental-mode "BSelect"
   "Major mode for selecting a citation key in a LaTeX document.

=== modified file 'lisp/textmodes/reftex-toc.el'
--- a/lisp/textmodes/reftex-toc.el      2012-01-19 07:21:25 +0000
+++ b/lisp/textmodes/reftex-toc.el      2012-05-13 03:05:06 +0000
@@ -31,6 +31,7 @@
 (require 'reftex)
 ;;;
 
+(define-obsolete-variable-alias 'reftex-toc-map 'reftex-toc-mode-map "24.1")
 (defvar reftex-toc-mode-map
   (let ((map (make-sparse-keymap)))
 
@@ -122,7 +123,6 @@
 
     map)
   "Keymap used for *toc* buffer.")
-(define-obsolete-variable-alias 'reftex-toc-map 'reftex-toc-mode-map "24.1")
 
 (defvar reftex-toc-menu)
 (defvar reftex-last-window-height nil)

=== modified file 'lisp/tooltip.el'
--- a/lisp/tooltip.el   2012-02-08 02:12:24 +0000
+++ b/lisp/tooltip.el   2012-05-13 03:05:06 +0000
@@ -154,6 +154,8 @@
 
 ;;; Variables that are not customizable.
 
+(define-obsolete-variable-alias 'tooltip-hook 'tooltip-functions "23.1")
+
 (defvar tooltip-functions nil
   "Functions to call to display tooltips.
 Each function is called with one argument EVENT which is a copy
@@ -161,8 +163,6 @@
 functions displays the tooltip, it should return non-nil and the
 rest are not called.")
 
-(define-obsolete-variable-alias 'tooltip-hook 'tooltip-functions "23.1")
-
 (defvar tooltip-timeout-id nil
   "The id of the timeout started when Emacs becomes idle.")
 

=== modified file 'lisp/vc/log-edit.el'
--- a/lisp/vc/log-edit.el       2012-05-08 15:19:18 +0000
+++ b/lisp/vc/log-edit.el       2012-05-13 03:05:06 +0000
@@ -195,7 +195,10 @@
 
 (defconst log-edit-maximum-comment-ring-size 32
   "Maximum number of saved comments in the comment ring.")
+(define-obsolete-variable-alias 'vc-comment-ring 'log-edit-comment-ring "22.1")
 (defvar log-edit-comment-ring (make-ring log-edit-maximum-comment-ring-size))
+(define-obsolete-variable-alias 'vc-comment-ring-index
+  'log-edit-comment-ring-index "22.1")
 (defvar log-edit-comment-ring-index nil)
 (defvar log-edit-last-comment-match "")
 
@@ -301,8 +304,6 @@
        (insert "\n"))))
 
 ;; Compatibility with old names.
-(define-obsolete-variable-alias 'vc-comment-ring 'log-edit-comment-ring "22.1")
-(define-obsolete-variable-alias 'vc-comment-ring-index 
'log-edit-comment-ring-index "22.1")
 (define-obsolete-function-alias 'vc-previous-comment 
'log-edit-previous-comment "22.1")
 (define-obsolete-function-alias 'vc-next-comment 'log-edit-next-comment "22.1")
 (define-obsolete-function-alias 'vc-comment-search-reverse 
'log-edit-comment-search-backward "22.1")