bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final patches for external editor

Browse Source
This commit is contained in:
Michiel Broek 2002-03-12 22:09:05 +00:00
parent 134a92e31f
commit cd0618bc01
13 changed files with 70 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4596,7 +4596,7 @@ v0.33.20 10-Feb-2002
Updated German, Spanish and Galego languages. Updated German, Spanish and Galego languages.
The location of the sourcefiles is not important anymore. The location of the sourcefiles is not important anymore.
Added detection of vpopmail in default installation path. Added detection of vpopmail in default installation path.
Changed language prompts 372, 373, 387, 388, 389 and 390. Changed language prompts 372, 373, 387, 388, 389, 390 and 438.
common.a: common.a:
Added 2 functions to return the OS name and CPU family. Added 2 functions to return the OS name and CPU family.

2
lang/Language.xref
View File

@ -436,7 +436,7 @@
435 user.c |Your password is expired, new password : 435 user.c |Your password is expired, new password :
436 funcs.c |Press ENTER to continue 436 funcs.c |Press ENTER to continue
437 mail.c |Posting not allowed, this area is Read Only! 437 mail.c |Posting not allowed, this area is Read Only!
438 |notdefined 438 change.c 12|Select: 1) Line editer, 2) Fullscreen editer
439 offline.c |Offline Reader Upload 439 offline.c |Offline Reader Upload
440 offline.c |Invalid packet received 440 offline.c |Invalid packet received
441 offline.c |Unknown compression type 441 offline.c |Unknown compression type

2
lang/dutch.txt
View File

@ -436,7 +436,7 @@ JN|Wilt U deze berichten downloaden [J/n]?
|Uw wachtwoord is verlopen, geef nieuw wachtwoord: |Uw wachtwoord is verlopen, geef nieuw wachtwoord:
|Toets ENTER voor doorgaan |Toets ENTER voor doorgaan
|Plaatsen berichten niet toegestaan, dit gebied is alleen lezen! |Plaatsen berichten niet toegestaan, dit gebied is alleen lezen!
|Antwoorden is niet toegestaan in dit gebied! 12|Kies: 1) Regel editer, 2) Volle scherm editer
|Offline Reader Upload |Offline Reader Upload
|Ongeldig pakket ontvangen |Ongeldig pakket ontvangen
|Onbekende compressie methode |Onbekende compressie methode

2
lang/english.txt
View File

@ -436,7 +436,7 @@ YN|Do you want to download these messages [Y/n]?
|Your password is expired, new password : |Your password is expired, new password :
|Press ENTER to continue |Press ENTER to continue
|Posting not allowed, this area is Read Only! |Posting not allowed, this area is Read Only!
|Replies are not allowed in this area! 12|Select: 1) Line editor, 2) Fullscreen editor
|Offline Reader Upload |Offline Reader Upload
|Invalid packet received |Invalid packet received
|Unknown compression type |Unknown compression type

2
lang/galego.txt
View File

@ -436,7 +436,7 @@ SN|
|A tua password caducou, nova password : |A tua password caducou, nova password :
|Pulsa ENTER para seguir |Pulsa ENTER para seguir
|Non podes escribir, ­esta  rea es S¢ Lectura! |Non podes escribir, ­esta  rea es S¢ Lectura!
|!Non se permite responder nesta  rea! 12|Select: 1) Line editor, 2) Fullscreen editor
|Upload de correo Off-Line |Upload de correo Off-Line
|O paquete recibido non ‚ v lido |O paquete recibido non ‚ v lido
|Comprimido con un compresor desco¤ecido |Comprimido con un compresor desco¤ecido

2
lang/german.txt
View File

@ -436,7 +436,7 @@ JN|Moechten Sie diese Mitteilungen herunterladen [J/n]?
|Ihr Passwort ist abgelaufen, neues Passwort: |Ihr Passwort ist abgelaufen, neues Passwort:
|Druecken Sie <Enter> um fortzufahren |Druecken Sie <Enter> um fortzufahren
|Kein Senden moeglich, diese Area ist "Nur lesen"! |Kein Senden moeglich, diese Area ist "Nur lesen"!
|In dieser Area sind Antworten nicht zugelassen! 12|Auswahl: 1) Zeilen-Editor, 2) Vollbild-Editor
|"Offline Reader" Paket heraufladen |"Offline Reader" Paket heraufladen
|Kein oder fehlerhaftes Paket erhalten |Kein oder fehlerhaftes Paket erhalten
|Unbekannter Datenkompressionstyp |Unbekannter Datenkompressionstyp

2
lang/italian.txt
View File

@ -436,7 +436,7 @@ SN|Vuoi scaricare questi messaggi [S/n]?
|La tua password e' scaduta, nuova password : |La tua password e' scaduta, nuova password :
|Premi INVIO per continuare |Premi INVIO per continuare
|Posting non consentito, quest'area e' in sola lettura! |Posting non consentito, quest'area e' in sola lettura!
|Non e' consentito rispondere in quest'area! 12|Select: 1) Line editor, 2) Fullscreen editor
|Offline Reader Upload |Offline Reader Upload
|Ricevuto pacchetto non valido |Ricevuto pacchetto non valido
|Algoritmo di compressione sconosciuto |Algoritmo di compressione sconosciuto

2
lang/spanish.txt
View File

@ -436,7 +436,7 @@ SN|
|Tu password ha caducado, nuevo password : |Tu password ha caducado, nuevo password :
|Pulsa ENTER para seguir |Pulsa ENTER para seguir
|No puedes escribir, ­esta  rea es de Solo Lectura! |No puedes escribir, ­esta  rea es de Solo Lectura!
|!No se permite responder en esta  rea! 12|Select: 1) Line editor, 2) Fullscreen editor
|Upload de correo Off-Line |Upload de correo Off-Line
|El paquete recibido no es v lido |El paquete recibido no es v lido
|Comprimido con un compresor desconocido |Comprimido con un compresor desconocido

9
mbsebbs/change.c
View File

@ -410,7 +410,12 @@ void Chg_FsMsged()
pout(LIGHTMAGENTA, BLACK, (char *)Language(390)); pout(LIGHTMAGENTA, BLACK, (char *)Language(390));
Enter(1); Enter(1);
pout(WHITE, BLACK, (char *)Language(373)); if (strlen(CFG.externaleditor))
/* Select: 1) Line editor, 2) Fullscreen editor, 3) External editor */
pout(WHITE, BLACK, (char *)Language(373));
else
/* Select: 1) Line editor, 2) Fullscreen editor */
pout(WHITE, BLACK, (char *)Language(438));
fflush(stdout); fflush(stdout);
alarm_on(); alarm_on();
z = toupper(Getone()); z = toupper(Getone());
@ -421,7 +426,7 @@ void Chg_FsMsged()
} else if (z == Keystroke(373, 1)) { } else if (z == Keystroke(373, 1)) {
exitinfo.MsgEditor = FSEDIT; exitinfo.MsgEditor = FSEDIT;
Syslog('+', "User selected fullscreen editor"); Syslog('+', "User selected fullscreen editor");
} else if (z == Keystroke(373, 2)) { } else if ((z == Keystroke(373, 2) && strlen(CFG.externaleditor))) {
exitinfo.MsgEditor = EXTEDIT; exitinfo.MsgEditor = EXTEDIT;
Syslog('+', "User selected external editor"); Syslog('+', "User selected external editor");
} }

3
mbsetup/m_global.c
View File

@ -246,7 +246,8 @@ void e_global2(void)
case 4: E_BOOL(19,16, CFG.leavecase, "^Leave^ outbound flo filenames as is, ^No^ forces uppercase.") case 4: E_BOOL(19,16, CFG.leavecase, "^Leave^ outbound flo filenames as is, ^No^ forces uppercase.")
case 5: E_PTH(10,16,64, CFG.ftp_base, "The ^FTP home^ directory to strip of the real directory") case 5: E_PTH(10,16,64, CFG.ftp_base, "The ^FTP home^ directory to strip of the real directory")
case 6: E_PTH(11,16,64, CFG.alists_path, "The path where ^area lists^ and ^filebone lists^ are stored.") case 6: E_PTH(11,16,64, CFG.alists_path, "The path where ^area lists^ and ^filebone lists^ are stored.")
case 7: E_STR(12,16,64, CFG.externaleditor, "The full path and filename to the ^external message editor^") case 7: E_STR(12,16,64, CFG.externaleditor,
"The full path and filename to the ^external message editor^ (blank=disable)")
} }
}; };
} }

15
script/Makefile
View File

@ -39,17 +39,20 @@ install:
echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR}" ; \ echo "${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 hatch ${BINDIR}" ; \
fi fi
@if [ -x /usr/bin/joe ]; then \ @if [ -x /usr/bin/joe ]; then \
echo "Making symlinks for joe's editor" ; \ rm -f /usr/bin/bbsjoe ; \
rm -f /usr/bin/bbsjmacs ; \
echo "ln -s /usr/bin/joe /usr/bin/bbsjoe" ; \
ln -s /usr/bin/joe /usr/bin/bbsjoe ; \ ln -s /usr/bin/joe /usr/bin/bbsjoe ; \
echo "ln -s /usr/bin/joe /usr/bin/bbsjmacs" ; \
ln -s /usr/bin/joe /usr/bin/bbsjmacs ; \ ln -s /usr/bin/joe /usr/bin/bbsjmacs ; \
fi fi
@if [ -d /usr/lib/joe ]; then \ @if [ -d /usr/lib/joe ]; then \
echo "Installing joerc files for MBSE BBS" ; \ ${INSTALL} -c -o root -g root -m 0644 bbsjoerc /usr/lib/joe ; \
${INSTALL} -c -o root -g root -m 0644 bbsjoerc /usr/lib/joe ; \ echo "${INSTALL} -c -o root -g root -m 0644 bbsjoerc /usr/lib/joe" ; \
echo "${INSTALL} -c -o root -g root -m 0644 bbsjoerc /usr/lib/joe" ; \ ${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe ; \
${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe ; \ echo "${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe" ; \
echo "${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc /usr/lib/joe" ; \
fi fi
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 editor ${BINDIR}
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 bbsdoor.sh ${BINDIR} ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 bbsdoor.sh ${BINDIR}
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR} ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 0755 rundoor.sh ${BINDIR}
@bash ./installinit.sh @bash ./installinit.sh

85
script/bbsjmacsrc
View File

@ -1,7 +1,7 @@
$Id$ $Id$
Initialization file for JOE Initialization file for JOE
Gnu-Emacs Joe BBS Emacs Joe
JOE looks for this file in: JOE looks for this file in:
1 - .jmacsrc 1 - .jmacsrc
@ -24,7 +24,7 @@
-mid Cursor is recentered when scrolling is necessary -mid Cursor is recentered when scrolling is necessary
-marking Text between ^KB and cursor is highlighted -marking Text between ^KB and cursor is highlighted
-asis Characters 128 - 255 shown as-is -asis Characters 128 - 255 shown as-is
-force Force final newline when files are saved -force Force final newline when files are saved
-nobackups If you don't want backup files to be created -nobackups If you don't want backup files to be created
-lightoff Turn off highlighting after block copy or move -lightoff Turn off highlighting after block copy or move
@ -32,8 +32,8 @@
-beep Beep on errors and when cursor goes past extremes -beep Beep on errors and when cursor goes past extremes
-nosta Disable top-most status line -nosta Disable top-most status line
-keepup %k and %c status line escape sequences updated frequently -keepup %k and %c status line escape sequences updated frequently
-pg 1 No. lines to keep for PgUp/PgDn -pg 1 No. lines to keep for PgUp/PgDn
-csmode ^KF after a pervious search does a ^L instead -csmode ^KF after a pervious search does a ^L instead
-backpath path Directory to store backup files -backpath path Directory to store backup files
-nonotice Disable copyright notice -nonotice Disable copyright notice
-noxon Attempt to turn off ^S/^Q processing -noxon Attempt to turn off ^S/^Q processing
@ -44,7 +44,7 @@
-baud nnn Set baud rate for terminal optimizations -baud nnn Set baud rate for terminal optimizations
-columns nnn Set no. screen columns -columns nnn Set no. screen columns
--help Start with help on --help Start with help on
-skiptop nnn Don't use top nnn lines of the screen -skiptop 4 Don't use top nnn lines of the screen
Status line definition strings. -lmsg defines the left-justified string and Status line definition strings. -lmsg defines the left-justified string and
-rmsg defines the right-justified string. The first character of -rmsg is -rmsg defines the right-justified string. The first character of -rmsg is
@ -81,7 +81,7 @@
\d Dim \d Dim
\f Blink \f Blink
-lmsg \i%k%T%W%I%X %n %m%R %M -lmsg \i%k%T%W%I%X %* [%n] %M
-rmsg %S Row %r Col %c %t Ctrl-X H for help -rmsg %S Row %r Col %c %t Ctrl-X H for help
SECOND SECTION: File name dependant local option settings: SECOND SECTION: File name dependant local option settings:
@ -125,7 +125,6 @@
-wordwrap -wordwrap
*.c *.c
-mnew rtn,"/* This is a C file */",rtn
-autoindent -autoindent
*.h *.h
@ -153,11 +152,11 @@
\i \i\uCURSOR\u \uGO TO\u \uUNDO\u \uMISC\u \uREGION\u \uEXIT\u \i \i \i \i\uCURSOR\u \uGO TO\u \uUNDO\u \uMISC\u \uREGION\u \uEXIT\u \i \i
\i \i^B left ^F right ^[V prev screen ^XU undo ^[^[ option ^@ mark ^XK quit \i \i \i \i^B left ^F right ^[V prev screen ^XU undo ^[^[ option ^@ mark ^XK quit \i \i
\i \i^P up ^N down ^V next screen ^^ redo ^[Q format ^W cut ^X^C save \i \i \i \i^P up ^N down ^V next screen ^^ redo ^[Q format ^W cut ^X^C save \i \i
\i \i^[B prev. word ^A beg of line \uDELETE\u ^L refresh ^Y paste \uFILE\u \i \i \i \i^[B prev. word ^A beg of line \uDELETE\u ^L refresh ^Y paste \i \i
\i \i^[F next word ^E end of line ^D char ^[$ spell ^[Y switch ^X^W save \i \i \i \i^[F next word ^E end of line ^D char ^[$ spell ^[Y switch \i \i
\i \i\uSEARCH\u ^[< top of file ^K >line ^[M math ^XA save ^XI insert\i \i \i \i\uSEARCH\u ^[< top of file ^K >line ^[M math ^XX swap \i \i
\i \i^S forward ^[> end of file ^[D >word ^[% query ^[| filter ^X^F load \i \i \i \i^S forward ^[> end of file ^[D >word ^[% query \uMODE\u \i \i
\i \i^R backward ^[G to line No. ^[ DEL word< replace ^XX swap ^X^B switch\i \i \i \i^R backward ^[G to line No. ^[ DEL word< replace ^[I Ins/Ovr \i \i
} }
{Editing {Editing
@ -293,8 +292,8 @@ query ^X q Query insert
record,"0" ^X ( Record macro record,"0" ^X ( Record macro
retype ^L Refresh screen retype ^L Refresh screen
rtn ^M Return rtn ^M Return
shell ^Z Suspend shell ^Z Suspend
shell ^[ s Suspend (uemacs) shell ^[ s Suspend (uemacs)
stop ^X ) Stop recording macro stop ^X ) Stop recording macro
:main Text editing window :main Text editing window
@ -304,8 +303,14 @@ stop ^X ) Stop recording macro
:def spellfile filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;cat ispell.tmp;/bin/rm ispell.tmp",rtn,retype :def spellfile filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;cat ispell.tmp;/bin/rm ispell.tmp",rtn,retype
:def spellword psh,nextword,markk,prevword,markb,filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;tr -d <ispell.tmp '\\012';/bin/rm ispell.tmp",rtn,retype,nextword :def spellword psh,nextword,markk,prevword,markb,filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;tr -d <ispell.tmp '\\012';/bin/rm ispell.tmp",rtn,retype,nextword
:def toggleinsert mode,"T"
spellword ^[ $ spellword ^[ $
toggleinsert ^[ I
toggleinsert ^[ ^I
toggleinsert ^[ i
ctrl ^Q Quote Ctrl chars ctrl ^Q Quote Ctrl chars
ctrl ` Quote Ctrl chars ctrl ` Quote Ctrl chars
@ -342,22 +347,22 @@ stop,msg,"Abort",rtn ^G Abort message
stop,msg,"Abort",rtn ^[ ^G Abort message stop,msg,"Abort",rtn ^[ ^G Abort message
stop,msg,"Abort",rtn ^X ^G Abort message stop,msg,"Abort",rtn ^X ^G Abort message
psh,markk,blkdel ^W Cut psh,markk,blkdel ^W Cut
save,rtn ^X ^S Save file save,rtn ^X ^S Save file
ask ^X s ask ^X s
drop,msg,"Mark set",rtn ^@ Drop anchor drop,msg,"Mark set",rtn ^@ Drop anchor
nextw,pgdn,prevw ^[ ^V Scroll other window down nextw,pgdn,prevw ^[ ^V Scroll other window down
nextw,pgup,prevw ^[ ^Z Scroll other window up nextw,pgup,prevw ^[ ^Z Scroll other window up
bol,nedge,pedge ^[ m Gnu-emacs goto indentation bol,nedge,pedge ^[ m Gnu-emacs goto indentation
nextw,nbuf,prevw ^X 4 b Switch buffers other window nextw,nbuf,prevw ^X 4 b Switch buffers other window
nextw,edit,query,prevw ^X 4 f Find file other window nextw,edit,query,prevw ^X 4 f Find file other window
nextw,edit,query,prevw ^X 4 ^F nextw,edit,query,prevw ^X 4 ^F
nextw,tag,query,prevw ^X 4 . Find tag other window nextw,tag,query,prevw ^X 4 . Find tag other window
ask,query,lose,query,abortbuf ^X ^C Gnu-emacs: Abort buffer in window ask,query,lose,query,abortbuf ^X ^C Gnu-emacs: Abort buffer in window
exsave ^X ^C Save file and exit exsave ^X ^C Save file and exit
lose,query,abortbuf ^X k Kill buffer in window lose,query,abortbuf ^X k Kill buffer in window
lose,query,edit ^X ^V Edit a file: no orphaned buffers lose,query,edit ^X ^V Edit a file: no orphaned buffers
psh,drop,fwrdc,query,markk,blkdel ^[ z Cut to char psh,drop,fwrdc,query,markk,blkdel ^[ z Cut to char
psh,markk,blksave,">>",query ^X a Append region to file psh,markk,blksave,">>",query ^X a Append region to file
retype, retype,
arg,"top+height/2-line",rtn,upslide ^L Recenter arg,"top+height/2-line",rtn,upslide ^L Recenter
arg,"top+height/2-line",rtn,dnarw ^[ r Move to center line arg,"top+height/2-line",rtn,dnarw ^[ r Move to center line
@ -366,9 +371,9 @@ swap,msg,math,"line-z",rtn,
" lines in region",rtn ^[ = Count lines region " lines in region",rtn ^[ = Count lines region
mode,"O" ^X ^Q Toggle read-only mode,"O" ^X ^Q Toggle read-only
edit,rtn,filt,query,parserr ^X c Compile edit,rtn,filt,query,parserr ^X c Compile
nxterr ^X n nxterr ^X n
prverr ^X p prverr ^X p
backs ^? Backspace backs ^? Backspace
backs ^H backs ^H
@ -378,11 +383,9 @@ bknd ^X ' Shell window (joe)
bof ^[ < Goto beginning of file bof ^[ < Goto beginning of file
bol .kh Goto beginning of line bol .kh Goto beginning of line
bol ^A bol ^A
bol ^[ [ H
bol ^[ [ 1 ~
bop ^[ p (uemacs) bop ^[ p (uemacs)
bufed ^X b bufed ^X b
bknd ^[ ' Shell window bknd ^[ ' Shell window
crawlr ^X > Scroll to the right crawlr ^X > Scroll to the right
crawll ^X < Scroll to the left crawll ^X < Scroll to the left
delch .kD Delete character delch .kD Delete character
@ -394,33 +397,31 @@ dnarw ^N
dnarw ^[ O B dnarw ^[ O B
dnarw ^[ [ B dnarw ^[ [ B
dnslide ^X ^N Slide down (uemacs) dnslide ^X ^N Slide down (uemacs)
edit ^X ^F Edit a file: creates orphaned buffers edit ^X ^F Edit a file: creates orphaned buffers
eof ^[ > Go to end of file eof ^[ > Go to end of file
eol .kH Go to end of line eol .kH Go to end of line
eol ^E eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
eop ^[ n (uemacs) eop ^[ n (uemacs)
execmd ^[ x execmd ^[ x
insc ^C (uemacs) insc ^C (uemacs)
ffirst ^S Search forward ffirst ^S Search forward
isrch ^S isrch ^S
ffirst ^\ ffirst ^\
psh,markk,filt,query ^[ | Filter block psh,markk,filt,query ^[ | Filter block
format ^[ q Format paragraph format ^[ q Format paragraph
gomark ^X / Goto bookmark gomark ^X / Goto bookmark
groww ^X ^ Enlarge window groww ^X ^ Enlarge window
groww ^X z (uemacs) groww ^X z (uemacs)
insf ^X i Insert a file insf ^X i Insert a file
yapp ^[ ^W Append next kill yapp ^[ ^W Append next kill
line ^[ g Goto line (uemacs) line ^[ g Goto line (uemacs)
ltarw .kl Go left ltarw .kl Go left
ltarw ^B ltarw ^B
ltarw ^[ O D ltarw ^[ O D
ltarw ^[ [ D ltarw ^[ [ D
mode ^[ ^[ Change modes mode ^[ ^[ Change modes
nbuf ^X ^B Next buffer in current window nbuf ^X ^B Next buffer in current window
nbuf ^X x (uemacs) nbuf ^X x (uemacs)
nextpos ^K = Goto next position in position history nextpos ^K = Goto next position in position history
nextword ^[ f Goto next word nextword ^[ f Goto next word
notmod ^[ ~ Not modified notmod ^[ ~ Not modified
@ -441,8 +442,8 @@ rtarw .kr Go right
rtarw ^F rtarw ^F
rtarw ^[ O C rtarw ^[ O C
rtarw ^[ [ C rtarw ^[ [ C
run ^[ ! run ^[ !
save ^X ^W Write file save ^X ^W Write file
setmark ^X j Set bookmark setmark ^X j Set bookmark
shrinkw ^X ^Z (uemacs) shrinkw ^X ^Z (uemacs)
splitw ^X 2 Split window splitw ^X 2 Split window

2
script/editor
View File

@ -74,7 +74,7 @@ case $BBSLANGUAGE in
;; ;;
## Languages not set defaults to english. ## Languages not set defaults to english.
else *)
LANGAREA='AREA' LANGAREA='AREA'
LANGFROM='FROM ' LANGFROM='FROM '
LANGTO='TO ' LANGTO='TO '