diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/font-lock.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 88096b3e78c..2d60bd5d630 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-10-07 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * font-lock.el (font-lock-fontify-buffer): Fix interactive-only markup. | ||
| 4 | |||
| 1 | 2014-10-07 Wilson Snyder <wsnyder@wsnyder.org> | 5 | 2014-10-07 Wilson Snyder <wsnyder@wsnyder.org> |
| 2 | 6 | ||
| 3 | Sync with upstream verilog-mode revision c075a492. | 7 | Sync with upstream verilog-mode revision c075a492. |
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 0a6a0e80d15..22444277ba2 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el | |||
| @@ -1047,7 +1047,7 @@ The region it returns may start or end in the middle of a line.") | |||
| 1047 | ;; Of course, this function doesn't do all of the above in all situations | 1047 | ;; Of course, this function doesn't do all of the above in all situations |
| 1048 | ;; (e.g. depending on whether jit-lock is in use) and it can't guess what | 1048 | ;; (e.g. depending on whether jit-lock is in use) and it can't guess what |
| 1049 | ;; the caller wants. | 1049 | ;; the caller wants. |
| 1050 | (interactive-only "use font-lock-ensure or font-lock-flush instead.")) | 1050 | (interactive-only "use `font-lock-ensure' or `font-lock-flush' instead.")) |
| 1051 | (interactive "p") | 1051 | (interactive "p") |
| 1052 | (font-lock-set-defaults) | 1052 | (font-lock-set-defaults) |
| 1053 | (let ((font-lock-verbose (or font-lock-verbose interactively))) | 1053 | (let ((font-lock-verbose (or font-lock-verbose interactively))) |