diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 07:45:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 07:45:30 -0700 |
| commit | 1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5 (patch) | |
| tree | 8a02e7689c33e13e15120508d724c497a14847c4 /lisp/emacs-lisp/find-func.el | |
| parent | 97c05cc892af85abd9438d2f685d08c557a0d9fb (diff) | |
| parent | 9c2a1a264cf418fcf187b95b49fe986b32ceabef (diff) | |
| download | emacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.tar.gz emacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.tar.bz2 emacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.zip | |
Merge from origin/emacs-25
9c2a1a2 * doc/misc/texinfo.tex: Sync from gnulib.
66cd4d8 * lisp/emacs-lisp/find-func.el (find-feature-regexp) (find-al...
1a5a05c Do not mistake colon at the end of regexp for slash symbol
4c5a00b Make package-install-from-buffer not move point
9596ea1 ; Revert "* emacs-lisp/lisp-mnt.el (lm-header): save-excursion"
f79c352 Redo the fix for bug#21839
8d2f78c Don't treat JS spread as contination method call
Diffstat (limited to 'lisp/emacs-lisp/find-func.el')
| -rw-r--r-- | lisp/emacs-lisp/find-func.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index c625fd345c9..7bc966366bd 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -111,7 +111,7 @@ should insert the feature name." ;; (point-min), which is acceptable in this case. :type 'regexp :group 'xref - :version "25.0") + :version "25.1") (defcustom find-alias-regexp "(defalias +'%s" @@ -120,7 +120,7 @@ Note it must contain a `%s' at the place where `format' should insert the feature name." :type 'regexp :group 'xref - :version "25.0") + :version "25.1") (defvar find-function-regexp-alist '((nil . find-function-regexp) |