Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-01-22 14:08:44 +01:00
commit 74c7e02bcf
1 changed files with 6 additions and 4 deletions

View File

@ -1,10 +1,12 @@
;;; org-install.el --- backward compatibility file for obsolete configuration ;;; org-install.el --- backward compatibility file for obsolete configuration
;; ;;
;;; Code: ;;; Code:
(warn "The file org-install is obsolete. ;;
It is provided here so that (require 'org-install) does not ;; The file org-install is obsolete.
trigger an error for users with obsolete Emacs configuration. ;;
You can safely remove (require 'org-install) from your config.") ;; It is provided here so that (require 'org-install) does not
;; trigger an error for users with obsolete Emacs configuration.
;; You can safely remove (require 'org-install) from your config."
(provide 'org-install) (provide 'org-install)