Merge latest Org fixes (commit 7524ef2).

[gnu-emacs] / lisp / profiler.el

diff --git a/lisp/profiler.el b/lisp/profiler.el
index efa23e7aec066e468c264d88b8365ce6fecae559..04a171a6cb2efe17d5efa07279f9c0cf9174fb83 100644 (file)
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -1,6 +1,6 @@
 ;;; profiler.el --- UI and helper functions for Emacs's native profiler -*- lexical-binding: t -*-
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
 
 ;; Author: Tomohiro Matsuyama <tomo@cx4a.org>
 ;; Keywords: lisp
@@ -20,7 +20,7 @@
 
 ;;; Commentary:
 
-;;
+;; See Info node `(elisp)Profiling'.
 
 ;;; Code:
 
@@ -29,6 +29,7 @@
 (defgroup profiler nil
   "Emacs profiler."
   :group 'lisp
+  :version "24.3"
   :prefix "profiler-")
 
 (defconst profiler-version "24.3")
@@ -352,7 +353,9 @@ this variable directly.")
                  (propertize (symbol-name entry)
                              'face 'link
                              'mouse-face 'highlight
-                             'help-echo "mouse-2 or RET jumps to definition"))
+                             'help-echo "\
+mouse-2: jump to definition\n\
+RET: expand or collapse"))
                 (t
                  (profiler-format-entry entry)))))
     (propertize string 'profiler-entry entry)))
@@ -495,7 +498,7 @@ return it."
            t))))))
 
 (defun profiler-report-collapse-entry ()
-  "Collpase entry at point."
+  "Collapse entry at point."
   (interactive)
   (save-excursion
     (beginning-of-line)