CVS update by viteno xemacs ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/11/24 23:51:26
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1354 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1353
retrieving revision 1.1354
diff -u -p -r1.1353 -r1.1354
--- version.sh 2005/11/23 22:50:51 1.1353
+++ version.sh 2005/11/24 22:51:25 1.1354
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051123)"
+xemacs_extra_name="(+CVS-20051124)"
xemacs_release_date="2005-10-26"
- 1 participants
- 0 comments
CVS update by malcolmp xemacs/lib-src ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: malcolmp
Date: 05/11/24 13:38:00
Modified: xemacs/lib-src ChangeLog etags.c
Log:
etags.c: Update to author version 17.15.
Revision Changes Path
1.200 +4 -0 XEmacs/xemacs/lib-src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- ChangeLog 2005/11/22 07:14:41 1.199
+++ ChangeLog 2005/11/24 12:37:59 1.200
＠＠ -1,3 +1,7 ＠＠
+2005-11-22 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * etags.c: Update to author version 17.15.
+
2005-11-22 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
1.34 +28 -25 XEmacs/xemacs/lib-src/etags.c
Index: etags.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- etags.c 2005/02/03 18:09:26 1.33
+++ etags.c 2005/11/24 12:37:59 1.34
＠＠ -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 ＠＠ static bool need_filebuf; /* some regexe
#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 ＠＠ static struct option longopts[] =
{ "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 ＠＠ static struct option longopts[] =
{ "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 ＠＠ linked with GNU getopt.");
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 ＠＠ Relative ones are stored relative to the
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 ＠＠ main (argc, argv)
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 ＠＠ main (argc, argv)
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 ＠＠ main (argc, argv)
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 ＠＠ main (argc, argv)
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 ＠＠ main (argc, argv)
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 ＠＠ main (argc, argv)
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;
}
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/11/23 23:50:51
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1353 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1352
retrieving revision 1.1353
diff -u -p -r1.1352 -r1.1353
--- version.sh 2005/11/22 22:51:18 1.1352
+++ version.sh 2005/11/23 22:50:51 1.1353
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051122)"
+xemacs_extra_name="(+CVS-20051123)"
xemacs_release_date="2005-10-26"
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/11/22 23:51:18
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1352 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1351
retrieving revision 1.1352
diff -u -p -r1.1351 -r1.1352
--- version.sh 2005/11/21 22:51:03 1.1351
+++ version.sh 2005/11/22 22:51:18 1.1352
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051121)"
+xemacs_extra_name="(+CVS-20051122)"
xemacs_release_date="2005-10-26"
- 1 participants
- 0 comments
CVS update by malcolmp xemacs/src, gtk-xemacs.c ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: malcolmp
Date: 05/11/22 12:24:55
Modified: xemacs/src ChangeLog frame-gtk.c glyphs-gtk.c glyphs-gtk.h
gtk-xemacs.c redisplay-gtk.c
Log:
Fix compilation errors and warnings in GTK code that have appeared over the
last few months.
Revision Changes Path
1.891 +11 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -p -r1.890 -r1.891
--- ChangeLog 2005/11/22 10:36:34 1.890
+++ ChangeLog 2005/11/22 11:24:40 1.891
＠＠ -1,3 +1,14 ＠＠
+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.
+
2005-11-22 Stephen J. Turnbull <stephen(a)xemacs.org>
* keymap.c (Fdefine_key): More focused docstring.
1.21 +1 -1 XEmacs/xemacs/src/frame-gtk.c
Index: frame-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-gtk.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- frame-gtk.c 2005/01/24 23:33:56 1.20
+++ frame-gtk.c 2005/11/22 11:24:44 1.21
＠＠ -265,7 +265,7 ＠＠ gtk_frame_property (struct frame *f, Lis
}
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)
1.32 +9 -8 XEmacs/xemacs/src/glyphs-gtk.c
Index: glyphs-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- glyphs-gtk.c 2005/09/27 05:48:26 1.31
+++ glyphs-gtk.c 2005/11/22 11:24:44 1.32
＠＠ -686,8 +686,8 ＠＠ image_instance_convert_to_pointer (Lisp_
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 ＠＠ gtk_xpm_instantiate (Lisp_Object image_i
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 ＠＠ gtk_xpm_instantiate (Lisp_Object image_i
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;
1.4 +1 -1 XEmacs/xemacs/src/glyphs-gtk.h
Index: glyphs-gtk.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- glyphs-gtk.h 2004/05/15 07:43:09 1.3
+++ glyphs-gtk.h 2005/11/22 11:24:45 1.4
＠＠ -86,7 +86,7 ＠＠ void init_image_instance_from_gdk_pixmap
(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)
1.15 +2 -0 XEmacs/xemacs/src/gtk-xemacs.c
Index: gtk-xemacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gtk-xemacs.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gtk-xemacs.c 2004/10/16 13:08:58 1.14
+++ gtk-xemacs.c 2005/11/22 11:24:45 1.15
＠＠ -410,6 +410,8 ＠＠ gtk_xemacs_expose (GtkWidget *widget, Gd
redisplay_redraw_exposed_area (f, a->x, a->y, a->width, a->height);
return (TRUE);
}
+
+ return FALSE;
}
Lisp_Object
1.18 +1 -1 XEmacs/xemacs/src/redisplay-gtk.c
Index: redisplay-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-gtk.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- redisplay-gtk.c 2005/01/24 23:34:06 1.17
+++ redisplay-gtk.c 2005/11/22 11:24:45 1.18
＠＠ -1176,7 +1176,7 ＠＠ gtk_output_pixmap (struct window *w,
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);
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/11/22 11:36:47
Modified: xemacs/src ChangeLog keymap.c
Log:
Improve define-key docstring. <87oe4dhvvq.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.890 +4 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -p -r1.889 -r1.890
--- ChangeLog 2005/11/22 09:02:37 1.889
+++ ChangeLog 2005/11/22 10:36:34 1.890
＠＠ -1,3 +1,7 ＠＠
+2005-11-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * keymap.c (Fdefine_key): More focused docstring.
+
2005-11-20 Marcus Crestani <crestani(a)xemacs.org>
* lisp.h: Add default_object_printer prototype.
1.60 +83 -71 XEmacs/xemacs/src/keymap.c
Index: keymap.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- keymap.c 2005/10/25 11:16:25 1.59
+++ keymap.c 2005/11/22 10:36:39 1.60
＠＠ -1331,7 +1331,7 ＠＠ define_key_check_and_coerce_keysym (Lisp
#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 ＠＠ ensure_meta_prefix_char_keymapp (Lisp_Ob
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 ＠＠ DEF is anything that can be a key's defi
(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 ＠＠ it is possible to redefine only one of t
(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 ＠＠ what's in `function-key-map' and `key-tr
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));
- 1 participants
- 0 comments
CVS update by crestani xemacs/src ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: crestani
Date: 05/11/22 10:02:48
Modified: xemacs/src ChangeLog lisp.h print.c toolbar.c
Log:
* 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.
Revision Changes Path
1.889 +8 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -p -r1.888 -r1.889
--- ChangeLog 2005/11/22 07:19:31 1.888
+++ ChangeLog 2005/11/22 09:02:37 1.889
＠＠ -1,3 +1,11 ＠＠
+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.
+
2005-11-22 Ben Wing <ben(a)xemacs.org>
* mule-coding.c (FROB):
1.134 +1 -0 XEmacs/xemacs/src/lisp.h
Index: lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- lisp.h 2005/11/13 10:48:03 1.133
+++ lisp.h 2005/11/22 09:02:42 1.134
＠＠ -4744,6 +4744,7 ＠＠ EXFUN (Fprint, 2);
/* 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);
1.58 +2 -2 XEmacs/xemacs/src/print.c
Index: print.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/print.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- print.c 2005/11/13 10:48:03 1.57
+++ print.c 2005/11/22 09:02:43 1.58
＠＠ -1449,7 +1449,7 ＠＠ print_string (Lisp_Object obj, Lisp_Obje
UNGCPRO;
}
-static void
+void
default_object_printer (Lisp_Object obj, Lisp_Object printcharfun,
int UNUSED (escapeflag))
{
＠＠ -1749,7 +1749,7 ＠＠ print_internal (Lisp_Object obj, Lisp_Ob
((LHEADER_IMPLEMENTATION (lheader)->printer)
(obj, printcharfun, escapeflag));
else
- default_object_printer (obj, printcharfun, escapeflag);
+ internal_object_printer (obj, printcharfun, escapeflag);
break;
}
1.38 +3 -1 XEmacs/xemacs/src/toolbar.c
Index: toolbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- toolbar.c 2005/10/25 11:16:28 1.37
+++ toolbar.c 2005/11/22 09:02:43 1.38
＠＠ -90,7 +90,9 ＠＠ mark_toolbar_button (Lisp_Object obj)
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);
- 1 participants
- 0 comments
CVS update by ben xemacs/src ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/11/22 08:19:35
Modified: xemacs/src ChangeLog mule-coding.c
Log:
fix crash printing iso2022 coding systems
mule-coding.c: Fix crashes printing ISO2022 coding systems.
Revision Changes Path
1.888 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.887
retrieving revision 1.888
diff -u -p -r1.887 -r1.888
--- ChangeLog 2005/11/22 07:14:43 1.887
+++ ChangeLog 2005/11/22 07:19:31 1.888
＠＠ -1,5 +1,10 ＠＠
2005-11-22 Ben Wing <ben(a)xemacs.org>
+ * mule-coding.c (FROB):
+ Fix crashes printing ISO2022 coding systems.
+
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
* Makefile.in.in (mostlyclean):
Ignore errors from rm during clean.
1.36 +4 -4 XEmacs/xemacs/src/mule-coding.c
Index: mule-coding.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-coding.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- mule-coding.c 2005/06/19 21:08:31 1.35
+++ mule-coding.c 2005/11/22 07:19:32 1.36
＠＠ -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
CVS update by ben xemacs/modules/common ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/11/22 08:14:55
Modified: xemacs/modules/common Makefile.common
Log:
fix problems building with CVS dirs
dynodump/Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean, to prevent problems trying to
remove lock/CVS.
Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean.
common/Makefile.common: Ignore errors from rm during clean.
Revision Changes Path
1.52 +5 -0 XEmacs/xemacs/modules/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ChangeLog 2005/11/16 07:14:13 1.51
+++ ChangeLog 2005/11/22 07:14:37 1.52
＠＠ -1,3 +1,8 ＠＠
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * common/Makefile.common (mostlyclean):
+ Ignore errors from rm during clean.
+
2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org>
* canna/canna_api.c: Small fixes to Mule-ization patch.
1.40 +5 -0 XEmacs/xemacs/netinstall/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ChangeLog 2005/11/13 10:39:31 1.39
+++ ChangeLog 2005/11/22 07:14:39 1.40
＠＠ -1,3 +1,8 ＠＠
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Ignore errors from rm during clean.
+
2005-11-13 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
1.7 +6 -6 XEmacs/xemacs/netinstall/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/Makefile.in.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- Makefile.in.in 2005/11/13 10:39:31 1.6
+++ Makefile.in.in 2005/11/22 07:14:39 1.7
＠＠ -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
1.75 +5 -0 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- ChangeLog 2005/11/16 07:22:42 1.74
+++ ChangeLog 2005/11/22 07:14:40 1.75
＠＠ -1,3 +1,8 ＠＠
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Ignore errors from rm during clean.
+
2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org>
* xlwcheckbox.c (CheckboxInit): Mark unused parameters. C++
1.20 +5 -5 XEmacs/xemacs/lwlib/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Makefile.in.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- Makefile.in.in 2005/11/13 10:39:34 1.19
+++ Makefile.in.in 2005/11/22 07:14:40 1.20
＠＠ -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
1.199 +5 -0 XEmacs/xemacs/lib-src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- ChangeLog 2005/11/13 10:39:32 1.198
+++ ChangeLog 2005/11/22 07:14:41 1.199
＠＠ -1,3 +1,8 ＠＠
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Ignore errors from rm during clean.
+
2005-11-13 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
1.49 +6 -6 XEmacs/xemacs/lib-src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/Makefile.in.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- Makefile.in.in 2005/11/13 10:39:32 1.48
+++ Makefile.in.in 2005/11/22 07:14:42 1.49
＠＠ -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:
1.887 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.886
retrieving revision 1.887
diff -u -p -r1.886 -r1.887
--- ChangeLog 2005/11/18 12:23:55 1.886
+++ ChangeLog 2005/11/22 07:14:43 1.887
＠＠ -1,3 +1,8 ＠＠
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in (mostlyclean):
+ Ignore errors from rm during clean.
+
2005-11-18 Aidan Kehoe <kehoea(a)parhasard.net>
* window.c (change_window_height): Have change_window_height
1.121 +7 -7 XEmacs/xemacs/src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- Makefile.in.in 2005/11/13 10:39:36 1.120
+++ Makefile.in.in 2005/11/22 07:14:44 1.121
＠＠ -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
1.472 +17 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -p -r1.471 -r1.472
--- ChangeLog 2005/11/16 12:12:57 1.471
+++ ChangeLog 2005/11/22 07:14:47 1.472
＠＠ -1,3 +1,20 ＠＠
+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.
+
2005-11-08 Malcolm Purvis <malcolmp(a)xemacs.org>
* Makefile.in.in: Install PROBLEMS into .../etc
1.29 +13 -13 XEmacs/xemacs/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Makefile.in.in 2005/11/16 12:12:57 1.28
+++ Makefile.in.in 2005/11/22 07:14:48 1.29
＠＠ -534,7 +534,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
＠＠ -552,10 +552,10 ＠＠ 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) etc/PROBLEMS
+ -$(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) etc/PROBLEMS
clean: top-mostlyclean top-clean
for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done
＠＠ -563,8 +563,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
＠＠ -576,9 +576,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
＠＠ -587,7 +587,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
＠＠ -613,7 +613,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
＠＠ -662,7 +662,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} && \
1.14 +6 -6 XEmacs/xemacs/dynodump/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/dynodump/Makefile.in.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Makefile.in.in 2005/11/13 10:39:40 1.13
+++ Makefile.in.in 2005/11/22 07:14:50 1.14
＠＠ -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) *~ \#*
1.12 +6 -6 XEmacs/xemacs/modules/common/Makefile.common
Index: Makefile.common
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/common/Makefile.common,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- Makefile.common 2005/11/13 10:39:41 1.11
+++ Makefile.common 2005/11/22 07:14:54 1.12
＠＠ -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
CVS update by viteno xemacs ...
18 years, 5 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/11/21 23:51:04
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1351 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1350
retrieving revision 1.1351
diff -u -p -r1.1350 -r1.1351
--- version.sh 2005/11/20 22:51:04 1.1350
+++ version.sh 2005/11/21 22:51:03 1.1351
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051120)"
+xemacs_extra_name="(+CVS-20051121)"
xemacs_release_date="2005-10-26"
- 1 participants
- 0 comments