diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-02-28 17:35:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-02-28 17:35:08 +0000 |
| commit | bdf36482bbea390390ae7ab1461b14b807c4fb1f (patch) | |
| tree | b5233d2eecc5dc15e0d4590bb8b006978470c1f9 /lisp/emacs-lisp | |
| parent | 769ca8d5851c58825954d69ffc9b6033db650204 (diff) | |
| parent | 3ea32d7481523bbb0c54b90606687dcba5c5a405 (diff) | |
| download | emacs-bdf36482bbea390390ae7ab1461b14b807c4fb1f.tar.gz emacs-bdf36482bbea390390ae7ab1461b14b807c4fb1f.tar.bz2 emacs-bdf36482bbea390390ae7ab1461b14b807c4fb1f.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-120
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-121
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-122
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-123
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-124
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-125
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-126
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-127
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-40
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-41
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-42
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-523
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/find-func.el | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index d6477b854a1..ee2d74c5646 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -512,7 +512,7 @@ The function does NOT recursively descend into subdirectories of the directory or directories specified." (interactive "DUpdate autoloads from directory: ") (let* ((files-re (let ((tmp nil)) - (dolist (suf load-suffixes + (dolist (suf (get-load-suffixes) (concat "^[^=.].*" (regexp-opt tmp t) "\\'")) (unless (string-match "\\.elc" suf) (push suf tmp))))) (files (apply 'nconc diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 8776d4522c2..4f961df0791 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -142,7 +142,7 @@ See the functions `find-function' and `find-variable'." (defun find-library-suffixes () (let ((suffixes nil)) - (dolist (suffix load-suffixes (nreverse suffixes)) + (dolist (suffix (get-load-suffixes) (nreverse suffixes)) (unless (string-match "elc" suffix) (push suffix suffixes))))) (defun find-library-name (library) @@ -153,7 +153,7 @@ See the functions `find-function' and `find-variable'." (setq library (replace-match "" t t library))) (or (locate-file library (or find-function-source-path load-path) - (append (find-library-suffixes) '(""))) + (append (find-library-suffixes) load-file-rep-suffixes)) (error "Can't find library %s" library))) (defvar find-function-C-source-directory |