summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2019-03-15 13:47:06 +0100
committerhaawda2019-03-15 13:47:06 +0100
commit6c164c9fd6780b8383da5bab54b23c61b2db5acc (patch)
tree1cbded803aec32df2d87a4704f4a1960e5754dfa
parent7f893fb794c43b89cd937f17106709af64176c00 (diff)
downloadaur-6c164c9fd6780b8383da5bab54b23c61b2db5acc.tar.gz
fix cc-mode.texi
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--ccmode-texi.diff13
3 files changed, 25 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5db5b0dac322..061fbbc4d0d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-lucid-git
pkgdesc = GNU Emacs. Official git master.
- pkgver = 27.0.50.r135402
+ pkgver = 27.0.50.r135573
pkgrel = 1
url = http://www.gnu.org/software/emacs/
arch = i686
@@ -29,7 +29,9 @@ pkgbase = emacs-lucid-git
options = docs
options = !emptydirs
source = git://git.savannah.gnu.org/emacs.git
+ source = ccmode-texi.diff
sha256sums = SKIP
+ sha256sums = 35dd3ad921976a4e3d48806602f6d060ae4a1ea155cda72b43138ae5a1f66d8f
pkgname = emacs-lucid-git
diff --git a/PKGBUILD b/PKGBUILD
index 6f73f5473944..afb7cede0696 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=emacs-lucid-git
-pkgver=27.0.50.r135402
+pkgver=27.0.50.r135573
pkgrel=1
pkgdesc="GNU Emacs. Official git master."
arch=('i686' 'x86_64')
@@ -14,14 +14,20 @@ makedepends=('git' 'texlive-core')
conflicts=('emacs')
options=('docs' '!emptydirs')
provides=('emacs' 'emacs-seq')
-source=("git://git.savannah.gnu.org/emacs.git")
-sha256sums=('SKIP')
+source=("git://git.savannah.gnu.org/emacs.git" ccmode-texi.diff)
+sha256sums=('SKIP'
+ '35dd3ad921976a4e3d48806602f6d060ae4a1ea155cda72b43138ae5a1f66d8f')
pkgver() {
cd emacs
_mainver=$(grep AC_INIT configure.ac | sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\).\+$/\1/')
printf "%s.r%s" "$(echo $_mainver)" "$(git rev-list --count HEAD)"
}
+
+prepare() {
+ cd emacs
+ patch -Np1 < "$srcdir"/ccmode-texi.diff
+}
build() {
cd emacs
diff --git a/ccmode-texi.diff b/ccmode-texi.diff
new file mode 100644
index 000000000000..507923d6982c
--- /dev/null
+++ b/ccmode-texi.diff
@@ -0,0 +1,13 @@
+diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
+index 0c77cc0..0102a4a 100644
+--- a/doc/misc/cc-mode.texi
++++ b/doc/misc/cc-mode.texi
+@@ -2307,7 +2307,7 @@ that takes precedence is the one that appears latest in this list:
+ @end ifclear
+ @c Version of list for Texinfo >= 5.x
+ @ifset txicommandconditionals
+-@itemize @asis
++@itemize @w{}
+ @item Style
+ @item File Style@footnote{In earlier versions of @ccmode{}, a File Style setting took precedence over any other setting apart from a File Local Variable setting.}
+ @item Top-level command or ``customization interface''