   (require 'man)
   (setq name (or name
                  (erlang-default-function-or-module)))
-  (require 'cl)
-  (flet ((disp-man-page-erl-fun (name)
-           (let ((modname nil)
-                 (funcname nil))
-             (cond ((string-match ":" name)
-                    (setq modname (substring name 0 (match-beginning 0)))
-                    (setq funcname (substring name (match-end 0) nil)))
-                   ((stringp name)
-                    (setq modname name)))
-             (when (or (null modname) (string= modname ""))
-               (error "No Erlang module name given"))
-             (cond ((fboundp 'Man-notify-when-ready)
-                    ;; Emacs 19:  The man command could possibly start an
-                    ;; asynchronous process, i.e. we must hook ourselves into
-                    ;; the system to be activated when the man-process
-                    ;; terminates.
-                    (if (null funcname)
-                        ()
-                      (erlang-man-patch-notify)
-                      (setq erlang-man-function-name funcname))
-                    (condition-case err
-                        (erlang-man-module modname)
-                      (error (setq erlang-man-function-name nil)
-                             (signal (car err) (cdr err)))))
-                   (t
-                    (erlang-man-module modname)
-                    (when funcname
-                      (erlang-man-find-function (current-buffer) funcname)))))))
-    (disp-man-page-erl-fun name)
-    (sleep-for 0 600)
-    ;; A hack to make sure that the function scrolls
-    ;; to the description of the function when it is
-    ;; the first time that the man page for a module
-    ;; is opened
-    (disp-man-page-erl-fun name)))
+  (erlang-man-function-display-man-page name)
+  (sleep-for 0 600)
+  ;; A hack to make sure that the function scrolls
+  ;; to the description of the function when it is
+  ;; the first time that the man page for a module
+  ;; is opened
+  (erlang-man-function-display-man-page name))
 
 
 (defun erlang-man-function-no-prompt ()

Used for communication between `erlang-man-function' and the
patch to `Man-notify-when-ready'.")

(defun erlang-man-function (&optional name)
  "Find manual page for NAME, where NAME is module:function.
The entry for `function' is displayed.

  (let ((name (erlang-default-function-or-module)))
    (if name
        (erlang-man-function name)
      (error "No function name under the cursor"))))

;; Should the defadvice be at the top level, the package `advice' would
;; be required.  Now it is only required when this functionality
