Compare commits
No commits in common. 'c9' and 'c10-beta' have entirely different histories.
@ -0,0 +1,42 @@
|
||||
From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Tromey <tom@tromey.com>
|
||||
Date: Wed, 10 Jun 2020 20:38:27 -0600
|
||||
Subject: Remove "throw" specifications
|
||||
|
||||
C++ throw specifications were deprecated in C++11.
|
||||
This patch removes them from the library.
|
||||
---
|
||||
ChangeLog | 5 +++++
|
||||
lib/srchilite/fileutil.cc | 2 +-
|
||||
lib/srchilite/fileutil.h | 2 +-
|
||||
3 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
|
||||
index 59a6d64..963178c 100644
|
||||
--- a/lib/srchilite/fileutil.cc
|
||||
+++ b/lib/srchilite/fileutil.cc
|
||||
@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
|
||||
// FIXME avoid using a global variable
|
||||
std::string start_path;
|
||||
|
||||
-string readFile(const string &fileName) throw (IOException) {
|
||||
+string readFile(const string &fileName) {
|
||||
ifstream file(fileName.c_str());
|
||||
|
||||
if (!file.is_open()) {
|
||||
diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
|
||||
index 7335a9b..042eb56 100644
|
||||
--- a/lib/srchilite/fileutil.h
|
||||
+++ b/lib/srchilite/fileutil.h
|
||||
@@ -27,7 +27,7 @@ extern std::string start_path;
|
||||
* @return the contents of the file
|
||||
* @throw IOException
|
||||
*/
|
||||
-string readFile(const string &fileName) throw (IOException);
|
||||
+string readFile(const string &fileName);
|
||||
|
||||
//char *read_file(const string &fileName);
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
commit 8be2bee7f6861fd27d5c181b15d3126fc7dbf73b
|
||||
Author: Keith Seitz <keiths@redhat.com>
|
||||
Date: Sat Jan 20 09:25:05 2024 -0700
|
||||
|
||||
lesspipe may contain ".sh" extension
|
||||
|
||||
On Fedora, the "lesspipe" script is actually called
|
||||
"lesspipe.sh". This patch proposes to use "$(which NAME)"
|
||||
to figure out the actual name of the script to use.
|
||||
|
||||
If neither "lesspipe" nor "lesspipe.sh" exists in $PATH,
|
||||
the patch simply uses "lesspipe", preserving the current behavior.
|
||||
|
||||
It was based on the 3.1.9 release tarball, but should
|
||||
apply cleanly to current git.
|
||||
|
||||
This was reported as Fedora bugzilla 2256374.
|
||||
|
||||
diff --git a/src/src-hilite-lesspipe.sh.in b/src/src-hilite-lesspipe.sh.in
|
||||
index eb5c3ee..76231c7 100644
|
||||
--- a/src/src-hilite-lesspipe.sh.in
|
||||
+++ b/src/src-hilite-lesspipe.sh.in
|
||||
@@ -7,7 +7,15 @@ for source in "$@"; do
|
||||
*Makefile|*makefile)
|
||||
source-highlight --failsafe -f esc --lang-def=makefile.lang --style-file=esc.style -i "$source" ;;
|
||||
*.tar|*.tgz|*.gz|*.bz2|*.xz)
|
||||
- lesspipe "$source" ;;
|
||||
+ # The "lesspipe" script may or may not have ".sh" extension.
|
||||
+ lesspipe=$(which lesspipe 2>/dev/null)
|
||||
+ if [ -z "$lesspipe" ]; then
|
||||
+ lesspipe=$(which lesspipe.sh 2>/dev/null)
|
||||
+ if [ -z "$lesspipe" ]; then
|
||||
+ lesspipe="lesspipe"
|
||||
+ fi
|
||||
+ fi
|
||||
+ $lesspipe "$source" ;;
|
||||
*) source-highlight --failsafe --infer-lang -f esc --style-file=esc.style -i "$source" ;;
|
||||
esac
|
||||
done
|
||||
Loading…
Reference in new issue