aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Malabarba2015-10-25 00:11:37 +0100
committerArtur Malabarba2015-10-25 01:53:46 +0100
commitfa647ecdf293c77b65cbf357d9e8c036185d43ed (patch)
treea314a6194f904dccce126d44eaec46845ac812c4
parent79fac080d277fed07b3c192890ad59d36d9f83b6 (diff)
downloademacs-fa647ecdf293c77b65cbf357d9e8c036185d43ed.tar.gz
emacs-fa647ecdf293c77b65cbf357d9e8c036185d43ed.zip
* lisp/isearch.el: Delete redundant :group entries
(search-exit-option, search-slow-window-lines) (search-slow-speed, search-upper-case) (search-nonincremental-instead, search-whitespace-regexp) (search-invisible, isearch-hide-immediately) (isearch-resume-in-command-history, search-ring-max) (regexp-search-ring-max, search-ring-update, search-highlight) (isearch-fail): Delete :group entries.
-rw-r--r--lisp/isearch.el40
1 files changed, 13 insertions, 27 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6b99da91ec4..159c9925ba3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -72,23 +72,20 @@
72 72
73(defcustom search-exit-option t 73(defcustom search-exit-option t
74 "Non-nil means random control characters terminate incremental search." 74 "Non-nil means random control characters terminate incremental search."
75 :type 'boolean 75 :type 'boolean)
76 :group 'isearch)
77 76
78(defcustom search-slow-window-lines 1 77(defcustom search-slow-window-lines 1
79 "Number of lines in slow search display windows. 78 "Number of lines in slow search display windows.
80These are the short windows used during incremental search on slow terminals. 79These are the short windows used during incremental search on slow terminals.
81Negative means put the slow search window at the top (normally it's at bottom) 80Negative means put the slow search window at the top (normally it's at bottom)
82and the value is minus the number of lines." 81and the value is minus the number of lines."
83 :type 'integer 82 :type 'integer)
84 :group 'isearch)
85 83
86(defcustom search-slow-speed 1200 84(defcustom search-slow-speed 1200
87 "Highest terminal speed at which to use \"slow\" style incremental search. 85 "Highest terminal speed at which to use \"slow\" style incremental search.
88This is the style where a one-line window is created to show the line 86This is the style where a one-line window is created to show the line
89that the search has reached." 87that the search has reached."
90 :type 'integer 88 :type 'integer)
91 :group 'isearch)
92 89
93(defcustom search-upper-case 'not-yanks 90(defcustom search-upper-case 'not-yanks
94 "If non-nil, upper case chars disable case fold searching. 91 "If non-nil, upper case chars disable case fold searching.
@@ -99,15 +96,13 @@ If this value is `not-yanks', text yanked into the search string
99in Isearch mode is always downcased." 96in Isearch mode is always downcased."
100 :type '(choice (const :tag "off" nil) 97 :type '(choice (const :tag "off" nil)
101 (const not-yanks) 98 (const not-yanks)
102 (other :tag "on" t)) 99 (other :tag "on" t)))
103 :group 'isearch)
104 100
105(defcustom search-nonincremental-instead t 101(defcustom search-nonincremental-instead t
106 "If non-nil, do a nonincremental search instead of exiting immediately. 102 "If non-nil, do a nonincremental search instead of exiting immediately.
107Actually, `isearch-edit-string' is called to let you enter the search 103Actually, `isearch-edit-string' is called to let you enter the search
108string, and RET terminates editing and does a nonincremental search." 104string, and RET terminates editing and does a nonincremental search."
109 :type 'boolean 105 :type 'boolean)
110 :group 'isearch)
111 106
112(defcustom search-whitespace-regexp (purecopy "\\s-+") 107(defcustom search-whitespace-regexp (purecopy "\\s-+")
113 "If non-nil, regular expression to match a sequence of whitespace chars. 108 "If non-nil, regular expression to match a sequence of whitespace chars.
@@ -127,7 +122,6 @@ In the Customization buffer, that is `[' followed by a space,
127a tab, a carriage return (control-M), a newline, and `]+'." 122a tab, a carriage return (control-M), a newline, and `]+'."
128 :type '(choice (const :tag "Match Spaces Literally" nil) 123 :type '(choice (const :tag "Match Spaces Literally" nil)
129 regexp) 124 regexp)
130 :group 'isearch
131 :version "24.3") 125 :version "24.3")
132 126
133(defcustom search-invisible 'open 127(defcustom search-invisible 'open
@@ -147,8 +141,7 @@ See also `reveal-mode' if you want overlays to automatically be opened
147whenever point is in one of them." 141whenever point is in one of them."
148 :type '(choice (const :tag "Match hidden text" t) 142 :type '(choice (const :tag "Match hidden text" t)
149 (const :tag "Open overlays" open) 143 (const :tag "Open overlays" open)
150 (const :tag "Don't match hidden text" nil)) 144 (const :tag "Don't match hidden text" nil)))
151 :group 'isearch)
152 145
153(defcustom isearch-hide-immediately t 146(defcustom isearch-hide-immediately t
154 "If non-nil, re-hide an invisible match right away. 147 "If non-nil, re-hide an invisible match right away.
@@ -156,15 +149,13 @@ This variable makes a difference when `search-invisible' is set to `open'.
156If nil then do not re-hide opened invisible text when the match moves. 149If nil then do not re-hide opened invisible text when the match moves.
157Whatever the value, all opened invisible text is hidden again after exiting 150Whatever the value, all opened invisible text is hidden again after exiting
158the search." 151the search."
159 :type 'boolean 152 :type 'boolean)
160 :group 'isearch)
161 153
162(defcustom isearch-resume-in-command-history nil 154(defcustom isearch-resume-in-command-history nil
163 "If non-nil, `isearch-resume' commands are added to the command history. 155 "If non-nil, `isearch-resume' commands are added to the command history.
164This allows you to resume earlier Isearch sessions through the 156This allows you to resume earlier Isearch sessions through the
165command history." 157command history."
166 :type 'boolean 158 :type 'boolean)
167 :group 'isearch)
168 159
169(defvar isearch-mode-hook nil 160(defvar isearch-mode-hook nil
170 "Function(s) to call after starting up an incremental search.") 161 "Function(s) to call after starting up an incremental search.")
@@ -212,12 +203,10 @@ displayed in the search message.")
212 203
213(defcustom search-ring-max 16 204(defcustom search-ring-max 16
214 "Maximum length of search ring before oldest elements are thrown away." 205 "Maximum length of search ring before oldest elements are thrown away."
215 :type 'integer 206 :type 'integer)
216 :group 'isearch)
217(defcustom regexp-search-ring-max 16 207(defcustom regexp-search-ring-max 16
218 "Maximum length of regexp search ring before oldest elements are thrown away." 208 "Maximum length of regexp search ring before oldest elements are thrown away."
219 :type 'integer 209 :type 'integer)
220 :group 'isearch)
221 210
222(defvar search-ring-yank-pointer nil 211(defvar search-ring-yank-pointer nil
223 "Index in `search-ring' of last string reused. 212 "Index in `search-ring' of last string reused.
@@ -229,15 +218,13 @@ It is nil if none yet.")
229(defcustom search-ring-update nil 218(defcustom search-ring-update nil
230 "Non-nil if advancing or retreating in the search ring should cause search. 219 "Non-nil if advancing or retreating in the search ring should cause search.
231Default value, nil, means edit the string instead." 220Default value, nil, means edit the string instead."
232 :type 'boolean 221 :type 'boolean)
233 :group 'isearch)
234 222
235;;; isearch highlight customization. 223;;; isearch highlight customization.
236 224
237(defcustom search-highlight t 225(defcustom search-highlight t
238 "Non-nil means incremental search highlights the current match." 226 "Non-nil means incremental search highlights the current match."
239 :type 'boolean 227 :type 'boolean)
240 :group 'isearch)
241 228
242(defface isearch 229(defface isearch
243 '((((class color) (min-colors 88) (background light)) 230 '((((class color) (min-colors 88) (background light))
@@ -269,8 +256,7 @@ Default value, nil, means edit the string instead."
269 :foreground "grey") 256 :foreground "grey")
270 (t (:inverse-video t))) 257 (t (:inverse-video t)))
271 "Face for highlighting failed part in Isearch echo-area message." 258 "Face for highlighting failed part in Isearch echo-area message."
272 :version "23.1" 259 :version "23.1")
273 :group 'isearch)
274 260
275(defcustom isearch-lazy-highlight t 261(defcustom isearch-lazy-highlight t
276 "Controls the lazy-highlighting during incremental search. 262 "Controls the lazy-highlighting during incremental search.