[PATCH 21.5] Fix dangerous strcpy
18 years, 5 months
Jerry James
Jerry James
PATCH 21.5
Here is how I would like to fix the dangerous strcpy we discussed
recently on xemacs-beta. The solution is to make the target area
precisely the right size to hold the copied string.
Is there seriously no Xlib function whatsoever to tell you if the server
is local or remote? Really?
src/ChangeLog addition:
2006-07-07 Jerry James <james(a)xemacs.org>
* sound.c (init_native_sound): Make the target of a strcpy be
exactly the right size to hold the copied string.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/sound.c
Index: src/sound.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.c,v
retrieving revision 1.26
diff -d -u -r1.26 sound.c
--- src/sound.c 2006/03/27 17:40:59 1.26
+++ src/sound.c 2006/07/07 20:44:16
＠＠ -640,7 +640,7 ＠＠
DEVICE_ON_CONSOLE_P (d) = 0;
else
{
- Extbyte hn [255];
+ Extbyte *hn = alloca_array (Extbyte, strlen (h->h_name) + 1);
struct hostent *l;
strcpy (hn, h->h_name);
l = gethostbyname (localname);
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 1 comments
[PATCH 21.5] config.values.in update
18 years, 5 months
Jerry James
Jerry James
PATCH 21.5
It looks like Mike Sperber's November patch in
<y9ld5koei1b.fsf(a)informatik.uni-tuebingen.de> necessitates an update to
lib-src/config.values.in. Here's the update.
lib-src/ChangeLog addition:
2006-07-07 Jerry James <james(a)xemacs.org>
* config.values.in: Regenerate.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: lib-src/config.values.in
Index: lib-src/config.values.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/config.values.in,v
retrieving revision 1.24
diff -d -u -r1.24 config.values.in
--- lib-src/config.values.in 2005/03/11 11:20:00 1.24
+++ lib-src/config.values.in 2006/07/07 20:15:13
＠＠ -25,6 +25,8 ＠＠
DEFS "＠DEFS＠"
DOCDIR "＠DOCDIR＠"
DOCDIR_USER_DEFINED "＠DOCDIR_USER_DEFINED＠"
+EARLY_PACKAGE_DIRECTORIES "＠EARLY_PACKAGE_DIRECTORIES＠"
+EARLY_PACKAGE_DIRECTORIES_USER_DEFINED "＠EARLY_PACKAGE_DIRECTORIES_USER_DEFINED＠"
ECHO_C "＠ECHO_C＠"
ECHO_N "＠ECHO_N＠"
ECHO_T "＠ECHO_T＠"
＠＠ -45,6 +47,10 ＠＠
INSTALL_DATA "＠INSTALL_DATA＠"
INSTALL_PROGRAM "＠INSTALL_PROGRAM＠"
INSTALL_SCRIPT "＠INSTALL_SCRIPT＠"
+LAST_PACKAGE_DIRECTORIES "＠LAST_PACKAGE_DIRECTORIES＠"
+LAST_PACKAGE_DIRECTORIES_USER_DEFINED "＠LAST_PACKAGE_DIRECTORIES_USER_DEFINED＠"
+LATE_PACKAGE_DIRECTORIES "＠LATE_PACKAGE_DIRECTORIES＠"
+LATE_PACKAGE_DIRECTORIES_USER_DEFINED "＠LATE_PACKAGE_DIRECTORIES_USER_DEFINED＠"
LDFLAGS "＠LDFLAGS＠"
LIBOBJS "＠LIBOBJS＠"
LIBS "＠LIBS＠"
＠＠ -110,6 +116,7 ＠＠
c_switch_all "＠c_switch_all＠"
c_switch_general "＠c_switch_general＠"
c_switch_window_system "＠c_switch_window_system＠"
+canna_libs "＠canna_libs＠"
configuration "＠configuration＠"
configure_input "＠configure_input＠"
datadir "＠datadir＠"
＠＠ -121,6 +128,7 ＠＠
dnd_objs "＠dnd_objs＠"
docdir "＠docdir＠"
dynodump_arch "＠dynodump_arch＠"
+early_packages "＠early_packages＠"
etcdir "＠etcdir＠"
exec_prefix "＠exec_prefix＠"
extra_includes "＠extra_includes＠"
＠＠ -134,6 +142,8 ＠＠
inststaticdir "＠inststaticdir＠"
instvardir "＠instvardir＠"
internal_makefile_list "＠internal_makefile_list＠"
+last_packages "＠last_packages＠"
+late_packages "＠late_packages＠"
ld "＠ld＠"
ld_dynamic_link_flags "＠ld_dynamic_link_flags＠"
ld_libs_all "＠ld_libs_all＠"
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 1 comments
[COMMIT] Prefer source-directory to source-root; fix find-func for 21.4
18 years, 5 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
xemacs-packages/xemacs-devel/ChangeLog addition:
2006-07-10 Aidan Kehoe <kehoea(a)parhasard.net>
* find-func.el (find-function-C-source-directory):
Prefer source-directory to source-root, check that the
corresponding variables exist before using them--fixes an error on
21.4.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/xemacs-devel/find-func.el
Index: xemacs-packages/xemacs-devel/find-func.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el,v
retrieving revision 1.9
diff -u -u -r1.9 find-func.el
--- xemacs-packages/xemacs-devel/find-func.el 2006/07/07 21:22:29 1.9
+++ xemacs-packages/xemacs-devel/find-func.el 2006/07/10 20:57:15
＠＠ -162,9 +162,14 ＠＠
;; GNU and is here.
(defvar find-function-C-source-directory
- ;; XEmacs change ; source-directory -> source-root
- (let ((dir (expand-file-name "src" source-root)))
- (when (and (file-directory-p dir) (file-readable-p dir))
+ ;; XEmacs change ; check source-root too, which was available for a couple
+ ;; of years in 21.5.
+ (let (dir)
+ (when (and (setq dir (or (and (boundp 'source-directory)
+ (expand-file-name "src" source-directory))
+ (and (boundp 'source-root)
+ (expand-file-name "src" source-root))))
+ (file-directory-p dir) (file-readable-p dir))
dir))
"Directory where the C source files of XEmacs can be found.
If nil, do not try to find the source code of functions and variables
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[PATCH] Use source-root, not build-root, in symbol-file. Document them.
18 years, 5 months
Aidan Kehoe
Aidan Kehoe
I did a mapatoms to find an appropriate variable by its value when handling
built-in functions in symbol-file; I didn’t quite get back then that
build-root and source-root reflect the corresponding configure settings.
lisp/ChangeLog addition:
2006-07-05 Aidan Kehoe <kehoea(a)parhasard.net>
* loadhist.el (symbol-file):
Use source-root, not build-root when constructing the path of
symbol's C source file.
* loadup.el (build-root):
* loadup.el (source-root):
Document both variables.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/loadup.el lisp/loadhist.el
Index: lisp/loadhist.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/loadhist.el,v
retrieving revision 1.7
diff -u -r1.7 loadhist.el
--- lisp/loadhist.el 2006/04/29 16:15:26 1.7
+++ lisp/loadhist.el 2006/07/05 10:35:07
＠＠ -49,7 +49,7 ＠＠
(and (fboundp sym) (subrp (symbol-function sym))))
(let ((built-in-file (built-in-symbol-file sym)))
(if built-in-file
- (concat build-root "/src/" built-in-file))))))
+ (concat source-root "/src/" built-in-file))))))
(defun feature-symbols (feature)
"Return the file and list of symbols associated with a given FEATURE."
Index: lisp/loadup.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/loadup.el,v
retrieving revision 1.31
diff -u -r1.31 loadup.el
--- lisp/loadup.el 2004/12/27 12:25:14 1.31
+++ lisp/loadup.el 2006/07/05 10:35:07
＠＠ -55,10 +55,20 ＠＠
(defvar Installation-string nil
"Description of XEmacs installation.")
-(defvar build-root (expand-file-name ".." invocation-directory))
+(defvar build-root (expand-file-name ".." invocation-directory)
+ "Where XEmacs object files and executables are written during the build.
+This will differ from `source-root' if `configure' was run in a different
+directory to the source code, something autoconf supports and the GCC people
+recomment for their project. ")
+
(defvar source-lisp (file-name-directory (expand-file-name
(nth 2 command-line-args))))
-(defvar source-root (expand-file-name ".." source-lisp))
+
+(defvar source-root (expand-file-name ".." source-lisp)
+ "Where the XEmacs source code is stored during the build.
+Used during loadup, and used `symbol-file' when giving the file a built-in
+symbol is defined in. ")
+
;(defvar build-lib-src (expand-file-name "lib-src" build-root))
;(start-profiling)
--
Santa Maradona, priez pour moi!
- 2 participants
- 2 comments
[COMMIT] Fix the Mule build failure, add some comments.
18 years, 5 months
Aidan Kehoe
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
src/ChangeLog addition:
2006-07-08 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.h:
* redisplay.c (add_octal_runes):
* syntax.h:
* text.c
Change some comments to reflect a 21-bit character space.
* text.c (non_ascii_valid_ichar_p):
Check that no character value is greater than 2^^21, not
2^^19. This fixes the Mule build when error-checking is turned on.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/text.c src/syntax.h src/redisplay.c src/lisp.h
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.142
diff -u -u -r1.142 lisp.h
--- src/lisp.h 2006/05/06 08:09:36 1.142
+++ src/lisp.h 2006/07/08 16:13:33
＠＠ -399,7 +399,7 ＠＠
/* To the user, a buffer is made up of characters. In the non-Mule world,
characters and Ibytes are equivalent, restricted to the range 0 - 255.
- In the Mule world, many more characters are possible (19 bits worth,
+ In the Mule world, many more characters are possible (21 bits worth,
more or less), and a character requires (typically) 1 to 4 Ibytes for
its representation in a buffer or string. Note that the representation
of a character by itself, in a variable, is very different from its
Index: src/redisplay.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.c,v
retrieving revision 1.99
diff -u -u -r1.99 redisplay.c
--- src/redisplay.c 2006/04/25 14:02:09 1.99
+++ src/redisplay.c 2006/07/08 16:13:37
＠＠ -1428,7 +1428,7 ＠＠
if (data->ch >= 0x100)
{
/* If the character is an extended Mule character, it could have
- up to 19 bits. For the moment, we treat it as a seven-digit
+ up to 21 bits. For the moment, we treat it as a seven-digit
octal number. This is not that pretty, but whatever. */
data->ch = (7 & (orig_char >> 18)) + '0';
ADD_NEXT_OCTAL_RUNE_CHAR;
Index: src/syntax.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syntax.h,v
retrieving revision 1.14
diff -u -u -r1.14 syntax.h
--- src/syntax.h 2006/02/21 11:33:46 1.14
+++ src/syntax.h 2006/07/08 16:13:37
＠＠ -149,7 +149,7 ＠＠
the tag and the comment bits.
Clearly, such a scheme will not work for Mule, because the matching
- paren could be any character and as such requires 19 bits, which
+ paren could be any character and as such requires 21 bits, which
we don't got.
Remember that under Mule we use char tables instead of vectors.
Index: src/text.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.c,v
retrieving revision 1.27
diff -u -u -r1.27 text.c
--- src/text.c 2006/06/19 18:19:38 1.27
+++ src/text.c 2006/07/08 16:13:40
＠＠ -215,13 +215,11 ＠＠
this to 2048, and further shrinkage would become uncomfortable.
No such problems exist in XEmacs.
- Composite characters could be represented as 0x8D C1 C2 C3,
- where each C[1-3] is in the range 0xA0 - 0xFF. This allows
- for slightly under 2^20 (one million) composite characters
- over the XEmacs process lifetime, and you only need to
- increase the size of a Mule character from 19 to 21 bits.
- Or you could use 0x8D C1 C2 C3 C4, allowing for about
- 85 million (slightly over 2^26) composite characters.
+ Composite characters could be represented as 0x8D C1 C2 C3, where each
+ C[1-3] is in the range 0xA0 - 0xFF. This allows for slightly under
+ 2^20 (one million) composite characters over the XEmacs process
+ lifetime. Or you could use 0x8D C1 C2 C3 C4, allowing for about 85
+ million (slightly over 2^26) composite characters.
==========================================================================
10. Internal API's
＠＠ -4695,8 +4693,8 ＠＠
{
int f1, f2, f3;
- /* Must have only lowest 19 bits set */
- if (ch & ~0x7FFFF)
+ /* Must have only lowest 21 bits set */
+ if (ch & ~0x1FFFFF)
return 0;
f1 = ichar_field1 (ch);
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[COMMIT] Style change in subr-name
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
APPROVCE COMMIT
NOTE: This patch has been committed.
src/ChangeLog addition:
2006-07-08 Aidan Kehoe <kehoea(a)parhasard.net>
* symbols.c (Fsubr_name):
Use the CHECK_SUBR macro instead of the GNU code's explicit if
statement.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/symbols.c
Index: src/symbols.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.57
diff -u -u -r1.57 symbols.c
--- src/symbols.c 2006/05/06 08:09:37 1.57
+++ src/symbols.c 2006/07/08 09:16:16
＠＠ -726,8 +726,8 ＠＠
(subr))
{
const char *name;
- if (!SUBRP (subr))
- wrong_type_argument (Qsubrp, subr);
+ CHECK_SUBR (subr);
+
name = XSUBR (subr)->name;
return make_string ((const Ibyte *)name, strlen (name));
}
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[PATCH] Adjust the 2D Mule charsets; allow ~5,000,000 Unicode code points.
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
This patches moves to supporting ~500,000 Unicode code points that would
otherwise be trashed by the editor. Previously, it was it was of the order
of 18,000 code points.
man/ChangeLog addition:
2006-06-24 Aidan Kehoe <kehoea(a)parhasard.net>
* internals/internals.texi (Internal String Encoding):
Mention that UTF-8 would be a reasonable alternative encoding.
* internals/internals.texi (Internal Character Encoding):
Re-arrange the description of characters to deal with 21-bit
characters.
src/ChangeLog addition:
2006-06-24 Aidan Kehoe <kehoea(a)parhasard.net>
* charset.h:
Move to 7 bits instead of 5 for the first field of a character.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/charset.h man/internals/internals.texi
Index: man/internals/internals.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v
retrieving revision 1.75
xodiff -u -u -r1.75 internals.texi
--- man/internals/internals.texi 2006/04/23 16:11:28 1.75
+++ man/internals/internals.texi 2006/06/24 21:15:25
＠＠ -11335,10 +11335,12 ＠＠
the actual multi-byte encoding.
＠end enumerate
- None of the standard non-modal encodings meet all of these
+ None of the pre-Unciode standard non-modal encodings meet all of these
conditions. For example, EUC satisfies only (2) and (3), while
-Shift-JIS and Big5 (not yet described) satisfy only (2). (All
-non-modal encodings must satisfy (2), in order to be unambiguous.)
+Shift-JIS and Big5 (not yet described) satisfy only (2). (All non-modal
+encodings must satisfy (2), in order to be unambiguous.) UTF-8,
+however, meets all three, and we are considering moving to it as an
+internal encoding.
＠node Internal Character Encoding, , Internal String Encoding, Internal Mule Encodings
＠subsection Internal Character Encoding
＠＠ -11346,16 +11348,16 ＠＠
＠cindex character encoding, internal
＠cindex encoding, internal character
- One 19-bit word represents a single character. The word is
+ One 21-bit word represents a single character. The word is
separated into three fields:
＠example
-Bit number: 18 17 16 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
- <------------> <------------------> <------------------>
-Field: 1 2 3
+Bit number: 20 19 18 17 16 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
+ <------------------> <------------------> <------------------>
+Field: 1 2 3
＠end example
- Note that fields 2 and 3 hold 7 bits each, while field 1 holds 5 bits.
+ Note that each field holds 7 bits.
＠example
Character set Field 1 Field 2 Field 3
＠＠ -11370,12 +11372,12 ＠＠
range: (20 - 6F) (20 - 7F)
Dimension-2 official LB - 0x8F PC1 PC2
range: (01 - 0A) (20 - 7F) (20 - 7F)
-Dimension-2 private LB - 0xE1 PC1 PC2
+Dimension-2 private LB - 0x80 PC1 PC2
range: (0F - 1E) (20 - 7F) (20 - 7F)
Composite 0x1F ? ?
＠end example
-Note that character codes 0 - 255 are the same as the ``binary
+Note also that character codes 0 - 255 are the same as the ``binary
encoding'' described above.
Most of the code in XEmacs knows nothing of the representation of a
＠＠ -11607,7 +11609,7 ＠＠
you cannot do the standard C trick of passing a pointer to a character
to a function that expects a string.
-An Ichar takes up 19 bits of representation and (for code compatibility
+An Ichar takes up 21 bits of representation and (for code compatibility
and such) is compatible with an int. This representation is visible on
the Lisp level. The important characteristics of the Ichar
representation are
Index: src/charset.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/charset.h,v
retrieving revision 1.13
diff -u -u -r1.13 charset.h
--- src/charset.h 2006/06/03 17:50:54 1.13
+++ src/charset.h 2006/06/24 21:15:27
＠＠ -140,8 +140,8 ＠＠
#define PRE_LEADING_BYTE_PRIVATE_2 0x9F /* 2-byte char-set */
#define MIN_LEADING_BYTE_PRIVATE_1 0xA0
-#define MAX_LEADING_BYTE_PRIVATE_1 0xEF
-#define MIN_LEADING_BYTE_PRIVATE_2 0xF0
+#define MAX_LEADING_BYTE_PRIVATE_1 0xC0
+#define MIN_LEADING_BYTE_PRIVATE_2 0xC1
#define MAX_LEADING_BYTE_PRIVATE_2 0xFF
#define NUM_LEADING_BYTES 129
＠＠ -354,9 +354,9 ＠＠
/************************************************************************/
/* The bit fields of character are divided into 3 parts:
- FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */
+ FIELD1(7bits):FIELD2(7bits):FIELD3(7bits) */
-#define ICHAR_FIELD1_MASK (0x1F << 14)
+#define ICHAR_FIELD1_MASK (0x7F << 14)
#define ICHAR_FIELD2_MASK (0x7F << 7)
#define ICHAR_FIELD3_MASK 0x7F
＠＠ -376,7 +376,7 ＠＠
#define FIELD2_TO_PRIVATE_LEADING_BYTE 0x80
#define FIELD1_TO_OFFICIAL_LEADING_BYTE (MIN_LEADING_BYTE_OFFICIAL_2 - 1)
-#define FIELD1_TO_PRIVATE_LEADING_BYTE 0xE1
+#define FIELD1_TO_PRIVATE_LEADING_BYTE 0x80
/* Minimum and maximum allowed values for the fields. */
＠＠ -406,7 +406,7 ＠＠
#define MIN_CHAR_PRIVATE_TYPE9N (MIN_ICHAR_FIELD2_PRIVATE << 7)
#define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_ICHAR_FIELD1_OFFICIAL << 14)
#define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_ICHAR_FIELD1_PRIVATE << 14)
-#define MIN_CHAR_COMPOSITION (0x1F << 14)
+#define MIN_CHAR_COMPOSITION (0x7F << 14)
/* Leading byte of a character.
--
Santa Maradona, priez pour moi!
- 1 participants
- 2 comments
[COMMIT] Support built-in functions in find-func
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
This was included in my original proposal to support builtin functions in
find-func, but didn’t get committed. This commit that.
NOTE: This patch has been committed.
xemacs-packages/xemacs-devel/ChangeLog addition:
2006-07-07 Aidan Kehoe <kehoea(a)parhasard.net>
* find-func.el:
Sync to GNU Emacs 22.0.50, add support for finding built-in
functions.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/xemacs-devel/find-func.el
Index: xemacs-packages/xemacs-devel/find-func.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-devel/find-func.el,v
retrieving revision 1.8
diff -u -u -r1.8 find-func.el
--- xemacs-packages/xemacs-devel/find-func.el 2004/06/29 17:44:28 1.8
+++ xemacs-packages/xemacs-devel/find-func.el 2006/07/07 21:14:09
＠＠ -1,6 +1,7 ＠＠
;;; find-func.el --- find the definition of the Emacs Lisp function near point
-;; Copyright (C) 1997, 1999, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004,
+;; 2006 Free Software Foundation, Inc.
;; Author: Jens Petersen <petersen(a)kurims.kyoto-u.ac.jp>
;; Maintainer: petersen(a)kurims.kyoto-u.ac.jp
＠＠ -21,10 +22,10 ＠＠
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
-;;; Synched up with: FSF 21.3.
+;;; Synched up with: FSF 22.0.50
;;; Commentary:
;;
＠＠ -43,9 +44,14 ＠＠
;; although it is unusual it can happen that say a variable and function
;; of the same name are defined in different files, which may lead to
;; incorrect results.) Unfortunately in Emacs, only symbols loaded from
-;; startup can be found. It would be nice if the location of primitive
-;; functions in the C code was also recorded!
+;; startup can be found.
+;; The file names of primitive functions in C is available in recent GNU and
+;; XEmacs beta versions; GNU since some point in 2004, XEmacs since early
+;; 2005. XEmacs returns the file name from `symbol-file' in loadhist.el, as
+;; with any other symbol. GNU has a function `help-C-file-name' in
+;; help-fns.el that they call instead.
+
;; The code started out from `describe-function', `describe-key'
;; ("help.el") and `fff-find-loaded-emacs-lisp-function' (Noah Friedman's
;; "fff.el").
＠＠ -75,30 +81,55 ＠＠
;; (define-derived-mode foo ...), (define-minor-mode foo)
(concat
"^\\s-*(\\(def\\(ine-skeleton\\|ine-generic-mode\\|ine-derived-mode\\|\
-ine-function\\|ine-obsolete-function-alias\\|ine-compatible-function-alias\\|\
-\[^cgv\W]\\w+\\*?\\)\\|define-minor-mode\
-\\|easy-mmode-define-global-mode\\)" find-function-space-re
+ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
+foo\\|[^cfgv]\\w+\\*?\\)\\|easy-mmode-define-[a-z-]+\\|easy-menu-define\\|\
+menu-bar-make-toggle\\)"
+ find-function-space-re
"\\('\\|\(quote \\)?%s\\(\\s-\\|$\\|\(\\|\)\\)")
"The regexp used by `find-function' to search for a function definition.
Note it must contain a `%s' at the place where `format'
should insert the function name. The default value avoids `defconst',
-`defgroup', `defvar'.
+`defgroup', `defvar', `defface'.
Please send improvements and fixes to the maintainer."
:type 'regexp
:group 'find-function)
(defcustom find-variable-regexp
- (concat "^\\s-*(\\(def[^umag\W]\\(\\w\\|\\s_\\)+\\*?\\|define-obsolete-variable-alias\\|define-compatible-variable-alias\\)"
- find-function-space-re "%s\\(\\s-\\|$\\)")
+ (concat
+ "^\\s-*(\\(def[^fumag]\\(\\w\\|\\s_\\)+\\*?\\|\
+easy-mmode-def\\(map\\|syntax\\)\\|easy-menu-define\\)"
+ find-function-space-re
+ "%s\\(\\s-\\|$\\)")
"The regexp used by `find-variable' to search for a variable definition.
-It should match right up to the variable name. The default value
-avoids `defun', `defmacro', `defalias', `defadvice', `defgroup'.
+Note it must contain a `%s' at the place where `format'
+should insert the variable name. The default value
+avoids `defun', `defmacro', `defalias', `defadvice', `defgroup', `defface'.
Please send improvements and fixes to the maintainer."
:type 'regexp
:group 'find-function)
+(defcustom find-face-regexp
+ (concat"^\\s-*(defface" find-function-space-re "%s\\(\\s-\\|$\\)")
+ "The regexp used by `find-face' to search for a face definition.
+Note it must contain a `%s' at the place where `format'
+should insert the face name.
+
+Please send improvements and fixes to the maintainer."
+:type 'regexp
+:group 'find-function
+:version "22.1")
+
+(defvar find-function-regexp-alist
+ '((nil . find-function-regexp)
+ (defvar . find-variable-regexp)
+ (defface . find-face-regexp))
+ "Alist mapping definition types into regexp variables.
+Each regexp variable's value should actually be a format string
+to be used to substitute the desired symbol name into the regexp.")
+(put 'find-function-regexp-alist 'risky-local-variable t)
+
(defcustom find-function-source-path nil
"The default list of directories where `find-function' searches.
＠＠ -124,51 +155,99 ＠＠
;;; Functions:
-;; XEmacs omission: Emacs has find-library and supporting friends here.
-;; We have the equivalent in lib-complete.el in core.
+;; XEmacs omission: Emacs has find-library and supporting friends here. We
+;; have the equivalent in lib-complete.el in core.
-;;;###autoload
-(defun find-function-search-for-symbol (symbol variable-p library)
- "Search for SYMBOL in LIBRARY.
-If VARIABLE-P is nil, `find-function-regexp' is used, otherwise
-`find-variable-regexp' is used."
+;; However, we don't have support for looking up C in core; that comes from
+;; GNU and is here.
+
+(defvar find-function-C-source-directory
+ ;; XEmacs change ; source-directory -> source-root
+ (let ((dir (expand-file-name "src" source-root)))
+ (when (and (file-directory-p dir) (file-readable-p dir))
+ dir))
+ "Directory where the C source files of XEmacs can be found.
+If nil, do not try to find the source code of functions and variables
+defined in C.")
+
+(defun find-function-C-source (fun-or-var file type)
+ "Find the source location where SUBR-OR-VAR is defined in FILE.
+TYPE should be nil to find a function, or `defvar' to find a variable."
+ (unless find-function-C-source-directory
+ (setq find-function-C-source-directory
+ (read-directory-name "XEmacs C source dir: " nil nil t)))
+ (setq file (expand-file-name file find-function-C-source-directory))
+ (unless (file-readable-p file)
+ (error "The C source file %s is not available"
+ (file-name-nondirectory file)))
+ (unless type
+ (setq fun-or-var (indirect-function fun-or-var)))
+ ;; Versions of XEmacs without `subr-name' shouldn't return C filenames
+ ;; from `symbol-file'.
+ (assert (fboundp 'subr-name)
+ t
+ "This code needs `subr-name', and shouldn't be called without it.")
+ (with-current-buffer (find-file-noselect file)
+ (goto-char (point-min))
+ (unless (re-search-forward
+ (if type
+ (concat "DEFVAR[A-Z_]*[ \t\n]*([ \t\n]*\""
+ (regexp-quote (symbol-name fun-or-var))
+ "\"")
+ (concat "DEFUN[ \t\n]*([ \t\n]*\""
+ (regexp-quote (subr-name fun-or-var))
+ "\""))
+ nil t)
+ (error "Can't find source for %s" fun-or-var))
+ (cons (current-buffer) (match-beginning 0))))
+
+;;;###autoload
+(defun find-function-search-for-symbol (symbol type library)
+ "Search for SYMBOL's definition of type TYPE in LIBRARY.
+If TYPE is nil, look for a function definition.
+Otherwise, TYPE specifies the kind of definition,
+and it is interpreted via `find-function-regexp-alist'.
+The search is done in the source for library LIBRARY."
(if (null library)
(error "Don't know where `%s' is defined" symbol))
;; We deviate significantly from Emacs here, due to our distinct
;; find-library implementations.
- (if (string-match "\\.el\\(c\\)\\'" library)
- (setq library (substring library 0 (match-beginning 1))))
- (let* ((path find-function-source-path)
- (filename (if (file-exists-p library)
- library
- ;; use `file-name-sans-extension' here? (if it gets fixed)
- (if (string-match "\\(\\.el\\)\\'" library)
- (setq library (substring library 0
- (match-beginning 1))))
- (or (locate-library (concat library ".el") t path)
- (locate-library library t path)))))
- (if (not filename)
- (error "The library \"%s\" is not in the path." library))
- (with-current-buffer (find-file-noselect filename)
- (save-match-data
- (let ((regexp (format (if variable-p
- find-variable-regexp
- find-function-regexp)
- (regexp-quote (symbol-name symbol))))
- (case-fold-search))
- (with-syntax-table emacs-lisp-mode-syntax-table
- (goto-char (point-min))
- (if (or (re-search-forward regexp nil t)
- (re-search-forward
- (concat "^([^ ]+" find-function-space-re "['(]"
- (regexp-quote (symbol-name symbol))
- "\\>")
- nil t))
- (progn
- (beginning-of-line)
- (cons (current-buffer) (point)))
- (error "Cannot find definition of `%s' in library `%s'"
- symbol library))))))))
+ (if (string-match "^\\(.*\\.c\\)$" library)
+ (find-function-C-source symbol (match-string 1 library) type)
+ (if (string-match "\\.el\\(c\\)\\'" library)
+ (setq library (substring library 0 (match-beginning 1))))
+ (let* ((path find-function-source-path)
+ (filename (if (file-exists-p library)
+ library
+ ;; use `file-name-sans-extension' here? (if it gets
+ ;; fixed)
+ (if (string-match "\\(\\.el\\)\\'" library)
+ (setq library (substring library 0
+ (match-beginning 1))))
+ (or (locate-library (concat library ".el") t path)
+ (locate-library library t path)))))
+ (if (not filename)
+ (error "The library \"%s\" is not in the path." library))
+ (with-current-buffer (find-file-noselect filename)
+ (save-match-data
+ (let ((regexp (format (if type
+ find-variable-regexp
+ find-function-regexp)
+ (regexp-quote (symbol-name symbol))))
+ (case-fold-search))
+ (with-syntax-table emacs-lisp-mode-syntax-table
+ (goto-char (point-min))
+ (if (or (re-search-forward regexp nil t)
+ (re-search-forward
+ (concat "^([^ ]+" find-function-space-re "['(]"
+ (regexp-quote (symbol-name symbol))
+ "\\_>")
+ nil t))
+ (progn
+ (beginning-of-line)
+ (cons (current-buffer) (point)))
+ (error "Cannot find definition of `%s' in library `%s'"
+ symbol library)))))))))
;;;###autoload
(defun find-function-noselect (function)
＠＠ -195,13 +274,8 ＠＠
function (symbol-name def)))))
(setq function (symbol-function function)
def (symbol-function function)))
- ;; XEmacs difference: check for primitive functions a bit differently
- (and (subrp (symbol-function function))
- (if aliases
- (error "%s which is a primitive function" aliases)
- (error "%s is a primitive function" function)))
(if aliases
- (message aliases))
+ (message "%s" aliases))
(let ((library
(cond ((eq (car-safe def) 'autoload)
(nth 1 def))
＠＠ -215,57 +289,62 ＠＠
(and (compiled-function-p (cdr def))
(file-name-sans-extension
(compiled-function-annotation (cdr def))))))))))
+ ;; XEmacs difference: check for primitive functions a bit differently
+ ;; XEmacs; move this after the symbol-file check, which can now return
+ ;; the place in C where the function is.
+ (and (null library) (subrp (symbol-function function))
+ (if aliases
+ (error "%s which is a primitive function" aliases)
+ (error "%s is a primitive function" function)))
(find-function-search-for-symbol function nil library))))
;; XEmacs change: these functions are defined in help.el
;(defalias 'function-at-point 'function-called-at-point)
-(defun find-function-read (&optional variable-p)
+(defun find-function-read (&optional type)
"Read and return an interned symbol, defaulting to the one near point.
-If the optional VARIABLE-P is nil, then a function is gotten
-defaulting to the value of the function `function-at-point', otherwise
-a variable is asked for, with the default coming from
-`variable-at-point'."
- (let ((symb (funcall (if variable-p
+If TYPE is nil, insist on a symbol with a function definition.
+Otherwise TYPE should be `defvar' or `defface'.
+If TYPE is nil, defaults using `function-at-point',
+otherwise uses `variable-at-point'."
+ (let ((symb (funcall (if type
'variable-at-point
'function-at-point)))
+ (predicate (cdr (assq type '((nil . fboundp) (defvar . boundp)
+ (defface . facep)))))
+ (prompt (cdr (assq type '((nil . "function") (defvar . "variable")
+ (defface . "face")))))
(enable-recursive-minibuffers t)
val)
(if (equal symb 0)
(setq symb nil))
- (setq val (if variable-p
- (completing-read
- (concat "Find variable"
- (if symb
- (format " (default %s)" symb))
- ": ")
- obarray 'boundp t nil 'variable-history)
- (completing-read
- (concat "Find function"
- (if symb
- (format " (default %s)" symb))
- ": ")
- obarray 'fboundp t nil 'function-history)))
+ (setq val (completing-read
+ (concat "Find "
+ prompt
+ (if symb
+ (format " (default %s)" symb))
+ ": ")
+ obarray predicate t nil))
(list (if (equal val "")
symb
(intern val)))))
-(defun find-function-do-it (symbol variable-p switch-fn)
- "Find Emacs Lisp SYMBOL in a buffer and display it with SWITCH-FN.
-If VARIABLE-P is nil, a function definition is searched for, otherwise
-a variable definition is searched for. The start of a definition is
-centered according to the variable `find-function-recenter-line'.
+(defun find-function-do-it (symbol type switch-fn)
+ "Find Emacs Lisp SYMBOL in a buffer and display it.
+TYPE is nil to search for a function definition,
+or else `defvar' or `defface'.
+
+The variable `find-function-recenter-line' controls how
+to recenter the display. SWITCH-FN is the function to call
+to display and select the buffer.
See also `find-function-after-hook'.
-Point is saved in the buffer if it is one of the current buffers."
+Set mark before moving, if the buffer already existed."
(let* ((orig-point (point))
(orig-buffers (buffer-list))
(buffer-point (save-excursion
- (funcall (if variable-p
- 'find-variable-noselect
- 'find-function-noselect)
- symbol)))
+ (find-definition-noselect symbol type)))
(new-buf (car buffer-point))
(new-point (cdr buffer-point)))
(when buffer-point
＠＠ -278,7 +357,7 ＠＠
;;;###autoload
(defun find-function (function)
- "Find the definition of the function near point in the current window.
+ "Find the definition of the FUNCTION near point.
Finds the Emacs Lisp library containing the definition of the function
near point (selected by `function-at-point') in a buffer and
＠＠ -319,46 +398,82 ＠＠
`find-function-source-path', if non nil, otherwise in `load-path'."
(if (not variable)
(error "You didn't specify a variable"))
- (and (built-in-variable-type variable)
- (error "%s is a primitive variable" variable))
(let ((library (or file (symbol-file variable))))
+ (unless (and (null library) (built-in-variable-type variable))
+ (error "%s is a primitive variable" variable))
(find-function-search-for-symbol variable 'variable library)))
;;;###autoload
(defun find-variable (variable)
- "Find the definition of the variable near point in the current window.
+ "Find the definition of the VARIABLE near point.
Finds the Emacs Lisp library containing the definition of the variable
near point (selected by `variable-at-point') in a buffer and
-places point before the definition. Point is saved in the buffer if
-it is one of the current buffers.
+places point before the definition.
+
+Set mark before moving, if the buffer already existed.
The library where VARIABLE is defined is searched for in
`find-function-source-path', if non nil, otherwise in `load-path'.
See also `find-function-recenter-line' and `find-function-after-hook'."
- (interactive (find-function-read 'variable))
- (find-function-do-it variable t 'switch-to-buffer))
+ (interactive (find-function-read 'defvar))
+ (find-function-do-it variable 'defvar 'switch-to-buffer))
;;;###autoload
(defun find-variable-other-window (variable)
- "Find the definition of the variable near point in another window.
+ "Find, in another window, the definition of VARIABLE near point.
See `find-variable' for more details."
- (interactive (find-function-read 'variable))
- (find-function-do-it variable t 'switch-to-buffer-other-window))
+ (interactive (find-function-read 'defvar))
+ (find-function-do-it variable 'defvar 'switch-to-buffer-other-window))
;;;###autoload
(defun find-variable-other-frame (variable)
- "Find the definition of the variable near point in another frame.
+ "Find, in annother frame, the definition of VARIABLE near point.
See `find-variable' for more details."
- (interactive (find-function-read 'variable))
- (find-function-do-it variable t 'switch-to-buffer-other-frame))
+ (interactive (find-function-read 'defvar))
+ (find-function-do-it variable 'defvar 'switch-to-buffer-other-frame))
+
+;;;###autoload
+(defun find-definition-noselect (symbol type &optional file)
+ "Return a pair `(BUFFER . POINT)' pointing to the definition of SYMBOL.
+TYPE says what type of definition: nil for a function,
+`defvar' or `defface' for a variable or face. This functoin
+does not switch to the buffer or display it.
+
+The library where SYMBOL is defined is searched for in FILE or
+`find-function-source-path', if non nil, otherwise in `load-path'."
+ (if (not symbol)
+ (error "You didn't specify a symbol"))
+ (if (null type)
+ (find-function-noselect symbol)
+ (let ((library (or file (symbol-file symbol))))
+ (find-function-search-for-symbol symbol type library))))
+
+;; RMS says:
+;; For symmetry, this should be called find-face; but some programs
+;; assume that, if that name is defined, it means something else.
+;;;###autoload
+(defun find-face-definition (face)
+ "Find the definition of FACE. FACE defaults to the name near point.
+
+Finds the Emacs Lisp library containing the definition of the face
+near point (selected by `variable-at-point') in a buffer and
+places point before the definition.
+
+Set mark before moving, if the buffer already existed.
+
+The library where FACE is defined is searched for in
+`find-function-source-path', if non nil, otherwise in `load-path'.
+See also `find-function-recenter-line' and `find-function-after-hook'."
+ (interactive (find-function-read 'defface))
+ (find-function-do-it face 'defface 'switch-to-buffer))
;;;###autoload
(defun find-function-on-key (key)
"Find the function that KEY invokes. KEY is a string.
-Point is saved if FUNCTION is in the current buffer."
+Set mark before moving, if the buffer already existed."
(interactive "kFind function on key: ")
;; XEmacs change: Avoid the complex menu code with key-or-menu-binding
(let ((defn (key-or-menu-binding key))
＠＠ -399,5 +514,5 ＠＠
(provide 'find-func)
-;;; arch-tag: 43ecd81c-74dc-4d9a-8f63-a61e55670d64
+;; arch-tag: 43ecd81c-74dc-4d9a-8f63-a61e55670d64
;;; find-func.el ends here
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[PATCH 21.5] -Wdeclaration-after-statement support
18 years, 6 months
Jerry James
Jerry James
PATCH 21.5
This patch captures the values of __GNUC__ and __GNUC_MINOR__ in
configure variables when gcc is used. It uses them to see if gcc 3.4 or
later is in use and, if so, adds -Wdeclaration-after-statement to the
warning flags when compiling with C.
I am interested in finding out whether this approach is acceptable to
the other developers. In particular, is the $(( ... )) syntax okay? It
is standard Bourne shell (see the Single Unix Specification on
www.unix.org), but it is not used anywhere in our present configure
script. Is anyone using a shell that does not support that syntax?
ChangeLog addition:
2006-06-20 Jerry James <james(a)xemacs.org>
* configure.ac: When gcc is used, capture the values of __GNUC__
and __GNUC_MINOR__. Use them to conditionally add warning flags
that are not supported by all versions of gcc.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.43
diff -d -u -r1.43 configure.ac
--- configure.ac 2006/06/06 00:18:29 1.43
+++ configure.ac 2006/06/20 17:11:33
＠＠ -1883,15 +1883,13 ＠＠
dnl Determine GCC version.
if test "$GCC" = "yes"; then
AC_RUN_IFELSE([AC_LANG_SOURCE([int main () {
-#if __GNUC__ >= 3
-return 11;
-#else
-return 0;
-#endif
-}])], [:],
-[case "$?" in
- 11) echo "You appear to be using GCC version 3 or above."; __GCC3=yes ;;
-esac])
+return __GNUC__;
+}])], [:], [__GCC="$?"])
+AC_RUN_IFELSE([AC_LANG_SOURCE([int main () {
+return __GNUC_MINOR__;
+}])], [:], [__GCC_MINOR="$?"])
+__GCC_VERSION=$__GCC"."$__GCC_MINOR
+echo "You appear to be using GCC version" $__GCC_VERSION
fi
dnl Support for using a different compiler for xemacs itself.
＠＠ -2311,7 +2309,7 ＠＠
dnl Warnings about char subscripts are pretty pointless, though,
dnl and we use them in various places.
with_cflags_warning="$with_cflags_warning -Wsign-compare -Wno-char-subscripts"
- test "$__GCC3" = "yes" && with_cflags_warning="$with_cflags_warning -Wpacked"
+ test $((__GCC)) -ge 3 && with_cflags_warning="$with_cflags_warning -Wpacked"
dnl glibc is intentionally not `-Wpointer-arith'-clean.
dnl Ulrich Drepper has rejected patches to fix the glibc header files.
test "$have_glibc" != "yes" && \
＠＠ -2327,8 +2325,11 ＠＠
dnl some very ugly code changes.
if test "$with_xemacs_compiler" = "g++"; then
xe_cflags_warning="$with_cflags_warning -Weffc++"
- elif test "$__GCC3" = "yes"; then
+ elif test $((__GCC)) -ge 3; then
xe_cflags_warning="$with_cflags_warning -Wunused-parameter"
+ if test $((__GCC)) -gt 3 || test $((__GCC_MINOR)) -ge 4; then
+ with_cflags_warning="$with_cflags_warning -Wdeclaration-after-statement"
+ fi
fi
with_cflags_warning="$with_cflags_warning -Wshadow -Wmissing-declarations"
with_cflags_warning="$with_cflags_warning -Wmissing-prototypes -Wstrict-prototypes"
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 2 participants
- 6 comments
[PATCH] Small bug in the INLINE_HEADER macro
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
This fixes the Cygwin build for me--it was failing because make-docfile
couldn’t find a definition of IS_DIRECTORY_SEP. Why GCC is choosing not to
inline IS_DIRECTORY_SEP is another question.
src/ChangeLog addition:
2006-07-04 Aidan Kehoe <kehoea(a)parhasard.net>
* config.h.in:
Don't declare inline macros as `extern' if we're building a
standalone program, because their extern definitions in inline.c
are unlikely to be included.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/config.h.in
Index: src/config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.108
diff -u -r1.108 config.h.in
--- src/config.h.in 2006/04/23 16:11:32 1.108
+++ src/config.h.in 2006/07/04 13:49:39
＠＠ -1066,7 +1066,7 ＠＠
Use `inline static' to define inline functions in .c files.
See the Internals manual for examples and more information. */
-#if defined (__cplusplus) || ! defined (__GNUC__)
+#if defined (__cplusplus) || ! defined (__GNUC__) || ! defined(emacs)
# define INLINE_HEADER inline static
#elif defined (DONT_EXTERN_INLINE_HEADER_FUNCTIONS)
# define INLINE_HEADER inline
--
Santa Maradona, priez pour moi!
- 1 participants
- 1 comments