summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-10-27 08:23:41 +0000
committerUlrich Müller <ulm@gentoo.org>2007-10-27 08:23:41 +0000
commitba4266f903bb9a77e55885e3b4fc2239f1ec923a (patch)
tree0618a9844e1f14d876cbf6dc3b365f0f9765e6d8 /app-emacs/calc/files
parentEase with migration to rarian by working around a blocker in some upgrade sce... (diff)
downloadhistorical-ba4266f903bb9a77e55885e3b4fc2239f1ec923a.tar.gz
historical-ba4266f903bb9a77e55885e3b4fc2239f1ec923a.tar.bz2
historical-ba4266f903bb9a77e55885e3b4fc2239f1ec923a.zip
Deactivate calc for Emacs 22. amd64 stable, bug 197184.
Package-Manager: portage-2.1.3.16
Diffstat (limited to 'app-emacs/calc/files')
-rw-r--r--app-emacs/calc/files/50calc-gentoo.el32
1 files changed, 16 insertions, 16 deletions
diff --git a/app-emacs/calc/files/50calc-gentoo.el b/app-emacs/calc/files/50calc-gentoo.el
index e00353a6a555..4c727c760c3a 100644
--- a/app-emacs/calc/files/50calc-gentoo.el
+++ b/app-emacs/calc/files/50calc-gentoo.el
@@ -1,19 +1,19 @@
;;; calc site-lisp configuration
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'calc-dispatch "calc" "Calculator Options" t)
-(autoload 'full-calc "calc" "Full-screen Calculator" t)
-(autoload 'full-calc-keypad "calc" "Full-screen X Calculator" t)
-(autoload 'calc-eval "calc" "Use Calculator from Lisp")
-(autoload 'defmath "calc" nil t t)
-(autoload 'calc "calc" "Calculator Mode" t)
-(autoload 'quick-calc "calc" "Quick Calculator" t)
-(autoload 'calc-keypad "calc" "X windows Calculator" t)
-(autoload 'calc-embedded "calc" "Use Calc inside any buffer" t)
-(autoload 'calc-embedded-activate "calc" "Activate =>'s in buffer" t)
-(autoload 'calc-grab-region "calc" "Grab region of Calc data" t)
-(autoload 'calc-grab-rectangle "calc" "Grab rectangle of data" t)
-
-(global-set-key "\e#" 'calc-dispatch)
+;; Emacs 22 and later include the calc package
+(unless (fboundp 'calc-dispatch)
+ (add-to-list 'load-path "@SITELISP@")
+ (autoload 'calc-dispatch "calc" "Calculator Options" t)
+ (autoload 'full-calc "calc" "Full-screen Calculator" t)
+ (autoload 'full-calc-keypad "calc" "Full-screen X Calculator" t)
+ (autoload 'calc-eval "calc" "Use Calculator from Lisp")
+ (autoload 'defmath "calc" nil t t)
+ (autoload 'calc "calc" "Calculator Mode" t)
+ (autoload 'quick-calc "calc" "Quick Calculator" t)
+ (autoload 'calc-keypad "calc" "X windows Calculator" t)
+ (autoload 'calc-embedded "calc" "Use Calc inside any buffer" t)
+ (autoload 'calc-embedded-activate "calc" "Activate =>'s in buffer" t)
+ (autoload 'calc-grab-region "calc" "Grab region of Calc data" t)
+ (autoload 'calc-grab-rectangle "calc" "Grab rectangle of data" t)
+ (global-set-key "\e#" 'calc-dispatch))