summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-10-27 09:25:18 +0200
committerBastien Guerry <bzg@altern.org>2012-10-27 09:25:18 +0200
commitb0eeb260ef8a6dafab4d548a254e15d8e5e07863 (patch)
tree7e97a5110c3ab4d99b7f603efd5aaa45eddebc69
parent4c3527d2e647615cbeddebf13de09b289f215c4a (diff)
parentb1f20bde27faf226e28ce980da9cca06de9c4a7d (diff)
downloadorg-mode-b0eeb260ef8a6dafab4d548a254e15d8e5e07863.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-install.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-install.el b/lisp/org-install.el
index a31d8b7..aca019f 100644
--- a/lisp/org-install.el
+++ b/lisp/org-install.el
@@ -1,8 +1,10 @@
-;;; org-install.el --- autogenerated file, do not edit
+;;; org-install.el --- backward compatibility file for obsolete configuration
;;
;;; Code:
(warn "The file org-install is obsolete.
-Please change your configuration to (require 'org) instead.")
+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)