diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-07-07 07:50:39 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-07-07 07:50:39 -0700 |
| commit | 3b36b38713aefb3aba40b3c094246782e8893f80 (patch) | |
| tree | 07fa2065252c6cfbe9dc266cfd043071921e321f /lisp | |
| parent | 6b80ff3c465f87a31ccaaf41b2b521075f43632d (diff) | |
| parent | 59e768d64ad97782249fda9e53b6adc94c6d0130 (diff) | |
| download | emacs-3b36b38713aefb3aba40b3c094246782e8893f80.tar.gz | |
Merge from origin/emacs-27
59e768d64a Fix undefined behavior in json.c (Bug#42113)
cce00bef03 Fix ACTION argument of 'display-buffer' call in gud.el
0121db2702 * src/keyboard.c (Fclear_this_command_keys): Doc fix.
b9abf5ceb2 Improve do string of 'man'
b87fc938a0 ; * src/xdisp.c (pos_visible_p): Yet another minor fix for...
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/man.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/man.el b/lisp/man.el index 5278a1a84dd..8a36f3ac25d 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -996,7 +996,11 @@ An \"apropos\" query with -k gives a buffer of matching page names or descriptions. The pattern argument is usually an \"grep -E\" style regexp. - -k pattern" + -k pattern + +Note that in some cases you will need to use \\[quoted-insert] to quote the +SPC character in the above examples, because this command attempts +to auto-complete your input based on the installed manual pages." (interactive (list (let* ((default-entry (Man-default-man-entry)) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index eb43e8b7e44..092d15983e5 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2620,9 +2620,9 @@ comint mode, which see." (select-window (display-buffer (get-buffer-create (concat "*gud" filepart "*")) - '(display-buffer-reuse-window - display-buffer-in-previous-window - display-buffer-same-window display-buffer-pop-up-window))) + '((display-buffer-reuse-window + display-buffer-in-previous-window + display-buffer-same-window display-buffer-pop-up-window)))) (when (and existing-buffer (get-buffer-process existing-buffer)) (error "This program is already being debugged")) ;; Set the dir, in case the buffer already existed with a different dir. |