Merge pull request #3113 from phst/master

Improve fix for https://github.com/google/protobuf/issues/295
2017-05-26 09:50:18 -07:00 · 2017-05-26 09:50:18 -07:00 · 4674cc7c07
commit 4674cc7c07
parent 95749d5af6 979107ec7a
1 changed files with 3 additions and 1 deletions
--- 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))