[COMMIT] New error_or_quit_failed_instantiator_in_domain(), reduce *Message-Log* spam.
7 years, 1 month
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1510906935 0
# Fri Nov 17 08:22:15 2017 +0000
# Node ID da34f595fb4e9234454846ec33da1d2c274998c2
# Parent 405c07ae230be01c54b036bab07d0c684f3f15d6
New error_or_quit_failed_instantiator_in_domain(), reduce *Message-Log* spam.
src/ChangeLog addition:
2017-11-17 Aidan Kehoe <kehoea(a)parhasard.net>
* specifier.c (error_or_quit_failed_instantiator_in_domain): New.
The first time instantiation has failed for INSTANTIATOR in
DOMAIN, throw an error. Otherwise, quit. Helpful for stopping an
error message on every redisplay for an invalid instantiator.
* fontcolor.c (color_instantiate): Use it.
* glyphs-eimage.c (jpeg_instantiate): Use it.
* glyphs-x.c (init_image_instance_from_x_image): Use it.
* glyphs-x.c (image_instance_add_x_image): Use it.
* glyphs-x.c (x_xpm_instantiate): Use it.
* glyphs.c (image_instantiate): Use it.
* lisp.h: Declare it.
* specifier.c (vars_of_specifier):
Make the weak alist that the function uses available at dump
time.
diff -r 405c07ae230b -r da34f595fb4e src/ChangeLog
--- a/src/ChangeLog Thu Nov 16 08:53:06 2017 +0000
+++ b/src/ChangeLog Fri Nov 17 08:22:15 2017 +0000
＠＠ -1,3 +1,20 ＠＠
+2017-11-17 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * specifier.c (error_or_quit_failed_instantiator_in_domain): New.
+ The first time instantiation has failed for INSTANTIATOR in
+ DOMAIN, throw an error. Otherwise, quit. Helpful for stopping an
+ error message on every redisplay for an invalid instantiator.
+ * fontcolor.c (color_instantiate): Use it.
+ * glyphs-eimage.c (jpeg_instantiate): Use it.
+ * glyphs-x.c (init_image_instance_from_x_image): Use it.
+ * glyphs-x.c (image_instance_add_x_image): Use it.
+ * glyphs-x.c (x_xpm_instantiate): Use it.
+ * glyphs.c (image_instantiate): Use it.
+ * lisp.h: Declare it.
+ * specifier.c (vars_of_specifier):
+ Make the weak alist that the function uses available at dump
+ time.
+
2017-11-15 Aidan Kehoe <kehoea(a)parhasard.net>
* Makefile.in.in ($(RAW_EXE)):
diff -r 405c07ae230b -r da34f595fb4e src/fontcolor.c
--- a/src/fontcolor.c Thu Nov 16 08:53:06 2017 +0000
+++ b/src/fontcolor.c Fri Nov 17 08:22:15 2017 +0000
＠＠ -639,13 +639,16 ＠＠
if (DEVICE_TTY_P (d))
return Vthe_null_color_instance;
else
- gui_error ("Color instantiator [] only valid on TTY's",
- device);
-
+ error_or_quit_failed_instantiator_in_domain
+ ("Color instantiator [] only valid on TTYs", instantiator,
+ domain);
case 1:
if (NILP (COLOR_SPECIFIER_FACE (XCOLOR_SPECIFIER (specifier))))
- gui_error ("Color specifier not attached to a face",
- instantiator);
+ {
+ error_or_quit_failed_instantiator_in_domain
+ ("Color specifier not attached to a face", instantiator,
+ domain);
+ }
return (FACE_PROPERTY_INSTANCE_1
(Fget_face (XVECTOR_DATA (instantiator)[0]),
COLOR_SPECIFIER_FACE_PROPERTY
＠＠ -667,8 +670,8 ＠＠
if (DEVICE_TTY_P (d))
return Vthe_null_color_instance;
else
- gui_error ("Color instantiator [] only valid on TTY's",
- device);
+ error_or_quit_failed_instantiator_in_domain
+ ("Color instantiator [] only valid on TTYs", instantiator, domain);
}
else
ABORT (); /* The spec validation routines are screwed up. */
diff -r 405c07ae230b -r da34f595fb4e src/glyphs-eimage.c
--- a/src/glyphs-eimage.c Thu Nov 16 08:53:06 2017 +0000
+++ b/src/glyphs-eimage.c Fri Nov 17 08:22:15 2017 +0000
＠＠ -387,15 +387,18 ＠＠
*/
{
- Lisp_Object errstring;
Extbyte buffer[JMSG_LENGTH_MAX];
+ Ibyte *ibuffer;
/* Create the message */
(*cinfo.err->format_message) ((j_common_ptr) &cinfo, buffer);
- errstring = build_extstring (buffer, Qjpeg_error_message_encoding);
- signal_image_error_2 ("JPEG decoding error",
- errstring, instantiator);
+ TO_INTERNAL_FORMAT (C_STRING, buffer, C_STRING_ALLOCA, ibuffer,
+ Qjpeg_error_message_encoding);
+ error_or_quit_failed_instantiator_in_domain ((const Ascbyte *) ibuffer,
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN
+ (ii));
}
}
＠＠ -453,12 +456,23 ＠＠
pixels_sq =
(UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height;
if (pixels_sq > ((size_t) -1) / 3)
- signal_image_error ("JPEG image too large to instantiate", instantiator);
+ {
+ error_or_quit_failed_instantiator_in_domain ("JPEG image too large to"
+ " instantiate",
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN
+ (ii));
+ }
unwind.eimage =
xnew_binbytes (cinfo.output_width * cinfo.output_height * 3);
if (!unwind.eimage)
- signal_image_error("Unable to allocate enough memory for image", instantiator);
-
+ {
+ error_or_quit_failed_instantiator_in_domain ("Unable to allocate "
+ "enough memory for image",
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN
+ (ii));
+ }
{
JSAMPARRAY row_buffer; /* Output row buffer */
JSAMPLE *jp;
diff -r 405c07ae230b -r da34f595fb4e src/glyphs-x.c
--- a/src/glyphs-x.c Thu Nov 16 08:53:06 2017 +0000
+++ b/src/glyphs-x.c Fri Nov 17 08:22:15 2017 +0000
＠＠ -936,13 +936,19 ＠＠
pixmap = XCreatePixmap (dpy, d, ximage->width,
ximage->height, ximage->depth);
if (!pixmap)
- gui_error ("Unable to create pixmap", instantiator);
+ {
+ error_or_quit_failed_instantiator_in_domain ("Unable to create pixmap",
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN (ii));
+ }
gc = XCreateGC (dpy, pixmap, 0, NULL);
if (!gc)
{
XFreePixmap (dpy, pixmap);
- gui_error ("Unable to create GC", instantiator);
+ error_or_quit_failed_instantiator_in_domain ("Unable to create GC",
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN (ii));
}
XPutImage (dpy, pixmap, gc, ximage, 0, 0, 0, 0,
＠＠ -989,13 +995,19 ＠＠
pixmap = XCreatePixmap (dpy, d, ximage->width,
ximage->height, ximage->depth);
if (!pixmap)
- gui_error ("Unable to create pixmap", instantiator);
+ {
+ error_or_quit_failed_instantiator_in_domain ("Unable to create pixmap",
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN (ii));
+ }
gc = XCreateGC (dpy, pixmap, 0, NULL);
if (!gc)
{
XFreePixmap (dpy, pixmap);
- gui_error ("Unable to create GC", instantiator);
+ error_or_quit_failed_instantiator_in_domain ("Unable to create GC",
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN (ii));
}
XPutImage (dpy, pixmap, gc, ximage, 0, 0, 0, 0,
＠＠ -1494,13 +1506,21 ＠＠
if (force_mono)
{
/* second time; blow out. */
- gui_error ("XPM color allocation failed", data);
+ error_or_quit_failed_instantiator_in_domain ("XPM color allocation"
+ " failed",
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN
+ (ii));
}
else
{
/* second time; blow out. */
if (! (dest_mask & IMAGE_MONO_PIXMAP_MASK))
- gui_error ("XPM color allocation failed", data);
+ {
+ error_or_quit_failed_instantiator_in_domain
+ ("XPM color allocation failed", instantiator,
+ IMAGE_INSTANCE_DOMAIN (ii));
+ }
force_mono = 1;
IMAGE_INSTANCE_TYPE (ii) = IMAGE_MONO_PIXMAP;
goto retry;
＠＠ -1513,10 +1533,18 ＠＠
}
default:
{
+ Ascbyte errbuf[sizeof ("Parsing pixmap data: unknown error code: %d")
+ + DECIMAL_PRINT_SIZE (result) + 1];
+
xpm_free (&xpmattrs);
- signal_error_2 (Qgui_error,
- "Parsing pixmap data: unknown error code",
- make_fixnum (result), data);
+
+ emacs_snprintf ((Ibyte *) errbuf, sizeof (errbuf),
+ "Parsing pixmap data: unknown error code: %d",
+ result);
+ error_or_quit_failed_instantiator_in_domain (errbuf,
+ instantiator,
+ IMAGE_INSTANCE_DOMAIN
+ (ii));
}
}
diff -r 405c07ae230b -r da34f595fb4e src/glyphs.c
--- a/src/glyphs.c Thu Nov 16 08:53:06 2017 +0000
+++ b/src/glyphs.c Fri Nov 17 08:22:15 2017 +0000
＠＠ -3422,7 +3422,12 ＠＠
#endif
}
else if (NILP (instance))
- gui_error ("Can't instantiate image (probably cached)", instantiator);
+ {
+ error_or_quit_failed_instantiator_in_domain ("Can't instantiate "
+ "image (probably "
+ "cached)", instantiator,
+ domain);
+ }
/* We found an instance. However, because we are using the glyph
as the hash key instead of the instantiator, the current
diff -r 405c07ae230b -r da34f595fb4e src/lisp.h
--- a/src/lisp.h Thu Nov 16 08:53:06 2017 +0000
+++ b/src/lisp.h Fri Nov 17 08:22:15 2017 +0000
＠＠ -6043,6 +6043,10 ＠＠
extern Lisp_Object Vsynchronous_sounds;
/* Defined in specifier.c */
+DECLARE_DOESNT_RETURN (error_or_quit_failed_instantiator_in_domain
+ (const Ascbyte *, Lisp_Object instantiator,
+ Lisp_Object domain));
+
EXFUN (Fadd_spec_to_specifier, 5);
EXFUN (Fspecifier_spec_list, 4);
diff -r 405c07ae230b -r da34f595fb4e src/specifier.c
--- a/src/specifier.c Thu Nov 16 08:53:06 2017 +0000
+++ b/src/specifier.c Fri Nov 17 08:22:15 2017 +0000
＠＠ -111,7 +111,53 ＠＠
EXFUN (Fspecifier_specs, 4);
EXFUN (Fremove_specifier, 4);
-
+
+static Lisp_Object Vfailed_instantiator_domain_warned_list;
+extern Lisp_Object Vcatch_everything_tag;
+
+/* Give a GUI error that INSTANTIATOR could not be instantiated in DOMAIN. If
+ a corresponding error was already signaled for the same INSTANTIATOR,
+ DOMAIN pair, signal Qquit, which will be silent for the likely wrapping
+ call_trapping_errors(). Without this--when we called gui_error()
+ directly--we would get an error and a backtrace in the message area on each
+ redisplay, which is not practical for getting work done. */
+
+DOESNT_RETURN
+error_or_quit_failed_instantiator_in_domain (const Ascbyte *reason,
+ Lisp_Object instantiator,
+ Lisp_Object domain)
+{
+ Lisp_Object instantiator_domains =
+ assq_no_quit (instantiator,
+ XWEAK_LIST_LIST (Vfailed_instantiator_domain_warned_list));
+ Lisp_Object found_domain = Qnil;
+
+ if (!NILP (instantiator_domains)
+ &&
+ !NILP ((found_domain
+ = memq_no_quit (domain,
+ XWEAK_LIST_LIST (XCDR (instantiator_domains))))))
+ {
+ Fsignal (Qquit, Qnil); /* Not displayed by call_trapping_errors(). */
+ }
+
+ if (NILP (instantiator_domains))
+ {
+ instantiator_domains = make_weak_list (WEAK_LIST_SIMPLE);
+ XWEAK_LIST_LIST (Vfailed_instantiator_domain_warned_list)
+ = Facons (instantiator, instantiator_domains,
+ XWEAK_LIST_LIST (Vfailed_instantiator_domain_warned_list));
+ XWEAK_LIST_LIST (instantiator_domains) = list1 (domain);
+ }
+ else
+ {
+ instantiator_domains = XCDR (instantiator_domains);
+ XWEAK_LIST_LIST (instantiator_domains)
+ = Fcons (domain, XWEAK_LIST_LIST (instantiator_domains));
+ }
+
+ signal_error_2 (Qgui_error, reason, instantiator, domain);
+}
/************************************************************************/
/* Specifier object methods */
＠＠ -3983,4 +4029,7 ＠＠
Vcharset_tag_lists =
make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, Qeq);
staticpro (&Vcharset_tag_lists);
+
+ Vfailed_instantiator_domain_warned_list = make_weak_list (WEAK_LIST_ASSOC);
+ staticpro (&Vfailed_instantiator_domain_warned_list);
}
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Add a missing parenthesis, #'buffers-tab-items
7 years, 1 month
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1510649042 0
# Tue Nov 14 08:44:02 2017 +0000
# Node ID fe1fc53d8443e8952d7eac9a9a1fc39f36f04c2f
# Parent 851f226f20f264da38cd53aad17a5a842f5d984f
Add a missing parenthesis, #'buffers-tab-items
lisp/ChangeLog addition:
2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
* gutter-items.el (buffers-tab-items):
Add a missing parenthesis after Stephen's last change, get things
building again.
diff -r 851f226f20f2 -r fe1fc53d8443 lisp/ChangeLog
--- a/lisp/ChangeLog Tue Nov 14 15:32:16 2017 +0900
+++ b/lisp/ChangeLog Tue Nov 14 08:44:02 2017 +0000
＠＠ -1,3 +1,9 ＠＠
+2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * gutter-items.el (buffers-tab-items):
+ Add a missing parenthesis after Stephen's last change, get things
+ building again.
+
2017-11-14 Stephen J. Turnbull <stephen(a)xemacs.org>
* gutter-items.el (buffers-tab-items):
diff -r 851f226f20f2 -r fe1fc53d8443 lisp/gutter-items.el
--- a/lisp/gutter-items.el Tue Nov 14 15:32:16 2017 +0900
+++ b/lisp/gutter-items.el Tue Nov 14 08:44:02 2017 +0000
＠＠ -298,7 +298,7 ＠＠
tail)
(and (> n 0)
(setf tail (nthcdr n buffers)) ;; Length greater than (1+ n)?
- (setf (cdr tail) nil)))
+ (setf (cdr tail) nil))))
(labels
((build-buffers-tab-internal (buffers)
"Convert BUFFERS to a list of structures used by the tab widget."
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 2 participants
- 1 comments
[COMMIT] Update the list of directories searched by #'x-color-list-internal
7 years, 1 month
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1510822386 0
# Thu Nov 16 08:53:06 2017 +0000
# Node ID 405c07ae230be01c54b036bab07d0c684f3f15d6
# Parent 1f4ff44e16576d064e9f7955ae59ce86428fd635
Update the list of directories searched by #'x-color-list-internal
lisp/ChangeLog addition:
2017-11-16 Aidan Kehoe <kehoea(a)parhasard.net>
* x-faces.el (x-library-search-path):
Update this variable to include share/ subdirectories of all the
potential prefixes, since rgb.txt is usually now in share/X11.
* x-faces.el (x-color-list-internal):
Use #'canoncase, not #'downcase when adding completion for the
lowercase form, avoiding problems with Turkish locales.
diff -r 1f4ff44e1657 -r 405c07ae230b lisp/ChangeLog
--- a/lisp/ChangeLog Wed Nov 15 23:05:39 2017 +0000
+++ b/lisp/ChangeLog Thu Nov 16 08:53:06 2017 +0000
＠＠ -1,3 +1,12 ＠＠
+2017-11-16 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * x-faces.el (x-library-search-path):
+ Update this variable to include share/ subdirectories of all the
+ potential prefixes, since rgb.txt is usually now in share/X11.
+ * x-faces.el (x-color-list-internal):
+ Use #'canoncase, not #'downcase when adding completion for the
+ lowercase form, avoiding problems with Turkish locales.
+
2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/cyrillic.el ("Cyrillic-ISO"):
diff -r 1f4ff44e1657 -r 405c07ae230b lisp/x-faces.el
--- a/lisp/x-faces.el Wed Nov 15 23:05:39 2017 +0000
+++ b/lisp/x-faces.el Thu Nov 16 08:53:06 2017 +0000
＠＠ -575,28 +575,36 ＠＠
;; Ben wanted all of the possibilities from the `configure' script used
;; here, but I think this is way too many. I already trimmed the R4 variants
;; and a few obvious losers from the list. --Stig
-(defvar x-library-search-path '("/usr/X11R6/lib/X11/"
- "/usr/X11R5/lib/X11/"
- "/usr/lib/X11R6/X11/"
- "/usr/lib/X11R5/X11/"
- "/usr/local/X11R6/lib/X11/"
- "/usr/local/X11R5/lib/X11/"
- "/usr/local/lib/X11R6/X11/"
- "/usr/local/lib/X11R5/X11/"
- "/usr/X11/lib/X11/"
- "/usr/lib/X11/"
- "/usr/share/X11/"
- "/usr/local/lib/X11/"
- "/usr/local/share/X11/"
- "/usr/X386/lib/X11/"
- "/usr/x386/lib/X11/"
- "/usr/XFree86/lib/X11/"
- "/usr/unsupported/lib/X11/"
- "/usr/athena/lib/X11/"
- "/usr/local/x11r5/lib/X11/"
- "/usr/lpp/Xamples/lib/X11/"
- "/usr/openwin/lib/X11/"
- "/usr/openwin/share/lib/X11/")
+(defvar x-library-search-path
+ (mapcan #'(lambda (path)
+ (let (search)
+ (list* path (when (setq search (search "/lib/" path))
+ `(,(concat (subseq path 0 search)
+ ;; Newer X11 stores rgb.txt in
+ ;; share/, not lib/.
+ "/share/"
+ (subseq path
+ (+ search
+ (length "/lib/")))))))))
+ '("/usr/X11R6/lib/X11/"
+ "/usr/X11R5/lib/X11/"
+ "/usr/lib/X11R6/X11/"
+ "/usr/lib/X11R5/X11/"
+ "/usr/local/X11R6/lib/X11/"
+ "/usr/local/X11R5/lib/X11/"
+ "/usr/local/lib/X11R6/X11/"
+ "/usr/local/lib/X11R5/X11/"
+ "/usr/X11/lib/X11/"
+ "/usr/lib/X11/"
+ "/usr/local/lib/X11/"
+ "/usr/X386/lib/X11/"
+ "/usr/x386/lib/X11/"
+ "/usr/XFree86/lib/X11/"
+ "/usr/unsupported/lib/X11/"
+ "/usr/athena/lib/X11/"
+ "/usr/local/x11r5/lib/X11/"
+ "/usr/lpp/Xamples/lib/X11/"
+ "/usr/openwin/lib/X11/"))
"Search path used by `x-color-list-internal' to find rgb.txt.")
(defvar x-color-list-internal-cache)
＠＠ -608,6 +616,13 ＠＠
;; strings as the TTY code does, and as expected by r-c-c-t.
;; -- sjt 2007-10-06
+;; Our completion no longer requires a list of lists, a list of strings is
+;; fine, and #'read-color just uses the output of #'color-list, which on X11
+;; becomes the value of the variable
+;; `x-color-list-internal-cache'. #'read-color-completion-table is still
+;; around for compatibility with facemenu.el in the packages, which needs that
+;; approach to be compatible with 21.4. Aidan Kehoe, 20171116.
+
;; This function is probably also used by the GTK platform. Cf.
;; gtk_color_list in src/fontcolor-gtk.c.
(defun x-color-list-internal ()
＠＠ -633,7 +648,7 ＠＠
clist (cons color clist))
;; Ugh. If we want to be able to complete the lowercase form
;; of the color name, we need to add it twice! Yuck.
- (let ((dcase (downcase color)))
+ (let ((dcase (canoncase color)))
(or (string= dcase color)
(push dcase clist)))
(forward-char 1))
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Be more general in checking for ASLR, Linux, Darwin.
7 years, 1 month
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
The heart of every traditionalist is heavy, Catholics eat fish on Friday, the
Anglicans have female priests, and this patch removes the need for a one-line
commit to configure.ac every time there’s a new macOS release. Some of the old
ones:
https://bitbucket.org/xemacs/xemacs/commits/e9f58d024c3ce7ea82f7061ac3ac3...
https://bitbucket.org/xemacs/xemacs/commits/bc51e191aaea4eb05a348806436eb...
https://bitbucket.org/xemacs/xemacs/commits/a58070ee1f31f90bdeb9dea88a9f4...
https://bitbucket.org/xemacs/xemacs/commits/acf69029482524b7228b90e932dff...
https://bitbucket.org/xemacs/xemacs/commits/423c4a0027f1a40c22422b76bdfe3...
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1510787139 0
# Wed Nov 15 23:05:39 2017 +0000
# Node ID 1f4ff44e16576d064e9f7955ae59ce86428fd635
# Parent 1a2f697b59a7e7443133636304f4dd62c5303120
Be more general in checking for ASLR, Linux, Darwin.
ChangeLog addition:
2017-11-15 Aidan Kehoe <kehoea(a)parhasard.net>
* configure: Regenerate.
* configure.ac:
Take a more general approach to checking for ASLR; check for the
technique itself initially, don't just examine the operating
system or the compile-time #defines. Then to work around it try a
list of techniques, using the first one that compiles.
This may bring an end to the XEmacs tradition of a single-line
configure.ac commit every time a new Mac OS version is released.
src/ChangeLog addition:
2017-11-15 Aidan Kehoe <kehoea(a)parhasard.net>
* Makefile.in.in ($(RAW_EXE)):
Place $start_flags after $ldflags in this make target, for that
minority of cases where the user has specified LDFLAGS and,
e.g. -no-pie in $start_flags is necessary to build.
diff -r 1a2f697b59a7 -r 1f4ff44e1657 ChangeLog
--- a/ChangeLog Wed Nov 15 00:44:17 2017 +0000
+++ b/ChangeLog Wed Nov 15 23:05:39 2017 +0000
＠＠ -1,3 +1,15 ＠＠
+2017-11-15 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * configure: Regenerate.
+ * configure.ac:
+ Take a more general approach to checking for ASLR; check for the
+ technique itself initially, don't just examine the operating
+ system or the compile-time #defines. Then to work around it try a
+ list of techniques, using the first one that compiles.
+
+ This may bring an end to the XEmacs tradition of a single-line
+ configure.ac commit every time a new Mac OS version is released.
+
2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
* configure: Regenerate.
diff -r 1a2f697b59a7 -r 1f4ff44e1657 configure
--- a/configure Wed Nov 15 00:44:17 2017 +0000
+++ b/configure Wed Nov 15 23:05:39 2017 +0000
＠＠ -824,7 +824,6 ＠＠
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
＠＠ -1111,7 +1110,6 ＠＠
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
＠＠ -1364,15 +1362,6 ＠＠
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
＠＠ -1510,7 +1499,7 ＠＠
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
＠＠ -1663,7 +1652,6 ＠＠
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
＠＠ -11826,7 +11814,7 ＠＠
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
＠＠ -11872,7 +11860,7 ＠＠
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
＠＠ -11896,7 +11884,7 ＠＠
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
＠＠ -11941,7 +11929,7 ＠＠
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
＠＠ -11965,7 +11953,7 ＠＠
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
＠＠ -12261,14 +12249,7 ＠＠
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ASLR needs to be disabled" >&5
$as_echo_n "checking whether ASLR needs to be disabled... " >&6; }
-case `uname -s`:`uname -r` in
- Darwin:1[123456].*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- start_flags="$start_flags -Wl,-no_pie" && if test "$verbose" = "yes"; then echo " Appending \"-Wl,-no_pie\" to \$start_flags"; fi
- ;;
- *)
- if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
＠＠ -12276,43 +12257,43 ＠＠
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int main () {
-#if defined __GNUC__ && defined __pie__
- return __pie__;
-#else
- return 0;
-#endif
-}
+#include <stdio.h>
+static int test_func(void) { return 42; }
+int main (int c, char **v) { if (--c) { printf ("%p", &test_func); } return 0; }
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- __pie__="$?";
-case "$__pie__" in
- 2)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, disabling -fPIE" >&5
-$as_echo "yes, disabling -fPIE" >&6; }
- start_flags="$start_flags -no-pie" && if test "$verbose" = "yes"; then echo " Appending \"-no-pie\" to \$start_flags"; fi
- ;;
- 1)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, disabling -fpie" >&5
-$as_echo "yes, disabling -fpie" >&6; }
- start_flags="$start_flags -no-pie" && if test "$verbose" = "yes"; then echo " Appending \"-no-pie\" to \$start_flags"; fi
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized __pie__ define $__pie__, attempting to disable ASLR with -no-pie" >&5
-$as_echo "$as_me: WARNING: unrecognized __pie__ define $__pie__, attempting to disable ASLR with -no-pie" >&2;}
- start_flags="$start_flags -no-pie" && if test "$verbose" = "yes"; then echo " Appending \"-no-pie\" to \$start_flags"; fi
- ;;
-esac
+ test_func_address=`./conftest t`
+if test "$test_func_address" = `./conftest t` \
+ -a "$test_func_address" = `./conftest t` \
+ -a "$test_func_address" = `./conftest t` \
+ -a "$test_func_address" = `./conftest t`; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ else
+ for try_no_pie in "-no-pie" "-Wl,-no_pie" "-nopie"; do
+ xe_check_libs="${try_no_pie}"
+ if ac_fn_c_try_link "$LINENO"; then :
+ no_pie="${try_no_pie}"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ xe_check_libs=""
+ if test -n "$no_pie"; then
+ start_flags="$start_flags $no_pie" && if test "$verbose" = "yes"; then echo " Appending \"$no_pie\" to \$start_flags"; fi
+ break;
+ fi
+ done
+ if test -z "$no_pie"; then
+ as_fn_error $? "don't know how to disable ASLR on $ac_cv_build" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, disabling address space layout randomization, xemacs binary" >&5
+$as_echo "yes, disabling address space layout randomization, xemacs binary" >&6; }
+ fi
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
- ;;
-esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specified window system" >&5
diff -r 1a2f697b59a7 -r 1f4ff44e1657 configure.ac
--- a/configure.ac Wed Nov 15 00:44:17 2017 +0000
+++ b/configure.ac Wed Nov 15 23:05:39 2017 +0000
＠＠ -2839,45 +2839,43 ＠＠
fi
fi
-dnl Disable ASLR on systems where it breaks pdump. Use $start_flags for this
-dnl rather than $LDFLAGS, so it's only done for the XEmacs binary, and
+dnl Disable ASLR on systems where it breaks pdump. Use start_flags for this
+dnl rather than LDFLAGS, so it's only done for the XEmacs binary, and
dnl gnuclient, movemail and so on get ASLR if the system defaults to it.
-AC_MSG_CHECKING([whether ASLR needs to be disabled])
-case `uname -s`:`uname -r` in
- dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks,
- dnl 10.10 Yosemite, 10.11 El Capitan, 10.12 Sierra
- Darwin:1[[123456]].*)
- AC_MSG_RESULT(yes)
- XE_APPEND([-Wl,-no_pie], start_flags)
- ;;
- *)
- AC_RUN_IFELSE([AC_LANG_SOURCE([int main () {
-#if defined __GNUC__ && defined __pie__
- return __pie__;
-#else
- return 0;
-#endif
-}])], [AC_MSG_RESULT(no)],
-[__pie__="$?";
-case "$__pie__" in
- 2)
- AC_MSG_RESULT([yes, disabling -fPIE])
- dnl We need to do this after the XE_PROTECT_LINKER_FLAGS() call,
- dnl above. On Debian 9.2 Stretch the linker does not recognise
- dnl -no-pie, it needs to be handled by the GCC invocation.
- XE_APPEND([-no-pie], start_flags)
- ;;
- 1)
- AC_MSG_RESULT([yes, disabling -fpie])
- XE_APPEND([-no-pie], start_flags)
- ;;
- *)
- AC_MSG_WARN([unrecognized __pie__ define $__pie__, attempting to disable ASLR with -no-pie])
- XE_APPEND([-no-pie], start_flags)
- ;;
-esac])
- ;;
-esac
+AC_MSG_CHECKING([whether ASLR needs to be disabled])
+AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
+static int test_func(void) { return 42; }
+int main (int c, char **v) { if (--c) { printf ("%p", &test_func); } return 0; }])],
+[test_func_address=`./conftest t`
+if test "$test_func_address" = `./conftest t` \
+ -a "$test_func_address" = `./conftest t` \
+ -a "$test_func_address" = `./conftest t` \
+ -a "$test_func_address" = `./conftest t`; then
+ dnl If your implementation of ASLR gives the same address for the same
+ dnl function five times in a row within the lifetime of the universe,
+ dnl your implementation of ASLR needs significant revision.
+ dnl (Yes, yes, if someone sat down and ran ./configure a huge number of
+ dnl times on XEmacs code with the intention of making this give the wrong
+ dnl answer, they might manage it, but there is no payoff for doing this.)
+ AC_MSG_RESULT(no)
+ else
+ for try_no_pie in "-no-pie" "-Wl,-no_pie" "-nopie"; do
+ xe_check_libs="${try_no_pie}"
+ AC_LINK_IFELSE([], no_pie="${try_no_pie}")
+ xe_check_libs=""
+ if test -n "$no_pie"; then
+ dnl Don't be tempted to apply XE_PROTECT_LINKER_FLAGS() to this.
+ dnl On Debian 9.2 Stretch the linker does not recognise -no-pie, it
+ dnl needs to be handled by the GCC invocation.
+ XE_APPEND($no_pie, start_flags)
+ break;
+ fi
+ done
+ if test -z "$no_pie"; then
+ AC_MSG_ERROR([don't know how to disable ASLR on $ac_cv_build])
+ fi
+ AC_MSG_RESULT([yes, disabling address space layout randomization, xemacs binary])
+ fi])
dnl ----------------------
dnl Choose a window system
diff -r 1a2f697b59a7 -r 1f4ff44e1657 src/ChangeLog
--- a/src/ChangeLog Wed Nov 15 00:44:17 2017 +0000
+++ b/src/ChangeLog Wed Nov 15 23:05:39 2017 +0000
＠＠ -1,3 +1,10 ＠＠
+2017-11-15 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * Makefile.in.in ($(RAW_EXE)):
+ Place $start_flags after $ldflags in this make target, for that
+ minority of cases where the user has specified LDFLAGS and,
+ e.g. -no-pie in $start_flags is necessary to build.
+
2017-11-15 Aidan Kehoe <kehoea(a)parhasard.net>
* specifier.c (print_specifier):
diff -r 1a2f697b59a7 -r 1f4ff44e1657 src/Makefile.in.in
--- a/src/Makefile.in.in Wed Nov 15 00:44:17 2017 +0000
+++ b/src/Makefile.in.in Wed Nov 15 23:05:39 2017 +0000
＠＠ -544,7 +544,7 ＠＠
#if !defined(PDUMP) || !defined(DUMP_IN_EXEC) || defined(WIN32_NATIVE)
$(RAW_EXE): $(link_deps) $(DUMP_ID)
- $(LD) $(start_flags) $(ldflags) -o $＠ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) $(LIBES)
+ $(LD) $(ldflags) $(start_flags) -o $＠ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) $(LIBES)
#else
$(RAW_EXE): $(link_deps) $(DUMP_ID)
if test -f dump-size ; then \
＠＠ -552,7 +552,7 ＠＠
else \
$(CC) -c $(cflags) -DMAX_SIZE=0 $(SRC)/dump-data.c ;\
fi
- $(LD) $(start_flags) $(ldflags) -o $＠ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) dump-data.o $(LIBES)
+ $(LD) $(ldflags) $(start_flags) -o $＠ $(start_files) $(objs) $(otherobjs) $(DUMP_ID) dump-data.o $(LIBES)
#endif
## (3) Update the .elc's needed for dumping
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Detect and disable ASLR for pdump on Linux as well as on Darwin.
7 years, 1 month
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1510697597 0
# Tue Nov 14 22:13:17 2017 +0000
# Node ID 00726cf7425524d7ad434590c8594ae05ee4eda4
# Parent c9a5d4d11d27e7a49923301f859f1f146b47dda6
Detect and disable ASLR for pdump on Linux as well as on Darwin.
ChangeLog addition:
2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
* configure: Regenerate.
* configure.ac:
Detect and disable ASLR on Linux as well as on Darwin, it doesn't
work with our approach to dumping.
Limit this to the main xemacs binary, not movemail, gnuclient and so
on.
diff -r c9a5d4d11d27 -r 00726cf74255 ChangeLog
--- a/ChangeLog Tue Nov 14 14:44:50 2017 +0000
+++ b/ChangeLog Tue Nov 14 22:13:17 2017 +0000
＠＠ -1,3 +1,12 ＠＠
+2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * configure: Regenerate.
+ * configure.ac:
+ Detect and disable ASLR on Linux as well as on Darwin, it doesn't
+ work with our approach to dumping.
+ Limit this to the main xemacs binary, not movemail, gnuclient and so
+ on.
+
2017-11-07 Aidan Kehoe <kehoea(a)parhasard.net>
* configure.ac (XE_COMPLEX_ARG):
diff -r c9a5d4d11d27 -r 00726cf74255 configure
--- a/configure Tue Nov 14 14:44:50 2017 +0000
+++ b/configure Tue Nov 14 22:13:17 2017 +0000
＠＠ -12265,10 +12265,53 ＠＠
Darwin:1[123456].*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- LDFLAGS="$LDFLAGS -Wl,-no_pie" && if test "$verbose" = "yes"; then echo " Appending \"-Wl,-no_pie\" to \$LDFLAGS"; fi
+ start_flags="$start_flags -Wl,-no_pie" && if test "$verbose" = "yes"; then echo " Appending \"-Wl,-no_pie\" to \$start_flags"; fi
;;
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; } ;;
+ *)
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main () {
+#if defined __GNUC__ && defined __pie__
+ return __pie__;
+#else
+ return 0;
+#endif
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+ __pie__="$?";
+case "$__pie__" in
+ 2)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, disabling -fPIE" >&5
+$as_echo "yes, disabling -fPIE" >&6; }
+ start_flags="$start_flags -no-pie" && if test "$verbose" = "yes"; then echo " Appending \"-no-pie\" to \$start_flags"; fi
+ ;;
+ 1)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, disabling -fpie" >&5
+$as_echo "yes, disabling -fpie" >&6; }
+ start_flags="$start_flags -no-pie" && if test "$verbose" = "yes"; then echo " Appending \"-no-pie\" to \$start_flags"; fi
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized __pie__ define $__pie__, attempting to disable ASLR with -no-pie" >&5
+$as_echo "$as_me: WARNING: unrecognized __pie__ define $__pie__, attempting to disable ASLR with -no-pie" >&2;}
+ start_flags="$start_flags -no-pie" && if test "$verbose" = "yes"; then echo " Appending \"-no-pie\" to \$start_flags"; fi
+ ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ ;;
esac
diff -r c9a5d4d11d27 -r 00726cf74255 configure.ac
--- a/configure.ac Tue Nov 14 14:44:50 2017 +0000
+++ b/configure.ac Tue Nov 14 22:13:17 2017 +0000
＠＠ -2839,16 +2839,44 ＠＠
fi
fi
-dnl Disable ASLR on systems where it breaks pdump.
+dnl Disable ASLR on systems where it breaks pdump. Use $start_flags for this
+dnl rather than $LDFLAGS, so it's only done for the XEmacs binary, and
+dnl gnuclient, movemail and so on get ASLR if the system defaults to it.
AC_MSG_CHECKING([whether ASLR needs to be disabled])
case `uname -s`:`uname -r` in
dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks,
dnl 10.10 Yosemite, 10.11 El Capitan, 10.12 Sierra
Darwin:1[[123456]].*)
AC_MSG_RESULT(yes)
- XE_APPEND([-Wl,-no_pie], LDFLAGS)
+ XE_APPEND([-Wl,-no_pie], start_flags)
;;
- *) AC_MSG_RESULT(no) ;;
+ *)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([int main () {
+#if defined __GNUC__ && defined __pie__
+ return __pie__;
+#else
+ return 0;
+#endif
+}])], [AC_MSG_RESULT(no)],
+[__pie__="$?";
+case "$__pie__" in
+ 2)
+ AC_MSG_RESULT([yes, disabling -fPIE])
+ dnl We need to do this after the XE_PROTECT_LINKER_FLAGS() call,
+ dnl above. On Debian 9.2 Stretch the linker does not recognise
+ dnl -no-pie, it needs to be handled by the GCC invocation.
+ XE_APPEND([-no-pie], start_flags)
+ ;;
+ 1)
+ AC_MSG_RESULT([yes, disabling -fpie])
+ XE_APPEND([-no-pie], start_flags)
+ ;;
+ *)
+ AC_MSG_WARN([unrecognized __pie__ define $__pie__, attempting to disable ASLR with -no-pie])
+ XE_APPEND([-no-pie], start_flags)
+ ;;
+esac])
+ ;;
esac
dnl ----------------------
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[COMMIT] Correct upcase2, downcase2, case-tests.el
7 years, 1 month
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1510669058 0
# Tue Nov 14 14:17:38 2017 +0000
# Node ID e1cbc6ba2a96755e8a1abdf7956dc9eb52583f34
# Parent fe1fc53d8443e8952d7eac9a9a1fc39f36f04c2f
Correct upcase2, downcase2, case-tests.el
tests/ChangeLog addition:
2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/case-tests.el (downcase1):
One more tweak to get the case table sanity check working.
diff -r fe1fc53d8443 -r e1cbc6ba2a96 tests/ChangeLog
--- a/tests/ChangeLog Tue Nov 14 08:44:02 2017 +0000
+++ b/tests/ChangeLog Tue Nov 14 14:17:38 2017 +0000
＠＠ -1,3 +1,8 ＠＠
+2017-11-14 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * automated/case-tests.el (downcase1):
+ One more tweak to get the case table sanity check working.
+
2017-11-13 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/case-tests.el:
diff -r fe1fc53d8443 -r e1cbc6ba2a96 tests/automated/case-tests.el
--- a/tests/automated/case-tests.el Tue Nov 14 08:44:02 2017 +0000
+++ b/tests/automated/case-tests.el Tue Nov 14 14:17:38 2017 +0000
＠＠ -105,7 +105,7 ＠＠
üýþßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ")
(upcase2
(format "¡¢£¤¥¦§¨©ª«¬®¯°±²³´%c¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛ\
-ÜÝÜ%cÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ÷ØÙÚÛÜÝÞ%c"
+ÜÝÞ%cÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ÷ØÙÚÛÜÝÞ%c"
(or (decode-char 'ucs #x039c) ?\u00b5)
(or (decode-char 'ucs #x1e9e) ?\u00df)
(or (decode-char 'ucs #x0178) ?\u00ff)))
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
- 1 participants
- 0 comments
[AC 21.5] Fix a few typos in comments
7 years, 1 month
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
I'm suspicious of the computation of most-postive-fixnum (see last
hunk). I don't think it's relevant on any real architecture we deal
with, though.
# HG changeset patch
# Parent d58b1c68ec10a5f5c29361ec82f9376a4073662d
Fix typos in comments.
diff -r d58b1c68ec10 src/alloc.c
--- a/src/alloc.c Tue Nov 14 14:14:25 2017 +0900
+++ b/src/alloc.c Tue Nov 14 14:25:45 2017 +0900
＠＠ -3499,7 +3499,7 ＠＠
/* Build a string whose content is a translatable message, and translate
the message according to the current language environment.
String must be pure-ASCII, and when compiled with error-checking,
- an abort will have if not pure-ASCII. */
+ an abort will happen if not pure-ASCII. */
Lisp_Object
build_msg_ascstring (const Ascbyte *str)
diff -r d58b1c68ec10 src/lisp.h
--- a/src/lisp.h Tue Nov 14 14:14:25 2017 +0900
+++ b/src/lisp.h Tue Nov 14 14:25:45 2017 +0900
＠＠ -1040,7 +1040,7 ＠＠
DECLARE_BAD_INTCLASS_ARITH_COMPARE (bytecl, Membpos) \
DECLARE_BAD_INTCLASS_ARITH_COMPARE (bytecl, Memxpos)
-/* Declare the "bad" or disallowed arithmetic and comparion operations
+/* Declare the "bad" or disallowed arithmetic and comparison operations
between class BYTECL (a mem class) and various non-mem classes.
Meant to go inside the private section of class GOOD. */
＠＠ -1798,6 +1798,7 ＠＠
#define FIXNUM_VALBITS (BITS_PER_EMACS_INT - FIXNUM_GCBITS)
#define VALBITS (BITS_PER_EMACS_INT - GCBITS)
+/* #### Does this actually work? EMACS_INT might be "long long"! */
#define MOST_POSITIVE_FIXNUM_UNSIGNED ((1UL << (FIXNUM_VALBITS - 1)) -1UL)
#define MOST_POSITIVE_FIXNUM ((EMACS_INT) MOST_POSITIVE_FIXNUM_UNSIGNED)
#define MOST_NEGATIVE_FIXNUM (-(MOST_POSITIVE_FIXNUM) - 1)
- 2 participants
- 1 comments
[AC 21.5] Improve docstring of #'save-current-buffer
7 years, 1 month
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
# HG changeset patch
# Parent 266b49192d351d854866fc29569e5d55d563e489
Improve docstring of #'save-current-buffer.
diff -r 266b49192d35 src/ChangeLog
--- a/src/ChangeLog Tue Nov 14 15:25:17 2017 +0900
+++ b/src/ChangeLog Tue Nov 14 15:32:16 2017 +0900
＠＠ -3010,6 +3010,10 ＠＠
Small bugfix, recognise that a trailing sign excludes a symbol
from potentially having number syntax.
+2016-01-19 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * editfns.c (Fsave_current_buffer): Improve docstring.
+
2015-06-22 Michael Sperber <mike(a)xemacs.org>
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR): Use
diff -r 266b49192d35 src/editfns.c
--- a/src/editfns.c Tue Nov 14 15:25:17 2017 +0900
+++ b/src/editfns.c Tue Nov 14 15:32:16 2017 +0900
＠＠ -394,7 +394,7 ＠＠
DEFUN ("save-current-buffer", Fsave_current_buffer, 0, UNEVALLED, 0, /*
Save the current buffer; execute BODY; restore the current buffer.
-Executes BODY just like `progn'.
+Returns value of last expression of BODY, like `progn'.
arguments: (&rest BODY)
*/
- 1 participants
- 0 comments
[AC 21.5] Fix itemize markup in lispref/faces.texi
7 years, 1 month
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
# HG changeset patch
# Parent a9091c0055178eb4580366fb3afc912e3d7f5ba5
Fix ＠itemize group.
diff -r a9091c005517 man/ChangeLog
--- a/man/ChangeLog Tue Nov 14 14:25:45 2017 +0900
+++ b/man/ChangeLog Tue Nov 14 15:25:17 2017 +0900
＠＠ -1,3 +1,7 ＠＠
+2017-11-14 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * lispref/faces.texi (Face Properties): Add items to itemize.
+
2017-04-19 Aidan Kehoe <kehoea(a)parhasard.net>
* lispref/buffers.texi (Buffer Names):
diff -r a9091c005517 man/lispref/faces.texi
--- a/man/lispref/faces.texi Tue Nov 14 14:25:45 2017 +0900
+++ b/man/lispref/faces.texi Tue Nov 14 15:25:17 2017 +0900
＠＠ -218,16 +218,19 ＠＠
to this property can be supplied in many different ways:
＠itemize ＠bullet
+＠item
If ＠var{value} is a simple instantiator (e.g. a string naming a font or
color) or a list of instantiators, then the instantiator(s) will be
added as a specification of the property for the given ＠var{locale}
(which defaults to ＠code{global} if omitted).
+＠item
If ＠var{value} is a list of specifications (each of which is a cons of a
locale and a list of instantiators), then ＠var{locale} must be
＠code{nil} (it does not make sense to explicitly specify a locale in
this case), and specifications will be added as given.
+＠item
If ＠var{value} is a specifier (as would be returned by
＠code{face-property} if no ＠var{locale} argument is given), then some or
all of the specifications in the specifier will be added to the
- 1 participants
- 0 comments
[AC 21.5] Sort buffers tabs before shortening list
7 years, 1 month
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
# HG changeset patch
# Parent eec2a31de9d67f78b606314136ed13abb364046d
Sort buffers list before truncating.
diff -r eec2a31de9d6 lisp/ChangeLog
--- a/lisp/ChangeLog Sat Apr 22 00:23:36 2017 +0100
+++ b/lisp/ChangeLog Tue Nov 14 14:02:31 2017 +0900
＠＠ -156,6 +156,11 ＠＠
* subr.el (safe-length): New. Moved here from data.c, there's no
indication to have this in C.
+2017-01-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * gutter-items.el (buffers-tab-items):
+ Sort list before shortening, clarify logic, remove comment.
+
2017-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
* subr.el (with-output-to-string):
diff -r eec2a31de9d6 lisp/gutter-items.el
--- a/lisp/gutter-items.el Sat Apr 22 00:23:36 2017 +0100
+++ b/lisp/gutter-items.el Tue Nov 14 14:02:31 2017 +0900
＠＠ -261,7 +261,7 ＠＠
;; context buffer before they get run.
(let* ((buffers (delete-if
buffers-tab-omit-function (buffer-list frame)))
- (first-buf (car buffers)) tail)
+ (first-buf (car buffers)))
;; maybe force the selected window
(when (and force-selection
(not in-deletion)
＠＠ -282,16 +282,16 ＠＠
buffers-tab-filter-functions)
(list buffer)))
buffers)))
- ;; maybe shorten list of buffers
- (let ((n (1-
- ;; Error on non-number, non-nil buffers-tab-max-size
- (or buffers-tab-max-size most-positive-fixnum))))
- (and (> n 0)
- (setf tail (nthcdr n buffers)) ;; Length greater than (1+ n)?
- (setf (cdr tail) nil)))
;; sort buffers in group (default is most-recently-selected)
(when buffers-tab-sort-function
(setq buffers (funcall buffers-tab-sort-function buffers)))
+ ;; maybe shorten list of buffers
+ (when (fixnump buffers-tab-max-size)
+ (let ((n (1- buffers-tab-max-size))
+ tail)
+ (and (> n 0)
+ (setf tail (nthcdr n buffers)) ;; Length greater than (1+ n)?
+ (setf (cdr tail) nil)))
(labels
((build-buffers-tab-internal (buffers)
"Convert BUFFERS to a list of structures used by the tab widget."
- 1 participants
- 0 comments