diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2017-05-26 09:50:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 09:50:18 -0700 |
| commit | 4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe (patch) | |
| tree | 51c9076fd65d2da0fe4b8a9ee1bcf7c80d52a112 | |
| parent | 95749d5af626cfb1925c932d23f5080fc609e11e (diff) | |
| parent | 979107ec7a257cbb6a0fa221956a9b2ada03b7ad (diff) | |
| download | protobuf-4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe.tar.gz protobuf-4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe.tar.bz2 protobuf-4674cc7c073f1b8d5efd2a42ffcf3ca30a907bfe.zip | |
Merge pull request #3113 from phst/master
Improve fix for https://github.com/google/protobuf/issues/295
| -rw-r--r-- | editors/protobuf-mode.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editors/protobuf-mode.el b/editors/protobuf-mode.el index 1cef4137..d3bdcded 100644 --- a/editors/protobuf-mode.el +++ b/editors/protobuf-mode.el @@ -64,9 +64,11 @@ ;;; Code: (require 'cc-mode) -(require 'cl) (eval-when-compile + (and (= emacs-major-version 24) + (>= emacs-minor-version 4) + (require 'cl)) (require 'cc-langs) (require 'cc-fonts)) |