[AC21.5R21.4] [CORE (21.5)] Fix data types in unexelf.c
18 years, 4 months
Steve Youngs
Steve Youngs
APPROVE COMMIT 21.5 RECOMMEND 21.4
Thanks very much for this patch, Andrey. Please send your future
XEmacs contributions to xemacs-patches(a)xemacs.org.
Vin, looks to me like this is needed in 21.4 too.
NOTE: This patch has been committed.
21.5 patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: src/ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: src/unexelf.c
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.878
diff -u -p -U0 -r1.878 ChangeLog
--- src/ChangeLog 26 Oct 2005 15:14:53 -0000 1.878
+++ src/ChangeLog 29 Oct 2005 07:11:42 -0000
＠＠ -0,0 +1,5 ＠＠
+2005-10-29 Steve Youngs <steve(a)sxemacs.org>
+
+ * unexelf.c (unexec): Fix data types.
+ From: Andrey Slusar <anrays(a)gmail.com>
+
Index: src/unexelf.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexelf.c,v
retrieving revision 1.19
diff -u -p -u -r1.19 unexelf.c
--- src/unexelf.c 10 Oct 2005 03:16:25 -0000 1.19
+++ src/unexelf.c 29 Oct 2005 07:11:06 -0000
＠＠ -565,8 +565,8 ＠＠ round_up (ElfW(Addr) x, ElfW(Addr) y)
*
*/
int
-unexec (Extbyte *new_name, Extbyte *old_name, unsigned int UNUSED (data_start),
- unsigned int UNUSED (bss_start), unsigned int UNUSED (entry_address))
+unexec (Extbyte *new_name, Extbyte *old_name, uintptr_t UNUSED (data_start),
+ uintptr_t UNUSED (bss_start), uintptr_t UNUSED (entry_address))
{
int new_file, old_file, new_file_size;
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| I am Dyslexic of Borg. |
| Fusistance is retile. Your arse will be laminated. |
|------------------------------------<steve(a)sxemacs.org>---|
- 4 participants
- 6 comments
21.4.17 open-network-stream doesn't allow an integer port number
18 years, 4 months
Katsumi Yamaoka
Katsumi Yamaoka
Hi,
I found `open-network-stream' doesn't work with an integer for
the fourth argument. It can be reproduced with XEmacs 21.4.17
built in at least the Fedora Core 4 system (but there's no
problem in some other platforms, e.g., Solaris 2.6). For
instance, the following form causes an error:
(delete-process
(open-network-stream "POP" (current-buffer) "popserver" 110))
Debugger entered--Lisp error: (error "popserver/'D & Servname not supported for ai_socktype")
open-network-stream-internal("POP" #<buffer "*scratch*"> "popserver" 110 nil)
open-network-stream("POP" #<buffer "*scratch*"> "popserver" 110)
We can use this function with only a string which specifies a
port number as follows:
(delete-process
(open-network-stream "POP" (current-buffer) "popserver" "110"))
Naoto Morishima investigated it in detail and made the patch,
and I confirmed it works in the Fedora Core 4 system.
2005-11-24 Naoto Morishima <naoto(a)dl.naist.jp>
* process-unix.c (unix_open_network_stream): Make it
work with an integer for the fourth argument.
--- process-unix.c~ 2005-02-13 21:58:19 +0000
+++ process-unix.c 2005-11-24 10:53:07 +0000
＠＠ -1684,13 +1684,13 ＠＠
volatile int xerrno = 0;
volatile int failed_connect = 0;
char *ext_host;
+ char portbuf[128];
/*
* Caution: service can either be a string or int.
* Convert to a C string for later use by getaddrinfo.
*/
if (INTP (service))
{
- char portbuf[128];
snprintf (portbuf, sizeof (portbuf), "%ld", (long) XINT (service));
portstring = portbuf;
port = htons ((unsigned short) XINT (service));
- 2 participants
- 1 comments
[PATCH] Etags update to v17.15.
18 years, 4 months
Malcolm Purvis
Malcolm Purvis
This patch upgrades etags to Francesco's recently announced version 17.15.
Malcolm
lib-src/ChangeLog addition:
2005-11-22 Malcolm Purvis <malcolmp(a)xemacs.org>
* etags.c: Update to author version 17.15.
xemacs-21.5-micro-patches source patch:
Diff command: cvs -q diff -u
Files affected: lib-src/etags.c
Index: lib-src/etags.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
retrieving revision 1.33
diff -u -r1.33 etags.c
--- lib-src/etags.c 2005/02/03 18:09:26 1.33
+++ lib-src/etags.c 2005/11/22 11:27:00
＠＠ -1,6 +1,7 ＠＠
/* Tags file maker to go with GNU Emacs -*- coding: latin-1 -*-
- Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2004
- Free Software Foundation, Inc. and Ken Arnold
+ Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005 Free Software Foundation, Inc. and Ken Arnold
This file is not considered part of GNU Emacs.
＠＠ -16,7 +17,7 ＠＠
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/*
* Authors:
＠＠ -40,7 +41,7 ＠＠
* configuration file containing regexp definitions for etags.
*/
-char pot_etags_version[] = "＠(#) pot revision number is 17.11";
+char pot_etags_version[] = "＠(#) pot revision number is 17.15";
#define TRUE 1
#define FALSE 0
＠＠ -489,6 +490,7 ＠＠
#if LONG_OPTIONS
static struct option longopts[] =
{
+ { "append", no_argument, NULL, 'a' },
{ "packages-only", no_argument, &packages_only, TRUE },
{ "c++", no_argument, NULL, 'C' },
{ "declarations", no_argument, &declarations, TRUE },
＠＠ -508,7 +510,7 ＠＠
{ "parse-stdin", required_argument, NULL, STDIN },
{ "version", no_argument, NULL, 'V' },
-#if CTAGS /* Etags options */
+#if CTAGS /* Ctags options */
{ "backward-search", no_argument, NULL, 'B' },
{ "cxref", no_argument, NULL, 'x' },
{ "defines", no_argument, NULL, 'd' },
＠＠ -519,8 +521,7 ＠＠
{ "vgrind", no_argument, NULL, 'v' },
{ "no-warn", no_argument, NULL, 'w' },
-#else /* Ctags options */
- { "append", no_argument, NULL, 'a' },
+#else /* Etags options */
{ "no-defines", no_argument, NULL, 'D' },
{ "no-globals", no_argument, &globals, FALSE },
{ "include", required_argument, NULL, 'i' },
＠＠ -888,8 +889,7 ＠＠
Absolute names are stored in the output file as they are.\n\
Relative ones are stored relative to the output file's directory.\n");
- if (!CTAGS)
- puts ("-a, --append\n\
+ puts ("-a, --append\n\
Append tag entries to existing tags file.");
puts ("--packages-only\n\
＠＠ -989,9 +989,9 ＠＠
if (CTAGS)
{
puts ("-v, --vgrind\n\
- Generates an index of items intended for human consumption,\n\
- similar to the output of vgrind. The index is sorted, and\n\
- gives the page number of each item.");
+ Print on the standard output an index of items intended for\n\
+ human consumption, similar to the output of vgrind. The index\n\
+ is sorted, and gives the page number of each item.");
puts ("-w, --no-warn\n\
Suppress warning messages about entries defined in multiple\n\
files.");
＠＠ -1196,10 +1196,10 ＠＠
if (!LONG_OPTIONS)
optstring += 1; /* remove the initial '-' */
optstring = concat (optstring,
- "Cf:Il:o:SVhH",
- (CTAGS) ? "BxdtTuvw" : "aDi:");
+ "aCf:Il:o:SVhH",
+ (CTAGS) ? "BxdtTuvw" : "Di:");
- while ((opt = getopt_long (argc, argv, optstring, longopts, 0)) != EOF)
+ while ((opt = getopt_long (argc, argv, optstring, longopts, NULL)) != EOF)
switch (opt)
{
case 0:
＠＠ -1227,6 +1227,7 ＠＠
break;
/* Common options. */
+ case 'a': append_to_tagfile = TRUE; break;
case 'C': cplusplus = TRUE; break;
case 'f': /* for compatibility with old makefiles */
case 'o':
＠＠ -1276,7 +1277,6 ＠＠
break;
/* Etags options */
- case 'a': append_to_tagfile = TRUE; break;
case 'D': constantypedefs = FALSE; break;
case 'i': included_files[nincluded_files++] = optarg; break;
＠＠ -1423,7 +1423,8 ＠＠
if (!CTAGS || cxref_style)
{
- put_entries (nodehead); /* write the remainig tags (ETAGS) */
+ /* Write the remaining tags to tagf (ETAGS) or stdout (CXREF). */
+ put_entries (nodehead);
free_tree (nodehead);
nodehead = NULL;
if (!CTAGS)
＠＠ -1437,10 +1438,11 ＠＠
while (nincluded_files-- > 0)
fprintf (tagf, "\f\n%s,include\n", *included_files++);
+
+ if (fclose (tagf) == EOF)
+ pfatal (tagfile);
}
- if (fclose (tagf) == EOF)
- pfatal (tagfile);
exit (EXIT_SUCCESS);
}
＠＠ -1475,12 +1477,13 ＠＠
if (fclose (tagf) == EOF)
pfatal (tagfile);
- if (update)
- {
- char cmd[2*BUFSIZ+10];
- sprintf (cmd, "sort -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile);
- exit (system (cmd));
- }
+ if (CTAGS)
+ if (append_to_tagfile || update)
+ {
+ char cmd[2*BUFSIZ+10];
+ sprintf (cmd, "sort -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile);
+ exit (system (cmd));
+ }
return EXIT_SUCCESS;
}
--
Malcolm Purvis <malcolmp(a)xemacs.org>
- 1 participants
- 1 comments
[AC21.5] GTK compilation fixes.
18 years, 4 months
Malcolm Purvis
Malcolm Purvis
APPROVE COMMIT 21.5
src/ChangeLog addition:
2005-11-22 Malcolm Purvis <malcolmp(a)xemacs.org>
* frame-gtk.c (gtk_internal_frame_property_p):
* glyphs-gtk.c (image_instance_convert_to_pointer):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.h (IMAGE_INSTANCE_GTK_MASK):
* gtk-xemacs.c (gtk_xemacs_expose):
* redisplay-gtk.c (gtk_output_vertical_divider):
Fix compilation errors and warnings that have appeared over the
last few months.
xemacs-gtk-warnings source patch:
Diff command: cvs -q diff -u
Files affected: src/redisplay-gtk.c src/gtk-xemacs.c src/glyphs-gtk.h src/glyphs-gtk.c src/frame-gtk.c
Index: src/frame-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-gtk.c,v
retrieving revision 1.20
diff -u -r1.20 frame-gtk.c
--- src/frame-gtk.c 2005/01/24 23:33:56 1.20
+++ src/frame-gtk.c 2005/11/22 11:14:23
＠＠ -265,7 +265,7 ＠＠
}
static int
-gtk_internal_frame_property_p (struct frame *f, Lisp_Object property)
+gtk_internal_frame_property_p (struct frame *UNUSED(f), Lisp_Object property)
{
return EQ (property, Qleft)
|| EQ (property, Qtop)
Index: src/glyphs-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.c,v
retrieving revision 1.31
diff -u -r1.31 glyphs-gtk.c
--- src/glyphs-gtk.c 2005/09/27 05:48:26 1.31
+++ src/glyphs-gtk.c 2005/11/22 11:14:25
＠＠ -686,8 +686,8 ＠＠
Lisp_Object pointer_bg)
{
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
- GdkPixmap *pixmap = IMAGE_INSTANCE_X_PIXMAP (ii);
- GdkPixmap *mask = (GdkPixmap *) IMAGE_INSTANCE_PIXMAP_MASK (ii);
+ GdkPixmap *pixmap = IMAGE_INSTANCE_GTK_PIXMAP (ii);
+ GdkPixmap *mask = (GdkPixmap *) IMAGE_INSTANCE_GTK_MASK (ii);
GdkColor fg, bg;
int xhot = 0, yhot = 0;
int w, h;
＠＠ -1310,7 +1310,7 ＠＠
gdk_window_get_geometry (pixmap, NULL, NULL, &w, &h, &depth);
IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
- IMAGE_INSTANCE_PIXMAP_MASK (ii) = (void*)mask;
+ IMAGE_INSTANCE_PIXMAP_MASK (ii) = mask;
IMAGE_INSTANCE_GTK_COLORMAP (ii) = cmap;
IMAGE_INSTANCE_GTK_PIXELS (ii) = 0;
IMAGE_INSTANCE_GTK_NPIXELS (ii) = 0;
＠＠ -1329,11 +1329,12 ＠＠
break;
case IMAGE_POINTER:
- if (xpmattrs.valuemask & XpmHotspot)
- IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = make_int (xpmattrs.x_hotspot);
- if (xpmattrs.valuemask & XpmHotspot)
- IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = make_int (xpmattrs.y_hotspot);
-
+ /* #### Gtk does not give us access to the hotspots of a pixmap */
+
+ IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = 1;
+ IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = 1;
+
+
image_instance_convert_to_pointer (ii, instantiator, pointer_fg,
pointer_bg);
break;
Index: src/glyphs-gtk.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.h,v
retrieving revision 1.3
diff -u -r1.3 glyphs-gtk.h
--- src/glyphs-gtk.h 2004/05/15 07:43:09 1.3
+++ src/glyphs-gtk.h 2005/11/22 11:14:26
＠＠ -86,7 +86,7 ＠＠
(GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[slice])
#define IMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \
(GTK_IMAGE_INSTANCE_DATA (i)->pixmaps)
-#define IMAGE_INSTANCE_GTK_MASK(i) (GdkPixmap*)(IMAGE_INSTANCE_PIXMAP_MASK (i))
+#define IMAGE_INSTANCE_GTK_MASK(i) ((GdkPixmap*)(IMAGE_INSTANCE_PIXMAP_MASK (i)))
#define IMAGE_INSTANCE_GTK_CURSOR(i) (GTK_IMAGE_INSTANCE_DATA (i)->cursor)
#define IMAGE_INSTANCE_GTK_COLORMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->colormap)
#define IMAGE_INSTANCE_GTK_PIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixels)
Index: src/gtk-xemacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gtk-xemacs.c,v
retrieving revision 1.14
diff -u -r1.14 gtk-xemacs.c
--- src/gtk-xemacs.c 2004/10/16 13:08:58 1.14
+++ src/gtk-xemacs.c 2005/11/22 11:14:26
＠＠ -410,6 +410,8 ＠＠
redisplay_redraw_exposed_area (f, a->x, a->y, a->width, a->height);
return (TRUE);
}
+
+ return FALSE;
}
Lisp_Object
Index: src/redisplay-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-gtk.c,v
retrieving revision 1.17
diff -u -r1.17 redisplay-gtk.c
--- src/redisplay-gtk.c 2005/01/24 23:34:06 1.17
+++ src/redisplay-gtk.c 2005/11/22 11:14:28
＠＠ -1176,7 +1176,7 ＠＠
Draw a vertical divider down the right side of the given window.
****************************************************************************/
static void
-gtk_output_vertical_divider (struct window *w, int clear)
+gtk_output_vertical_divider (struct window *w, int UNUSED(clear))
{
struct frame *f = XFRAME (w->frame);
struct device *d = XDEVICE (f->device);
--
Malcolm Purvis <malcolmp(a)xemacs.org>
- 1 participants
- 0 comments
[AC21.5] More focused define-key docstring
18 years, 5 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
Alan Mackenzie remarked that although he appreciated having all the
information in define-key's docstring, he would prefer more
declarative wording. I've rewritten it from the point of view that
the "vector of lists of symbols" representation is canonical, followed
that with variant representations, and finally the examples.
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.886
diff -u -U0 -r1.886 ChangeLog
--- src/ChangeLog 18 Nov 2005 12:23:55 -0000 1.886
+++ src/ChangeLog 22 Nov 2005 09:12:05 -0000
＠＠ -0,0 +1,4 ＠＠
+2005-11-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * keymap.c (Fdefine_key): More focused docstring.
+
Index: src/keymap.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v
retrieving revision 1.59
diff -u -r1.59 keymap.c
--- src/keymap.c 25 Oct 2005 11:16:25 -0000 1.59
+++ src/keymap.c 22 Nov 2005 09:24:52 -0000
＠＠ -1331,7 +1331,7 ＠＠
#endif /* unused */
)
invalid_argument
- ("Invalid (FSF Emacs) key format (see doc of define-key)",
+ ("Invalid (GNU Emacs) key format (see doc of define-key)",
*keysym);
/* #### Ok, this is a bit more dubious - make people not lose if they
＠＠ -1780,7 +1780,7 ＠＠
DEFUN ("define-key", Fdefine_key, 3, 3, 0, /*
Define key sequence KEYS, in KEYMAP, as DEF.
KEYMAP is a keymap object.
-KEYS is the sequence of keystrokes to bind, described below.
+KEYS is the key sequence to bind, described below.
DEF is anything that can be a key's definition:
nil (means key is undefined in this keymap);
a command (a Lisp function suitable for interactive calling);
＠＠ -1793,68 +1793,96 ＠＠
(DEFN should be a valid definition in its own right);
or a cons (KEYMAP . CHAR), meaning use definition of CHAR in map KEYMAP.
-Contrary to popular belief, the world is not ASCII. When running under a
-window system, XEmacs can tell the difference between, for example, the
-keystrokes control-h, control-shift-h, and backspace. You can, in fact,
-bind different commands to each of these.
-
-A `key sequence' is a set of keystrokes. A `keystroke' is a keysym and some
-set of modifiers (such as control and meta). A `keysym' is what is printed
-on the keys on your keyboard.
-
-A keysym may be represented by a symbol, or (if and only if it is equivalent
-to a character with a code in the range 32 - 255) by a character or its
-equivalent code. The `A' key may be represented by the symbol `A', the
-character `?A', or by the number 65. The `break' key may be represented
-only by the symbol `break'.
-
-A keystroke may be represented by a list: the last element of the list
-is the key (a symbol, character, or number, as above) and the
-preceding elements are the symbolic names of modifier keys (control,
-meta, super, hyper, alt, and shift). Thus, the sequence control-b is
-represented by the forms `(control b)', `(control ?b)', and `(control
-98)'. A keystroke may also be represented by an event object, as
-returned by the `next-command-event' and `read-key-sequence'
-functions.
-
-Note that in this context, the keystroke `control-b' is *not* represented
-by the number 2 (the ASCII code for ^B) or the character `?\^B'. See below.
-
-The `shift' modifier is somewhat of a special case. You should not (and
-cannot) use `(meta shift a)' to mean `(meta A)', since for characters that
-have ASCII equivalents, the state of the shift key is implicit in the
-keysym (a vs. A). You also cannot say `(shift =)' to mean `+', as that
-sort of thing varies from keyboard to keyboard. The shift modifier is for
-use only with characters that do not have a second keysym on the same key,
-such as `backspace' and `tab'.
-
-A key sequence is a vector of keystrokes. As a degenerate case, elements
-of this vector may also be keysyms if they have no modifiers. That is,
-the `A' keystroke is represented by all of these forms:
+A `key sequence' is a vector of one or more keystrokes.
+A `keystroke' is a list containing a key and zero or more modifiers. The
+key must be the last element of the list.
+A `key' is a symbol corresponding to a key on the keyboard, or to a mouse
+gesture. Mouse clicks are denoted by symbols prefixed with "button",
+followed by a digit for which button, and optionally "up". Thus `button1'
+means the down-stroke and `button1up' means the up-stroke when clicking
+mouse button 1.
+A `modifier' is a symbol naming a physical key which is only "noticed" by
+XEmacs when chorded with another key. The `shift' modifier is a special
+case. You cannot use `(meta shift a)' to mean `(meta A)', since for
+characters that have ASCII equivalents, the state of the shift key is
+implicit in the keysym (a vs. A). You also cannot say `(shift =)' to mean
+`+', as that correspondence varies from keyboard to keyboard. The shift
+modifier can only be applied to keys that do not have a second keysym on the
+same key, such as `backspace' and `tab'. A mouse click may be combined with
+modifiers to create a compound "keystroke".
+
+The keys, mouse gestures, and modifiers that are available depend on your
+console and its driver. At a minimum the ASCII graphic characters will be
+available as keys, and shift, control, and meta as modifiers.
+
+To find out programmatically what a key is bound to, use `key-binding' to
+check all applicable keymaps, or `lookup-key' to check a specific keymap.
+The documentation for `key-binding' also contains a description of which
+keymaps are applicable in various situations. `where-is-internal' does
+the opposite of `key-binding', i.e. searches keymaps for the keys that
+map to a particular binding.
+
+If you are confused about why a particular key sequence is generating a
+particular binding, and looking through the keymaps doesn't help, setting
+the variable `debug-emacs-events' may help. If not, try checking
+what's in `function-key-map' and `key-translation-map'.
+
+When running under a window system, typically the repertoire of keys is
+vastly expanded. XEmacs does its best to use the names defined on each
+platform. Also, when running under a window system, XEmacs can tell the
+difference between the keystrokes control-h, control-shift-h, and backspace.
+If the symbols differ, you can bind different actions to each. For mouse
+clicks, different commands may be bound to the up and down strokes, though
+that is probably not what you want, so be careful.
+
+Variant representations:
+
+Besides the canonical representation as a vector of lists of symbols,
+`define-key' also accepts a number of abbreviations, aliases, and variants
+for convenience, compatibility, and internal use.
+
+A keystroke may be represented by a key; this is treated as though it were a
+list containing that key as the only element. A keystroke may also be
+represented by an event object, as returned by the `next-command-event' and
+`read-key-sequence' functions. A key sequence may be represented by a
+single keystroke; this is treated as a vector containing that keystroke as
+its only element.
+
+A key may be represented by a character or its equivalent integer code,
+if and only if it is equivalent to a character with a code in the range
+32 - 255.
+
+For backward compatibility, a key sequence may also be represented by a
+string. In this case, it represents the key sequence(s) that would
+produce that sequence of ASCII characters in a purely ASCII world. An
+alternative string representation is keyboard macro notation, which can
+be translated to the canonical representation with `kbd'.
+
+Examples:
+
+The key sequence `A' (which invokes `self-insert-command') is represented
+by all of these forms:
A ?A 65 (A) (?A) (65)
[A] [?A] [65] [(A)] [(?A)] [(65)]
-the `control-a' keystroke is represented by these forms:
+The key sequence `control-a' is represented by these forms:
(control A) (control ?A) (control 65)
[(control A)] [(control ?A)] [(control 65)]
-the key sequence `control-c control-a' is represented by these forms:
+
+The key sequence `control-c control-a' is represented by these forms:
[(control c) (control a)] [(control ?c) (control ?a)]
[(control 99) (control 65)] etc.
+The keystroke `control-b' *may not* be represented by the number 2 (the
+ASCII code for ^B) or the character `?\^B'.
+
+The `break' key may be represented only by the symbol `break'.
+
Mouse button clicks work just like keypresses: (control button1) means
pressing the left mouse button while holding down the control key.
-\[(control c) (shift button3)] means control-c, hold shift, click right.
-
-Commands may be bound to the mouse-button up-stroke rather than the down-
-stroke as well. `button1' means the down-stroke, and `button1up' means the
-up-stroke. Different commands may be bound to the up and down strokes,
-though that is probably not what you want, so be careful.
-For backward compatibility, a key sequence may also be represented by a
-string. In this case, it represents the key sequence(s) that would
-produce that sequence of ASCII characters in a purely ASCII world. For
-example, a string containing the ASCII backspace character, "\\^H", would
-represent two key sequences: `(control h)' and `backspace'. Binding a
+A string containing the ASCII backspace character, "\\^H", would represent
+two key sequences: `(control h)' and `backspace'. Binding a
command to this will actually bind both of those key sequences. Likewise
for the following pairs:
＠＠ -1873,22 +1901,6 ＠＠
(define-key global-map [(control x) (control i)] \'command-2)
(define-key global-map [(control x) tab] \'command-3)
-
-Of course, all of this applies only when running under a window system. If
-you're talking to XEmacs through a TTY connection, you don't get any of
-these features.
-
-To find out programmatically what a key is bound to, use `key-binding' to
-check all applicable keymaps, or `lookup-key' to check a specific keymap.
-The documentation for `key-binding' also contains a description of which
-keymaps are applicable in various situations. `where-is-internal' does
-the opposite of `key-binding', i.e. searches keymaps for the keys that
-map to a particular binding.
-
-If you are confused about why a particular key sequence is generating a
-particular binding, and looking through the keymaps doesn't help, setting
-the variable `debug-emacs-events' may help. If not, try checking
-what's in `function-key-map' and `key-translation-map'.
*/
(keymap, keys, def))
{
＠＠ -1925,8 +1937,8 ＠＠
for example) then the binding will be made for both keysyms.
This is done if the user binds a command to a string, as in
- (define-key map "\^H" 'something), but not when using one of the new
- syntaxes, like (define-key map '(control h) 'something).
+ (define-key map "\^H" 'something), but not when using the canonical
+ syntax (define-key map '(control h) 'something).
*/
ascii_hack = (STRINGP (keys));
--
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
- 1 participants
- 0 comments
[PATCH21.5] Change semantics of print_internal
18 years, 5 months
Marcus Crestani
Marcus Crestani
Ben suggested to change the semantics of print_internal:
>>>>>"BW" == Ben Wing <ben(a)xemacs.org> writes:
BW> -- since you are creating a lot of new internal objects, i'd
BW> suggest a minor change to the semantics of the object print
BW> method. currently if you set it to 0, if calls
BW> default_object_printer. for internal objects, which should never
BW> escape to Lisp level, we want internal_object_printer instead.
BW> currently, even looking among the modules, there is only one
BW> object (toolbar-button) that relies on the current behavior by
BW> specifying 0 to get default_object_printer, while a number of
BW> others (the event-*-data objects -- granted, not currently used)
BW> also specify 0 but really want internal_object_printer. your new
BW> internal objects do the same. so i'd suggest just changing things
BW> in print_internal() to call internal_object_printer when there is
BW> no print method, and change the print method for toolbar-button to
BW> default_object_printer.
I'll commit tomorrow, if nobody objects.
src/ChangeLog addition:
2005-11-20 Marcus Crestani <crestani(a)xemacs.org>
* lisp.h: Add default_object_printer prototype.
* print.c (default_object_printer): Remove static.
* print.c (print_internal): Use internal_object_printer if a
object has no print method.
* toolbar.c: Use default_object_printer for toolbar-button.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/toolbar.c src/print.c src/lisp.h
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.133
diff -u -r1.133 lisp.h
--- src/lisp.h 13 Nov 2005 10:48:03 -0000 1.133
+++ src/lisp.h 20 Nov 2005 15:34:36 -0000
＠＠ -4744,6 +4744,7 ＠＠
/* Lower-level ways to output data: */
+void default_object_printer (Lisp_Object, Lisp_Object, int);
void print_internal (Lisp_Object, Lisp_Object, int);
void debug_print (Lisp_Object);
void debug_p4 (Lisp_Object obj);
Index: src/print.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/print.c,v
retrieving revision 1.57
diff -u -r1.57 print.c
--- src/print.c 13 Nov 2005 10:48:03 -0000 1.57
+++ src/print.c 20 Nov 2005 15:34:38 -0000
＠＠ -1449,7 +1449,7 ＠＠
UNGCPRO;
}
-static void
+void
default_object_printer (Lisp_Object obj, Lisp_Object printcharfun,
int UNUSED (escapeflag))
{
＠＠ -1749,7 +1749,7 ＠＠
((LHEADER_IMPLEMENTATION (lheader)->printer)
(obj, printcharfun, escapeflag));
else
- default_object_printer (obj, printcharfun, escapeflag);
+ internal_object_printer (obj, printcharfun, escapeflag);
break;
}
Index: src/toolbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.c,v
retrieving revision 1.37
diff -u -r1.37 toolbar.c
--- src/toolbar.c 25 Oct 2005 11:16:28 -0000 1.37
+++ src/toolbar.c 20 Nov 2005 15:34:39 -0000
＠＠ -90,7 +90,9 ＠＠
DEFINE_LRECORD_IMPLEMENTATION ("toolbar-button", toolbar_button,
0, /*dumpable-flag*/
- mark_toolbar_button, 0, 0, 0, 0,
+ mark_toolbar_button,
+ default_object_printer,
+ 0, 0, 0,
toolbar_button_description,
struct toolbar_button);
--
Marcus
- 1 participants
- 1 comments
[COMMIT] fix crash printing iso2022 coding systems
18 years, 5 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
src/ChangeLog addition:
2005-11-22 Ben Wing <ben(a)xemacs.org>
* mule-coding.c (FROB):
Fix crashes printing ISO2022 coding systems.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: src/mule-coding.c
Index: src/mule-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-coding.c,v
retrieving revision 1.35
diff -u -p -r1.35 mule-coding.c
--- src/mule-coding.c 2005/06/19 21:08:31 1.35
+++ src/mule-coding.c 2005/11/22 07:18:29
＠＠ -2643,10 +2643,10 ＠＠ iso2022_print (Lisp_Object cs, Lisp_Obje
write_c_string (printcharfun, "(force)");
}
-#define FROB(prop) \
- if (!NILP (iso2022_getprop (cs, prop))) \
- { \
- write_fmt_string (printcharfun, ", %s", prop); \
+#define FROB(prop) \
+ if (!NILP (iso2022_getprop (cs, prop))) \
+ { \
+ write_fmt_string_lisp (printcharfun, ", %s", 1, prop); \
}
FROB (Qshort);
- 1 participants
- 0 comments
[COMMIT] fix problems building with CVS dirs
18 years, 5 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
ChangeLog addition:
2005-11-22 Ben Wing <ben(a)xemacs.org>
* dynodump/Makefile.in.in (mostlyclean):
Ignore errors from rm during clean.
2005-11-22 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in (top-mostlyclean):
* Makefile.in.in (top-clean):
* Makefile.in.in (top-distclean-noconfig):
* Makefile.in.in (top-distclean):
* Makefile.in.in (top-realclean-noconfig):
* Makefile.in.in (top-extraclean-noconfig):
* Makefile.in.in (TAGS tags):
Ignore errors from rm during clean, to prevent problems trying to
remove lock/CVS.
src/ChangeLog addition:
2005-11-22 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in (mostlyclean):
Ignore errors from rm during clean.
lib-src/ChangeLog addition:
2005-11-22 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
Ignore errors from rm during clean.
lwlib/ChangeLog addition:
2005-11-22 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
Ignore errors from rm during clean.
netinstall/ChangeLog addition:
2005-11-22 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
Ignore errors from rm during clean.
modules/ChangeLog addition:
2005-11-22 Ben Wing <ben(a)xemacs.org>
* common/Makefile.common (mostlyclean):
Ignore errors from rm during clean.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: modules/common/Makefile.common netinstall/Makefile.in.in dynodump/Makefile.in.in lwlib/Makefile.in.in lib-src/Makefile.in.in src/Makefile.in.in Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.in.in
--- Makefile.in.in 2005/11/13 10:39:39 1.27
+++ Makefile.in.in 2005/11/22 06:25:20
＠＠ -531,7 +531,7 ＠＠ FRC.distclean-noconfig FRC.realclean-noc
## target for GCC does not delete `libgcc.a', because recompiling it
## is rarely necessary and takes a lot of time.
top-mostlyclean: FRC.mostlyclean
- $(RM) core
+ -$(RM) core
mostlyclean: top-mostlyclean
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
＠＠ -549,9 +549,9 ＠＠ mostlyclean: top-mostlyclean
## when they don't work right. (beta can't depend on distclean, which
## removes necessary files generated by configure.)
top-clean: FRC.clean
- $(RM) core lisp/auto-autoloads.el* lisp/custom-load.el*
- $(RM) lisp/mule/auto-autoloads.el* lisp/mule/custom-load.el*
- $(RM) modules/auto-autoloads.el* modules/custom-load.el*
+ -$(RM) core lisp/auto-autoloads.el* lisp/custom-load.el*
+ -$(RM) lisp/mule/auto-autoloads.el* lisp/mule/custom-load.el*
+ -$(RM) modules/auto-autoloads.el* modules/custom-load.el*
clean: top-mostlyclean top-clean
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
＠＠ -559,8 +559,8 ＠＠ clean: top-mostlyclean top-clean
## `distclean-noconfig'
## Like `distclean' but don't delete files created by `configure'.
top-distclean-noconfig: FRC.distclean-noconfig
- $(RM) TAGS .sbinit lock/* lisp/finder-inf.el*
- $(RM) -r site-packages xemacs-packages mule-packages site-lisp
+ -$(RM) TAGS .sbinit lock/* lisp/finder-inf.el*
+ -$(RM) -r site-packages xemacs-packages mule-packages site-lisp
distclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
＠＠ -572,9 +572,9 ＠＠ distclean-noconfig: top-mostlyclean top-
## `make distclean' should leave only the files that were in the
## distribution.
top-distclean: FRC.distclean
- $(RM) config.status config.log confdefs.h config-tmp-* build-install Installation
- $(RM) GNUmakefile Makefile Makefile.in
- $(RM) Installation.el Installation.elc
+ -$(RM) config.status config.log confdefs.h config-tmp-* build-install Installation
+ -$(RM) GNUmakefile Makefile Makefile.in
+ -$(RM) Installation.el Installation.elc
distclean: top-mostlyclean top-clean top-distclean-noconfig top-distclean
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
＠＠ -583,7 +583,7 ＠＠ distclean: top-mostlyclean top-clean top
## Delete everything that can be reconstructed by `make'. Don't delete
## anything requiring reconfiguration.
top-realclean-noconfig: FRC.realclean-noconfig
- $(RM) *.elc lisp/*.elc lisp/mule/*.elc lisp/term/*.elc modules/*.elc
+ -$(RM) *.elc lisp/*.elc lisp/mule/*.elc lisp/term/*.elc modules/*.elc
realclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig top-realclean-noconfig
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
＠＠ -609,7 +609,7 ＠＠ realclean: top-mostlyclean top-clean top
## `extraclean-noconfig'
## Like `extraclean' but don't delete anything requiring reconfiguration.
top-extraclean-noconfig: FRC.extraclean-noconfig
- $(RM) *~ \#*
+ -$(RM) *~ \#*
extraclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig top-realclean-noconfig top-extraclean-noconfig
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
＠＠ -658,7 +658,7 ＠＠ PRUNE_VC = -name SCCS -prune -o -name RC
tagslisp = lisp
TAGS tags: FRC.tags
＠echo "If you don't have a copy of etags around, then do 'make lib-src' first."
- $(RM) ${srcdir}/TAGS
+ -$(RM) ${srcdir}/TAGS
＠PATH=`$(pwd)`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \
echo "Using etags from `which etags`."
PATH=`$(pwd)`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
Index: src/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.120
diff -u -p -r1.120 Makefile.in.in
--- src/Makefile.in.in 2005/11/13 10:39:36 1.120
+++ src/Makefile.in.in 2005/11/22 06:25:25
＠＠ -1007,33 +1007,33 ＠＠ covmacs: $(temacs_deps)
.PHONY: mostlyclean clean distclean realclean versionclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
- $(RM) *.o *.i *.rtl *.ln core \
+ -$(RM) *.o *.i *.rtl *.ln core \
temacs puremacs quantmacs covmacs rtcmacs temacs.exe \
sheap-adjust.h dump-id.c $(BLDSRC)/NEEDTODUMP SATISFIED \
$(LIB_SRC)/*.po $(LIB_SRC)/*.mo
versionclean:
- $(RM) $(RAW_EXE) $(DUMP_TARGET) $(LIB_SRC)/DOC
+ -$(RM) $(RAW_EXE) $(DUMP_TARGET) $(LIB_SRC)/DOC
## Remove the generated load files here; they cause lots of problems
## when they don't work right.
clean: mostlyclean versionclean
- $(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \
+ -$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \
$(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \
$(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el*
## This is used in making a distribution.
## Do not use it on development directories!
distclean-noconfig: clean
- $(RM) config.h paths.h Emacs.ad.h $(LISP)/finder-inf.el* \
+ -$(RM) config.h paths.h Emacs.ad.h $(LISP)/finder-inf.el* \
TAGS xemacs.def xemacs.def.in
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
- $(RM) GNUmakefile Makefile Makefile.in
+ -$(RM) GNUmakefile Makefile Makefile.in
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
- $(RM) *~ \#* m/*~ m/\#* s/*~ s/\#*
+ -$(RM) *~ \#* m/*~ m/\#* s/*~ s/\#*
extraclean: realclean
- $(RM) *~ \#* m/*~ m/\#* s/*~ s/\#*
+ -$(RM) *~ \#* m/*~ m/\#* s/*~ s/\#*
###################### Lock, unlock
Index: lib-src/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/Makefile.in.in,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile.in.in
--- lib-src/Makefile.in.in 2005/11/13 10:39:32 1.48
+++ lib-src/Makefile.in.in 2005/11/22 06:25:29
＠＠ -273,21 +273,21 ＠＠ uninstall:
.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
- $(RM) *.o *.i core
+ -$(RM) *.o *.i core
clean: mostlyclean
- $(RM) ${EXES} *.exe
+ -$(RM) ${EXES} *.exe
distclean-noconfig: clean
- $(RM) DOC *.tab.c *.tab.h TAGS ellcc.h blessmail config.values
+ -$(RM) DOC *.tab.c *.tab.h TAGS ellcc.h blessmail config.values
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
- $(RM) GNUmakefile Makefile Makefile.in
+ -$(RM) GNUmakefile Makefile Makefile.in
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
- $(RM) *~ \#*
+ -$(RM) *~ \#*
extraclean: realclean
- $(RM) *~ \#*
+ -$(RM) *~ \#*
## Test the contents of the directory.
check:
Index: lwlib/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Makefile.in.in,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile.in.in
--- lwlib/Makefile.in.in 2005/11/13 10:39:34 1.19
+++ lwlib/Makefile.in.in 2005/11/22 06:25:32
＠＠ -85,20 +85,20 ＠＠ liblw.a: $(objs)
.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
- $(RM) liblw.a liblw_pure_*.a *.o *.i core
+ -$(RM) liblw.a liblw_pure_*.a *.o *.i core
clean: mostlyclean
distclean-noconfig: clean
- $(RM) config.h TAGS
+ -$(RM) config.h TAGS
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
- $(RM) GNUmakefile Makefile Makefile.in
+ -$(RM) GNUmakefile Makefile Makefile.in
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
- $(RM) *~ \#*
+ -$(RM) *~ \#*
extraclean: realclean
- $(RM) *~ \#*
+ -$(RM) *~ \#*
CONFIG_H = ../src/config.h config.h
Index: dynodump/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/dynodump/Makefile.in.in,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.in.in
--- dynodump/Makefile.in.in 2005/11/13 10:39:40 1.13
+++ dynodump/Makefile.in.in 2005/11/22 06:25:37
＠＠ -78,18 +78,18 ＠＠ uninit.o: ${srcdir}/$(ARCH)/uninit.c
.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
- $(RM) *.o *.i core
+ -$(RM) *.o *.i core
clean: mostlyclean
- $(RM) *.so *.so.1
+ -$(RM) *.so *.so.1
distclean-noconfig: clean
- $(RM) TAGS
+ -$(RM) TAGS
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
- $(RM) GNUmakefile Makefile Makefile.in
+ -$(RM) GNUmakefile Makefile Makefile.in
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
- $(RM) *~ \#*
+ -$(RM) *~ \#*
extraclean: realclean
- $(RM) *~ \#*
+ -$(RM) *~ \#*
Index: netinstall/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/Makefile.in.in,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.in.in
--- netinstall/Makefile.in.in 2005/11/13 10:39:31 1.6
+++ netinstall/Makefile.in.in 2005/11/22 06:25:39
＠＠ -202,21 +202,21 ＠＠ inilex.c : inilex.l iniparse.h
.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
- $(RM) *.o *.i *.ini core
+ -$(RM) *.o *.i *.ini core
clean: mostlyclean
- $(RM) $(PROGS)
+ -$(RM) $(PROGS)
distclean-noconfig: clean
- $(RM) TAGS
+ -$(RM) TAGS
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
- $(RM) GNUmakefile Makefile Makefile.in
+ -$(RM) GNUmakefile Makefile Makefile.in
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
- $(RM) *~ \#*
+ -$(RM) *~ \#*
extraclean: realclean
- $(RM) *~ \#*
+ -$(RM) *~ \#*
choose.o: choose.cc win32.h dialog.h resource.h state.h ini.h concat.h \
msg.h log.h find.h reginfo.h
Index: modules/common/Makefile.common
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/common/Makefile.common,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.common
--- modules/common/Makefile.common 2005/11/13 10:39:41 1.11
+++ modules/common/Makefile.common 2005/11/22 06:25:43
＠＠ -81,21 +81,21 ＠＠ $(MODNAME)_i.c: $(SRCS)
.PHONY: mostlyclean clean distclean realclean extraclean
.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
mostlyclean:
- $(RM) $(OBJS) $(MODNAME)_i.* core
+ -$(RM) $(OBJS) $(MODNAME)_i.* core
clean: mostlyclean
- $(RM) $(MODNAME).ell
+ -$(RM) $(MODNAME).ell
distclean-noconfig: clean
- $(RM) config.* TAGS
+ -$(RM) config.* TAGS
## This is used in making a distribution.
## Do not use it on development directories!
distclean: distclean-noconfig
- $(RM) GNUmakefile Makefile Makefile.in configure
+ -$(RM) GNUmakefile Makefile Makefile.in configure
realclean-noconfig: distclean-noconfig
realclean: distclean
extraclean-noconfig: realclean-noconfig
- $(RM) *~ \#*
+ -$(RM) *~ \#*
extraclean: realclean
- $(RM) *~ \#*
+ -$(RM) *~ \#*
install: $(OBJECT_TO_BUILD)
$(INSTALL_PROGRAM) $< $(INSTALLPATH)
- 1 participants
- 0 comments
[C] packages: Add crm.elc to edit-utils/Makefile
18 years, 5 months
Adrian Aichner
Adrian Aichner
COMMIT
Oops, sorry Norbert, forgot this yesterday.
Norbert, adding files at the end seems to be the practice in use?
Let me know if this was not the right thing to do.
I am not adding an entry to MAINTAINERS since we don't have a separate
maintainer for crm.el.
Best regards,
Adrian
packages ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: xemacs-packages/edit-utils/ChangeLog
Index: xemacs-packages/edit-utils/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/ChangeLog,v
retrieving revision 1.211
diff -u -U0 -r1.211 ChangeLog
--- xemacs-packages/edit-utils/ChangeLog 20 Nov 2005 21:36:57 -0000 1.211
+++ xemacs-packages/edit-utils/ChangeLog 21 Nov 2005 07:53:31 -0000
＠＠ -0,0 +1,4 ＠＠
+2005-11-21 Adrian Aichner <adrian(a)xemacs.org>
+
+ * Makefile (ELCS): Add crm.elc.
+
packages source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: xemacs-packages/edit-utils/Makefile
Index: xemacs-packages/edit-utils/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/Makefile,v
retrieving revision 1.141
diff -u -w -r1.141 Makefile
--- xemacs-packages/edit-utils/Makefile 14 Nov 2005 07:25:51 -0000 1.141
+++ xemacs-packages/edit-utils/Makefile 21 Nov 2005 07:53:05 -0000
＠＠ -42,7 +42,7 ＠＠
toolbar-utils.elc tree-menu.elc uniquify.elc where-was-i-db.elc \
winring.elc vertical-mode.elc power-macros.elc \
search-buffers.elc setnu.elc align.elc autorevert.elc allout.elc \
- narrow-stack.elc highline.elc
+ narrow-stack.elc highline.elc crm.elc
EXPLICIT_DOCS = $(PACKAGE).texi tempo.texi
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments
edit-utils/crm.el (completing-read-multiple) in XEmacs
18 years, 5 months
Reiner Steib
Reiner Steib
[ I've suggested to add `crm.el' (completing-read-multiple) which is
available in Emacs 21 and Emacs 22 (CVS[2]) to XEmacs on xemacs-beta.
Please keep <auctex-devel(a)gnu.org> in Cc when replying. ]
>From the discussion on xemacs-beta[1]:
On Sun, Oct 23 2005, Reiner Steib wrote:
> On Sun, Oct 23 2005, Ben Wing wrote:
>> i think this sounds great. probably crm.el should go in edit-utils.
>> does this need to be ported or does it work already under xemacs?
>
> Thank you for your response. I've done some testing with XEmacs
> 21.4.15:
>
> `crm.el' from Emacs 21 (21.3 or 21.4) works without any modifications
> in XEmacs. The version from Emacs 22 (CVS) uses the function
> `minibuffer-prompt-end' (a `diff -w -u' of those versions is
> attached), a built-in function in Emacs 22, not present in XEmacs.
>
> AfAICS, it would be sufficient if you'd include the Emacs 21 version
> of `crm.el' in edit-utils. [My understanding is, that XEmacs users
> (regardless whether they use a recent XEmacs 21.4 or XEmacs 21.5)
> would then just need to upgrade the edit-utils package to get this.
> Please CMIIW.]
>
> It would be great if you could include `crm.el' in the next packages
> updates. TIA.
On Mon, Oct 24 2005, Stephen J. Turnbull wrote:
> If you want to help something to get done a lot faster, you can post
> a full patch (in the case of a new file, either a patch against
> /dev/null or the file as an attachment is OK), with appropriate
> XEmacs-format changelog, to XEmacs Patches
> <xemacs-patches(a)xemacs.org>.
Attached is revision 1.5 [2] from Emacs CVS plus the update of FSF
address (done in revision 1.8 in Emacs CVS). The changes from
revision 1.6 and 1.7 cannot be applied because XEmacs doesn't have
`minibuffer-prompt-end'. I propose to add the attached file to the
edit-utils package as suggested by Ben.
Suggested ChangeLog entry:
--8<---------------cut here---------------start------------->8---
2005-10-26 Reiner Steib <Reiner.Steib(a)gmx.de>
* crm.el: New file. Revison 1.5 of lisp/emacs-lisp/crm.el in
Emacs. Update FSF's address.
--8<---------------cut here---------------end--------------->8---
> An analysis of any extra work needed to make the package compatible
> with both XEmacs 21.4 (preferably tested with the most recent release,
> but that's not absolutely necessary) and XEmacs 21.5 (tested with CVS
> head by preference, or at least the most recent beta release) is very
> helpful. (For example, the information you posted in response to Ben
> in <v9wtk4a86h.fsf(a)marauder.physik.uni-ulm.de> later in this thread is
> excellent.)
I've tested the attached version of `crm.el' with these versions of
XEmacs:
"XEmacs 21.5 (beta18) \"chestnut\" (+CVS-20041021) [Lucid]
(i386-suse-linux, Mule) of Tue Mar 22 2005 on mozart"
"XEmacs 21.4 (patch 15) \"Security Through Obscurity\" [Lucid]
(x86_64-suse-linux, Mule) of Fri Feb 11 2005 on helvede"
Sorry, I didn't download an compile a XEmacs 21.5 or the most recent
beta release. But I think it's quite unlikely that `crm.el' wont work
with current CVS. Maybe people using current XEmacs from CVS and/or
current AUCTeX[3] from CVS could report success or problems. There
are some testing examples at the end of `crm.el'.
Bye, Reiner.
[1] http://thread.gmane.org/xemacs-crm-2005-10-11-a%40marauder.physik.uni-ulm.de
[2] <URL:http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/emacs/emacs/lisp/e...>
[3] `C-c C-m \usepackage RET amsmath RET ...'
If you don't have CVS, you may try...
http://theotp1.physik.uni-ulm.de/~ste/comp/emacs/auctex/snapshots/
--
,,,
(o o)
---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/
- 3 participants
- 3 comments