commit/XEmacs: sperber: Fix breakage caused by previous commit.
9 years, 11 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/6928877dbc26/
Changeset: 6928877dbc26
User: sperber
Date: 2014-10-25 13:59:31+00:00
Summary: Fix breakage caused by previous commit.
2014-10-25 Michael Sperber <mike(a)xemacs.org>
* fontcolor-x.c (x_font_instance_truename):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.h (PRINT_XFT_PATTERN, PRINT_XFT_PATTERN): Don't modify
fontconfig pattern passed in in place.
Affected #: 4 files
diff -r efb76d6d0c1d07c4ff4cb603cf3a6c4efc81e189 -r 6928877dbc26781161b655a841c000d5622079ed src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-25 Michael Sperber <mike(a)xemacs.org>
+
+ * fontcolor-x.c (x_font_instance_truename):
+ * font-mgr.c (Ffc_name_unparse):
+ * font-mgr.h (PRINT_XFT_PATTERN): Don't modify
+ fontconfig pattern passed in in place.
+
2014-10-18 Aidan Kehoe <kehoea(a)parhasard.net>
Some changes to eliminate warnings with Apple clang version 1.7.
diff -r efb76d6d0c1d07c4ff4cb603cf3a6c4efc81e189 -r 6928877dbc26781161b655a841c000d5622079ed src/font-mgr.c
--- a/src/font-mgr.c
+++ b/src/font-mgr.c
@@ -266,9 +266,12 @@
CHECK_FC_PATTERN (pattern);
/* #### Could use multiple values here to extract and return charset? */
- FcPatternDel (XFC_PATTERN_PTR (pattern), FC_CHARSET);
-
- name = FcNameUnparse (XFC_PATTERN_PTR (pattern));
+ {
+ FcPattern* temp = FcPatternDuplicate (XFC_PATTERN_PTR (pattern));
+ FcPatternDel (temp, FC_CHARSET);
+ name = FcNameUnparse (XFC_PATTERN_PTR (pattern));
+ FcPatternDestroy (temp);
+ }
result = build_fcapi_string (name);
xfree (name);
return result;
diff -r efb76d6d0c1d07c4ff4cb603cf3a6c4efc81e189 -r 6928877dbc26781161b655a841c000d5622079ed src/font-mgr.h
--- a/src/font-mgr.h
+++ b/src/font-mgr.h
@@ -145,8 +145,10 @@
do { \
DECLARE_EISTRING (eistrpxft_name); \
Extbyte *name; \
- FcPatternDel(pattern, FC_CHARSET); \
- name = (Extbyte *) FcNameUnparse (pattern); \
+ FcPattern* temp = FcPatternDuplicate (pattern); \
+ FcPatternDel (temp, FC_CHARSET); \
+ name = (Extbyte *) FcNameUnparse (temp); \
+ FcPatternDestroy (temp); \
eicpy_ext(eistrpxft_name, \
name ? name : "FONT WITH NULL NAME", \
Qfc_font_name_encoding); \
diff -r efb76d6d0c1d07c4ff4cb603cf3a6c4efc81e189 -r 6928877dbc26781161b655a841c000d5622079ed src/fontcolor-x.c
--- a/src/fontcolor-x.c
+++ b/src/fontcolor-x.c
@@ -763,8 +763,12 @@
"Xft font present but lacks pattern",
wrap_font_instance(f), Qfont, errb);
}
- FcPatternDel (pattern, FC_CHARSET); /* FcNameUnparse may choke */
- res = FcNameUnparse (pattern);
+ {
+ FcPattern* temp = FcPatternDuplicate (pattern);
+ FcPatternDel (temp, FC_CHARSET); /* FcNameUnparse may choke */
+ res = FcNameUnparse (temp);
+ FcPatternDestroy (temp);
+ }
if (res)
{
FONT_INSTANCE_TRUENAME (f) =
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: 3 new changesets
9 years, 11 months
Bitbucket
3 new commits in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/e34c3557e14e/
Changeset: e34c3557e14e
User: stephen_at_xemacs
Date: 2014-10-19 08:54:46+00:00
Summary: Avoid commands defined in packages in some tests.
Packages may not be available at make check time.
Affected #: 2 files
diff -r ba0ff364bd94973aad604c1ebf39007c47aefef1 -r e34c3557e14efa873d89db3916aad2ecb52c8798 tests/ChangeLog
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-11 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/keymap-tests.el:
+ Avoid commands defined in packages in some tests.
+ Packages may not be available at make check time.
+
2014-07-14 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/extent-tests.el:
diff -r ba0ff364bd94973aad604c1ebf39007c47aefef1 -r e34c3557e14efa873d89db3916aad2ecb52c8798 tests/automated/keymap-tests.el
--- a/tests/automated/keymap-tests.el
+++ b/tests/automated/keymap-tests.el
@@ -31,6 +31,7 @@
help-next-symbol c customize-variable V
find-variable-at-point q
help-mode-quit f find-function-at-point d
+ describe-function-at-point D
describe-function-at-point v
describe-variable-at-point i Info-elisp-ref F
find-function-at-point Q help-mode-bury button2
@@ -63,7 +64,7 @@
view-search-forward N view-buffer m
point-to-register h view-mode-describe \7
digit-argument
- find-function-at-point view-mode-describe)
+ describe-function-at-point view-mode-describe)
by #'cddr
do (define-key parent-map (vector keys) def))
(Assert (eq (key-binding [F]) 'find-function-at-point)
@@ -74,31 +75,31 @@
"checking normal key parent lookup works, \\2")
(Assert (eq (key-binding [|]) 'shell-command-on-region)
"checking normal key parent lookup works, |")
- (define-key map [remap find-function-at-point] #'find-file)
- (Assert (eq (key-binding [F]) 'find-file)
- "checking remapped key lookup works, F")
- (Assert (eq (key-binding [f]) 'find-file)
+ (define-key map [remap describe-function-at-point] #'find-file)
+ (Assert (eq (key-binding [D]) 'find-file)
+ "checking remapped key lookup works, d")
+ (Assert (eq (key-binding [d]) 'find-file)
"checking remapped key lookup works, f")
(Assert (eq (key-binding [\2]) 'digit-argument)
"checking normal key parent lookup works, \\2")
(Assert (eq (key-binding [|]) 'shell-command-on-region)
"checking normal key parent lookup works, |")
- (Assert (eq (key-binding [find-function-at-point]) 'view-mode-describe)
+ (Assert (eq (key-binding [describe-function-at-point]) 'view-mode-describe)
"checking remapped function doesn't affect key name mapping")
(define-key parent-map [remap help-next-symbol] #'find-file)
(Assert (eq (key-binding [tab]) 'find-file)
"checking remapping in parent extends to child")
(Assert (equal (commands-remapped-to 'find-file)
- '(help-next-symbol find-function-at-point))
+ '(help-next-symbol describe-function-at-point))
"checking #'commands-remapped-to is sane")
(Check-Error wrong-type-argument (commands-remapped-to pi))
(Check-Error wrong-type-argument (commands-remapped-to 'find-file pi))
(Check-Error wrong-type-argument (commands-remapped-to 'find-file nil pi))
- (Assert (eq (command-remapping 'find-function-at-point) 'find-file)
+ (Assert (eq (command-remapping 'describe-function-at-point) 'find-file)
"checking #'command-remapping is sane")
(Check-Error wrong-type-argument (command-remapping pi))
- (Check-Error wrong-type-argument (command-remapping 'find-function-at-point
+ (Check-Error wrong-type-argument (command-remapping 'describe-function-at-point
pi))
- (Check-Error wrong-type-argument (command-remapping 'find-function-at-point
+ (Check-Error wrong-type-argument (command-remapping 'describe-function-at-point
nil pi)))
https://bitbucket.org/xemacs/xemacs/commits/21b5725c6a45/
Changeset: 21b5725c6a45
User: stephen_at_xemacs
Date: 2014-10-19 08:54:50+00:00
Summary: Reformat loops for readability and maintainability.
Affected #: 2 files
diff -r e34c3557e14efa873d89db3916aad2ecb52c8798 -r 21b5725c6a451ab519bbe526e930d7bcb8835731 tests/ChangeLog
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-11 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/keymap-tests.el:
+ Reformat loops for readability and maintainability.
+
2014-10-11 Stephen J. Turnbull <stephen(a)xemacs.org>
* automated/keymap-tests.el:
diff -r e34c3557e14efa873d89db3916aad2ecb52c8798 -r 21b5725c6a451ab519bbe526e930d7bcb8835731 tests/automated/keymap-tests.el
--- a/tests/automated/keymap-tests.el
+++ b/tests/automated/keymap-tests.el
@@ -27,43 +27,74 @@
(help-map-copy t)
(minor-mode-map-alist (acons 'help-map-copy map minor-mode-map-alist)))
(set-keymap-parent map parent-map)
- (loop for (keys def) on '((shift tab) help-prev-symbol tab
- help-next-symbol c customize-variable V
- find-variable-at-point q
- help-mode-quit f find-function-at-point d
- describe-function-at-point D
- describe-function-at-point v
- describe-variable-at-point i Info-elisp-ref F
- find-function-at-point Q help-mode-bury button2
- help-mouse-find-source-or-track p
- help-prev-section n help-next-section return
- help-activate-function-or-scroll-up)
+ ;; Take care in choosing commands for these tests! Many of the commands
+ ;; here are defined in packages, which may not be available to make check.
+ (loop for (keys def) on '((shift tab) help-prev-symbol
+ tab help-next-symbol
+ c customize-variable
+ V find-variable-at-point
+ q help-mode-quit
+ f find-function-at-point
+ d describe-function-at-point
+ D describe-function-at-point
+ v describe-variable-at-point
+ i Info-elisp-ref
+ F find-function-at-point
+ Q help-mode-bury
+ button2 help-mouse-find-source-or-track
+ p help-prev-section
+ n help-next-section
+ return help-activate-function-or-scroll-up)
by #'cddr
do (define-key map (vector keys) def))
- (loop for (keys def) on '(u view-scroll-some-lines-down % view-goto-percent
- \2 digit-argument p view-goto-percent \?
- view-search-backward - negative-argument k
- view-scroll-lines-down backspace scroll-down G
- view-last-windowful f scroll-up \5
- digit-argument s view-repeat-search \0
- digit-argument n view-repeat-search = what-line
- \\ view-search-backward delete scroll-down \8
- digit-argument E view-file d
- view-scroll-some-lines-up \3 digit-argument q
- view-quit ! shell-command (control j)
- view-scroll-lines-up (control m)
- view-scroll-lines-up y view-scroll-lines-down
- linefeed view-scroll-lines-up g view-goto-line
- \6 digit-argument t toggle-truncate-lines C
- view-cleanup-backspaces b scroll-down \1
- digit-argument P view-buffer return
- view-scroll-lines-up | shell-command-on-region j
- view-scroll-lines-up \9 digit-argument \'
- register-to-point e view-scroll-lines-up \4
- digit-argument r recenter space scroll-up /
- view-search-forward N view-buffer m
- point-to-register h view-mode-describe \7
- digit-argument
+ (loop for (keys def) on '(u view-scroll-some-lines-down
+ % view-goto-percent
+ \2 digit-argument
+ p view-goto-percent
+ \? view-search-backward
+ - negative-argument
+ k view-scroll-lines-down
+ backspace scroll-down
+ G view-last-windowful
+ f scroll-up
+ \5 digit-argument
+ s view-repeat-search
+ \0 digit-argument
+ n view-repeat-search
+ = what-line
+ \\ view-search-backward
+ delete scroll-down
+ \8 digit-argument
+ E view-file
+ d view-scroll-some-lines-up
+ \3 digit-argument
+ q view-quit
+ ! shell-command
+ (control j) view-scroll-lines-up
+ (control m) view-scroll-lines-up
+ y view-scroll-lines-down
+ linefeed view-scroll-lines-up
+ g view-goto-line
+ \6 digit-argument
+ t toggle-truncate-lines
+ C view-cleanup-backspaces
+ b scroll-down
+ \1 digit-argument
+ P view-buffer
+ return view-scroll-lines-up
+ | shell-command-on-region
+ j view-scroll-lines-up
+ \9 digit-argument
+ \' register-to-point
+ e view-scroll-lines-up
+ \4 digit-argument
+ r recenter
+ space scroll-up
+ / view-search-forward
+ N view-buffer
+ m point-to-register
+ h view-mode-describe
+ \7 digit-argument
describe-function-at-point view-mode-describe)
by #'cddr
do (define-key parent-map (vector keys) def))
https://bitbucket.org/xemacs/xemacs/commits/efb76d6d0c1d/
Changeset: efb76d6d0c1d
User: stephen_at_xemacs
Date: 2014-10-20 07:35:18+00:00
Summary: Trivial merge
Affected #: 2 files
diff -r b3824b7f5627c37e193a69108848ccbd480d6817 -r efb76d6d0c1d07c4ff4cb603cf3a6c4efc81e189 tests/ChangeLog
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,14 @@
+2014-10-11 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/keymap-tests.el:
+ Reformat loops for readability and maintainability.
+
+2014-10-11 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/keymap-tests.el:
+ Avoid commands defined in packages in some tests.
+ Packages may not be available at make check time.
+
2014-07-14 Aidan Kehoe <kehoea(a)parhasard.net>
* automated/extent-tests.el:
diff -r b3824b7f5627c37e193a69108848ccbd480d6817 -r efb76d6d0c1d07c4ff4cb603cf3a6c4efc81e189 tests/automated/keymap-tests.el
--- a/tests/automated/keymap-tests.el
+++ b/tests/automated/keymap-tests.el
@@ -27,43 +27,75 @@
(help-map-copy t)
(minor-mode-map-alist (acons 'help-map-copy map minor-mode-map-alist)))
(set-keymap-parent map parent-map)
- (loop for (keys def) on '((shift tab) help-prev-symbol tab
- help-next-symbol c customize-variable V
- find-variable-at-point q
- help-mode-quit f find-function-at-point d
- describe-function-at-point v
- describe-variable-at-point i Info-elisp-ref F
- find-function-at-point Q help-mode-bury button2
- help-mouse-find-source-or-track p
- help-prev-section n help-next-section return
- help-activate-function-or-scroll-up)
+ ;; Take care in choosing commands for these tests! Many of the commands
+ ;; here are defined in packages, which may not be available to make check.
+ (loop for (keys def) on '((shift tab) help-prev-symbol
+ tab help-next-symbol
+ c customize-variable
+ V find-variable-at-point
+ q help-mode-quit
+ f find-function-at-point
+ d describe-function-at-point
+ D describe-function-at-point
+ v describe-variable-at-point
+ i Info-elisp-ref
+ F find-function-at-point
+ Q help-mode-bury
+ button2 help-mouse-find-source-or-track
+ p help-prev-section
+ n help-next-section
+ return help-activate-function-or-scroll-up)
by #'cddr
do (define-key map (vector keys) def))
- (loop for (keys def) on '(u view-scroll-some-lines-down % view-goto-percent
- \2 digit-argument p view-goto-percent \?
- view-search-backward - negative-argument k
- view-scroll-lines-down backspace scroll-down G
- view-last-windowful f scroll-up \5
- digit-argument s view-repeat-search \0
- digit-argument n view-repeat-search = what-line
- \\ view-search-backward delete scroll-down \8
- digit-argument E view-file d
- view-scroll-some-lines-up \3 digit-argument q
- view-quit ! shell-command (control j)
- view-scroll-lines-up (control m)
- view-scroll-lines-up y view-scroll-lines-down
- linefeed view-scroll-lines-up g view-goto-line
- \6 digit-argument t toggle-truncate-lines C
- view-cleanup-backspaces b scroll-down \1
- digit-argument P view-buffer return
- view-scroll-lines-up | shell-command-on-region j
- view-scroll-lines-up \9 digit-argument \'
- register-to-point e view-scroll-lines-up \4
- digit-argument r recenter space scroll-up /
- view-search-forward N view-buffer m
- point-to-register h view-mode-describe \7
- digit-argument
- find-function-at-point view-mode-describe)
+ (loop for (keys def) on '(u view-scroll-some-lines-down
+ % view-goto-percent
+ \2 digit-argument
+ p view-goto-percent
+ \? view-search-backward
+ - negative-argument
+ k view-scroll-lines-down
+ backspace scroll-down
+ G view-last-windowful
+ f scroll-up
+ \5 digit-argument
+ s view-repeat-search
+ \0 digit-argument
+ n view-repeat-search
+ = what-line
+ \\ view-search-backward
+ delete scroll-down
+ \8 digit-argument
+ E view-file
+ d view-scroll-some-lines-up
+ \3 digit-argument
+ q view-quit
+ ! shell-command
+ (control j) view-scroll-lines-up
+ (control m) view-scroll-lines-up
+ y view-scroll-lines-down
+ linefeed view-scroll-lines-up
+ g view-goto-line
+ \6 digit-argument
+ t toggle-truncate-lines
+ C view-cleanup-backspaces
+ b scroll-down
+ \1 digit-argument
+ P view-buffer
+ return view-scroll-lines-up
+ | shell-command-on-region
+ j view-scroll-lines-up
+ \9 digit-argument
+ \' register-to-point
+ e view-scroll-lines-up
+ \4 digit-argument
+ r recenter
+ space scroll-up
+ / view-search-forward
+ N view-buffer
+ m point-to-register
+ h view-mode-describe
+ \7 digit-argument
+ describe-function-at-point view-mode-describe)
by #'cddr
do (define-key parent-map (vector keys) def))
(Assert (eq (key-binding [F]) 'find-function-at-point)
@@ -74,31 +106,31 @@
"checking normal key parent lookup works, \\2")
(Assert (eq (key-binding [|]) 'shell-command-on-region)
"checking normal key parent lookup works, |")
- (define-key map [remap find-function-at-point] #'find-file)
- (Assert (eq (key-binding [F]) 'find-file)
- "checking remapped key lookup works, F")
- (Assert (eq (key-binding [f]) 'find-file)
+ (define-key map [remap describe-function-at-point] #'find-file)
+ (Assert (eq (key-binding [D]) 'find-file)
+ "checking remapped key lookup works, d")
+ (Assert (eq (key-binding [d]) 'find-file)
"checking remapped key lookup works, f")
(Assert (eq (key-binding [\2]) 'digit-argument)
"checking normal key parent lookup works, \\2")
(Assert (eq (key-binding [|]) 'shell-command-on-region)
"checking normal key parent lookup works, |")
- (Assert (eq (key-binding [find-function-at-point]) 'view-mode-describe)
+ (Assert (eq (key-binding [describe-function-at-point]) 'view-mode-describe)
"checking remapped function doesn't affect key name mapping")
(define-key parent-map [remap help-next-symbol] #'find-file)
(Assert (eq (key-binding [tab]) 'find-file)
"checking remapping in parent extends to child")
(Assert (equal (commands-remapped-to 'find-file)
- '(help-next-symbol find-function-at-point))
+ '(help-next-symbol describe-function-at-point))
"checking #'commands-remapped-to is sane")
(Check-Error wrong-type-argument (commands-remapped-to pi))
(Check-Error wrong-type-argument (commands-remapped-to 'find-file pi))
(Check-Error wrong-type-argument (commands-remapped-to 'find-file nil pi))
- (Assert (eq (command-remapping 'find-function-at-point) 'find-file)
+ (Assert (eq (command-remapping 'describe-function-at-point) 'find-file)
"checking #'command-remapping is sane")
(Check-Error wrong-type-argument (command-remapping pi))
- (Check-Error wrong-type-argument (command-remapping 'find-function-at-point
+ (Check-Error wrong-type-argument (command-remapping 'describe-function-at-point
pi))
- (Check-Error wrong-type-argument (command-remapping 'find-function-at-point
+ (Check-Error wrong-type-argument (command-remapping 'describe-function-at-point
nil pi)))
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
Add xz support to jka-compr
9 years, 11 months
Vin Shelton
xz is not currently one of the compress methods supported by jka-compr.
diff -r 7f5da95927f2 ChangeLog
--- a/ChangeLog Thu May 15 21:06:10 2014 +0200
+++ b/ChangeLog Sun Oct 19 20:40:15 2014 -0400
@@ -1,3 +1,7 @@
+2014-10-19 Vin Shelton <acs(a)xemacs.org>
+
+ * jka-compr.el (jka-compr-compression-info-list): Add xz compression.
+
2014-05-15 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.44 released.
diff -r 7f5da95927f2 jka-compr.el
--- a/jka-compr.el Thu May 15 21:06:10 2014 +0200
+++ b/jka-compr.el Sun Oct 19 20:40:15 2014 -0400
@@ -144,6 +144,10 @@
["\\.gz\\(~\\|\\.~[0-9]+~\\)?\\'"
"zipping" "gzip" ("-c" "-q")
"unzipping" "gzip" ("-c" "-q" "-d")
+ t t]
+ ["\\.xz\\(~\\|\\.~[0-9]+~\\)?\\'"
+ "zipping" "xz" ("-c" "-q")
+ "unzipping" "xz" ("-c" "-q" "-d")
t t])
"List of vectors that describe available compression techniques.
Regards,
Vin
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[C21.5] Some issues with the test suite
9 years, 11 months
Stephen J. Turnbull
COMMIT 21.5
Per Aidan's approval these patches have been committed and pushed.
Stephen J. Turnbull writes:
> 21.5
>
> Aidan Kehoe writes:
>
> > > > keymap-tests.el: 28 tests completed (aborted).
> > >
> > > Due to missing packages.
> >
> > This should work without packages,
>
> I don't know why you would think that. The `find-function' commands
> are all in packages, so they're not commandp unless packages are
> present.
>
> > I’d be interested in the backtrace, but am not going to follow up
> > now.
>
> The attached patch fixes. I don't know whether you had a specific
> reason to use `find-function', though, so I'm not going to commit
> immediately. I probably should have done them in the opposite order,
> but we can sort that later.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[COMMIT] Some changes to eliminate warnings with Apple clang version 1.7.
9 years, 11 months
Aidan Kehoe
This follows up on a thread in February. The precedence of the ternary
operator is higher than that of the comma operator, so Ben’s code was (and is)
correct. With these changes I’m casting an explicit zero to void to quiet the
compiler about unused values, and doing similar things in a couple of other
places. There remains a warning about alloca being #defined to
__builtin_alloca in config.h, because clang #defines __GNUC__. It’s unclear to
me right now what to do about this, it may be best to have HAVE_ALLOCA_H take
priority, since GNU C implementations seem to provide it too.
APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1413665290 -3600
# Sat Oct 18 21:48:10 2014 +0100
# Node ID b3824b7f5627c37e193a69108848ccbd480d6817
# Parent ba0ff364bd94973aad604c1ebf39007c47aefef1
Some changes to eliminate warnings with Apple clang version 1.7.
src/ChangeLog addition:
2014-10-18 Aidan Kehoe <kehoea(a)parhasard.net>
Some changes to eliminate warnings with Apple clang version 1.7.
* cm.c (send_string_to_tty_console):
* doprnt.c (doprnt_2):
* doprnt.c (parse_off_posnum):
* event-stream.c (dribble_out_event):
Cast various calls to Lstream_putc() to void when the result isn't
being used, for the sake of clang.
* lisp.h:
Declare #'replace here too, it's used in event-stream.c.
* lisp.h (ALLOCA):
* lisp.h (MALLOC_OR_ALLOCA):
Cast a couple of zeros in the context of the ternary operator to
void to prevent unused value warnings with clang.
* sysdep.c (child_setup_tty):
* text.h (ASSERT_ASCTEXT_ASCII_LEN):
Use DO_NOTHING in these files to quieten the compiler.
lib-src/ChangeLog addition:
2014-10-18 Aidan Kehoe <kehoea(a)parhasard.net>
* ootags.c (substitute):
Cast the result of strlen to int before comparing it with a signed
value, for the sake of compiler warnings.
diff -r ba0ff364bd94 -r b3824b7f5627 lib-src/ChangeLog
--- a/lib-src/ChangeLog Sat Oct 18 23:21:30 2014 +0900
+++ b/lib-src/ChangeLog Sat Oct 18 21:48:10 2014 +0100
@@ -1,3 +1,9 @@
+2014-10-18 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * ootags.c (substitute):
+ Cast the result of strlen to int before comparing it with a signed
+ value, for the sake of compiler warnings.
+
2013-06-23 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.34 "kale" is released.
diff -r ba0ff364bd94 -r b3824b7f5627 lib-src/ootags.c
--- a/lib-src/ootags.c Sat Oct 18 23:21:30 2014 +0900
+++ b/lib-src/ootags.c Sat Oct 18 21:48:10 2014 +0100
@@ -4869,7 +4869,7 @@
*t++ = *out;
*t = '\0';
- if (DEBUG && (t > result + size || t - result != strlen (result)))
+ if (DEBUG && (t > result + size || t - result != (int) (strlen (result))))
abort ();
return result;
diff -r ba0ff364bd94 -r b3824b7f5627 src/ChangeLog
--- a/src/ChangeLog Sat Oct 18 23:21:30 2014 +0900
+++ b/src/ChangeLog Sat Oct 18 21:48:10 2014 +0100
@@ -1,3 +1,22 @@
+2014-10-18 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ Some changes to eliminate warnings with Apple clang version 1.7.
+ * cm.c (send_string_to_tty_console):
+ * doprnt.c (doprnt_2):
+ * doprnt.c (parse_off_posnum):
+ * event-stream.c (dribble_out_event):
+ Cast various calls to Lstream_putc() to void when the result isn't
+ being used, for the sake of clang.
+ * lisp.h:
+ Declare #'replace here too, it's used in event-stream.c.
+ * lisp.h (ALLOCA):
+ * lisp.h (MALLOC_OR_ALLOCA):
+ Cast a couple of zeros in the context of the ternary operator to
+ void to prevent unused value warnings with clang.
+ * sysdep.c (child_setup_tty):
+ * text.h (ASSERT_ASCTEXT_ASCII_LEN):
+ Use DO_NOTHING in these files to quieten the compiler.
+
2014-10-18 Stephen J. Turnbull <stephen(a)xemacs.org>
* fontcolor-xlike-inc.c (xft_find_charset_font):
diff -r ba0ff364bd94 -r b3824b7f5627 src/cm.c
--- a/src/cm.c Sat Oct 18 23:21:30 2014 +0900
+++ b/src/cm.c Sat Oct 18 21:48:10 2014 +0100
@@ -66,7 +66,7 @@
}
if (len == 1)
- Lstream_putc (lstr, *str);
+ (void) Lstream_putc (lstr, *str);
else if (len > 0)
Lstream_write (lstr, str, len);
}
diff -r ba0ff364bd94 -r b3824b7f5627 src/doprnt.c
--- a/src/doprnt.c Sat Oct 18 23:21:30 2014 +0900
+++ b/src/doprnt.c Sat Oct 18 21:48:10 2014 +0100
@@ -122,7 +122,7 @@
/* Padding at beginning to right-justify ... */
if (!minus_flag)
while (to_add-- > 0)
- Lstream_putc (lstr, zero_flag ? '0' : ' ');
+ (void) Lstream_putc (lstr, zero_flag ? '0' : ' ');
if (0 <= maxlen && maxlen < cclen)
len = charcount_to_bytecount (string, maxlen);
@@ -131,7 +131,7 @@
/* Padding at end to left-justify ... */
if (minus_flag)
while (to_add-- > 0)
- Lstream_putc (lstr, zero_flag ? '0' : ' ');
+ (void) Lstream_putc (lstr, zero_flag ? '0' : ' ');
}
static const Ibyte *
diff -r ba0ff364bd94 -r b3824b7f5627 src/event-stream.c
--- a/src/event-stream.c Sat Oct 18 23:21:30 2014 +0900
+++ b/src/event-stream.c Sat Oct 18 21:48:10 2014 +0100
@@ -4826,9 +4826,9 @@
/* one-char key events are printed with just the key name */
Fprinc (keysym, Vdribble_file);
else if (EQ (keysym, Qreturn))
- Lstream_putc (XLSTREAM (Vdribble_file), '\n');
+ (void) Lstream_putc (XLSTREAM (Vdribble_file), '\n');
else if (EQ (keysym, Qspace))
- Lstream_putc (XLSTREAM (Vdribble_file), ' ');
+ (void) Lstream_putc (XLSTREAM (Vdribble_file), ' ');
else
Fprinc (event, Vdribble_file);
}
diff -r ba0ff364bd94 -r b3824b7f5627 src/lisp.h
--- a/src/lisp.h Sat Oct 18 23:21:30 2014 +0900
+++ b/src/lisp.h Sat Oct 18 21:48:10 2014 +0100
@@ -1363,12 +1363,12 @@
alternative is to force all callers to declare a local temporary if the
expression has side effects -- something easy to forget. */
-#define ALLOCA(size) \
- (REGEX_MALLOC_CHECK (), \
- __temp_alloca_size__ = (size), \
- __temp_alloca_size__ > MAX_ALLOCA_VS_C_ALLOCA ? \
- xemacs_c_alloca (__temp_alloca_size__) : \
- (need_to_check_c_alloca ? xemacs_c_alloca (0) : 0, \
+#define ALLOCA(size) \
+ (REGEX_MALLOC_CHECK (), \
+ __temp_alloca_size__ = (size), \
+ __temp_alloca_size__ > MAX_ALLOCA_VS_C_ALLOCA ? \
+ xemacs_c_alloca (__temp_alloca_size__) : \
+ (need_to_check_c_alloca ? xemacs_c_alloca (0) : (void) 0, \
alloca (__temp_alloca_size__)))
/* Version of ALLOCA() that is guaranteed to work inside of function calls
@@ -1397,12 +1397,12 @@
/* WARNING: If you use this, you must unbind_to() at the end of your
function! */
-#define MALLOC_OR_ALLOCA(size) \
- (REGEX_MALLOC_CHECK (), \
- __temp_alloca_size__ = (size), \
- __temp_alloca_size__ > MAX_ALLOCA_VS_MALLOC ? \
- xmalloc_and_record_unwind (__temp_alloca_size__) : \
- (need_to_check_c_alloca ? xemacs_c_alloca (0) : 0, \
+#define MALLOC_OR_ALLOCA(size) \
+ (REGEX_MALLOC_CHECK (), \
+ __temp_alloca_size__ = (size), \
+ __temp_alloca_size__ > MAX_ALLOCA_VS_MALLOC ? \
+ xmalloc_and_record_unwind (__temp_alloca_size__) : \
+ (need_to_check_c_alloca ? xemacs_c_alloca (0) : (void) 0, \
alloca (__temp_alloca_size__)))
/* -------------- convenience functions for memory allocation ------------- */
@@ -5770,6 +5770,7 @@
/* Defined in sequence.c */
EXFUN (Ffill, MANY);
+EXFUN (Freplace, MANY);
/* Defined in signal.c */
void init_interrupts_late (void);
diff -r ba0ff364bd94 -r b3824b7f5627 src/sysdep.c
--- a/src/sysdep.c Sat Oct 18 23:21:30 2014 +0900
+++ b/src/sysdep.c Sat Oct 18 21:48:10 2014 +0100
@@ -495,9 +495,9 @@
/* <mdiers> What to do upon failure? Just ignoring rc is probably
not acceptable, is it? */
if (cfsetispeed (&s.main, B9600) == -1)
- ; /* ignore */
+ DO_NOTHING; /* ignore */
if (cfsetospeed (&s.main, B9600) == -1)
- ; /* ignore */
+ DO_NOTHING; /* ignore */
#endif /* defined (CBAUD) */
#else /* not HAVE_TERMIO */
diff -r ba0ff364bd94 -r b3824b7f5627 src/text.h
--- a/src/text.h Sat Oct 18 23:21:30 2014 +0900
+++ b/src/text.h Sat Oct 18 21:48:10 2014 +0100
@@ -642,8 +642,8 @@
ASSERT_ASCTEXT_ASCII_LEN (aiaz2, strlen (aiaz2)); \
} while (0)
#else
-#define ASSERT_ASCTEXT_ASCII_LEN(ptr, len)
-#define ASSERT_ASCTEXT_ASCII(ptr)
+#define ASSERT_ASCTEXT_ASCII_LEN(ptr, len) DO_NOTHING
+#define ASSERT_ASCTEXT_ASCII(ptr) DO_NOTHING
#endif
/* -------------------------------------------------------------- */
--
‘Tramadol is further fed to cattle […] when working them […] (as draft
animals) so that the animals do not get tired quickly. …’
— Angewandte Chemie, Sept 2014, describing the social context of
(synthetic) tramadol having been found in Cameroon tree roots.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
Re: [21.5] Some issues with the test suite
9 years, 11 months
Aidan Kehoe
APPROVE 21.5
Ar an t-ochtú lá déag de mí Deireadh Fómhair, scríobh Stephen J. Turnbull:
> 21.5
>
> Aidan Kehoe writes:
>
> > > > keymap-tests.el: 28 tests completed (aborted).
> > >
> > > Due to missing packages.
> >
> > This should work without packages,
>
> I don't know why you would think that. The `find-function' commands
> are all in packages, so they're not commandp unless packages are
> present.
Ah, of course. Your patches are reasonable, I didn’t have a specific reason
to use find-function, I just trawled through the symbols in obarray looking
for appropriate candidates when writing the tests, and it hadn’t clicked
that that function limited to the packages.
--
‘Tramadol is further fed to cattle […] when working them […] (as draft
animals) so that the animals do not get tired quickly. …’
— Angewandte Chemie, Sept 2014, describing the social context of
(synthetic) tramadol having been found in Cameroon tree roots.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: stephen_at_xemacs: Repair invalid GNU-style key-bindings.
9 years, 11 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/ba0ff364bd94/
Changeset: ba0ff364bd94
User: stephen_at_xemacs
Date: 2014-10-18 14:21:30+00:00
Summary: Repair invalid GNU-style key-bindings.
Affected #: 3 files
diff -r 15b0715c204dbcd74eeea5b583111441785bbb6a -r ba0ff364bd94973aad604c1ebf39007c47aefef1 lisp/ChangeLog
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-11 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * mule/korea-util.el (korean-key-bindings):
+ * mule/ethio-util.el (setup-ethiopic-environment-internal):
+ Change invalid GNU-style key definitions to XEmacs format.
+
2014-10-07 Jerry James <james(a)xemacs.org>
* code-process.el (network-stream-get-response):
diff -r 15b0715c204dbcd74eeea5b583111441785bbb6a -r ba0ff364bd94973aad604c1ebf39007c47aefef1 lisp/mule/ethio-util.el
--- a/lisp/mule/ethio-util.el
+++ b/lisp/mule/ethio-util.el
@@ -39,12 +39,14 @@
;;;###autoload
(defun setup-ethiopic-environment-internal ()
(let ((key-bindings '((" " . ethio-insert-space)
- ([?\S- ] . ethio-insert-ethio-space)
- ([?\C-'] . ethio-gemination)
+ ([(shift space)] . ethio-insert-ethio-space)
+ ([(control ?\')] . ethio-gemination)
;; these old bindings conflict
;; with Emacs' binding policy
+ ;; These are GNU-style bindings that fail in XEmacs
+ ;; but I didn't feel like fixing them
;; ([f2] . ethio-toggle-space)
;; ([S-f2] . ethio-replace-space) ; as requested
;; ([f3] . ethio-toggle-punctuation)
@@ -61,17 +63,17 @@
;; this is the rewritten bindings
([f3] . ethio-fidel-to-sera-buffer)
- ([S-f3] . ethio-fidel-to-sera-region)
- ([C-f3] . ethio-fidel-to-sera-mail-or-marker)
+ ([(shift f3)] . ethio-fidel-to-sera-region)
+ ([(control f3)] . ethio-fidel-to-sera-mail-or-marker)
([f4] . ethio-sera-to-fidel-buffer)
- ([S-f4] . ethio-sera-to-fidel-region)
- ([C-f4] . ethio-sera-to-fidel-mail-or-marker)
- ([S-f5] . ethio-toggle-punctuation)
- ([S-f6] . ethio-modify-vowel)
- ([S-f7] . ethio-replace-space)
- ([S-f8] . ethio-input-special-character)
- ([C-f9] . ethio-toggle-space)
- ([S-f9] . ethio-replace-space) ; as requested
+ ([(shift f4)] . ethio-sera-to-fidel-region)
+ ([(control f4)] . ethio-sera-to-fidel-mail-or-marker)
+ ([(shift f5)] . ethio-toggle-punctuation)
+ ([(shift f6)] . ethio-modify-vowel)
+ ([(shift f7)] . ethio-replace-space)
+ ([(shift f8)] . ethio-input-special-character)
+ ([(control f9)] . ethio-toggle-space)
+ ([(shift f9)] . ethio-replace-space) ; as requested
))
kb)
(while key-bindings
diff -r 15b0715c204dbcd74eeea5b583111441785bbb6a -r ba0ff364bd94973aad604c1ebf39007c47aefef1 lisp/mule/korea-util.el
--- a/lisp/mule/korea-util.el
+++ b/lisp/mule/korea-util.el
@@ -97,11 +97,11 @@
;; Information for setting and exiting Korean environment.
(defvar korean-key-bindings
- `((global [?\S- ] toggle-korean-input-method nil)
- (global [C-f9] quail-hangul-switch-symbol-ksc nil)
+ `((global [(shift space)] toggle-korean-input-method nil)
+ (global [(control f9)] quail-hangul-switch-symbol-ksc nil)
(global [f9] quail-hangul-switch-hanja nil)
- (,isearch-mode-map [?\S- ] isearch-toggle-korean-input-method nil)
- (,isearch-mode-map [C-f9] isearch-hangul-switch-symbol-ksc nil)
+ (,isearch-mode-map [(shift space)] isearch-toggle-korean-input-method nil)
+ (,isearch-mode-map [(control f9)] isearch-hangul-switch-symbol-ksc nil)
(,isearch-mode-map [f9] isearch-hangul-switch-hanja nil)))
;;;###autoload
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/xemacs-packages: 3 new changesets
9 years, 11 months
Bitbucket
3 new commits in xemacs-packages:
https://bitbucket.org/xemacs/xemacs-packages/commits/c3a1382ef4f4/
Changeset: c3a1382ef4f4
User: Norbert Koch
Date: 2014-10-18 13:19:47+00:00
Summary: update packages
Affected #: 1 file
diff -r 166fafc44378f62512c06614b572cb7d64f02e43 -r c3a1382ef4f43d8d543f0655f43cccaf4526dca8 .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -17,7 +17,7 @@
3e0a184be3acd281672f1c918d14aedf91caa815 xemacs-packages/c-support
f9bedd372b048eb45be81e9de245052c2dddd47b xemacs-packages/calc
70908a6be1fb833d22b89242287aabafa67adea0 xemacs-packages/calendar
-d642888abd550fb46cb98c83fb8b37a340fc9dc6 xemacs-packages/cc-mode
+3b8ae6d070a74023f7ab1897c5ac79965cb93cb1 xemacs-packages/cc-mode
c0beb9512f2969a7ba4d5acf8b4ae850abe4796b xemacs-packages/cedet-common
7b5eba68be71a29a327c6deedf00c96590a06e94 xemacs-packages/clearcase
a58b300984e8fc66e8309ff4b60d9da09a382057 xemacs-packages/cogre
https://bitbucket.org/xemacs/xemacs-packages/commits/13ba78a8b6b7/
Changeset: 13ba78a8b6b7
User: Norbert Koch
Date: 2014-10-18 13:20:10+00:00
Summary: XEmacs Package Release
Affected #: 1 file
diff -r c3a1382ef4f43d8d543f0655f43cccaf4526dca8 -r 13ba78a8b6b7cc3ba576be7336c441bb47931ac6 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-18 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: cc-mode.
+
2014-10-16 Norbert Koch <viteno(a)xemacs.org>
* Packages released: xemacs-base, edit-utils.
https://bitbucket.org/xemacs/xemacs-packages/commits/511416071418/
Changeset: 511416071418
User: Norbert Koch
Date: 2014-10-18 14:03:30+00:00
Summary: pre-release packages
Affected #: 1 file
diff -r 13ba78a8b6b7cc3ba576be7336c441bb47931ac6 -r 51141607141802cebbc570c83434f847df1ea6f2 .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -17,7 +17,7 @@
3e0a184be3acd281672f1c918d14aedf91caa815 xemacs-packages/c-support
f9bedd372b048eb45be81e9de245052c2dddd47b xemacs-packages/calc
70908a6be1fb833d22b89242287aabafa67adea0 xemacs-packages/calendar
-3b8ae6d070a74023f7ab1897c5ac79965cb93cb1 xemacs-packages/cc-mode
+7afc2ba9a07d8ddab67fd6de7cccd5a1bfdb79fb xemacs-packages/cc-mode
c0beb9512f2969a7ba4d5acf8b4ae850abe4796b xemacs-packages/cedet-common
7b5eba68be71a29a327c6deedf00c96590a06e94 xemacs-packages/clearcase
a58b300984e8fc66e8309ff4b60d9da09a382057 xemacs-packages/cogre
Repository URL: https://bitbucket.org/xemacs/xemacs-packages/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/cc-mode: 2 new changesets
9 years, 11 months
Bitbucket
2 new commits in cc-mode:
https://bitbucket.org/xemacs/cc-mode/commits/d28d2db96776/
Changeset: d28d2db96776
User: Norbert Koch
Date: 2014-10-18 13:20:09+00:00
Summary: XEmacs Package Release 1.81
Affected #: 2 files
diff -r 3b8ae6d070a74023f7ab1897c5ac79965cb93cb1 -r d28d2db96776eec75fb13e0d876377a16652628d ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-18 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.81 released.
+
2014-10-16 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.80 released.
diff -r 3b8ae6d070a74023f7ab1897c5ac79965cb93cb1 -r d28d2db96776eec75fb13e0d876377a16652628d Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.80
+VERSION = 1.81
AUTHOR_VERSION = 5.32.5
MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org>
PACKAGE = cc-mode
https://bitbucket.org/xemacs/cc-mode/commits/7afc2ba9a07d/
Changeset: 7afc2ba9a07d
User: Norbert Koch
Date: 2014-10-18 13:20:09+00:00
Summary: Added tag cc-mode-1_81 for changeset d28d2db96776
Affected #: 1 file
diff -r d28d2db96776eec75fb13e0d876377a16652628d -r 7afc2ba9a07d8ddab67fd6de7cccd5a1bfdb79fb .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -112,3 +112,4 @@
a58213a1783220dd979ab5e7cc9049dbcb79343e cc-mode-1_78
61d8330ff7f1ade9286f5cbbd0dd77d35fa4dfc2 cc-mode-1_79
fa434928fbe85f041fc87933e70a0b79dcf0a6b5 cc-mode-1_80
+d28d2db96776eec75fb13e0d876377a16652628d cc-mode-1_81
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[AC21.5] XFT crash in Ubuntu 14 (FIXED)
9 years, 11 months
Stephen J. Turnbull
APPROVE COMMIT 21.5
This patch has been committed and pushed. The crash is fixed for
Raymond's test case.
Stephen J. Turnbull writes:
> Raymond Toy writes:
> > >>>>> "Raymond" == Raymond Toy <toy.raymond(a)gmail.com> writes:
> > FYI, I built xemacs from current hg sources on a Macbook Pro running
> > 10.9.5. This crash happens there now too.
I discovered by switching debuggers to lldb from gdb that the crash
was occurring in PRINT_XFT_PATTERN. I still don't understand why (gdb
is useless, and I haven't figured out lldb well enough to decode Lisp
objects), so I protected all instances of FcNameUnparse. I think this
is reasonable since the printed representation of an FcCharset is not
really useful to Emacs Lisp programmers.
> (gdb) pp args
> A syntax error in expression, near `) $val'.
I don't understand this; modern XEmacs .gdbinit uses pobj, my mistake.
Why there is a "pp" user command available I don't know.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches