[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5682] infokey.h merged into infomap.h
|
From: |
Gavin D. Smith |
|
Subject: |
[5682] infokey.h merged into infomap.h |
|
Date: |
Sat, 28 Jun 2014 16:07:25 +0000 |
Revision: 5682
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5682
Author: gavin
Date: 2014-06-28 16:07:24 +0000 (Sat, 28 Jun 2014)
Log Message:
-----------
infokey.h merged into infomap.h
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/Makefile.am
trunk/info/infokey.c
trunk/info/infomap.c
trunk/info/infomap.h
trunk/info/makedoc.c
Removed Paths:
-------------
trunk/info/infokey.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-06-28 15:54:00 UTC (rev 5681)
+++ trunk/ChangeLog 2014-06-28 16:07:24 UTC (rev 5682)
@@ -1,5 +1,13 @@
2014-06-28 Gavin Smith <address@hidden>
+ * info/infokey.h (ISMETA, META, UNMETA, ISCONTROL, INFOKEY_RADIX)
+ (INFOKEY_MAX_SECTIONLEN): Removed.
+ * info/infokey.h, info/infomap.h (INFOKEY_FILE, A_MAX_COMMAND)
+ (A_INVALID, CONTROL): Remaining definitions moved between files.
+ infokey.h merged into infomap.h.
+
+2014-06-28 Gavin Smith <address@hidden>
+
* info/infokey.h:
(SK_RIGHT_ARROW, SK_LEFT_ARROW, SK_UP_ARROW, SK_DOWN_ARROW, SK_PAGE_UP)
(SK_PAGE_DOWN SK_HOME, SK_END, SK_DELETE, SK_INSERT, SK_CTL_LEFT_ARROW)
Modified: trunk/info/Makefile.am
===================================================================
--- trunk/info/Makefile.am 2014-06-28 15:54:00 UTC (rev 5681)
+++ trunk/info/Makefile.am 2014-06-28 16:07:24 UTC (rev 5682)
@@ -34,7 +34,7 @@
ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \
echo-area.c echo-area.h \
filesys.c filesys.h footnotes.c footnotes.h indices.c indices.h \
- info-utils.c info-utils.h info.c info.h infodoc.c infokey.c infokey.h \
+ info-utils.c info-utils.h info.c info.h infodoc.c infokey.c \
infomap.c infomap.h infopath.c m-x.c man.c man.h nodemenu.c \
nodes.c nodes.h search.c search.h session.c session.h signals.c signals.h \
tag.c tag.h termdep.h terminal.c terminal.h tilde.c tilde.h \
Modified: trunk/info/infokey.c
===================================================================
--- trunk/info/infokey.c 2014-06-28 15:54:00 UTC (rev 5681)
+++ trunk/info/infokey.c 2014-06-28 16:07:24 UTC (rev 5682)
@@ -21,7 +21,6 @@
#include "info.h"
#include "infomap.h"
-#include "infokey.h"
#include "doc.h"
#include "getopt.h"
#include "variables.h"
Deleted: trunk/info/infokey.h
===================================================================
--- trunk/info/infokey.h 2014-06-28 15:54:00 UTC (rev 5681)
+++ trunk/info/infokey.h 2014-06-28 16:07:24 UTC (rev 5682)
@@ -1,71 +0,0 @@
-/* infokey.h -- Custom keystroke definition support.
- $Id$
-
- Copyright 1999, 2002, 2007, 2013, 2014 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- Originally written by Andrew Bettison.
-
- This design was derived from the "lesskey" system in less 3.4.0. by
- Mark Nudelman.
-
- The following terminology is confusing:
- source file = $HOME/.infokey
- infokey file = $HOME/.info
- Oh, well.
- */
-
-/* Default "infokey file", where user defs are kept and read by
- Info. MS-DOS doesn't allow leading dots in file names. */
-#ifdef __MSDOS__
-#define INFOKEY_FILE "_infokey"
-#else
-#define INFOKEY_FILE ".infokey"
-#endif
-
-/*
-Format of INFO and EA sections:
-
- 1 byte flag: 1 == suppress default key bindings
- Repeat:
- X bytes key sequence
- 1 byte '\0' terminator
- 1 byte action code (A_xxx)
-
-Format of VAR section:
-
- Repeat:
- X bytes variable name
- 1 byte '\0' terminator
- Y bytes value
- 1 byte '\0' terminator
-
-*/
-
-#define INFOKEY_RADIX 64
-#define INFOKEY_MAX_SECTIONLEN 500
-
-#define A_MAX_COMMAND 120
-#define A_INVALID 121
-
-/* Character transformations (independent of info's own) */
-
-#define CONTROL(c) ((c) & 0x1f)
-#define ISCONTROL(c) (((c) & ~0x1f) == 0)
-#define META(c) ((c) | 0x80)
-#define UNMETA(c) ((c) & ~0x80)
-#define ISMETA(c) (((c) & 0x80) != 0)
-
-
Modified: trunk/info/infomap.c
===================================================================
--- trunk/info/infomap.c 2014-06-28 15:54:00 UTC (rev 5681)
+++ trunk/info/infomap.c 2014-06-28 16:07:24 UTC (rev 5682)
@@ -23,8 +23,6 @@
#include "infomap.h"
#include "funs.h"
#include "terminal.h"
-
-#include "infokey.h"
#include "variables.h"
void keymap_bind_keyseq (Keymap map, int *keyseq, KEYMAP_ENTRY *keyentry);
Modified: trunk/info/infomap.h
===================================================================
--- trunk/info/infomap.h 2014-06-28 15:54:00 UTC (rev 5681)
+++ trunk/info/infomap.h 2014-06-28 16:07:24 UTC (rev 5682)
@@ -1,7 +1,8 @@
/* infomap.h -- description of a keymap in Info and related functions.
$Id$
- Copyright 1993, 2001, 2004, 2007, 2013, 2014 Free Software Foundation, Inc.
+ Copyright 1993, 1999, 2001, 2002, 2004, 2007, 2013, 2014 Free Software
+ Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -99,6 +100,19 @@
#define KEYMAP_META(k) ((k) < KEYMAP_META_BASE ? (k) + KEYMAP_META_BASE : (k))
+/* Default "infokey file", where user defs are kept and read by
+ Info. MS-DOS doesn't allow leading dots in file names. */
+#ifdef __MSDOS__
+#define INFOKEY_FILE "_infokey"
+#else
+#define INFOKEY_FILE ".infokey"
+#endif
+
+#define A_MAX_COMMAND 120
+#define A_INVALID 121
+
+#define CONTROL(c) ((c) & 0x1f)
+
/* Return a new keymap which has all the uppercase letters mapped to run
the function info_do_lowercase_version (). */
extern Keymap keymap_make_keymap (void);
Modified: trunk/info/makedoc.c
===================================================================
--- trunk/info/makedoc.c 2014-06-28 15:54:00 UTC (rev 5681)
+++ trunk/info/makedoc.c 2014-06-28 16:07:24 UTC (rev 5682)
@@ -25,7 +25,7 @@
declared with DECLARE_INFO_COMMAND. */
#include "info.h"
-#include "infokey.h"
+#include "infomap.h"
char *program_name = "makedoc";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5682] infokey.h merged into infomap.h,
Gavin D. Smith <=