Add compiled cmake-mode.elc to load-path and do not barf when cmake-data was removed.

Thanks to Kevin Ryde.
Closes: #710573
ci/unstable
Modestas Vainius 11 years ago
parent 9ea4ef6d81
commit d2afae7e18

3
debian/changelog vendored

@ -10,6 +10,9 @@ cmake (2.8.12-0r1) UNRELEASED; urgency=low
(Closes: #716798) (Closes: #716798)
* Follow emacsen policy 5C and link cmake-mode.el source file next to * Follow emacsen policy 5C and link cmake-mode.el source file next to
compiled one. Thanks to Kevin Ryde. (Closes: #710570) compiled one. Thanks to Kevin Ryde. (Closes: #710570)
* Add compiled cmake-mode.elc to load-path and do not barf in emacs if
cmake-data was removed but not purged. Thanks to Kevin Ryde.
(Closes: #710573)
-- Modestas Vainius <modax@debian.org> Sun, 03 Nov 2013 12:28:06 +0200 -- Modestas Vainius <modax@debian.org> Sun, 03 Nov 2013 12:28:06 +0200

@ -2,9 +2,14 @@
;; ;;
;; Emacs startup file for the Debian GNU/Linux cmake package ;; Emacs startup file for the Debian GNU/Linux cmake package
(autoload 'cmake-mode "cmake-mode") (if (file-exists-p "/usr/share/emacs/site-lisp/cmake-mode.el")
(progn
(setq auto-mode-alist (debian-pkg-add-load-path-item (concat "/usr/share/"
(symbol-name debian-emacs-flavor)
"/site-lisp/cmake-data"))
(autoload 'cmake-mode "cmake-mode")
(setq auto-mode-alist
(append '(("CMakeLists\\.txt\\'" . cmake-mode) (append '(("CMakeLists\\.txt\\'" . cmake-mode)
("\\.cmake\\'" . cmake-mode)) ("\\.cmake\\'" . cmake-mode))
auto-mode-alist)) auto-mode-alist)))
(message "cmake-data removed but not purged, skipping setup"))

Loading…
Cancel
Save