mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
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.
This commit is contained in:
parent
b974955453
commit
af3ccb5cc0
3 changed files with 26 additions and 13 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -271,30 +271,37 @@ and `lazy-highlight-interval')."
|
|||
: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 @@ A value of nil means highlight all matches."
|
|||
: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 @@ A value of nil means highlight all matches."
|
|||
: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.
|
||||
|
||||
|
|
|
|||
|
|
@ -99,6 +99,9 @@ These options can be used to limit how many ICMP packets are emitted."
|
|||
: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 @@ These options can be used to limit how many ICMP packets are emitted."
|
|||
: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
|
||||
|
|
|
|||
Loading…
Reference in a new issue