diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ido.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/flymake.el | 31 |
2 files changed, 17 insertions, 16 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 47cbcb63c69..4f1e36ba914 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -4701,7 +4701,7 @@ Modified from `icomplete-completions'." (if (and ido-use-faces comps) (let* ((fn (ido-name (car comps))) (ln (length fn))) - (setq first (format "%s" fn)) + (setq first (copy-sequence fn)) (put-text-property 0 ln 'face (if (= (length comps) 1) (if ido-incomplete-regexp diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index e4c6a38a77e..8c9c4b211a2 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -878,11 +878,11 @@ Do it only if `flymake-no-changes-timeout' is non-nil." (flymake-log :warning "Turned on in `flymake-find-file-hook'"))) (defun flymake-goto-next-error (&optional n filter interactive) - "Go to Nth next Flymake error in buffer matching FILTER. -Interactively, always move to the next error. With a prefix arg, -skip any diagnostics with a severity less than `:warning'. + "Go to Nth next Flymake diagnostic that matches FILTER. +Interactively, always move to the next diagnostic. With a prefix +arg, skip any diagnostics with a severity less than `:warning'. -If `flymake-wrap-around' is non-nil and no more next errors, +If `flymake-wrap-around' is non-nil and no more next diagnostics, resumes search from top. FILTER is a list of diagnostic types found in @@ -933,12 +933,13 @@ applied." "")))))) (defun flymake-goto-prev-error (&optional n filter interactive) - "Go to Nth previous Flymake error in buffer matching FILTER. -Interactively, always move to the previous error. With a prefix -arg, skip any diagnostics with a severity less than `:warning'. + "Go to Nth previous Flymake diagnostic that matches FILTER. +Interactively, always move to the previous diagnostic. With a +prefix arg, skip any diagnostics with a severity less than +`:warning'. -If `flymake-wrap-around' is non-nil and no more previous errors, -resumes search from bottom. +If `flymake-wrap-around' is non-nil and no more previous +diagnostics, resumes search from bottom. FILTER is a list of diagnostic types found in `flymake-diagnostic-types-alist', or nil, if no filter is to be @@ -953,13 +954,13 @@ applied." ;;; (easy-menu-define flymake-menu flymake-mode-map "Flymake" `("Flymake" - [ "Go to next error" flymake-goto-next-error t ] - [ "Go to previous error" flymake-goto-prev-error t ] - [ "Check now" flymake-start t ] - [ "Go to log buffer" flymake-switch-to-log-buffer t ] - [ "Show error buffer" flymake-show-diagnostics-buffer t ] + [ "Go to next problem" flymake-goto-next-error t ] + [ "Go to previous problem" flymake-goto-prev-error t ] + [ "Check now" flymake-start t ] + [ "List all problems" flymake-show-diagnostics-buffer t ] "--" - [ "Turn off Flymake" flymake-mode t ])) + [ "Go to log buffer" flymake-switch-to-log-buffer t ] + [ "Turn off Flymake" flymake-mode t ])) (defvar flymake--mode-line-format `(:eval (flymake--mode-line-format))) |