[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d203429: Abbreviate rgrep command on MS Windows (bug#48302)
From: |
Michael Albinus |
Subject: |
master d203429: Abbreviate rgrep command on MS Windows (bug#48302) |
Date: |
Wed, 12 May 2021 04:47:15 -0400 (EDT) |
branch: master
commit d2034296a906bf444472c02b958dba21cbaae762
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Michael Albinus <michael.albinus@gmx.de>
Abbreviate rgrep command on MS Windows (bug#48302)
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords):
Adapt regexp to match MS Windows-style shell-quoting.
* test/lisp/progmodes/grep-tests.el: New file.
---
lisp/progmodes/grep.el | 2 +-
test/lisp/progmodes/grep-tests.el | 69 +++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index e9fbcbb..80c3e78 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -473,7 +473,7 @@ buffer `default-directory'."
(1 (if (eq (char-after (match-beginning 1)) ?\0)
`(face nil display ,(match-string 2)))))
;; Hide excessive part of rgrep command
- ("^find \\(\\. -type d .*\\\\)\\)"
+ ("^find \\(\\. -type d .*\\(?:\\\\)\\|\")\"\\)\\)"
(1 (if grep-find-abbreviate grep-find-abbreviate-properties
'(face nil abbreviated-command t))))
;; Hide excessive part of lgrep command
diff --git a/test/lisp/progmodes/grep-tests.el
b/test/lisp/progmodes/grep-tests.el
new file mode 100644
index 0000000..2059822
--- /dev/null
+++ b/test/lisp/progmodes/grep-tests.el
@@ -0,0 +1,69 @@
+;;; grep-tests.el --- Test suite for grep.el -*- lexical-binding:t -*-
+
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'grep)
+
+(defconst grep-tests--ellipsis (if (char-displayable-p ?…) "[…]" "[...]")
+ "The form that the ellipsis takes in `grep-find-abbreviate-properties'.")
+
+(defun grep-tests--get-rgrep-abbreviation ()
+ "Get the `display' property of the excessive part of the rgrep command."
+ (with-temp-buffer
+ (grep-compute-defaults)
+ (insert (rgrep-default-command "search" "*" nil))
+ (grep-mode)
+ (font-lock-mode)
+ (font-lock-ensure)
+ (goto-char (point-min))
+ (re-search-forward "find ")
+ (get-text-property (point) 'display)))
+
+(defun grep-tests--check-rgrep-abbreviation ()
+ "Check that the excessive part of the rgrep command is abbreviated iff
+`grep-find-abbreviate' is non-nil."
+ (let ((grep-find-abbreviate t))
+ (should (equal (grep-tests--get-rgrep-abbreviation)
+ grep-tests--ellipsis)))
+ (let ((grep-find-abbreviate nil))
+ (should-not (grep-tests--get-rgrep-abbreviation))))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-gnu-linux ()
+ (let ((system-type 'gnu/linux))
+ (grep-tests--check-rgrep-abbreviation)))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-darwin ()
+ (let ((system-type 'darwin))
+ (grep-tests--check-rgrep-abbreviation)))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics
()
+ (let ((system-type 'windows-nt))
+ (cl-letf (((symbol-function 'w32-shell-dos-semantics) #'always))
+ (grep-tests--check-rgrep-abbreviation))))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics ()
+ (let ((system-type 'windows-nt))
+ (cl-letf (((symbol-function 'w32-shell-dos-semantics) #'ignore))
+ (grep-tests--check-rgrep-abbreviation))))
+
+;;; grep-tests.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master d203429: Abbreviate rgrep command on MS Windows (bug#48302),
Michael Albinus <=