diff lisp/lisp-mode.el @ 5199:49e931565616

merge
author Ben Wing <ben@xemacs.org>
date Mon, 12 Apr 2010 00:53:18 -0500
parents 77907bd57d25
children 308d34e9f07d
line wrap: on
line diff
--- 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\\|"