More alias-related tedium

* lisp/comint.el (comint-scroll-to-bottom-on-output):
* lisp/completion.el (cmpl-syntax-table):
* lisp/erc/erc-button.el (erc-button-google-url):
* lisp/font-lock.el (font-lock-reference-face):
* lisp/hfy-cmap.el (hfy-fallback-colour-map, hfy-rgb-txt-colour-map):
* lisp/isearch.el (isearch-regexp-function, isearch-new-word):
* lisp/startup.el (argv):
* lisp/version.el (emacs-bzr-version):
* lisp/org/org.el (org-CUA-compatible)
(org-popup-calendar-for-date-prompt):
Move aliases before targets, to silence new compiler warning.

9 files changed, 35 insertions, 29 deletions

diff --git a/lisp/comint.el b/lisp/comint.el
index 3182cba8663..0a33e749446 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -263,6 +263,8 @@ See `comint-preinput-scroll-to-bottom'.  This variable is buffer-local."
 		 (const this))
   :group 'comint)
 
+(defvaralias 'comint-scroll-to-bottom-on-output 'comint-move-point-for-output)
+
 (defcustom comint-move-point-for-output nil
   "Controls whether interpreter output moves point to the end of the output.
 If nil, then output never moves point to the output.
@@ -295,8 +297,6 @@ end of the current logical (not visual) line after insertion."
                 (const :tag "Move to end of line" end-of-line))
   :group 'comint)
 
-(defvaralias 'comint-scroll-to-bottom-on-output 'comint-move-point-for-output)
-
 (defcustom comint-scroll-show-maximum-output t
   "Controls how to scroll due to interpreter output.
 This variable applies when point is at the end of the buffer
diff --git a/lisp/completion.el b/lisp/completion.el
index ff942940861..2ddf0999e43 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -518,6 +518,9 @@ Used to decide whether to save completions.")
 	(modify-syntax-entry char "w" table)))
     table))
 
+;; Old name, non-namespace-clean.
+(defvaralias 'cmpl-syntax-table 'completion-syntax-table)
+
 (defvar completion-syntax-table completion-standard-syntax-table
   "This variable holds the current completion syntax table.")
 (make-variable-buffer-local 'completion-syntax-table)
@@ -2360,8 +2363,7 @@ if ARG is omitted or nil."
 (completion-def-wrapper 'delete-backward-char :backward)
 (completion-def-wrapper 'delete-backward-char-untabify :backward)
 
-;; Old names, non-namespace-clean.
-(defvaralias 'cmpl-syntax-table 'completion-syntax-table)
+;; Old name, non-namespace-clean.
 (defalias 'initialize-completions 'completion-initialize)
 
 (provide 'completion)
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 749ae5db5a2..7599053e9d3 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -121,6 +121,9 @@ longer than `erc-fill-column'."
   :group 'erc-button
   :type 'string)
 
+(define-obsolete-variable-alias 'erc-button-google-url
+  'erc-button-search-url "27.1")
+
 (defcustom erc-button-search-url "http://duckduckgo.com/?q=%s"
   "URL used to search for a term.
 %s is replaced by the search string."
@@ -128,9 +131,6 @@ longer than `erc-fill-column'."
   :group 'erc-button
   :type 'string)
 
-(define-obsolete-variable-alias 'erc-button-google-url
-  'erc-button-search-url "27.1")
-
 (defcustom erc-button-alist
   ;; Since the callback is only executed when the user is clicking on
   ;; a button, it makes no sense to optimize performance by
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 0ed94bd0e8b..be9fb4dc93f 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -327,6 +327,9 @@ If a number, only buffers greater than this size have fontification messages."
 (defvar font-lock-type-face		'font-lock-type-face
   "Face name to use for type and class names.")
 
+(define-obsolete-variable-alias
+  'font-lock-reference-face 'font-lock-constant-face "20.3")
+
 (defvar font-lock-constant-face		'font-lock-constant-face
   "Face name to use for constant and label names.")
 
@@ -340,9 +343,6 @@ This can be an \"!\" or the \"n\" in \"ifndef\".")
 (defvar font-lock-preprocessor-face	'font-lock-preprocessor-face
   "Face name to use for preprocessor directives.")
 
-(define-obsolete-variable-alias
-  'font-lock-reference-face 'font-lock-constant-face "20.3")
-
 ;; Fontification variables:
 
 (defvar font-lock-keywords nil
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el
index 4ec24cea70a..ee6e18edb0a 100644
--- a/lisp/hfy-cmap.el
+++ b/lisp/hfy-cmap.el
@@ -32,6 +32,10 @@
 
 ;;; Code:
 
+(define-obsolete-variable-alias
+  'hfy-fallback-colour-map
+  'hfy-fallback-color-map "27.1")
+
 (defconst hfy-fallback-color-map
   '(("snow"                    65535 64250 64250)
     ("ghost white"             63736 63736 65535)
@@ -785,15 +789,13 @@
     ("DarkRed"                 35723     0     0)
     ("light green"             37008 61166 37008)
     ("LightGreen"              37008 61166 37008)) )
-(define-obsolete-variable-alias
-  'hfy-fallback-colour-map
-  'hfy-fallback-color-map "27.1")
 
-(defvar hfy-rgb-txt-color-map nil)
 (define-obsolete-variable-alias
   'hfy-rgb-txt-colour-map
   'hfy-rgb-txt-color-map "27.1")
 
+(defvar hfy-rgb-txt-color-map nil)
+
 (defvar hfy-rgb-load-path
   (list "/etc/X11"
 	(format "/usr/share/emacs/%d.%d/etc"
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 0874ebb54e6..db196e00efb 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -562,6 +562,9 @@ This is like `describe-bindings', but displays only Isearch keys."
 
 (defvar isearch-forward nil)	; Searching in the forward direction.
 (defvar isearch-regexp nil)	; Searching for a regexp.
+;; We still support setting this to t for backwards compatibility.
+(define-obsolete-variable-alias 'isearch-word
+  'isearch-regexp-function "25.1")
 (defvar isearch-regexp-function nil
   "Regexp-based search mode for words/symbols.
 If the value is a function (e.g. `isearch-symbol-regexp'), it is
@@ -573,9 +576,6 @@ specifies the prefix string displayed in the search message.
 This variable is set and changed during isearch.  To change the
 default behavior used for searches, see `search-default-mode'
 instead.")
-;; We still support setting this to t for backwards compatibility.
-(define-obsolete-variable-alias 'isearch-word
-  'isearch-regexp-function "25.1")
 
 (defvar isearch-lax-whitespace t
   "If non-nil, a space will match a sequence of whitespace chars.
@@ -1242,13 +1242,14 @@ If MSG is non-nil, use variable `isearch-message', otherwise `isearch-string'."
 	  (length succ-msg)
 	0))))
 
+(define-obsolete-variable-alias 'isearch-new-word
+  'isearch-new-regexp-function "25.1")
+
 (defvar isearch-new-regexp-function nil
   "Holds the next `isearch-regexp-function' inside `with-isearch-suspended'.
 If this is set inside code wrapped by the macro
 `with-isearch-suspended', then the value set will be used as the
 `isearch-regexp-function' once isearch resumes.")
-(define-obsolete-variable-alias 'isearch-new-word
-  'isearch-new-regexp-function "25.1")
 
 (defvar isearch-suspended nil)
 
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 7f4c6d5936b..e45bc55b244 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1071,6 +1071,8 @@ has been set."
   :group 'org-startup
   :type 'boolean)
 
+(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys)
+
 (defcustom org-replace-disputed-keys nil
   "Non-nil means use alternative key bindings for some keys.
 Org mode uses S-<cursor> keys for changing timestamps and priorities.
@@ -1095,8 +1097,6 @@ loading Org."
   :group 'org-startup
   :type 'boolean)
 
-(defvaralias 'org-CUA-compatible 'org-replace-disputed-keys)
-
 (defcustom org-disputed-keys
   '(([(shift up)]		. [(meta p)])
     ([(shift down)]		. [(meta n)])
@@ -3343,6 +3343,9 @@ This display will be in an overlay, in the minibuffer."
   :group 'org-time
   :type 'boolean)
 
+(defvaralias 'org-popup-calendar-for-date-prompt
+  'org-read-date-popup-calendar)
+
 (defcustom org-read-date-popup-calendar t
   "Non-nil means pop up a calendar when prompting for a date.
 In the calendar, the date can be selected with mouse-1.  However, the
@@ -3350,8 +3353,6 @@ minibuffer will also be active, and you can simply enter the date as well.
 When nil, only the minibuffer will be available."
   :group 'org-time
   :type 'boolean)
-(defvaralias 'org-popup-calendar-for-date-prompt
-  'org-read-date-popup-calendar)
 
 (defcustom org-extend-today-until 0
   "The hour when your day really ends.  Must be an integer.
diff --git a/lisp/startup.el b/lisp/startup.el
index bb3e70493c4..5b2d3e58cba 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -120,9 +120,6 @@ Elements look like (SWITCH-STRING . HANDLER-FUNCTION).
 HANDLER-FUNCTION receives the switch string as its sole argument;
 the remaining command-line args are in the variable `command-line-args-left'.")
 
-(defvar command-line-args-left nil
-  "List of command-line args not yet processed.")
-
 (with-no-warnings
   (defvaralias 'argv 'command-line-args-left
     "List of command-line args not yet processed.
@@ -131,6 +128,9 @@ inside of --eval command line arguments in order to access
 following arguments."))
 (internal-make-var-non-special 'argv)
 
+(defvar command-line-args-left nil
+  "List of command-line args not yet processed.")
+
 (with-no-warnings
   (defvar argi nil
     "Current command-line argument."))
diff --git a/lisp/version.el b/lisp/version.el
index 3a38b1d83c8..84919308191 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -99,15 +99,15 @@ to the system configuration; look at `system-configuration' instead."
 ;; We hope that this alias is easier for people to find.
 (defalias 'version 'emacs-version)
 
+(define-obsolete-variable-alias 'emacs-bzr-version
+                                'emacs-repository-version "24.4")
+
 ;; Set during dumping, this is a defvar so that it can be setq'd.
 (defvar emacs-repository-version nil
   "String giving the repository revision from which this Emacs was built.
 Value is nil if Emacs was not built from a repository checkout,
 or if we could not determine the revision.")
 
-(define-obsolete-variable-alias 'emacs-bzr-version
-                                'emacs-repository-version "24.4")
-
 (define-obsolete-function-alias 'emacs-bzr-get-version
                                 'emacs-repository-get-version "24.4")