Compile fixes
15 years, 3 months
Dominique Quatravaux
Dear xemacs hackers,
the attached patch applies against the current Mercurial tip
(dd9030354e14). It solves the following compile problems:
* trivial typo in src/console-gtk.c;
* replace IMAGE_INSTANCE_GTK_MASK with IMAGE_INSTANCE_PIXMAP_MASK in
assignments in src/glyphs-gtk.c, because gcc 4.0 doesn't quite like
assigning to a cast lvalue. (This is the same issue as Ubuntu Hardy's
current 20_gcc_4.0.dpatch,
https://launchpad.net/ubuntu/hardy/+source/xemacs21/21.4.21-1ubuntu2).
Please apply.
Note that I use Mercurial too; if you prefer patches sent by "hg
email", please state your preferred options.
Cheers,
--
Dominique Quatravaux
+41 791 609 40 72
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[R21.4] fix at-dot regexp in Mule
15 years, 3 months
Stephen J. Turnbull
RECOMMEND 21.4
Vin,
The test attached was suggested by Julian Bradfield. This test should
be applied in any case.
I believe his fix to regex.c is correct, see
<87hc6rv53v.fsf(a)uwakimon.sk.tsukuba.ac.jp> on xemacs-patches.
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.123
diff -u -r1.290.2.123 ChangeLog
--- src/ChangeLog 8 Oct 2007 01:22:54 -0000 1.290.2.123
+++ src/ChangeLog 1 Nov 2008 15:21:25 -0000
＠＠ -0,0 +1,5 ＠＠
+2008-11-01 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * regex.c (re_search_2): Fix at_dot by changing charpos to bytepos.
+ From Julian Bradfield <18654.1143.304851.782755(a)krk.inf.ed.ac.uk>.
+
Index: tests/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.2.2.48
diff -u -r1.2.2.48 ChangeLog
--- tests/ChangeLog 8 Oct 2007 01:23:15 -0000 1.2.2.48
+++ tests/ChangeLog 1 Nov 2008 15:21:25 -0000
＠＠ -0,0 +1,4 ＠＠
+2008-09-27 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/regexp-tests.el: Add test for at_dot regexp.
+
Index: src/regex.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.25.2.14
diff -u -r1.25.2.14 regex.c
--- src/regex.c 31 Mar 2006 01:29:00 -0000 1.25.2.14
+++ src/regex.c 1 Nov 2008 15:21:25 -0000
＠＠ -4075,7 +4075,7 ＠＠
don't keep searching past point. */
if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == at_dot && range > 0)
{
- range = BUF_PT (regex_emacs_buffer) - BUF_BEGV (regex_emacs_buffer)
+ range = BI_BUF_PT (regex_emacs_buffer) - BI_BUF_BEGV (regex_emacs_buffer)
- startpos;
if (range < 0)
return -1;
Index: tests/automated/regexp-tests.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/regexp-tests.el,v
retrieving revision 1.2.2.10
diff -u -r1.2.2.10 regexp-tests.el
--- tests/automated/regexp-tests.el 2 Feb 2005 03:40:01 -0000 1.2.2.10
+++ tests/automated/regexp-tests.el 1 Nov 2008 15:21:25 -0000
＠＠ -449,3 +449,20 ＠＠
(not (match-beginning 1))))
)
+;; empty string at point
+;; Thanks Julian Bradford on XEmacs Beta
+;; <18652.54975.894512.880956(a)krk.inf.ed.ac.uk>
+(with-string-as-buffer-contents "aáa"
+ (goto-char (point-min))
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 1))
+ (forward-char 1)
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 2))
+ (forward-char 1)
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 3))
+ (forward-char 1)
+ (Assert (looking-at "\\="))
+ (Assert (= (re-search-forward "\\=") 4)))
+
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] fix for off-by-one bug in mule-ccl.c, XEmacs 21.4 and 21.5
15 years, 3 months
Julian Bradfield
The following patch fixes an off-by-one error in the 21.4.21 mule-ccl.c file,
which causes corruption and crashes when a ccl program accesses the
last official 2D charset, namely chinese-cns11643-2.
(This bug has been annoying me for a long time, since I tried to have
cns high in the unicode translation precedence list, but couldn't,
since I got crashes, which I wrongly assumed to be due to bugs in the
code conversion ccl programs. Quite by chance, while trying to track
a quite different problem, I noticed this error; fixing it resolves my
problems with cns.)
This patch should also be applied to the 21.5 source, where the
bug is still present.
--- src/mule-ccl.c-orig 2008-10-25 16:36:30.000000000 +0100
+++ src/mule-ccl.c 2008-10-25 16:19:31.000000000 +0100
＠＠ -1380,7 +1380,7 ＠＠
if (XCHARSET_DIMENSION (CHARSET_BY_LEADING_BYTE (i)) == 1)
i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7)
| (reg[rrr] & 0x7F));
- else if (i < MAX_LEADING_BYTE_OFFICIAL_2)
+ else if (i <= MAX_LEADING_BYTE_OFFICIAL_2)
i = ((i - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14)
| reg[rrr];
else
--
The University of Edinburgh is a charitable body, registered in
Scotland, with registration number SC005336.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Allow compilation under Cygwin 1.7
15 years, 3 months
Vin Shelton
changeset: 4538:112f6ed4429915e2b374be688228895bbfcbc18a
tag: tip
user: acs＠samwise
date: Sat Dec 27 21:23:16 2008 -0500
files: src/ChangeLog src/syswindows.h
description:
Allow compilation under Cygwin 1.7
diff -r 7ca6d57ce12d6c3b7ee6c297ae1122d179277db4 -r 112f6ed4429915e2b374be688228895bbfcbc18a src/ChangeLog
--- a/src/ChangeLog Sat Dec 27 15:30:50 2008 +0000
+++ b/src/ChangeLog Sat Dec 27 21:23:16 2008 -0500
＠＠ -1,3 +1,8 ＠＠ 2008-12-22 Aidan Kehoe <kehoea＠parhasa
+2008-12-27 Vin Shelton <acs(a)xemacs.org>
+
+ * syswindows.h: Don't define wide character interfaces for Cygwin
+ 1.7 and up.
+
2008-12-22 Aidan Kehoe <kehoea(a)parhasard.net>
* symbols.c (Fdefine_function):
diff -r 7ca6d57ce12d6c3b7ee6c297ae1122d179277db4 -r 112f6ed4429915e2b374be688228895bbfcbc18a src/syswindows.h
--- a/src/syswindows.h Sat Dec 27 15:30:50 2008 +0000
+++ b/src/syswindows.h Sat Dec 27 21:23:16 2008 -0500
＠＠ -479,7 +479,7 ＠＠ typedef LPCDLGTEMPLATE LPCDLGTEMPLATEA;
#define BIF_NEWDIALOGSTYLE 64
#endif
-#ifdef CYGWIN
+#if defined (CYGWIN) && (CYGWIN_VERSION_DLL_COMBINED < 190)
/* All but wcscmp and wcslen left out of Cygwin headers -- but present
in /usr/include/mingw/string.h! */
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] Move operator definitions to autoload-operators.el and use them
15 years, 3 months
Vin Shelton
Here's what I cobbled together based on Mike's 21.5 patch. Please
review.
Regards,
Vin
lisp/ChangeLog addition:
2008-12-23 Vin Shelton <acs(a)xemacs.org>
* autoload.el: Move operator definitions to autoload-operators.el
in the xemacs-base package.
21.4 source patch:
Diff command: cvs -q diff -u
Files affected: lisp/autoload.el
Index: lisp/autoload.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/autoload.el,v
retrieving revision 1.5.2.2
diff -a -u -u -r1.5.2.2 autoload.el
--- lisp/autoload.el 2002/08/20 11:34:34 1.5.2.2
+++ lisp/autoload.el 2008/12/24 04:33:04
＠＠ -39,33 +39,100 ＠＠
;;; Code:
+;; Need to load easy-mmode because we expand macro calls to easy-mmode
+;; macros in make-autoloads below.
+(require 'easy-mmode)
+
+; Add operator definitions to autoload-operators.el in the xemacs-base
+; package.
+(eval-when-compile (load "cl-macs"))
+(ignore-errors (require 'autoload-operators))
+
+; As autoload-operators is new, provide stopgap measure for a while.
+(if (not (boundp 'autoload-make-autoload-operators))
+ (progn
+ (defvar autoload-make-autoload-operators
+ '(defun define-skeleton defmacro define-derived-mode define-generic-mode
+ easy-mmode-define-minor-mode easy-mmode-define-global-mode
+ define-minor-mode defun* defmacro*)
+ "`defun'-like operators that use `autoload' to load the library.")
+
+ (defvar autoload-make-autoload-complex-operators
+ '(easy-mmode-define-minor-mode easy-mmode-define-global-mode
+ define-minor-mode)
+ "`defun'-like operators to macroexpand before using `autoload'.")
+
+ (put 'autoload 'doc-string-elt 3)
+ (put 'defun 'doc-string-elt 3)
+ (put 'defun* 'doc-string-elt 3)
+ (put 'defvar 'doc-string-elt 3)
+ (put 'defcustom 'doc-string-elt 3)
+ (put 'defconst 'doc-string-elt 3)
+ (put 'defmacro 'doc-string-elt 3)
+ (put 'defmacro* 'doc-string-elt 3)
+ (put 'defsubst 'doc-string-elt 3)
+ (put 'define-skeleton 'doc-string-elt 2)
+ (put 'define-derived-mode 'doc-string-elt 4)
+ (put 'easy-mmode-define-minor-mode 'doc-string-elt 2)
+ (put 'define-minor-mode 'doc-string-elt 2)
+ (put 'define-generic-mode 'doc-string-elt 7)
+ ;; defin-global-mode has no explicit docstring.
+ (put 'easy-mmode-define-global-mode 'doc-string-elt 1000)))
+
(defun make-autoload (form file)
- "Turn a definition generator FORM into an autoload for source file FILE.
-Returns nil if FORM is not a defun, define-skeleton, define-derived-mode,
-or defmacro."
- (let ((car (car-safe form)))
- (if (memq car '(defun define-skeleton defmacro define-derived-mode))
- (let ((macrop (eq car 'defmacro))
- name doc)
- (setq form (cdr form)
- name (car form)
- ;; Ignore the arguments.
- form (cdr (cond ((eq car 'define-skeleton)
- form)
- ((eq car 'define-derived-mode)
- (cddr form))
- (t
- (cdr form))))
- doc (car form))
- (if (stringp doc)
- (setq form (cdr form))
- (setq doc nil))
- (list 'autoload (list 'quote name) file doc
- (or (eq car 'define-skeleton)
- (eq car 'define-derived-mode)
- (eq (car-safe (car form)) 'interactive))
- (if macrop (list 'quote 'macro) nil)))
- nil)))
+ "Turn FORM into an autoload or defvar for source file FILE.
+Returns nil if FORM is not a special autoload form (i.e. a function definition
+or macro definition or a defcustom)."
+ (let ((car (car-safe form)) expand)
+ (cond
+ ;; For complex cases, try again on the macro-expansion.
+ ((and (memq car autoload-make-autoload-complex-operators)
+ (setq expand (let ((load-file-name file)) (macroexpand form)))
+ (eq (car expand) 'progn)
+ (memq :autoload-end expand))
+ (let ((end (memq :autoload-end expand)))
+ ;; Cut-off anything after the :autoload-end marker.
+ (setcdr end nil)
+ (cons 'progn
+ (mapcar (lambda (form) (make-autoload form file))
+ (cdr expand)))))
+
+ ;; For special function-like operators, use the `autoload' function.
+ ((memq car autoload-make-autoload-operators)
+ (let* ((macrop (memq car '(defmacro defmacro*)))
+ (name (nth 1 form))
+ (body (nthcdr (get car 'doc-string-elt) form))
+ (doc (if (stringp (car body)) (pop body))))
+ ;; `define-generic-mode' quotes the name, so take care of that
+ (list 'autoload (if (listp name) name (list 'quote name)) file doc
+ (or (and (memq car '(define-skeleton define-derived-mode
+ define-generic-mode
+ easy-mmode-define-global-mode
+ easy-mmode-define-minor-mode
+ define-minor-mode)) t)
+ (eq (car-safe (car body)) 'interactive))
+ (if macrop (list 'quote 'macro) nil))))
+
+ ;; Convert defcustom to a simpler (and less space-consuming) defvar,
+ ;; but add some extra stuff if it uses :require.
+ ((eq car 'defcustom)
+ (let ((varname (car-safe (cdr-safe form)))
+ (init (car-safe (cdr-safe (cdr-safe form))))
+ (doc (car-safe (cdr-safe (cdr-safe (cdr-safe form)))))
+ (rest (cdr-safe (cdr-safe (cdr-safe (cdr-safe form))))))
+ (if (not (plist-get rest :require))
+ `(defvar ,varname ,init ,doc)
+ `(progn
+ (defvar ,varname ,init ,doc)
+ (custom-add-to-group ,(plist-get rest :group)
+ ',varname 'custom-variable)
+ (custom-add-load ',varname
+ ,(plist-get rest :require))))))
+ ;; Coding systems. #### Would be nice to handle the docstring here too.
+ ((memq car '(make-coding-system make-8-bit-coding-system))
+ `(autoload-coding-system ,(nth 1 form) '(load ,file)))
+ ;; nil here indicates that this is not a special autoload form.
+ (t nil))))
(defvar generate-autoload-cookie ";;;###autoload"
"Magic comment indicating the following form should be autoloaded.
＠＠ -91,32 +158,6 ＠＠
"String which indicates the end of the section of autoloads for a file.")
(defvar autoload-package-name nil)
-
-;;; Forms which have doc-strings which should be printed specially.
-;;; A doc-string-elt property of ELT says that (nth ELT FORM) is
-;;; the doc-string in FORM.
-;;;
-;;; There used to be the following note here:
-;;; ;;; Note: defconst and defvar should NOT be marked in this way.
-;;; ;;; We don't want to produce defconsts and defvars that
-;;; ;;; make-docfile can grok, because then it would grok them twice,
-;;; ;;; once in foo.el (where they are given with ;;;###autoload) and
-;;; ;;; once in loaddefs.el.
-;;;
-;;; Counter-note: Yes, they should be marked in this way.
-;;; make-docfile only processes those files that are loaded into the
-;;; dumped Emacs, and those files should never have anything
-;;; autoloaded here. The above-feared problem only occurs with files
-;;; which have autoloaded entries *and* are processed by make-docfile;
-;;; there should be no such files.
-
-(put 'autoload 'doc-string-elt 3)
-(put 'defun 'doc-string-elt 3)
-(put 'defvar 'doc-string-elt 3)
-(put 'defconst 'doc-string-elt 3)
-(put 'defmacro 'doc-string-elt 3)
-(put 'define-skeleton 'doc-string-elt 3)
-(put 'define-derived-mode 'doc-string-elt 4)
(defun autoload-trim-file-name (file)
"Returns a relative pathname of FILE including the last directory."
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Re: [PATCH] Move operator definitions to autoload-operators.el and use them
15 years, 3 months
Vin Shelton
Yes, of course. The build worked and the packages I've used are fine. I
don't use semantic or eieio, though.
I've committed the patch. Commit notice to follow soon.
Thanks for the review.
On Dec 27, 2008 7:27 AM, "Michael Sperber" <sperber(a)deinprogramm.de> wrote:
The patch by itself looks good to me.
You might also need this:
hangeset: 4331:6ad202d453cb
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Thu Dec 20 08:49:38 2007 +0100
files: lisp/ChangeLog lisp/autoload.el
description:
Insert <immediate> into section header for immediate autoloads.
... to make the package build work properly. Have you tried a package
build yet?
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: configure, configure.ac: Fixed two typos in args of main: char *v -> char **v
15 years, 3 months
Aidan Kehoe
changeset: 4536:0ed907d0f1e9a1106751a8e192b2f7d9578ec016
user: "Vladimir G. Ivanovic" <vgivanovic(a)comcast.net>
date: Sat Dec 27 15:28:43 2008 +0000
files: ChangeLog configure configure.ac
description:
configure,configure.ac: Fixed two typos in args of main: char *v -> char **v
diff -r 69a1eda3da06721407d3085ed7aabd1112b22173 -r 0ed907d0f1e9a1106751a8e192b2f7d9578ec016 ChangeLog
--- a/ChangeLog Mon Dec 22 14:07:48 2008 +0000
+++ b/ChangeLog Sat Dec 27 15:28:43 2008 +0000
＠＠ -5,6 +5,11 ＠＠ 2008-10-25 Stephen J. Turnbull <stephe
2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
* configure.ac (xemacs_cc_cc_mismatch): Improve g++ detection.
+
+2008-09-17 Vladimir G. Ivanovic <vladimir(a)acm.org>
+
+ * configure: Fixed two typos in args of main: char *v -> char **v
+ * configure.ac: Fixed two typos in args of main: char *v -> char **v
2008-08-03 Mats Lidell <matsl(a)xemacs.org>
diff -r 69a1eda3da06721407d3085ed7aabd1112b22173 -r 0ed907d0f1e9a1106751a8e192b2f7d9578ec016 configure
--- a/configure Mon Dec 22 14:07:48 2008 +0000
+++ b/configure Sat Dec 27 15:28:43 2008 +0000
＠＠ -19012,7 +19012,7 ＠＠ cat >>conftest.$ac_ext <<_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Intrinsic.h>
- int main(int c, char *v) { return c>1 ? XlibSpecificationRelease : 0; }
+ int main(int c, char **v) { return c>1 ? XlibSpecificationRelease : 0; }
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
＠＠ -38857,7 +38857,7 ＠＠ cat confdefs.h >>conftest.$ac_ext
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-int main(int c,char *v){return 0;}
+int main(int c,char **v){return 0;}
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
diff -r 69a1eda3da06721407d3085ed7aabd1112b22173 -r 0ed907d0f1e9a1106751a8e192b2f7d9578ec016 configure.ac
--- a/configure.ac Mon Dec 22 14:07:48 2008 +0000
+++ b/configure.ac Sat Dec 27 15:28:43 2008 +0000
＠＠ -3434,7 +3434,7 ＠＠ dnl Avoid re-AC_DEFINE-ing xmkmf symbols
AC_MSG_CHECKING(the version of X11 being used)
AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/Intrinsic.h>
- int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }])],
+ int main(int c, char **v[]) { return c>1 ? XlibSpecificationRelease : 0; }])],
[./conftest foobar; x11_release=$?],[x11_release=4],[x11_release=4])
AC_MSG_RESULT(R${x11_release})
AC_DEFINE_UNQUOTED(THIS_IS_X11R${x11_release})
＠＠ -5582,7 +5582,7 ＠＠ dnl One of the above link tests may have
dnl One of the above link tests may have succeeded but caused resulting
dnl executables to fail to run. Also any tests using AC_RUN_IFELSE will
dnl have reported incorrect results.
-AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char *v[]){return 0;}])],[:],[
+AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char **v[]){return 0;}])],[:],[
echo ""
echo "*** PANIC *** The C compiler can no longer build working executables."
echo "*** PANIC *** Please examine the tail of config.log for runtime errors."
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
commit: Clarify syntax in configure.ac following Vladimir Ivanovic's change.
15 years, 3 months
Aidan Kehoe
changeset: 4537:7ca6d57ce12d6c3b7ee6c297ae1122d179277db4
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Dec 27 15:30:50 2008 +0000
files: ChangeLog configure.ac
description:
Clarify syntax in configure.ac following Vladimir Ivanovic's change.
2008-12-27 Aidan Kehoe <kehoea(a)parhasard.net>
* configure.ac: Vladimir Ivanovic's change of 2008-09-17 was
effective, but not correct. The original issue was that m4
stripped [], so "char *v[]" in configure.ac became "char *v" in
configure. His change to configure.ac rendered the declaration
"char **v[]", which is effective but confusing; this change
renders it "char **v".
* configure: Regenerate.
diff -r 0ed907d0f1e9a1106751a8e192b2f7d9578ec016 -r 7ca6d57ce12d6c3b7ee6c297ae1122d179277db4 ChangeLog
--- a/ChangeLog Sat Dec 27 15:28:43 2008 +0000
+++ b/ChangeLog Sat Dec 27 15:30:50 2008 +0000
＠＠ -1,3 +1,13 ＠＠ 2008-10-25 Stephen J. Turnbull <stephe
+2008-12-27 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * configure.ac: Vladimir Ivanovic's change of 2008-09-17 was
+ effective, but not correct. The original issue was that m4
+ stripped [], so "char *v[]" in configure.ac became "char *v" in
+ configure. His change to configure.ac rendered the declaration
+ "char **v[]", which is effective but confusing; this change
+ renders it "char **v".
+ * configure: Regenerate.
+
2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
* INSTALL: Give better pointers to package documentation.
diff -r 0ed907d0f1e9a1106751a8e192b2f7d9578ec016 -r 7ca6d57ce12d6c3b7ee6c297ae1122d179277db4 configure.ac
--- a/configure.ac Sat Dec 27 15:28:43 2008 +0000
+++ b/configure.ac Sat Dec 27 15:30:50 2008 +0000
＠＠ -3434,7 +3434,7 ＠＠ dnl Avoid re-AC_DEFINE-ing xmkmf symbols
AC_MSG_CHECKING(the version of X11 being used)
AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/Intrinsic.h>
- int main(int c, char **v[]) { return c>1 ? XlibSpecificationRelease : 0; }])],
+ int main(int c, char **v) { return c>1 ? XlibSpecificationRelease : 0; }])],
[./conftest foobar; x11_release=$?],[x11_release=4],[x11_release=4])
AC_MSG_RESULT(R${x11_release})
AC_DEFINE_UNQUOTED(THIS_IS_X11R${x11_release})
＠＠ -5582,7 +5582,7 ＠＠ dnl One of the above link tests may have
dnl One of the above link tests may have succeeded but caused resulting
dnl executables to fail to run. Also any tests using AC_RUN_IFELSE will
dnl have reported incorrect results.
-AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char **v[]){return 0;}])],[:],[
+AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char **v){return 0;}])],[:],[
echo ""
echo "*** PANIC *** The C compiler can no longer build working executables."
echo "*** PANIC *** Please examine the tail of config.log for runtime errors."
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[PATCH] configure,configure.ac: Fixed two typos in args of main: char *v -> char **v
15 years, 3 months
Vladimir G. Ivanovic
Is this correct format (generated with 'hg diff')?
--- Vladimir
--
Vladimir G. Ivanovic
diff -r 83e35df20028 ChangeLog
--- a/ChangeLog Mon Sep 08 08:48:22 2008 +0200
+++ b/ChangeLog Thu Sep 18 10:14:31 2008 -0700
＠＠ -1,3 +1,8 ＠＠
+2008-09-17 Vladimir G. Ivanovic <vladimir(a)acm.org>
+
+ * configure: Fixed two typos in args of main: char *v -> char **v
+ * configure.ac: Fixed two typos in args of main: char *v -> char **v
+
2008-08-03 Mats Lidell <matsl(a)xemacs.org>
* configure.ac: Fix typo xft_gauge to xft_gauges
diff -r 83e35df20028 configure
--- a/configure Mon Sep 08 08:48:22 2008 +0200
+++ b/configure Thu Sep 18 10:14:31 2008 -0700
＠＠ -19012,7 +19012,7 ＠＠
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Intrinsic.h>
- int main(int c, char *v) { return c>1 ? XlibSpecificationRelease : 0; }
+ int main(int c, char **v) { return c>1 ? XlibSpecificationRelease : 0; }
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
＠＠ -38857,7 +38857,7 ＠＠
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-int main(int c,char *v){return 0;}
+int main(int c,char **v){return 0;}
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
diff -r 83e35df20028 configure.ac
--- a/configure.ac Mon Sep 08 08:48:22 2008 +0200
+++ b/configure.ac Thu Sep 18 10:14:32 2008 -0700
＠＠ -3427,7 +3427,7 ＠＠
AC_MSG_CHECKING(the version of X11 being used)
AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/Intrinsic.h>
- int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }])],
+ int main(int c, char **v[]) { return c>1 ? XlibSpecificationRelease : 0; }])],
[./conftest foobar; x11_release=$?],[x11_release=4],[x11_release=4])
AC_MSG_RESULT(R${x11_release})
AC_DEFINE_UNQUOTED(THIS_IS_X11R${x11_release})
＠＠ -5575,7 +5575,7 ＠＠
dnl One of the above link tests may have succeeded but caused resulting
dnl executables to fail to run. Also any tests using AC_RUN_IFELSE will
dnl have reported incorrect results.
-AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char *v[]){return 0;}])],[:],[
+AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char **v[]){return 0;}])],[:],[
echo ""
echo "*** PANIC *** The C compiler can no longer build working executables."
echo "*** PANIC *** Please examine the tail of config.log for runtime errors."
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Re: [COMMIT] Differentiate between symbol variables and functions, find-func
15 years, 3 months
Aidan Kehoe
Hi Vlad --
Ar an séú lá is fiche de mí na Nollaig, scríobh Vladimir G. Ivanovic:
> I have three questions/issues:
>
> 1. I'm unable to parse the comment:
>
> Call #'symbol-file with two arguments if that is allowing,
> allowing us to differentiate between variables and functions
> with the same symbol name.
>
> Is what's meant "Call #'symbol-file with two arguments, if that is
> allowed, ..."?
Yes--thanks for pointing this out, I hadn’t noticed.
> 2. The construct "#'" is not Emacs Lisp, but a Common Lisp extension.
GNU’s ChangeLog says they incorporated support for it in C in 1995. The
Lucid Emacs 19.0.23 beta, with a NEWS file dating from 19920528,
incorporates it in C. It doesn’t make sense to call it “not Emacs Lisp” in
2008.
> Is the Common Lisp package always, always, always available?
> (Appendix D "Porting Common Lisp" in the Common Lisp Extension info
> file lists an alternative that's pure Emacs Lisp: use a regular
> quote, e.g. "'symbol-file".)
I’m aware of that; that misses the point of the #' construct, though, since
I used it to indicate that I’m interested in the symbol’s associated
function, not its associated variable.
> 3. Since the function 'symbol-file' takes one mandatory argument and
> one optional one, so calling 'symbol-file' with two arguments is
> *always* allowed, so I don't understand the intent of the comment.
Stephen covered that question well--thanks, Stephen!
Season’s greetings,
Aidan
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches