bug#73656: 30.0.91; icomplete-vertical has no matches for M-x man RET chdir

[Van Ly via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

> [1:text/plain Hide]
>
>>>> +                         (if (eq system-type 'berkeley-unix) "-l")
>> As gap filler, the following change does not misbehave on deb or netbsd.
>
> I don't think we need a gap filler.
> How 'bout the patch below?
>
>

On NetBSD the patch fails to generate the icomplete-vertical-mode
autocomplete for "chd" when invoked in "emacs -Q" session.  The man.elc
file was byte recompiled.

On debian the patch also fails.  Emacs was configured --without-x and
has *Messages* buffer content referring to unbound image-scaling-factor

 . Byte-Compile man.el? (y or n) y
 . Compiling /u/van/src/emacs/30.0.91/lisp/man.el...done
 . Wrote /u/van/src/emacs/30.0.91/lisp/man.elc
 . Byte-Compile: 1 file.
 . Quit
 . Note, built-in variable ‘image-scaling-factor’ not bound
 . You can run the command ‘icomplete-vertical-mode’ with M-x ic--m
 . Note, built-in variable ‘image-scaling-factor’ not bound


Note, also, on debian the -l switch means as follows

  -l, --local-file           interpret PAGE argument(s) as local filename(s)



[-- Attachment #2: result from applied diff --]
[-- Type: application/octet-stream, Size: 3747 bytes --]

diff -u /u/van/src/emacs/30.0.91/lisp/man_orig_el /u/van/src/emacs/30.0.91/lisp/man.el
--- /u/van/src/emacs/30.0.91/lisp/man_orig_el	2024-09-12 07:10:33.000000000 +1000
+++ /u/van/src/emacs/30.0.91/lisp/man.el	2024-11-02 02:17:18.997424504 +1100
@@ -973,6 +973,27 @@
               (search-forward-regexp "\\=, *\\([^ \t,]+\\)" bound t)))))
     (nreverse table)))
 
+(defvar Man-man-k-flags
+  ;; It's not clear which man page will "always" be available, `man -k man'
+  ;; seems like the safest choice, but `man -k apropos' seems almost as safe
+  ;; and usually returns a much shorter output.
+  (with-temp-buffer
+    (with-demoted-errors "%S" (call-process "man" nil t nil "-k" "apropos"))
+    (let ((lines (count-lines (point-min) (point-max)))
+          (completions (Man-parse-man-k)))
+      (if (>= (length completions) lines)
+          '("-k") ;; "-k" seems to return sane results: look no further!
+        (erase-buffer)
+        ;; Try "-k -l" (bug#73656).
+        (with-demoted-errors "%S" (call-process "man" nil t nil
+                                                "-k" "-l" "apropos"))
+        (let ((lines (count-lines (point-min) (point-max)))
+              (completions (Man-parse-man-k)))
+          (if (>= (length completions) lines)
+              '("-k" "-l") ;; "-k -l" seems to return sane results.
+            '("-k"))))))
+  "List of arguments to pass to get the expected \"man -k\" output.")
+
 (defun Man-completion-table (string pred action)
   (cond
    ;; This ends up returning t for pretty much any string, and hence leads to
@@ -1009,19 +1030,23 @@
                       (ignore-errors
                         (process-file
                          manual-program nil '(t nil) nil
-                         "-k" (concat (when (or Man-man-k-use-anchor
-                                                (string-equal prefix ""))
-                                        "^")
-                                      (if (string-equal prefix "")
-                                          prefix
-                                        ;; FIXME: shell-quote-argument
-                                        ;; is not entirely
-                                        ;; appropriate: we actually
-                                        ;; need to quote ERE here.
-                                        ;; But we don't have that, and
-                                        ;; shell-quote-argument does
-                                        ;; the job...
-                                        (shell-quote-argument prefix))))))
+                         ;; FIXME: When `process-file' runs on a remote hosts,
+                         ;; `Man-man-k-flags' may be wrong.
+                         `(,@Man-man-k-flags
+                           ,(concat (when (or Man-man-k-use-anchor
+                                              (string-equal prefix ""))
+                                      "^")
+                                    (if (string-equal prefix "")
+                                        prefix
+                                      ;; FIXME: shell-quote-argument
+                                      ;; is not entirely
+                                      ;; appropriate: we actually
+                                      ;; need to quote ERE here.
+                                      ;; But we don't have that, and
+                                      ;; shell-quote-argument does
+                                      ;; the job...
+                                      (shell-quote-argument prefix)))))))
+
               (setq table (Man-parse-man-k)))))
 	;; Cache the table for later reuse.
         (when table

Diff finished.  Sat Nov  2 02:29:09 2024

[-- Attachment #3: Type: text/plain, Size: 10 bytes --]




-- 
vl