Mercurial > hg > xemacs-beta

changeset 5199:49e931565616

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 12 Apr 2010 00:53:18 -0500
parents bc3ede8f29a8 (current diff) c87ec061e8cc (diff)
children 70ed8a0d8da8
files src/ChangeLog
diffstat 6 files changed, 55 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Apr 09 23:38:02 2010 -0500
+++ b/lisp/ChangeLog	Mon Apr 12 00:53:18 2010 -0500
@@ -1,3 +1,16 @@
+2010-04-09  Didier Verna  <didier@xemacs.org>
+
+	* hyper-apropos.el (hyper-apropos-get-doc): Use [not available]
+	when a function's arglist is unknown (this happens for autoloaded
+	functions).
+
+2010-04-07  Didier Verna  <didier@xemacs.org>
+
+	* font-lock.el (lisp-font-lock-keywords-2): Add missing CL style
+	lambda list constructs (&key etc.).
+	* lisp-mode.el (lisp-function-and-type-regexp): Recognize defun*
+	as well as defun.
+
 2010-04-02  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* descr-text.el (describe-char-unicode-data):
--- a/lisp/font-lock.el	Fri Apr 09 23:38:02 2010 -0500
+++ b/lisp/font-lock.el	Mon Apr 12 00:53:18 2010 -0500
@@ -2259,7 +2259,9 @@
     '("\\<:\\sw+\\>" 0 font-lock-reference-face prepend)
     ;;
     ;; ELisp and CLisp `&' keywords as types.
-    '("\\<\\&\\(optional\\|rest\\|whole\\)\\>" . font-lock-type-face)
+    '("\\<\\&\\(\
+optional\\|rest\\|body\\|whole\\|key\\|allow-other-keys\\|aux\\|environment\
+\\)\\>" . font-lock-type-face)
     ))
   "Gaudy level highlighting for Lisp modes.")
 
--- a/lisp/hyper-apropos.el	Fri Apr 09 23:38:02 2010 -0500
+++ b/lisp/hyper-apropos.el	Mon Apr 12 00:53:18 2010 -0500
@@ -772,11 +772,14 @@
 		     global (current-global-map)
 		     obsolete (get symbol 'byte-obsolete-info)
 		     doc (function-documentation symbol t)
-                     arglist (replace-in-string
-                              (function-arglist symbol)
-                              (format "^(%s "
-                                      (regexp-quote (symbol-name symbol)))
-                              "("))
+                     arglist (let ((farglist (function-arglist symbol)))
+			       (if farglist
+				   (replace-in-string
+				    farglist
+				    (format "^(%s "
+					(regexp-quote (symbol-name symbol)))
+				    "(")
+				 "[not available]")))
 	       (save-excursion
 		 (set-buffer hyper-apropos-help-buf)
 		 (goto-char (point-max))
--- a/lisp/lisp-mode.el	Fri Apr 09 23:38:02 2010 -0500
+++ b/lisp/lisp-mode.el	Mon Apr 12 00:53:18 2010 -0500
@@ -699,7 +699,7 @@
 (defvar lisp-function-and-type-regexp
   (concat "def\\("
 	  ;; def but not define-.
-	  "\\(un\\|advice\\|alias\\|macro\\*?\\|setf\\|subst\\*?\\|"
+	  "\\(un\\*?\\|advice\\|alias\\|macro\\*?\\|setf\\|subst\\*?\\|"
 	  "-edebug-spec\\|"
 	  ;; CLOS
 	  "method\\|generic\\|"
--- a/src/ChangeLog	Fri Apr 09 23:38:02 2010 -0500
+++ b/src/ChangeLog	Mon Apr 12 00:53:18 2010 -0500
@@ -29,6 +29,17 @@
 	* specifier.c (set_specifier_caching):
 	Fix coding style to correspond to GNU standard.
 
+2010-04-09  Didier Verna  <didier@xemacs.org>
+
+	* fontcolor-xlike-inc.c (DEBUG_FONTS2):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS3):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS4):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP1):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP2):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP3):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP4): Conditionalize
+	definitions on DEBUG_XEMACS, provide empty definitions otherwise.
+
 2010-04-06  Ben Wing  <ben@xemacs.org>
 
 	* elhash.c (Feq_hash):
--- a/src/fontcolor-xlike-inc.c	Fri Apr 09 23:38:02 2010 -0500
+++ b/src/fontcolor-xlike-inc.c	Mon Apr 12 00:53:18 2010 -0500
@@ -34,53 +34,64 @@
 
 #include "console-xlike-inc.h"
 
-#define DEBUG_FONTS1(format, arg)		\
+#ifdef DEBUG_XEMACS
+# define DEBUG_FONTS1(format, arg)		\
 do {						\
   if (debug_x_fonts)				\
     debug_out (format, arg);			\
 } while (0)
 
-#define DEBUG_FONTS2(format, arg1, arg2)	\
+# define DEBUG_FONTS2(format, arg1, arg2)	\
 do {						\
   if (debug_x_fonts)				\
     debug_out (format, arg1, arg2);		\
 } while (0)
 
-#define DEBUG_FONTS3(format, arg1, arg2, arg3)	\
+# define DEBUG_FONTS3(format, arg1, arg2, arg3)	\
 do {						\
   if (debug_x_fonts)				\
     debug_out (format, arg1, arg2, arg3);	\
 } while (0)
 
-#define DEBUG_FONTS4(format, arg1, arg2, arg3, arg4)	\
+# define DEBUG_FONTS4(format, arg1, arg2, arg3, arg4)	\
 do {							\
   if (debug_x_fonts)					\
     debug_out (format, arg1, arg2, arg3, arg4);		\
 } while (0)
 
-#define DEBUG_FONTS_LISP1(format, arg)		\
+# define DEBUG_FONTS_LISP1(format, arg)		\
 do {						\
   if (debug_x_fonts)				\
     debug_out_lisp (format, 1, arg);		\
 } while (0)
 
-#define DEBUG_FONTS_LISP2(format, arg1, arg2)	\
+# define DEBUG_FONTS_LISP2(format, arg1, arg2)	\
 do {						\
   if (debug_x_fonts)				\
     debug_out_lisp (format, 2, arg1, arg2);	\
 } while (0)
 
-#define DEBUG_FONTS_LISP3(format, arg1, arg2, arg3)	\
+# define DEBUG_FONTS_LISP3(format, arg1, arg2, arg3)	\
 do {							\
   if (debug_x_fonts)					\
     debug_out_lisp (format, 3, arg1, arg2, arg3);	\
 } while (0)
 
-#define DEBUG_FONTS_LISP4(format, arg1, arg2, arg3, arg4)	\
+# define DEBUG_FONTS_LISP4(format, arg1, arg2, arg3, arg4)	\
 do {								\
   if (debug_x_fonts)						\
     debug_out_lisp (format, 4, arg1, arg2, arg3, arg4);		\
 } while (0)
+#else /* not DEBUG_XEMACS */
+# define DEBUG_FONTS1(format, arg)
+# define DEBUG_FONTS2(format, arg1, arg2)
+# define DEBUG_FONTS3(format, arg1, arg2, arg3)
+# define DEBUG_FONTS4(format, arg1, arg2, arg3, arg4)
+# define DEBUG_FONTS_LISP1(format, arg)
+# define DEBUG_FONTS_LISP2(format, arg1, arg2)
+# define DEBUG_FONTS_LISP3(format, arg1, arg2, arg3)
+# define DEBUG_FONTS_LISP4(format, arg1, arg2, arg3, arg4)
+#endif
 
 #ifdef MULE