(match-string-no-properties): Use substring-no-properties.

[gnu-emacs] / lisp / emacs-lisp / find-func.el

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 6186577079e2c99e8bf657b134e5430f42b20d7a..5a7cd1093c42d69bd662d2ba91dc47ec5720e537 100644 (file)
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -121,11 +121,11 @@ See the functions `find-function' and `find-variable'."
   "Return the full name of the elisp source of LIBRARY."
   ;; If the library is byte-compiled, try to find a source library by
   ;; the same name.
-  (if (string-match "\\.el\\(c\\(\\..*\\)\\)\\'" library)
-      (setq library (replace-match "" t t library 1)))
+  (if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library)
+      (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) '("")))
       (error "Can't find library %s" library)))
 
 ;;;###autoload
@@ -312,7 +312,8 @@ The library where VARIABLE is defined is searched for in FILE or
 `find-function-source-path', if non nil, otherwise in `load-path'."
   (if (not variable)
       (error "You didn't specify a variable"))
-  (let ((library (or file (symbol-file variable))))
+  ;; Fixme: I think `symbol-file' should be fixed instead.  -- fx
+  (let ((library (or file (symbol-file (cons 'defvar variable)))))
     (find-function-search-for-symbol variable 'variable library)))
 
 ;;;###autoload
@@ -351,26 +352,27 @@ See `find-variable' for more details."
   "Find the function that KEY invokes.  KEY is a string.
 Point is saved if FUNCTION is in the current buffer."
   (interactive "kFind function on key: ")
-  (save-excursion
-    (let* ((event (and (eventp key) (aref key 0))) ; Null event OK below.
-          (start (event-start event))
-          (modifiers (event-modifiers event))
-          (window (and (or (memq 'click modifiers) (memq 'down modifiers)
-                           (memq 'drag modifiers))
-                       (posn-window start))))
-      ;; For a mouse button event, go to the button it applies to
-      ;; to get the right key bindings.  And go to the right place
-      ;; in case the keymap depends on where you clicked.
-      (when (windowp window)
-       (set-buffer (window-buffer window))
-       (goto-char (posn-point start)))
-      (let ((defn (key-binding key))
-           (key-desc (key-description key)))
-       (if (or (null defn) (integerp defn))
-           (message "%s is unbound" key-desc)
-         (if (consp defn)
-             (message "%s runs %s" key-desc (prin1-to-string defn))
-           (find-function-other-window defn)))))))
+  (let (defn)
+    (save-excursion
+      (let* ((event (and (eventp key) (aref key 0))) ; Null event OK below.
+            (start (event-start event))
+            (modifiers (event-modifiers event))
+            (window (and (or (memq 'click modifiers) (memq 'down modifiers)
+                             (memq 'drag modifiers))
+                         (posn-window start))))
+       ;; For a mouse button event, go to the button it applies to
+       ;; to get the right key bindings.  And go to the right place
+       ;; in case the keymap depends on where you clicked.
+       (when (windowp window)
+         (set-buffer (window-buffer window))
+         (goto-char (posn-point start)))
+       (setq defn (key-binding key))))
+    (let ((key-desc (key-description key)))
+      (if (or (null defn) (integerp defn))
+         (message "%s is unbound" key-desc)
+       (if (consp defn)
+           (message "%s runs %s" key-desc (prin1-to-string defn))
+         (find-function-other-window defn))))))
 
 ;;;###autoload
 (defun find-function-at-point ()
@@ -401,4 +403,5 @@ Point is saved if FUNCTION is in the current buffer."
 
 (provide 'find-func)
 
+;;; arch-tag: 43ecd81c-74dc-4d9a-8f63-a61e55670d64
 ;;; find-func.el ends here