===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/funmap.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- src/usr.bin/mg/funmap.c	2012/10/12 21:13:46	1.41
+++ src/usr.bin/mg/funmap.c	2012/11/20 13:10:16	1.42
@@ -1,4 +1,4 @@
-/*	$OpenBSD: funmap.c,v 1.41 2012/10/12 21:13:46 jasper Exp $	*/
+/*	$OpenBSD: funmap.c,v 1.42 2012/11/20 13:10:16 florian Exp $	*/
 
 /* This file is in the public domain */
 
@@ -21,7 +21,7 @@
 
 static struct funmap functnames[] = {
 	{apropos_command, "apropos",},
-	{auto_execute, "auto-execute", },
+	{auto_execute, "auto-execute",},
 	{fillmode, "auto-fill-mode",},
 	{indentmode, "auto-indent-mode",},
 	{backtoindent, "back-to-indentation",},
@@ -45,18 +45,31 @@
 	{cntmatchlines, "count-matches",},
 	{cntnonmatchlines, "count-non-matches",},
 #endif /* REGEX */
+	{cscreatelist, "cscope-create-list-of-files-to-index",},
+	{csfuncalled, "cscope-find-called-functions",},
+	{csegrep, "cscope-find-egrep-pattern",},
+	{csfindinc, "cscope-find-files-including-file",},
+	{cscallerfuncs, "cscope-find-functions-calling-this-function",},
+	{csdefinition, "cscope-find-global-definition",},
+	{csfindfile, "cscope-find-this-file",},
+	{cssymbol, "cscope-find-this-symbol",},
+	{csfindtext, "cscope-find-this-text-string",},
+	{csnextfile, "cscope-next-file",},
+	{csnextmatch, "cscope-next-symbol",},
+	{csprevfile, "cscope-prev-file",},
+	{csprevmatch, "cscope-prev-symbol",},
 	{redefine_key, "define-key",},
 	{backdel, "delete-backward-char",},
 	{deblank, "delete-blank-lines",},
 	{forwdel, "delete-char",},
 	{delwhite, "delete-horizontal-space",},
 	{delleadwhite, "delete-leading-space",},
-	{deltrailwhite, "delete-trailing-space",},
 #ifdef	REGEX
 	{delmatchlines, "delete-matching-lines",},
 	{delnonmatchlines, "delete-non-matching-lines",},
 #endif /* REGEX */
 	{onlywind, "delete-other-windows",},
+	{deltrailwhite, "delete-trailing-space",},
 	{delwind, "delete-window",},
 	{wallchart, "describe-bindings",},
 	{desckey, "describe-key-briefly",},
@@ -65,7 +78,6 @@
 	{lowerword, "downcase-word",},
 	{showversion, "emacs-version",},
 	{finishmacro, "end-kbd-macro",},
-	{globalwdtoggle, "global-wd-mode",},
 	{gotoeob, "end-of-buffer",},
 	{gotoeol, "end-of-line",},
 	{enlargewind, "enlarge-window",},
@@ -75,17 +87,20 @@
 	{swapmark, "exchange-point-and-mark",},
 	{extend, "execute-extended-command",},
 	{fillpara, "fill-paragraph",},
-	{filevisit, "find-file",},
-	{filevisitro, "find-file-read-only",},
 	{filevisitalt, "find-alternate-file",},
+	{filevisit, "find-file",},
 	{poptofile, "find-file-other-window",},
+	{filevisitro, "find-file-read-only",},
+	{findtag, "find-tag",},
 	{forwchar, "forward-char",},
 	{gotoeop, "forward-paragraph",},
 	{forwword, "forward-word",},
 	{bindtokey, "global-set-key",},
 	{unbindtokey, "global-unset-key",},
+	{globalwdtoggle, "global-wd-mode",},
 	{gotoline, "goto-line",},
 	{help_help, "help-help",},
+	{indent, "indent-current-line",},
 	{insert, "insert",},
 	{bufferinsert, "insert-buffer",},
 	{fileinsert, "insert-file",},
@@ -112,7 +127,6 @@
 	{negative_argument, "negative-argument",},
 	{newline, "newline",},
 	{lfindent, "newline-and-indent",},
-	{indent, "indent-current-line",},
 	{forwline, "next-line",},
 #ifdef NOTAB
 	{notabmode, "no-tab-mode",},
@@ -121,17 +135,14 @@
 	{openline, "open-line",},
 	{nextwind, "other-window",},
 	{overwrite_mode, "overwrite-mode",},
+	{poptag, "pop-tag-mark",},
 	{prefixregion, "prefix-region",},
 	{backline, "previous-line",},
 	{prevwind, "previous-window",},
-	{poptag, "pop-tag-mark",},
 	{spawncli, "push-shell",},
-	{findtag, "find-tag",},
-	{tagsvisit, "visit-tags-table",},
 	{showcwdir, "pwd",},
 	{queryrepl, "query-replace",},
 #ifdef REGEX
-	{replstr, "replace-string",},
 	{re_queryrepl, "query-replace-regexp",},
 #endif /* REGEX */
 	{quote, "quoted-insert",},
@@ -142,6 +153,10 @@
 #endif /* REGEX */
 	{reposition, "recenter",},
 	{redraw, "redraw-display",},
+#ifdef REGEX
+	{replstr, "replace-string",},
+#endif /* REGEX */
+	{revertbuffer, "revert-buffer",},
 	{filesave, "save-buffer",},
 	{quit, "save-buffers-kill-emacs",},
 	{savebuffers, "save-some-buffers",},
@@ -173,31 +188,18 @@
 	{poptobuffer, "switch-to-buffer-other-window",},
 	{togglereadonly, "toggle-read-only" },
 	{twiddle, "transpose-chars",},
-	{undo, "undo", },
-	{undo_enable, "undo-enable", },
-	{undo_boundary_enable, "undo-boundary-toggle", },
-	{undo_add_boundary, "undo-boundary", },
-	{undo_dump, "undo-list", },
+	{undo, "undo",},
+	{undo_add_boundary, "undo-boundary",},
+	{undo_boundary_enable, "undo-boundary-toggle",},
+	{undo_enable, "undo-enable",},
+	{undo_dump, "undo-list",},
 	{universal_argument, "universal-argument",},
 	{upperregion, "upcase-region",},
 	{upperword, "upcase-word",},
+	{tagsvisit, "visit-tags-table",},
 	{showcpos, "what-cursor-position",},
 	{filewrite, "write-file",},
 	{yank, "yank",},
-	{cssymbol, "cscope-find-this-symbol",},
-	{csdefinition, "cscope-find-global-definition",},
-	{csfuncalled, "cscope-find-called-functions",},
-	{cscallerfuncs, "cscope-find-functions-calling-this-function",},
-	{csfindtext, "cscope-find-this-text-string",},
-	{csegrep, "cscope-find-egrep-pattern",},
-	{csfindfile, "cscope-find-this-file",},
-	{csfindinc, "cscope-find-files-including-file",},
-	{csnextmatch, "cscope-next-symbol",},
-	{csprevmatch, "cscope-prev-symbol",},
-	{csnextfile, "cscope-next-file",},
-	{csprevfile, "cscope-prev-file",},
-	{cscreatelist, "cscope-create-list-of-files-to-index",},
-	{revertbuffer, "revert-buffer",},
 	{NULL, NULL,}
 };