diff options
| author | Leo Liu | 2015-07-19 12:39:37 +0800 |
|---|---|---|
| committer | Leo Liu | 2015-07-19 12:39:37 +0800 |
| commit | f7ba648def727053a2da7d71150a0ee991ec4f9e (patch) | |
| tree | 15d66d0e87777cd5c2a352cb719c5950a211b29c | |
| parent | 82ed706469925bfe570e20c4daa750aeeaf4e63b (diff) | |
| download | emacs-f7ba648def727053a2da7d71150a0ee991ec4f9e.tar.gz emacs-f7ba648def727053a2da7d71150a0ee991ec4f9e.zip | |
Fix a bug in cfengine3-mode
* progmodes/cfengine.el (cfengine3-mode): Handle nil
eldoc-documentation-function.
| -rw-r--r-- | lisp/progmodes/cfengine.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index 27784a503ba..108ccb654c4 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el | |||
| @@ -1390,6 +1390,10 @@ to the action header." | |||
| 1390 | (when buffer-file-name | 1390 | (when buffer-file-name |
| 1391 | (shell-quote-argument buffer-file-name))))) | 1391 | (shell-quote-argument buffer-file-name))))) |
| 1392 | 1392 | ||
| 1393 | ;; For emacs < 25.1 where `eldoc-documentation-function' defaults to | ||
| 1394 | ;; nil. | ||
| 1395 | (or eldoc-documentation-function | ||
| 1396 | (setq-local eldoc-documentation-function #'ignore)) | ||
| 1393 | (add-function :before-until (local 'eldoc-documentation-function) | 1397 | (add-function :before-until (local 'eldoc-documentation-function) |
| 1394 | #'cfengine3-documentation-function) | 1398 | #'cfengine3-documentation-function) |
| 1395 | 1399 | ||