master 3d4b389f32: Rename recently-introduced dired-omit-line-regexp user option

[Lars Ingebrigtsen]

branch: master
commit 3d4b389f3247d0158ba8572caf89331cb6f04a6d
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Rename recently-introduced dired-omit-line-regexp user option
    
    * lisp/dired-x.el (dired-omit-lines, dired-omit-mode): Rename
    dired-omit-line-regexp to dired-omit-lines for consistency.
---
 etc/NEWS        | 2 +-
 lisp/dired-x.el | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index f10573b86b..c54a1cc42a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1623,7 +1623,7 @@ the thumbnail file.
 ** Dired
 
 ---
-*** New user option 'dired-omit-line-regexp'.
+*** New user option 'dired-omit-lines'.
 This is used by 'dired-omit-mode', and now allows you to hide based on
 other things than just the file names.
 
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 6eb0f63ee5..b4b647f1b0 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -125,7 +125,7 @@ folding to be used on case-insensitive filesystems only."
       (file-name-case-insensitive-p dir)
     dired-omit-case-fold))
 
-(defcustom dired-omit-line-regexp nil
+(defcustom dired-omit-lines nil
   "Regexp matching lines to be omitted by `dired-omit-mode'.
 The value can also be a variable whose value is such a regexp.
 The value can also be nil, which means do no line matching.
@@ -167,7 +167,7 @@ Dired-Omit mode is a buffer-local minor mode.
 When enabled in a Dired buffer, Dired does not list files whose
 filenames match regexp `dired-omit-files', files ending with
 extensions in `dired-omit-extensions', or files listed on lines
-matching `dired-omit-line-regexp'.
+matching `dired-omit-lines'.
 
 To enable omitting in every Dired buffer, you can put this in
 your init file:
@@ -184,8 +184,8 @@ See Info node `(dired-x) Omitting Variables' for more 
information."
       ;; Use count of file-name match as INIT-COUNT for line match.
       ;; Return total count.  (Return value is not used anywhere, so far).
       (setq file-count (dired-omit-expunge))
-      (when dired-omit-line-regexp
-        (dired-omit-expunge dired-omit-line-regexp 'LINEP file-count)))))
+      (when dired-omit-lines
+        (dired-omit-expunge dired-omit-lines 'LINEP file-count)))))
 
 (put 'dired-omit-mode 'safe-local-variable 'booleanp)