It looks like functnames was supposed to be sorted. I have an ok from
jasper but running this by tech@ because I'm not sure if there is a
reason why this might not be desirable. Also fix some whitespace while
there.
So I'm going to commit this unless someone screams at me ;)
(I checked that every line removed is added somewhere else)
diff --git funmap.c funmap.c
index 66dd414..45e9cf8 100644
--- funmap.c
+++ funmap.c
@@ -21,7 +21,7 @@ static struct funmap *funs;
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 @@ static struct funmap functnames[] = {
{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 @@ static struct funmap functnames[] = {
{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 @@ static struct funmap functnames[] = {
{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 @@ static struct funmap functnames[] = {
{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 @@ static struct funmap functnames[] = {
{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 @@ static struct funmap functnames[] = {
#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 @@ static struct funmap functnames[] = {
{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,}
};
--
I'm not entirely sure you are real.
