fix indent

Makefile.in

@@ -140,8 +140,11 @@ keybind_lynx.o: funcname2.h
 parsetagx.o: html.c
 
 funcname.tab: main.c menu.c
-	(echo '#define DEFUN(x,y,z) x y'; grep -h '^DEFUN' $^) | $(CPP) - | \
+	(echo '#define DEFUN(x,y,z) x y';\
-	 awk '$$1 ~ /^[_A-Za-z]/ { for (i=2;i<=NF;i++) { print $$i, $$1} }' > $@
+	 sed -ne '/^DEFUN/{p;n;/^[ 	]/p;}' $^) | $(CPP) - | \
+	 awk '$$1 ~ /^[_A-Za-z]/ { \
+	       for (i=2;i<=NF;i++) { print $$i, $$1} \
+	 }' > $@
 
 funcname.c: funcname.tab
 	sort funcname.tab | $(AWK) -f $(top_srcdir)/funcname0.awk > $@

funcname.tab

@@ -1,153 +1,150 @@
-# $Id: funcname.tab,v 1.22 2003/09/22 21:02:18 ukai Exp $
-# macro name	function name
-#----------------------------
-@@@		nulcmd
-ABORT		quitfm
-ACCESSKEY	accessKey
-ADD_BOOKMARK	adBmark
-ALARM        setAlarm
-BACK		backBf
-BEGIN		goLineF
-BOOKMARK	ldBmark
-CENTER_H	ctrCsrH
-CENTER_V	ctrCsrV
-CHARSET		docCSet
-CLOSE_TAB	closeT
-CLOSE_TAB_MOUSE	closeTMs
-COMMAND		execCmd
-COOKIE		cooLst
-DEFAULT_CHARSET	defCSet
-DEFINE_KEY	defKey
-DELETE_PREVBUF	deletePrevBuf
-DICT_WORD	dictword
-DICT_WORD_AT	dictwordat
-DISPLAY_IMAGE	dispI
-DOWN		ldown1
-DOWNLOAD	svSrc
-DOWNLOAD_LIST	ldDL
-EDIT		editBf
-EDIT_SCREEN	editScr
-END		goLineL
-ESCBMAP		escbmap
-ESCMAP		escmap
-EXEC_SHELL	execsh
-EXIT		quitfm
-EXTERN		extbrz
-EXTERN_LINK	linkbrz
-FRAME		rFrame
-GOTO		goURL
-GOTO_LINE	goLine
-GOTO_LINK	followA
-GOTO_RELATIVE	gorURL
-HELP		ldhelp
-HISTORY		ldHist
-INFO		pginfo
-INTERRUPT	susp
-ISEARCH		isrchfor
-ISEARCH_BACK	isrchbak
-LEFT		col1L
-LINE_BEGIN	linbeg
-LINE_END	linend
-LINE_INFO	curlno
-LINK_BEGIN	topA
-LINK_END	lastA
-LINK_MENU	linkMn
-LIST		linkLst
-LIST_MENU	listMn
-LOAD		ldfile
-MAIN_MENU	mainMn
-MARK		_mark
-MARK_MID	chkNMID
-MARK_URL	chkURL
-MARK_WORD	chkWORD
-MENU		mainMn
-MENU_MOUSE	menuMs
-MOUSE		mouse
-MOUSE_TOGGLE	msToggle
-MOVE_DOWN	movD
-MOVE_DOWN1     movD1
-MOVE_LEFT	movL
-MOVE_LEFT1     movL1
-MOVE_LIST_MENU	movlistMn
-MOVE_MOUSE     movMs
-MOVE_RIGHT	movR
-MOVE_RIGHT1    movR1
-MOVE_UP		movU
-MOVE_UP1       movU1
-MSGS		msgs
-MULTIMAP	multimap
-NEW_TAB		newT
-NEXT		nextBf
-NEXT_DOWN      nextD
-NEXT_LEFT      nextL
-NEXT_LEFT_UP   nextLU
-NEXT_LINK	nextA
-NEXT_MARK	nextMk
-NEXT_PAGE	pgFore
-NEXT_RIGHT     nextR
-NEXT_RIGHT_DOWN        nextRD
-NEXT_TAB	nextT
-NEXT_UP                nextU
-NEXT_WORD	movRW
 NOTHING nulcmd
 NULL nulcmd
-OPTIONS		ldOpt
+@@@ nulcmd
 PCMAP pcmap
-PEEK		curURL
+ESCMAP escmap
-PEEK_IMG	peekIMG
+ESCBMAP escbmap
-PEEK_LINK	peekURL
+MULTIMAP multimap
-PIPE_BUF       pipeBuf
+NEXT_PAGE pgFore
-PIPE_SHELL	pipesh
-PREV		prevBf
-PREV_LINK	prevA
-PREV_MARK	prevMk
 PREV_PAGE pgBack
-PREV_TAB	prevT
+UP lup1
-PREV_WORD	movLW
+DOWN ldown1
-PRINT		svBuf
+CENTER_V ctrCsrV
-QUIT		qquitfm
+CENTER_H ctrCsrH
-READ_SHELL	readsh
-REDO		redoPos
 REDRAW rdrwSc
-REG_MARK	reMark
-REINIT		reinit
-RELOAD		reload
-RESHAPE		reshape
-RIGHT		col1R
-SAVE		svSrc
-SAVE_IMAGE	svI
-SAVE_LINK	svA
-SAVE_SCREEN	svBuf
 SEARCH srchfor
-SEARCH_BACK	srchbak
 SEARCH_FORE srchfor
+WHEREIS srchfor
+ISEARCH isrchfor
+SEARCH_BACK srchbak
+ISEARCH_BACK isrchbak
 SEARCH_NEXT srchnxt
 SEARCH_PREV srchprv
-SELECT		selBuf
-SELECT_MENU    selMn
-SETENV          setEnv
-SET_OPTION      setOpt
-SHELL		execsh
 SHIFT_LEFT shiftl
 SHIFT_RIGHT shiftr
-SOURCE		vwSrc
+RIGHT col1R
-STOP_IMAGE	stopI
+LEFT col1L
-SUBMIT        submitForm
+SETENV setEnv
+PIPE_BUF pipeBuf
+PIPE_SHELL pipesh
+READ_SHELL readsh
+EXEC_SHELL execsh
+SHELL execsh
+LOAD ldfile
+HELP ldhelp
+MOVE_LEFT movL
+MOVE_LEFT1 movL1
+MOVE_DOWN movD
+MOVE_DOWN1 movD1
+MOVE_UP movU
+MOVE_UP1 movU1
+MOVE_RIGHT movR
+MOVE_RIGHT1 movR1
+PREV_WORD movLW
+NEXT_WORD movRW
+ABORT quitfm
+EXIT quitfm
+QUIT qquitfm
+SELECT selBuf
+INTERRUPT susp
 SUSPEND susp
-TAB_GOTO	tabURL
+GOTO_LINE goLine
-TAB_GOTO_RELATIVE	tabrURL
+BEGIN goLineF
-TAB_LEFT	tabL
+END goLineL
-TAB_LINK	tabA
+LINE_BEGIN linbeg
-TAB_MENU	tabMn
+LINE_END linend
-TAB_MOUSE	tabMs
+EDIT editBf
-TAB_RIGHT	tabR
+EDIT_SCREEN editScr
-UNDO		undoPos
+MARK _mark
-UP		lup1
+NEXT_MARK nextMk
-VERSION dispVer
+PREV_MARK prevMk
-VIEW		vwSrc
+REG_MARK reMark
-VIEW_BOOKMARK	ldBmark
+GOTO_LINK followA
 VIEW_IMAGE followI
-WHEREIS		srchfor
+SUBMIT submitForm
-WRAP_TOGGLE	wrapToggle
+LINK_BEGIN topA
+LINK_END lastA
+NEXT_LINK nextA
+PREV_LINK prevA
 NEXT_VISITED nextVA
 PREV_VISITED prevVA
+NEXT_LEFT nextL
+NEXT_LEFT_UP nextLU
+NEXT_RIGHT nextR
+NEXT_RIGHT_DOWN nextRD
+NEXT_DOWN nextD
+NEXT_UP nextU
+NEXT nextBf
+PREV prevBf
+BACK backBf
+DELETE_PREVBUF deletePrevBuf
+GOTO goURL
+GOTO_RELATIVE gorURL
+BOOKMARK ldBmark
+VIEW_BOOKMARK ldBmark
+ADD_BOOKMARK adBmark
+OPTIONS ldOpt
+SET_OPTION setOpt
+MSGS msgs
+INFO pginfo
+LINK_MENU linkMn
+ACCESSKEY accessKey
+LIST_MENU listMn
+MOVE_LIST_MENU movlistMn
+LIST linkLst
+COOKIE cooLst
+HISTORY ldHist
+SAVE_LINK svA
+SAVE_IMAGE svI
+PRINT svBuf
+SAVE_SCREEN svBuf
+DOWNLOAD svSrc
+SAVE svSrc
+PEEK_LINK peekURL
+PEEK_IMG peekIMG
+PEEK curURL
+SOURCE vwSrc
+VIEW vwSrc
+RELOAD reload
+RESHAPE reshape
+CHARSET docCSet
+DEFAULT_CHARSET defCSet
+MARK_URL chkURL
+MARK_WORD chkWORD
+MARK_MID chkNMID
+FRAME rFrame
+EXTERN extbrz
+EXTERN_LINK linkbrz
+LINE_INFO curlno
+DISPLAY_IMAGE dispI
+STOP_IMAGE stopI
+MOUSE_TOGGLE msToggle
+MOUSE mouse
+MOVE_MOUSE movMs
+MENU_MOUSE menuMs
+TAB_MOUSE tabMs
+CLOSE_TAB_MOUSE closeTMs
+VERSION dispVer
+WRAP_TOGGLE wrapToggle
+DICT_WORD dictword
+DICT_WORD_AT dictwordat
+COMMAND execCmd
+ALARM setAlarm
+REINIT reinit
+DEFINE_KEY defKey
+NEW_TAB newT
+CLOSE_TAB closeT
+NEXT_TAB nextT
+PREV_TAB prevT
+TAB_LINK tabA
+TAB_GOTO tabURL
+TAB_GOTO_RELATIVE tabrURL
+TAB_RIGHT tabR
+TAB_LEFT tabL
+DOWNLOAD_LIST ldDL
+UNDO undoPos
+REDO redoPos
+MAIN_MENU mainMn
+MENU mainMn
+SELECT_MENU selMn
+TAB_MENU tabMn

main.c

@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.236 2003/09/26 20:45:53 ukai Exp $ */
+/* $Id: main.c,v 1.237 2003/09/26 20:58:51 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -1232,7 +1232,7 @@ do_dump(Buffer *buf)
     mySignal(SIGINT, prevtrap);
 }
 
-DEFUN(nulcmd, @@@ NOTHING NULL, "Do nothing")
+DEFUN(nulcmd, NOTHING NULL @@@, "Do nothing")
 {				/* do nothing */
 }
 
@@ -2130,7 +2130,8 @@ _movL(int n)
     displayBuffer(Currentbuf, B_NORMAL);
 }
 
-DEFUN(movL, MOVE_LEFT, "Move cursor left (a half screen shift at the left edge)")
+DEFUN(movL, MOVE_LEFT,
+      "Move cursor left (a half screen shift at the left edge)")
 {
     _movL(Currentbuf->COLS / 2);
 }
@@ -2152,12 +2153,14 @@ _movD(int n)
     displayBuffer(Currentbuf, B_NORMAL);
 }
 
-DEFUN(movD, MOVE_DOWN, "Move cursor down (a half screen scroll at the end of screen)")
+DEFUN(movD, MOVE_DOWN,
+      "Move cursor down (a half screen scroll at the end of screen)")
 {
     _movD((Currentbuf->LINES + 1) / 2);
 }
 
-DEFUN(movD1, MOVE_DOWN1, "Move cursor down (1 line scroll at the end of screen)")
+DEFUN(movD1, MOVE_DOWN1,
+      "Move cursor down (1 line scroll at the end of screen)")
 {
     _movD(1);
 }
@@ -2174,7 +2177,8 @@ _movU(int n)
     displayBuffer(Currentbuf, B_NORMAL);
 }
 
-DEFUN(movU, MOVE_UP, "Move cursor up (a half screen scroll at the top of screen)")
+DEFUN(movU, MOVE_UP,
+      "Move cursor up (a half screen scroll at the top of screen)")
 {
     _movU((Currentbuf->LINES + 1) / 2);
 }
@@ -2196,12 +2200,14 @@ _movR(int n)
     displayBuffer(Currentbuf, B_NORMAL);
 }
 
-DEFUN(movR, MOVE_RIGHT, "Move cursor right (a half screen shift at the right edge)")
+DEFUN(movR, MOVE_RIGHT,
+      "Move cursor right (a half screen shift at the right edge)")
 {
     _movR(Currentbuf->COLS / 2);
 }
 
-DEFUN(movR1, MOVE_RIGHT1, "Move cursor right (1 columns shift at the right edge)")
+DEFUN(movR1, MOVE_RIGHT1,
+      "Move cursor right (1 columns shift at the right edge)")
 {
     _movR(1);
 }
@@ -3930,7 +3936,8 @@ DEFUN(backBf, BACK, "Back to previous buffer")
     displayBuffer(Currentbuf, B_FORCE_REDRAW);
 }
 
-DEFUN(deletePrevBuf, DELETE_PREVBUF, "Delete previous buffer (mainly for local-CGI)")
+DEFUN(deletePrevBuf, DELETE_PREVBUF,
+      "Delete previous buffer (mainly for local-CGI)")
 {
     Buffer *buf = Currentbuf->nextBuffer;
     if (buf)
@@ -4289,7 +4296,8 @@ DEFUN(listMn, LIST_MENU, "Popup link list menu and go to selected link")
     anchorMn(list_menu, TRUE);
 }
 
-DEFUN(movlistMn, MOVE_LIST_MENU, "Popup link list menu and move cursor to selected link")
+DEFUN(movlistMn, MOVE_LIST_MENU,
+      "Popup link list menu and move cursor to selected link")
 {
     anchorMn(list_menu, FALSE);
 }
@@ -5444,7 +5452,8 @@ DEFUN(tabMs, TAB_MOUSE, "Move to tab on mouse cursor (for mouse action)")
     displayBuffer(Currentbuf, B_FORCE_REDRAW);
 }
 
-DEFUN(closeTMs, CLOSE_TAB_MOUSE, "Close tab on mouse cursor (for mouse action)")
+DEFUN(closeTMs, CLOSE_TAB_MOUSE,
+      "Close tab on mouse cursor (for mouse action)")
 {
     TabBuffer *tab;
 
@@ -5563,7 +5572,8 @@ DEFUN(dictword, DICT_WORD, "Execute dictionary command (see README.dict)")
     execdict(inputStr("(dictionary)!", ""));
 }
 
-DEFUN(dictwordat, DICT_WORD_AT, "Execute dictionary command for word at cursor")
+DEFUN(dictwordat, DICT_WORD_AT,
+      "Execute dictionary command for word at cursor")
 {
     execdict(GetWord(Currentbuf));
 }
@@ -5909,7 +5919,8 @@ DEFUN(reinit, REINIT, "Reload configuration files")
 		     ptr, FALSE);
 }
 
-DEFUN(defKey, DEFINE_KEY, "Define a binding between a key stroke and a user command")
+DEFUN(defKey, DEFINE_KEY,
+      "Define a binding between a key stroke and a user command")
 {
     char *data;