diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cc-styles.el | 12 | ||||
| -rw-r--r-- | lisp/progmodes/flymake.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/xref.el | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el index c6b6be5b399..4d518838d11 100644 --- a/lisp/progmodes/cc-styles.el +++ b/lisp/progmodes/cc-styles.el @@ -444,17 +444,19 @@ STYLE using `c-set-style' if the optional SET-P flag is non-nil." defstr)) (prompt (concat symname " offset " defstr)) (keymap (make-sparse-keymap)) - (minibuffer-completion-table obarray) - (minibuffer-completion-predicate 'fboundp) offset input) ;; In principle completing-read is used here, but SPC is unbound ;; to make it less annoying to enter lists. (set-keymap-parent keymap minibuffer-local-completion-map) (define-key keymap " " 'self-insert-command) (while (not offset) - (setq input (read-from-minibuffer prompt nil keymap t - 'c-read-offset-history - (format "%s" oldoff))) + (minibuffer-with-setup-hook + (lambda () + (setq-local minibuffer-completion-table obarray) + (setq-local minibuffer-completion-predicate 'fboundp)) + (setq input (read-from-minibuffer prompt nil keymap t + 'c-read-offset-history + (format "%s" oldoff)))) (if (c-valid-offset input) (setq offset input) ;; error, but don't signal one, keep trying diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 403925c8557..4f9506c98b9 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -332,7 +332,7 @@ retrieval with `flymake-diagnostic-data'. If LOCUS is a buffer BEG and END should be buffer positions inside it. If LOCUS designates a file, BEG and END should be a cons (LINE . COL) indicating a file position. In this second -case, END may be ommited in which case the region is computed +case, END may be omitted in which case the region is computed using `flymake-diag-region' if the diagnostic is appended to an actual buffer. @@ -870,7 +870,7 @@ and other buffers." (dolist (d diags) (setf (flymake--diag-backend d) backend)) (save-restriction (widen) - ;; First, clean up. Remove diagnostics from bookeeping lists and + ;; First, clean up. Remove diagnostics from bookkeeping lists and ;; their overlays from buffers. ;; (cond diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 26188bbddab..edb98aa5fe6 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1028,7 +1028,7 @@ GROUP is a string for decoration purposes and XREF is an (run-hooks 'xref-after-update-hook)) (defun xref--group-name-for-display (group project-root) - "Return GROUP formatted in the prefered style. + "Return GROUP formatted in the preferred style. The style is determined by the value of `xref-file-name-display'. If GROUP looks like a file name, its value is formatted according |