Mercurial > emacs
changeset 110532:7060c3b16693
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 23 Sep 2010 00:05:22 -0700 |
| parents | 67ff8ad45bd5 |
| children | b799d38f522a e78f439a4955 |
| files | lisp/ChangeLog lisp/isearch.el lisp/net/net-utils.el |
| diffstat | 3 files changed, 26 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Sep 21 18:11:23 2010 -0400 +++ b/lisp/ChangeLog Thu Sep 23 00:05:22 2010 -0700 @@ -1,3 +1,12 @@ +2010-09-23 Glenn Morris <rgm@gnu.org> + + * 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 <monnier@iro.umontreal.ca> * newcomment.el (comment-normalize-vars): Better test validity of
--- a/lisp/isearch.el Tue Sep 21 18:11:23 2010 -0400 +++ b/lisp/isearch.el Thu Sep 23 00:05:22 2010 -0700 @@ -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.
--- a/lisp/net/net-utils.el Tue Sep 21 18:11:23 2010 -0400 +++ b/lisp/net/net-utils.el Thu Sep 23 00:05:22 2010 -0700 @@ -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