[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100056: Move some aliases to options before the associated definitions.

[Glenn Morris]

------------------------------------------------------------
revno: 100056
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-09-23 00:05:22 -0700
message:
  Move some aliases to options before the associated definitions.
  
  * isearch.el (isearch-lazy-highlight-cleanup)
  (isearch-lazy-highlight-initial-delay)
  (isearch-lazy-highlight-interval)
  (isearch-lazy-highlight-max-at-a-time, isearch-lazy-highlight-face):
  * net/net-utils.el (ipconfig-program-options):
  Move aliases to options before the associated definitions.
modified:
  lisp/ChangeLog
  lisp/isearch.el
  lisp/net/net-utils.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-21 13:09:22 +0000
+++ b/lisp/ChangeLog    2010-09-23 07:05:22 +0000
@@ -1,3 +1,12 @@
+2010-09-23  Glenn Morris  <address@hidden>
+
+       * isearch.el (isearch-lazy-highlight-cleanup)
+       (isearch-lazy-highlight-initial-delay)
+       (isearch-lazy-highlight-interval)
+       (isearch-lazy-highlight-max-at-a-time, isearch-lazy-highlight-face):
+       * net/net-utils.el (ipconfig-program-options):
+       Move aliases to options before the associated definitions.
+
 2010-09-21  Stefan Monnier  <address@hidden>
 
        * newcomment.el (comment-normalize-vars): Better test validity of

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2010-08-08 20:55:52 +0000
+++ b/lisp/isearch.el   2010-09-23 07:05:22 +0000
@@ -271,30 +271,37 @@
   :group 'isearch
   :group 'matching)
 
+(define-obsolete-variable-alias 'isearch-lazy-highlight-cleanup
+                                'lazy-highlight-cleanup
+                                "22.1")
+
 (defcustom lazy-highlight-cleanup t
   "Controls whether to remove extra highlighting after a search.
 If this is nil, extra highlighting can be \"manually\" removed with
 \\[lazy-highlight-cleanup]."
   :type 'boolean
   :group 'lazy-highlight)
-(define-obsolete-variable-alias 'isearch-lazy-highlight-cleanup
-                                'lazy-highlight-cleanup
+
+(define-obsolete-variable-alias 'isearch-lazy-highlight-initial-delay
+                                'lazy-highlight-initial-delay
                                 "22.1")
 
 (defcustom lazy-highlight-initial-delay 0.25
   "Seconds to wait before beginning to lazily highlight all matches."
   :type 'number
   :group 'lazy-highlight)
-(define-obsolete-variable-alias 'isearch-lazy-highlight-initial-delay
-                                'lazy-highlight-initial-delay
+
+(define-obsolete-variable-alias 'isearch-lazy-highlight-interval
+                                'lazy-highlight-interval
                                 "22.1")
 
 (defcustom lazy-highlight-interval 0 ; 0.0625
   "Seconds between lazily highlighting successive matches."
   :type 'number
   :group 'lazy-highlight)
-(define-obsolete-variable-alias 'isearch-lazy-highlight-interval
-                                'lazy-highlight-interval
+
+(define-obsolete-variable-alias 'isearch-lazy-highlight-max-at-a-time
+                                'lazy-highlight-max-at-a-time
                                 "22.1")
 
 (defcustom lazy-highlight-max-at-a-time 20
@@ -305,9 +312,6 @@
   :type '(choice (const :tag "All" nil)
                 (integer :tag "Some"))
   :group 'lazy-highlight)
-(define-obsolete-variable-alias 'isearch-lazy-highlight-max-at-a-time
-                                'lazy-highlight-max-at-a-time
-                                "22.1")
 
 (defface lazy-highlight
   '((((class color) (min-colors 88) (background light))
@@ -323,10 +327,10 @@
   :group 'lazy-highlight
   :group 'basic-faces)
 (define-obsolete-face-alias 'isearch-lazy-highlight-face 'lazy-highlight 
"22.1")
-(defvar lazy-highlight-face 'lazy-highlight)
 (define-obsolete-variable-alias 'isearch-lazy-highlight-face
                                 'lazy-highlight-face
                                 "22.1")
+(defvar lazy-highlight-face 'lazy-highlight)
 
 ;; Define isearch help map.
 

=== modified file 'lisp/net/net-utils.el'
--- a/lisp/net/net-utils.el     2010-01-13 08:35:10 +0000
+++ b/lisp/net/net-utils.el     2010-09-23 07:05:22 +0000
@@ -99,6 +99,9 @@
   :group 'net-utils
   :type  'string)
 
+(define-obsolete-variable-alias 'ipconfig-program-options
+  'ifconfig-program-options "22.2")
+
 (defcustom ifconfig-program-options
   (list
    (if (eq system-type 'windows-nt)
@@ -113,9 +116,6 @@
   :type 'string
   :version "23.1")
 
-(define-obsolete-variable-alias 'ipconfig-program-options
-  'ifconfig-program-options "22.2")
-
 (defcustom iwconfig-program-options nil
  "Options for the iwconfig program."
  :group 'net-utils