diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
| commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
| tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /lisp/emacs-lisp | |
| parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
| parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
| download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.bz2 emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip | |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/benchmark.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/elp.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ewoc.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index 0dc9333d5fa..b86b56b81ec 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el @@ -96,7 +96,8 @@ result. The overhead of the `lambda's is accounted for." ;;;###autoload (defun benchmark (repetitions form) "Print the time taken for REPETITIONS executions of FORM. -Interactively, REPETITIONS is taken from the prefix arg. +Interactively, REPETITIONS is taken from the prefix arg, and +the command prompts for the form to benchmark. For non-interactive use see also `benchmark-run' and `benchmark-run-compiled'." (interactive "p\nxForm: ") diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index a0b42086308..4f97712b980 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -641,7 +641,7 @@ list of a symbol.") (defun edebug-form-data-symbol () "Return the edebug data symbol of the form where point is in. -If point is not inside a edebuggable form, cause error." +If point is not inside an edebuggable form, signal an error." (or (edebug--form-data-name (edebug-get-form-data-entry (point))) (error "Not inside instrumented form"))) diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el index 2dc18163aa3..012e7cf1cd3 100644 --- a/lisp/emacs-lisp/elp.el +++ b/lisp/emacs-lisp/elp.el @@ -278,8 +278,9 @@ Argument FUNSYM is the symbol of a defined function." (defun elp-instrument-list (&optional list) "Instrument, for profiling, all functions in `elp-function-list'. Use optional LIST if provided instead. -If called interactively, read LIST using the minibuffer." - (interactive "PList of functions to instrument: ") ;FIXME: Doesn't work?! +If called interactively, prompt for LIST in the minibuffer; +type \"nil\" to use `elp-function-list'." + (interactive "xList of functions to instrument: ") (unless (listp list) (signal 'wrong-type-argument (list 'listp list))) (mapcar #'elp-instrument-function (or list elp-function-list))) diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index b88a1a5097c..262d4d85941 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -411,7 +411,7 @@ If the EWOC is empty, nil is returned." ((>= pos (ewoc--node-start-marker (ewoc--node-nth dll -2))) (ewoc--node-nth dll -2)) - ;; We now know that pos is within a elem. + ;; We now know that pos is within an elem. (t ;; Make an educated guess about which of the three known ;; node'es (the first, the last, or GUESS) is nearest. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index ab02d4255b1..999e0d07524 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1750,7 +1750,7 @@ with PKG-DESC entry removed." "Return a list of dependencies for PACKAGE sorted by dependency. PACKAGE is included as the first element of the returned list. ONLY is an alist associating package names to package objects. -Only these packages will be in the return value an their cdrs are +Only these packages will be in the return value and their cdrs are destructively set to nil in ONLY." (let ((out)) (dolist (dep (package-desc-reqs package)) |