aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoah Friedman1996-10-04 04:43:42 +0000
committerNoah Friedman1996-10-04 04:43:42 +0000
commit477c388f4ba4ccafb6dff77ea4db97bf7fcc9df5 (patch)
treeae9d93dd8b592f55532a3c53b64fc5255b8fefec
parent0995fa350a861885b709fc2bfc210d65a5597385 (diff)
downloademacs-477c388f4ba4ccafb6dff77ea4db97bf7fcc9df5.tar.gz
emacs-477c388f4ba4ccafb6dff77ea4db97bf7fcc9df5.zip
(eldoc-function-argstring-from-docstring): Add search that finds arglist
for `start-process'; possibly others.
-rw-r--r--lisp/emacs-lisp/eldoc.el14
1 files changed, 11 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 5c4683d4138..ff84819c748 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -11,9 +11,9 @@
11;; LCD Archive Entry: 11;; LCD Archive Entry:
12;; eldoc|Noah Friedman|friedman@prep.ai.mit.edu| 12;; eldoc|Noah Friedman|friedman@prep.ai.mit.edu|
13;; show function arglist or variable docstring in echo area| 13;; show function arglist or variable docstring in echo area|
14;; $Date: 1995/11/25 03:45:25 $|$Revision: 1.5 $|~/misc/eldoc.el.gz| 14;; $Date: 1996/07/14 16:46:25 $|$Revision: 1.6 $|~/misc/eldoc.el.gz|
15 15
16;; $Id: eldoc.el,v 1.5 1995/11/25 03:45:25 friedman Exp friedman $ 16;; $Id: eldoc.el,v 1.6 1996/07/14 16:46:25 friedman Exp friedman $
17 17
18;; This program is free software; you can redistribute it and/or modify 18;; This program is free software; you can redistribute it and/or modify
19;; it under the terms of the GNU General Public License as published by 19;; it under the terms of the GNU General Public License as published by
@@ -319,6 +319,8 @@ documentation string if possible."
319 (doclist nil) 319 (doclist nil)
320 (end nil)) 320 (end nil))
321 (save-match-data 321 (save-match-data
322 ;; TODO: Move these into a separate table that is iterated over until
323 ;; a match is found.
322 (cond 324 (cond
323 ;; Try first searching for args starting with symbol name. 325 ;; Try first searching for args starting with symbol name.
324 ;; This is to avoid matching parenthetical remarks in e.g. sit-for. 326 ;; This is to avoid matching parenthetical remarks in e.g. sit-for.
@@ -373,7 +375,13 @@ documentation string if possible."
373 (setq end (- (match-end 1) 1)) 375 (setq end (- (match-end 1) 1))
374 (if (string-match " +" docstring (match-beginning 1)) 376 (if (string-match " +" docstring (match-beginning 1))
375 (setq doc (substring docstring (match-end 0) end)) 377 (setq doc (substring docstring (match-end 0) end))
376 (setq doc "")))) 378 (setq doc "")))
379
380 ;; This finds the argstring for `start-process'.
381 ;; I don't know if there are any others with the same pattern.
382 ((string-match "^Args are +\\([^\n]+\\)$" docstring)
383 (setq doc (substring docstring (match-beginning 1) (match-end 1))))
384 )
377 385
378 (cond ((not (stringp doc)) 386 (cond ((not (stringp doc))
379 nil) 387 nil)