phracek pushed to emacs (f21). "GREP option is deprecated (#1218384) (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 7 16:37:44 UTC 2015
From eff9071ce16947cb43c648fafb6f0bdccdca1e75 Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek at redhat.com>
Date: Thu, 7 May 2015 18:37:13 +0200
Subject: GREP option is deprecated (#1218384)
Signed-off-by: Petr Hracek <phracek at redhat.com>
diff --git a/emacs-grep-deprecated.patch b/emacs-grep-deprecated.patch
new file mode 100644
index 0000000..7aa44b1
--- /dev/null
+++ b/emacs-grep-deprecated.patch
@@ -0,0 +1,54 @@
+diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
+index 9962945..763f906 100644
+--- a/lisp/progmodes/grep.el
++++ b/lisp/progmodes/grep.el
+@@ -77,11 +77,10 @@ in grep buffers, so if you have globally disabled font-lock-mode,
+ you will not get highlighting.
+
+ This option sets the environment variable GREP_COLORS to specify
+-markers for highlighting and GREP_OPTIONS to add the --color
+-option in front of any explicit grep options before starting
+-the grep.
++markers for highlighting and adds the --color option in front of
++any explicit grep options before starting the grep.
+
+-When this option is `auto', grep uses `--color=auto' to highlight
++When this option is `auto', grep uses `--color' to highlight
+ matches only when it outputs to a terminal (when `grep' is the last
+ command in the pipe), thus avoiding the use of any potentially-harmful
+ escape sequences when standard output goes to a file or pipe.
+@@ -97,7 +96,7 @@ To change the default value, use Customize or call the function
+ :type '(choice (const :tag "Do not highlight matches with grep markers" nil)
+ (const :tag "Highlight matches with grep markers" t)
+ (const :tag "Use --color=always" always)
+- (const :tag "Use --color=auto" auto)
++ (const :tag "Use --color" auto)
+ (other :tag "Not Set" auto-detect))
+ :set 'grep-apply-setting
+ :version "22.1"
+@@ -467,10 +466,6 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
+ ;; `setenv' modifies `process-environment' let-bound in `compilation-start'
+ ;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
+ (setenv "TERM" "emacs-grep")
+- (setenv "GREP_OPTIONS"
+- (concat (getenv "GREP_OPTIONS")
+- " --color=" (if (eq grep-highlight-matches 'always)
+- "always" "auto")))
+ ;; GREP_COLOR is used in GNU grep 2.5.1, but deprecated in later versions
+ (setenv "GREP_COLOR" "01;31")
+ ;; GREP_COLORS is used in GNU grep 2.5.2 and later versions
+@@ -570,7 +565,13 @@ This function is called from `compilation-filter-hook'."
+ (unless (and grep-command grep-find-command
+ grep-template grep-find-template)
+ (let ((grep-options
+- (concat (if grep-use-null-device "-n" "-nH")
++ (concat (and grep-highlight-matches
++ (grep-probe grep-program
++ `(nil nil nil "--color" "x" ,null-device)
++ nil 1)
++ (if (eq grep-highlight-matches 'always)
++ "--color=always " "--color "))
++ (if grep-use-null-device "-n" "-nH")
+ (if (grep-probe grep-program
+ `(nil nil nil "-e" "foo" ,null-device)
+ nil 1)
diff --git a/emacs.spec b/emacs.spec
index 65a7bca..e950a3a 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 24.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+ and CC0-1.0
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -23,6 +23,7 @@ Patch1: emacs-spellchecker.patch
# Fix for default PDF viewer bug #971162
Patch2: emacs-pdf-default.patch
+Patch3: emacs-grep-deprecated.patch
BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
@@ -148,6 +149,7 @@ packages that add functionality to Emacs.
%patch1 -p1 -b .spellchecker
%patch2 -p1 -b .pdf-default.patch
+%patch3 -p1 -b .grep-deprecated
# We prefer our emacs.desktop file
cp %SOURCE1 etc/emacs.desktop
@@ -431,6 +433,9 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog
+* Thu May 07 2015 Petr Hracek <phracek at redhat.com> - 1:24.5-2
+- GREP option is deprecated (#1218384)
+
* Fri Apr 17 2015 Petr Hracek <phracek at redhat.com> - 1:24.5-1
- New upstream version 24.5 (#1210919)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/emacs.git/commit/?h=f21&id=eff9071ce16947cb43c648fafb6f0bdccdca1e75
More information about the scm-commits
mailing list