o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '9fans:master' into wayland

Browse source
This commit is contained in:
Ethan Burns 2025-02-04 21:51:52 -05:00 • committed by GitHub
commit 464c522746
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/man
View file

@ -18,6 +18,7 @@ fn roff {
}
if not {
Nflag=-N
Lflag='-rL1000i'
}
if(~ $x *eqn*)
preproc=($preproc eqn)
@ -26,15 +27,15 @@ fn roff {
switch($#preproc) {
case 0
{echo -n $FONTS; cat $2< /dev/null} | troff $Nflag -$MAN
{echo -n $FONTS; cat $2< /dev/null} | troff $Nflag $Lflag -$MAN
case 1
{echo -n $FONTS; cat $2< /dev/null} | $preproc | troff $Nflag -$MAN
{echo -n $FONTS; cat $2< /dev/null} | $preproc | troff $Nflag $Lflag -$MAN
case 2
{echo -n $FONTS; cat $2< /dev/null} | $preproc(1) | $preproc(2) | troff $Nflag -$MAN
{echo -n $FONTS; cat $2< /dev/null} | $preproc(1) | $preproc(2) | troff $Nflag $Lflag -$MAN
case 3
{echo -n $FONTS; cat $2< /dev/null} | $preproc(1) | $preproc(2) | $preproc(3) | | troff $Nflag -$MAN
{echo -n $FONTS; cat $2< /dev/null} | $preproc(1) | $preproc(2) | $preproc(3) | | troff $Nflag $Lflag -$MAN
case *
{echo -n $FONTS; cat $2< /dev/null} | $preproc(1) | $preproc(2) | $preproc(3) | | $preproc(4) | troff $Nflag -$MAN
{echo -n $FONTS; cat $2< /dev/null} | $preproc(1) | $preproc(2) | $preproc(3) | | $preproc(4) | troff $Nflag $Lflag -$MAN
}
}

8
mac/9term.app/Contents/MacOS/9term
View file

@ -3,12 +3,16 @@ fshell=$(finger $(whoami) | sed -n 's/.*Shell: //p' | sed 1q)
SHELL=${fshell:-$SHELL}
PLAN9=${PLAN9:-/usr/local/plan9}
cd $HOME
arch=x86_64
if arch -arch arm64 date >/dev/null 2>&1; then
arch=arm64
fi
case "$SHELL" in
*/rc)
echo '
if(! ~ $PLAN9/bin $path)
path=($path $PLAN9/bin)
$PLAN9/bin/9term -l -W600x800 &
arch -arch '$arch' $PLAN9/bin/9term -l -W600x800 &
' | $SHELL -l
exit 0
;;
@ -24,6 +28,6 @@ if ! [[ :$PATH: =~ :$PLAN9/bin: ]]
then
PATH=$PATH:$PLAN9/bin
fi
$PLAN9/bin/9term -l -W600x800 &
arch -arch $arch $PLAN9/bin/9term -l -W600x800 &
exit 0

6
mac/Plumb.app/Contents/MacOS/plumb
View file

@ -3,6 +3,10 @@
if [ -e ~/.bashrc ] ; then
. ~/.bashrc
fi
arch=x86_64
if arch -arch arm64 date >/dev/null 2>&1; then
arch=arm64
fi
PLAN9=${PLAN9:-/usr/local/plan9}
bin=$PLAN9/bin
@ -10,5 +14,5 @@ IFS=$'\n'
for file in $($bin/macargv)
do
$bin/macedit "$file"
arch -arch $arch $bin/macedit "$file"
done

4
tmac/tmac.an
View file

@ -479,7 +479,9 @@
.if t \{.ds R ®
.ds S \s\n()S
..\}
.if n \{.nr )L 11i
.if n \{.ie \nL<=0 .nr )L 11i
.el \{.nr )L \nLu
.nr V 0\}
.nr LL 6.5i
.nr )O .463i
.if '\*(.T'think' \{.nrLL 80n