aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2023-11-03 09:41:11 +0200
committerEli Zaretskii2023-11-03 09:41:11 +0200
commit12d1f33ceb37a2d0399af7e4054024c60a465ab8 (patch)
tree8bf9b7f1809782e69e81358fb2ba457b32b68697
parent9867be2f6c2f9a94aa4778d72b598717a0925d73 (diff)
downloademacs-12d1f33ceb37a2d0399af7e4054024c60a465ab8.tar.gz
emacs-12d1f33ceb37a2d0399af7e4054024c60a465ab8.zip
; Fix recent changes in documentation
* lisp/man.el (Man-header-file-path, man): Doc fix. * etc/NEWS: Fix wording.
-rw-r--r--etc/NEWS8
-rw-r--r--lisp/man.el9
2 files changed, 9 insertions, 8 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 1390cb1cf6f..e29a787a0cc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -693,10 +693,10 @@ asynchronously (which is the default behavior).
693 693
694+++ 694+++
695*** New user option 'Man-support-remote-systems'. 695*** New user option 'Man-support-remote-systems'.
696This option controls whether the man page is taken from the remote 696This option controls whether the man page is formatted on the remote
697system when the current buffer is remote. You can invoke the 'man' 697system when the current buffer's default-directory is remote. You can
698command with a prefix argument to reverse the value of this option 698invoke the 'man' command with a prefix argument to countermand the
699only for the current invocation. 699value of this option for the current invocation of 'man'.
700 700
701** DocView 701** DocView
702 702
diff --git a/lisp/man.el b/lisp/man.el
index 28c71ba1e06..f18e2f50b7c 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -583,10 +583,11 @@ Otherwise, the value is whatever the function
583 "/bin/sh")) 583 "/bin/sh"))
584 584
585(defun Man-header-file-path () 585(defun Man-header-file-path ()
586 "Return the C header file search path that Man uses. 586 "Return the C header file search path that Man should use.
587Normally, this is the value of the user option `Man-header-file-path', 587Normally, this is the value of the user option `Man-header-file-path',
588but when the man page is retrieved from a remote system this 588but when the man page is formatted on a remote system (see
589function tries to find the C header path on that system." 589`Man-support-remote-systems'), this function tries to figure out the
590list of directories where the remote system has the C header files."
590 (let ((remote-id (file-remote-p default-directory))) 591 (let ((remote-id (file-remote-p default-directory)))
591 (if (null remote-id) 592 (if (null remote-id)
592 ;; The local case. 593 ;; The local case.
@@ -1091,7 +1092,7 @@ to auto-complete your input based on the installed manual pages.
1091If `default-directory' is remote, and `Man-support-remote-systems' 1092If `default-directory' is remote, and `Man-support-remote-systems'
1092is non-nil, this command formats the man page on the remote system. 1093is non-nil, this command formats the man page on the remote system.
1093A prefix argument reverses the value of `Man-support-remote-systems' 1094A prefix argument reverses the value of `Man-support-remote-systems'
1094for the current call." 1095for the current invocation."
1095 1096
1096 (interactive 1097 (interactive
1097 (list (let* ((default-entry (Man-default-man-entry)) 1098 (list (let* ((default-entry (Man-default-man-entry))