diff options
Diffstat (limited to 'lisp/man.el')
| -rw-r--r-- | lisp/man.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/man.el b/lisp/man.el index bec3bfdbb2e..1a82b120629 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -253,7 +253,7 @@ the associated section number." "Regexp that matches the text that precedes the command's name. Used in `bookmark-set' to get the default bookmark name." :version "24.1" - :type 'string :group 'bookmark) + :type 'regexp :group 'bookmark) (defcustom manual-program "man" "Program used by `man' to produce man pages." @@ -836,7 +836,8 @@ POS defaults to `point'." ;; ====================================================================== ;; Top level command and background process sentinel -;; For compatibility with older versions. +;; This alias was originally for compatibility with older versions. +;; Some users got used to having it, so we will not remove it. ;;;###autoload (defalias 'manual-entry 'man) @@ -1013,10 +1014,9 @@ to auto-complete your input based on the installed manual pages." (completion-ignore-case t) Man-completion-cache ;Don't cache across calls. (input (completing-read - (format "Manual entry%s" - (if (string= default-entry "") - ": " - (format " (default %s): " default-entry))) + (format-prompt "Manual entry" + (and (not (equal default-entry "")) + default-entry)) 'Man-completion-table nil nil nil 'Man-topic-history default-entry))) (if (string= input "") @@ -1396,7 +1396,7 @@ synchronously, PROCESS is the name of the buffer where the manpage command is run. Second argument STRING is the entire string of output." (save-excursion (let ((Man-buffer (process-buffer process))) - (if (null (buffer-name Man-buffer)) ;; deleted buffer + (if (not (buffer-live-p Man-buffer)) ;; deleted buffer (set-process-buffer process nil) (with-current-buffer Man-buffer @@ -1430,7 +1430,7 @@ manpage command." (delete-buff nil) message) - (if (null (buffer-name Man-buffer)) ;; deleted buffer + (if (not (buffer-live-p Man-buffer)) ;; deleted buffer (or (stringp process) (set-process-buffer process nil)) |