aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-01-03 22:05:12 +0000
committerStefan Monnier2005-01-03 22:05:12 +0000
commit1b60b25ac3554a6b70f553f8d227acac9255b6e1 (patch)
tree743f2957c2dddf288fd47f309486bcf904ab4d37
parent8ea5080e3587261d4188dbdeac4ed6ddf352f706 (diff)
downloademacs-1b60b25ac3554a6b70f553f8d227acac9255b6e1.tar.gz
emacs-1b60b25ac3554a6b70f553f8d227acac9255b6e1.zip
(find-variable-regexp): Avoid defface.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/find-func.el8
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ad139850ba..f53277edaa4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12005-01-03 Stefan Monnier <monnier@iro.umontreal.ca> 12005-01-03 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/find-func.el (find-variable-regexp): Avoid defface.
4
3 * progmodes/perl-mode.el (perl-nochange, perl-calculate-indent): 5 * progmodes/perl-mode.el (perl-nochange, perl-calculate-indent):
4 Don't confuse module-prefixed identifiers for labels. 6 Don't confuse module-prefixed identifiers for labels.
5 Reported by Juan-Leon Lahoz Garcia <juanleon1@gmail.com>. 7 Reported by Juan-Leon Lahoz Garcia <juanleon1@gmail.com>.
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index a70adb4d423..8b3125db50b 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -1,6 +1,6 @@
1;;; find-func.el --- find the definition of the Emacs Lisp function near point 1;;; find-func.el --- find the definition of the Emacs Lisp function near point
2 2
3;; Copyright (C) 1997, 1999, 2001, 2004 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 1999, 2001, 2004, 2005 Free Software Foundation, Inc.
4 4
5;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp> 5;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp>
6;; Maintainer: petersen@kurims.kyoto-u.ac.jp 6;; Maintainer: petersen@kurims.kyoto-u.ac.jp
@@ -76,10 +76,10 @@ Please send improvements and fixes to the maintainer."
76 :version "21.1") 76 :version "21.1")
77 77
78(defcustom find-variable-regexp 78(defcustom find-variable-regexp
79 (concat"^\\s-*(def[^umag]\\(\\w\\|\\s_\\)+\\*?" find-function-space-re "%s\\(\\s-\\|$\\)") 79 (concat"^\\s-*(def[^fumag]\\(\\w\\|\\s_\\)+\\*?" find-function-space-re "%s\\(\\s-\\|$\\)")
80 "The regexp used by `find-variable' to search for a variable definition. 80 "The regexp used by `find-variable' to search for a variable definition.
81It should match right up to the variable name. The default value 81It should match right up to the variable name. The default value
82avoids `defun', `defmacro', `defalias', `defadvice', `defgroup'. 82avoids `defun', `defmacro', `defalias', `defadvice', `defgroup', `defface'.
83 83
84Please send improvements and fixes to the maintainer." 84Please send improvements and fixes to the maintainer."
85 :type 'regexp 85 :type 'regexp
@@ -437,5 +437,5 @@ Point is saved if FUNCTION is in the current buffer."
437 437
438(provide 'find-func) 438(provide 'find-func)
439 439
440;;; arch-tag: 43ecd81c-74dc-4d9a-8f63-a61e55670d64 440;; arch-tag: 43ecd81c-74dc-4d9a-8f63-a61e55670d64
441;;; find-func.el ends here 441;;; find-func.el ends here