branch: externals/idlwave
commit 8a9197e18d2ff1fb91322c83f11a9b4d8f715cbc
Author: JD Smith <jdtsm...@gmail.com>
Commit: JD Smith <jdtsm...@gmail.com>
Remove defcustom kludge from Emacs 19.
From upstream Emacs.
---
idlw-shell.el | 12 ------------
idlwave.el | 9 ---------
2 files changed, 21 deletions(-)
diff --git a/idlw-shell.el b/idlw-shell.el
index df9c27a73b..b816c1945d 100644
--- a/idlw-shell.el
+++ b/idlw-shell.el
@@ -96,18 +96,6 @@
(eval-when-compile (require 'cl))
(defvar idlwave-shell-have-new-custom nil)
-(eval-and-compile
- ;; Kludge to allow `defcustom' for Emacs 19.
- (condition-case () (require 'custom) (error nil))
- (if (and (featurep 'custom)
- (fboundp 'custom-declare-variable)
- (fboundp 'defface))
- ;; We've got what we needed
- (setq idlwave-shell-have-new-custom t)
- ;; We have the old or no custom-library, hack around it!
- (defmacro defgroup (&rest args) nil)
- (defmacro defcustom (var value doc &rest args)
- `(defvar ,var ,value ,doc))))
;;; Customizations: idlwave-shell group
diff --git a/idlwave.el b/idlwave.el
index 375023fc64..c4388c2c5d 100644
--- a/idlwave.el
+++ b/idlwave.el
@@ -170,15 +170,6 @@
(require 'timer)
(error nil)))
-(eval-and-compile
- ;; Kludge to allow `defcustom' for Emacs 19.
- (condition-case () (require 'custom) (error nil))
- (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
- nil ;; We've got what we needed
- ;; We have the old or no custom-library, hack around it!
- (defmacro defgroup (&rest args) nil)
- (defmacro defcustom (var value doc &rest args)
- `(defvar ,var ,value ,doc))))
(declare-function idlwave-shell-get-path-info "idlw-shell")
(declare-function idlwave-shell-temp-file "idlw-shell")
(declare-function idlwave-shell-is-running "idlw-shell")
